lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,824 Commits 43 Branches 150 Tags 886 MiB
10.0.4
Commit Graph

68218 Commits

Author SHA1 Message Date
gauthier
e2680f7637 FIX : limit 20 prevent to see all products/services 2019-11-12 09:42:27 +01:00
Laurent Destailleur
5ae5b87b60 Fix get bad default value for accounting for sales export 2019-11-11 19:07:22 +01:00
Laurent Destailleur
6233f8e1c5 Fix visibility = 3 2019-11-09 18:19:04 +01:00
Laurent Destailleur
5ebd5a401c Fix avoid error on lang not defined when calling trigger 2019-11-09 13:09:05 +01:00
Laurent Destailleur
fcf983ee23 Fix decimal separator according to lang setup 
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
 2019-11-09 12:56:34 +01:00
Laurent Destailleur
f9869dbfed Fix price2num need langs when lang is not necessarly loaded. 2019-11-09 12:46:11 +01:00
Laurent Destailleur
8f35c24b62 Add quick hack by hidden const as solution when numbering is locked. 2019-11-08 16:37:25 +01:00
Laurent Destailleur
3b44760e65 FIX #12356 2019-11-07 14:10:07 +01:00
Laurent Destailleur
5a4a421a8e FIX #12372 2019-11-07 13:07:40 +01:00
Laurent Destailleur
9423449237
Merge pull request #12308 from olibre/FIX_the_SELECT_examine_more_than_MAX_JOIN_SIZE_rows_12305 
FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305
 2019-11-07 11:26:50 +01:00
Laurent Destailleur
de77e39e08 FIX #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC. 
Now autofill works, option can be reverted in v11.
 2019-11-07 11:14:36 +01:00
Laurent Destailleur
abe35660c7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-06 18:46:18 +01:00
Laurent Destailleur
887c1a70d9 Fix remove annoying files 2019-11-06 18:46:04 +01:00
O. Libre
441eadb883 Check if mysqli to avoid perturbing PostgreSQL with "SET SQL_BIG_SELECTS=1" 2019-11-05 06:21:35 +01:00
O. Libre
729ed78063 FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305 2019-11-05 06:21:26 +01:00
Laurent Destailleur
2047f50b10
Merge pull request #12246 from mapiolca/patch-12 
Fix Multicompany Filter
 2019-11-04 21:01:26 +01:00
Pierre Ardoin
d2b7961e87
Update customerMargins.php 2019-11-03 22:45:50 +01:00
Laurent Destailleur
4d36f5de09
Merge pull request #12280 from atm-josselin/FIX_productlot_field_misspelling 
Fix misspelling on field of productlot
 2019-11-02 13:02:28 +01:00
Frédéric FRANCE
e191dd7cc0 $key is overwriting a variable from outer foreach loop 2019-11-02 11:39:32 +01:00
Laurent Destailleur
cf2ee892ee FIX security check. A user can see holiday with link without permissions 2019-11-01 21:27:19 +01:00
Laurent Destailleur
a3a326b25e FIX Search on leave request ref 2019-11-01 20:52:11 +01:00
Laurent Destailleur
83cc9ea643 FIX Search on leave request ref 2019-11-01 20:48:46 +01:00
atm-josselin
5550a62afa Fix misspelling on field of productlot 2019-10-31 11:05:45 +01:00
Marc de Lima Lucio
85cef09e83 FIX: triggers: directories read with opendir() never closed 2019-10-30 14:46:46 +01:00
Laurent Destailleur
c839551b91
Merge pull request #12206 from atm-quentin/10_fix_expeditiondet_extrafields 
FIX shipping extrafields line
 2019-10-30 03:26:35 +01:00
Laurent Destailleur
c2638f4148
Merge pull request #12238 from atm-maxime/fix_fetch_contact 
Fix missing contact fetch on card
 2019-10-30 03:04:01 +01:00
Laurent Destailleur
b7e81c5396
Merge pull request #12247 from frederic34/patch-21 
HOLIDAY_APPROVEInDolibarr
 2019-10-30 02:44:50 +01:00
