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

83273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status 
FIX viewstatut to search status
 2020-04-16 00:48:12 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of 
DOL_DOCUMENT_DIR.
 2020-04-15 20:00:27 +02:00
atm-quentin
5b96066bf4 FIX keep viewstatut for doli 3.5 2020-04-15 15:07:11 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
53ceef5b6a FIX XSS Vulnerability 2020-04-15 02:32:55 +02:00
Laurent Destailleur
c3b8949e2e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-04-14 21:57:20 +02:00
Laurent Destailleur
85bea5a7c4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:27 +02:00
Laurent Destailleur
110787d66a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:16 +02:00
Laurent Destailleur
d143bd8aec FIX #13589 missing price_level in import of thirdparties 2020-04-14 21:22:08 +02:00
Laurent Destailleur
f2704036cd FIX #13517 2020-04-13 16:00:41 +02:00
Laurent Destailleur
236898f4e7 FIX #13503 2020-04-13 14:55:37 +02:00
Laurent Destailleur
a72b262f5b FIx #13592 
Conflicts:
	htdocs/compta/bank/line.php
 2020-04-13 14:52:06 +02:00
Laurent Destailleur
f726fcdcd8 FIX #13593 2020-04-13 14:32:15 +02:00
Laurent Destailleur
1c6faf79a9 FIX #13595 2020-04-13 14:23:57 +02:00
Laurent Destailleur
384cfeccf6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 21:38:51 +02:00
Laurent Destailleur
46ccd61009 Fix phpcs 2020-04-12 21:38:23 +02:00
Laurent Destailleur
0f71ee1e49
Merge pull request #13563 from simicar29/11.0 
FIX #7594 Expense report multi pagebreak
 2020-04-12 18:19:23 +02:00
Laurent Destailleur
afbfd66ee9
Merge pull request #13581 from atm-maxime/fix_expedition_warning_count 
Fix warning on shipment because of count func
 2020-04-12 17:21:28 +02:00
Laurent Destailleur
8e6de35d7b
Merge pull request #13568 from atm-maxime/10.0 
FIX #13535 : state in italian address
 2020-04-12 17:03:24 +02:00
Laurent Destailleur
8e246f2a18 Prepare 11.0.4 2020-04-12 16:54:54 +02:00
Laurent Destailleur
acbbffdb7f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 16:54:15 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:54:09 +02:00
Laurent Destailleur
94ae75c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-12 16:53:07 +02:00
Laurent Destailleur
eebf48b27c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:52:58 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Laurent Destailleur
b1bae5f3dd
Merge pull request #13569 from tuxgasy/Fix_breaking_selectForFormsList 
Keep compatibility with old object declaration
 2020-04-12 16:48:08 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php 2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php 2020-04-12 16:46:21 +02:00
Laurent Destailleur
e9ee7a23e6
Merge pull request #13573 from frederic34/patch-11 
Update actioncomm.class.php
 2020-04-12 16:42:07 +02:00
Laurent Destailleur
3cc68c6972
Merge pull request #13579 from atm-maxime/fix_variants_links 
Fix #13576 : links on variants
 2020-04-12 16:38:56 +02:00
Laurent Destailleur
a38e273ae8
Merge pull request #13583 from atm-maxime/fix_default_workdayhour 
Fix #13468 setup working days and hours
 2020-04-12 16:38:36 +02:00
Laurent Destailleur
ba2c035556
Merge pull request #13580 from atm-maxime/fix_composition_token 
Fix missing token on product composition
 2020-04-12 16:36:48 +02:00
Maxime Kohlhaas
20e684ec69 Fix #13468 setup working days and hours 2020-04-12 15:30:58 +02:00
Maxime Kohlhaas
3ca0d48b37 Fix warning on shipment because of count func 2020-04-12 10:45:30 +02:00
Maxime Kohlhaas
8bca68cfba Fix missing token on product composition 2020-04-12 10:39:16 +02:00
Maxime Kohlhaas
3f59ca6418 Fix #13576 : links on variants 2020-04-12 10:13:37 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php 2020-04-11 22:38:28 +02:00
TuxGasy
fecfe2e3a1 Keep compatibility with old object declaration 2020-04-11 18:37:06 +02:00
Maxime Kohlhaas
f5ab957faf FIX #13535 : state in italian address 2020-04-11 17:56:23 +02:00
simicar29
d0af49cdce
Merge pull request #6 from simicar29/simicar29-patch-7 
FIX #7594
 2020-04-11 13:46:27 +02:00
simicar29
9573f1289a
FIX #7594 
This is a temptative fix of the bad "multi page break" in expense report
 2020-04-11 13:42:37 +02:00
Laurent Destailleur
eb63350d55 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-11 01:09:36 +02:00
Laurent Destailleur
450b1761b1 Fix label 2020-04-11 01:09:26 +02:00
Laurent Destailleur
679b94dcaa
Merge pull request #13553 from atm-quentin/11_fix_checkbox_supplier_order 
FIX missing selectedlines on supplier order
 2020-04-10 20:04:24 +02:00
Laurent Destailleur
70e71d32c7
Merge pull request #13555 from atm-gauthier/fix_cabyprodserv 
FIX : some others modules (like subtotal) use other product_type than…
 2020-04-10 20:03:56 +02:00
Laurent Destailleur
b693525b3e
Merge pull request #13557 from philazerty/patch-9 
FIX #13519 - Update list.php
 2020-04-10 20:03:27 +02:00
philazerty
63d41fa356
Update list.php 
Bug #13519
 2020-04-10 16:48:18 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
atm-quentin
83f3c9ab6e use only 1 if 2020-04-10 12:09:18 +02:00
atm-quentin
28fa0e4e5d FIX missing selectedlines on supplier order but checkbox are displayed 2020-04-10 11:55:00 +02:00