Commit Graph

87205 Commits

Author SHA1 Message Date
Laurent Destailleur
e0d22b739d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/product/stock/class/entrepot.class.php
2020-07-24 01:53:24 +02:00
Laurent Destailleur
db9fc264d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-24 01:51:20 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
0f4e00a2a3 Fix language 2020-07-24 01:43:03 +02:00
Laurent Destailleur
99935ce11f FIX Should not be able to edit qty on shipment when no stock available 2020-07-24 01:31:07 +02:00
Laurent Destailleur
431b207dab Fix to solve sql error on some databases 2020-07-24 01:02:07 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d FIX Can go on page even when module disabled 2020-07-23 23:57:12 +02:00
ATM john
921e904acc Fix MySQL rank usage for column 2020-07-23 20:34:11 +02:00
John Botella
55e65bbabf Fix variable init 2020-07-23 11:12:04 +02:00
John Botella
fc1de5b4f3 Fix multicurecy option not applied 2020-07-23 11:10:18 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Frans Bosman
e2592d9049 Update card_presend.tpl.php
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
2020-07-22 11:44:26 +02:00
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
florian HENRY
734a6de996 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_fix_commerce_MenuSupplierORderOnly 2020-07-20 09:01:30 +02:00
florian HENRY
2c5e96bb28 better fix 2020-07-20 09:01:21 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Francis Appels
c2030a7db5 jdate already in function listProductFournisseurPriceLog
So no conversion needed.
2020-07-19 09:43:15 +02:00
Laurent Destailleur
d598039f20 Merge pull request #14218 from Ahuahuachi/12.0
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
521c4679d9 FIX #14241 Mysql 8 compatibility 2020-07-19 01:52:30 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
48adeb9dd7 FIX #14256 2020-07-19 01:38:38 +02:00
Laurent Destailleur
6fdd5ea73a Not required 2020-07-19 01:31:51 +02:00
Laurent Destailleur
ee74740384 FIX #14259 2020-07-19 01:29:42 +02:00
Laurent Destailleur
16d486e211 FIX Setup of currency limit and accuracy 2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4 Code comment 2020-07-19 00:02:02 +02:00
Laurent Destailleur
3069eaa5c0 Merge pull request #14191 from Gecka-Apps/12.0-fix-14181
[REGRESSION] Fix #14181. Limits and accuracy form not saving modified values.
2020-07-18 23:59:29 +02:00
Laurent Destailleur
c30491284f Fix phpcs 2020-07-18 23:16:05 +02:00
Abdessalam@MEGALOGI
1e6273b92d Update card.php
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-18 23:11:17 +02:00
Oarces DEV
f3e3c47af3 Add the possibility for the prospect to order
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 23:04:22 +02:00
Laurent Destailleur
15cdb3ed79 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2020-07-18 23:00:09 +02:00
Laurent Destailleur
ac92a9fa40 Doc more complete 2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82 Fix comment 2020-07-18 19:41:11 +02:00
Laurent Destailleur
384cb22d3a Merge pull request #14220 from FHenry/11.0
fix missing entity into fetch wharehouse
2020-07-18 19:32:24 +02:00
Laurent Destailleur
f61b6a1c31 Merge pull request #14234 from FHenry/11_fix_listwharehou_ref_filter
fix filter wharehouse list on ref
2020-07-18 19:31:31 +02:00
Laurent Destailleur
cbc8187616 Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
Fix extrafields ordering on PDFs
2020-07-18 19:30:34 +02:00
Laurent Destailleur
eef66ae6ed Fix var not defined 2020-07-18 19:22:03 +02:00
Laurent Destailleur
bb4543167f FIX #14222 2020-07-18 19:19:12 +02:00
Laurent Destailleur
ecfcbeef26 Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-18 19:13:52 +02:00
Laurent Destailleur
f07a1a6d1e FIX for #14253 2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645 FIX for #14253 2020-07-18 18:52:33 +02:00
florian HENRY
d2e528d8c1 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:34 +02:00
Francis Appels
1bc1fd4cb4 Fix date in supplier price log tooltip. 2020-07-15 11:24:11 +02:00
florian HENRY
f4074428f8 fix filter wharehouse list on ref 2020-07-14 09:38:52 +02:00
florian HENRY
72e0250117 fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:53:00 +02:00
florian HENRY
1173059e7b fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:52:41 +02:00
florian HENRY
96d26be1d4 fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:51:58 +02:00