Laurent Destailleur
e716e9cba6 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-10-30 02:40:05 +01:00
Laurent Destailleur
15d0d6e271 FIX #12258 2019-10-30 02:39:51 +01:00
Laurent Destailleur
8849cd9897
Update index.php 2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1 Fix sign for VAT repaid in report 2019-10-29 17:10:10 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:48:11 +01:00
Laurent Destailleur
149d63757f Space 2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:43:35 +01:00
Laurent Destailleur
21d15c3bcb FIX Set unpaid of expense report 2019-10-29 11:35:33 +01:00
Laurent Destailleur
5e06fe0712 FIX Avoid fatal error when creating thumb from PDF 2019-10-29 11:11:13 +01:00
Frédéric FRANCE
30d416f8c0
Update agenda.lang 2019-10-28 20:16:27 +01:00
Pierre Ardoin
abc7198db4
Fix Multicompany Filter 
Select only invoice in current company.
 2019-10-28 12:51:12 +01:00
Maxime Kohlhaas
fced9ec690 Fix missing contact fetch on card 2019-10-27 12:04:01 +01:00
Laurent Destailleur
88e848e346 FIX Extrafields missing in export of expense report 2019-10-24 16:00:10 +02:00
Juanjo Menent
7e9d6dc153 Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders 2019-10-24 10:58:29 +02:00
atm-quentin
7f5933adbc FIX shipping extrafields line 2019-10-23 16:00:21 +02:00
Laurent Destailleur
034b3bc814 Css 2019-10-23 03:57:17 +02:00
Laurent Destailleur
161f2a018f Fix responsive and bad closing td 2019-10-23 03:50:48 +02:00
Laurent Destailleur
2e573fd794 Fix save of units 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/card.php
	htdocs/product/class/product.class.php
 2019-10-23 03:03:55 +02:00
Laurent Destailleur
f23804a091 FIX #12152 2019-10-23 03:00:19 +02:00
Laurent Destailleur
2f0b791cfe
Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service 
FIX : if we search something with global search, and after with form …
 2019-10-22 20:06:10 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
gauthier
44ced0cbeb FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list 2019-10-22 16:11:59 +02:00
Laurent Destailleur
6079a4d159 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/main.lang
 2019-10-22 15:25:31 +02:00
Laurent Destailleur
84c8b6b5d1 FIX #12198 2019-10-22 15:23:23 +02:00
Laurent Destailleur
6205913056 FIX CVE-2019-17578 CVE-2019-17577 CVE-2019-17576 2019-10-22 02:35:54 +02:00
Laurent Destailleur
febf9ccd04 FIX The Button "Automatic binding" did not use the account intracomm or 
export.
 2019-10-21 05:24:54 +02:00
Laurent Destailleur
776bfabfc4 FIX If country not defined keep value empty 2019-10-21 05:24:42 +02:00
Laurent Destailleur
45d64e468f Fix regression 2019-10-20 15:29:15 +02:00
Laurent Destailleur
e224170dc2 FIX Clean the + of categories on the product view only in POS module 
Conflicts:
	htdocs/takepos/takepos.php
 2019-10-20 15:27:09 +02:00
Laurent Destailleur
40135e043e
Merge pull request #12166 from frederic34/patch-13 
fix cant add bookmark with csrf active
 2019-10-20 12:43:39 +02:00
Laurent Destailleur
b5390bfb3c
Merge pull request #12167 from frederic34/patch-14 
Update main.lang
 2019-10-20 12:41:06 +02:00
Laurent Destailleur
78ac543dee Fix link to list 2019-10-18 20:01:47 +02:00
Laurent Destailleur
becd3f7d2f FIX Missing status and paid flag in export or expense report 2019-10-18 15:35:25 +02:00
Laurent Destailleur
ce1b443212 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-18 14:26:09 +02:00
Frédéric FRANCE
f9c0e63f16
Update main.lang 2019-10-17 22:59:52 +02:00
Frédéric FRANCE
aeafdae34c
Update main.lang 2019-10-17 22:58:47 +02:00
Frédéric FRANCE
d442134a51
fix cant add bookmark with csrf active 2019-10-17 21:15:34 +02:00
Laurent Destailleur
373d6d60e7 Add a message 2019-10-17 21:13:18 +02:00
Laurent Destailleur
d9abbfa461 Add a message 2019-10-17 21:12:18 +02:00
Laurent Destailleur
25fe861f9b
Merge pull request #12151 from tuxgasy/10_Product_import_duplicate_volumUnits 
Fix width unit label in product import
 2019-10-17 17:47:31 +02:00
