Commit Graph

83285 Commits

Author SHA1 Message Date
stickler-ci
27aeaaecb5 Fixing style errors. 2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594 [BUGFIX] Allow update of extra fields
This is to make supplier invoices consistent with other similar classes
2020-04-20 14:42:08 +02:00
Frédéric FRANCE
f546103c01 make dolistore happy again 2020-04-20 14:37:52 +02:00
Laurent Destailleur
ea60d0be63 FIX #13618 2020-04-17 10:27:38 +02:00
Laurent Destailleur
3e7f0b364e FIX #13611 2020-04-17 10:22:08 +02:00
Laurent Destailleur
3c29a7b8d8 Fix phpcs 2020-04-16 16:02:06 +02:00
Laurent Destailleur
01ec8693f2 Trans 2020-04-16 15:48:05 +02:00
Laurent Destailleur
855ac5467c FIX setup of suggested payment mode on proposals and orders 2020-04-16 15:40:16 +02:00
Laurent Destailleur
26022f062f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +02:00
Laurent Destailleur
7f746af10e
Merge pull request #13620 from atm-quentin/FIX_draftordered_replenish
FIX draftordered replenish virtual stock
2020-04-16 00:58:23 +02:00
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
18fdf3573f FIX draftordered replenish virtual stock 2020-04-15 16:05:50 +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