Gildas
ac46d2c918 Fix filtering ticket bug (Fixes #12081) 2019-10-17 17:46:42 +02:00
Laurent Destailleur
5e12dcc6b1 Fix on FACTURE_ENABLE_NEGATIVE 2019-10-17 15:40:02 +02:00
Laurent Destailleur
1a419a6eb6 Fix translation 2019-10-17 15:15:16 +02:00
Laurent Destailleur
e709c005a0 FIX Payment was not saved on TakePOS module. 2019-10-17 12:28:48 +02:00
Laurent Destailleur
084ab53b4b Fix translation 2019-10-17 12:14:38 +02:00
Marc de Lima Lucio
d79340a632 FIX: stock replenish: fetching and freeing non existing SQL result set 2019-10-17 09:55:02 +02:00
Laurent Destailleur
8a7a0b80e2 Fix remove warnings 2019-10-16 19:08:31 +02:00
TuxGasy
43ce1543d8 Fix width unit label in product import 2019-10-16 17:37:20 +02:00
Laurent Destailleur
8152c60878 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-10-16 17:13:14 +02:00
Laurent Destailleur
93aa7e208d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:19 +02:00
Laurent Destailleur
b47ebcca2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:10 +02:00
Laurent Destailleur
86e4ca55df Merge 2019-10-16 14:04:54 +02:00
Laurent Destailleur
81cb88721a
Merge pull request #12146 from aspangaro/10.0_p27 
Fix - Accountancy - Various payment - Subledger is not recovered in bank journal
 2019-10-16 13:19:46 +02:00
Juanjo Menent
5a1682509b FIX It is not possible to create an expedition if there is no unit data 2019-10-16 11:11:34 +02:00
Alexandre SPANGARO
4bb1677079 Fix - Accountancy - Various payment - Subledger is not recovered in bank journal 2019-10-16 10:39:35 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php 2019-10-15 17:55:07 +02:00
Laurent Destailleur
568faef7f4 Fix encoding of message 2019-10-15 04:08:34 +02:00
Laurent Destailleur
ee5fdc3239 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 23:52:58 +02:00
Laurent Destailleur
0fe3159a8a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2019-10-14 23:52:46 +02:00
Laurent Destailleur
6662b00575 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:40 +02:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Laurent Destailleur
9f61bd23ce
Merge pull request #12127 from atm-josselin/FIX_product_batch_fields_definition 
Fix : add fields definition in product batch class
 2019-10-14 21:22:24 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25 
Remove a duplicate line
 2019-10-14 21:04:22 +02:00
Laurent Destailleur
d87a1e39a6
Merge pull request #12110 from aspangaro/10.0_holiday 
lang file for holidays is holiday
 2019-10-14 21:03:55 +02:00
Laurent Destailleur
3432147385
Merge pull request #12099 from prietojc/patch-11 
FIX: Update card.php
 2019-10-14 21:02:04 +02:00
Laurent Destailleur
2e7cc67f9c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 20:42:28 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
ed0e090d91
Merge pull request #12123 from atm-greg/FIX_blocked_log_missing_lib 
add security.lib.php for dol_hash
 2019-10-14 20:37:19 +02:00
Frédéric FRANCE
45b3d623bb
Update list.php 2019-10-14 20:30:31 +02:00
atm-josselin
4f10009113 Add fields definition in product batch class for extrafields compatibility 2019-10-14 15:39:38 +02:00
atm-greg
92c624daf0 add security.lib.php for dol_hash 2019-10-14 15:28:06 +02:00
Laurent Destailleur
4fd12e22cb Fix trans export 2019-10-14 12:27:44 +02:00
Alexandre SPANGARO
e50d32dc00 Remove a duplicate line 2019-10-13 13:20:45 +02:00