Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-05 23:55:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 39 Branches 191 Tags
9165ea9e673a0e4f743d43a627cda170ce5547eb
Commit Graph

78410 Commits

Author SHA1 Message Date
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 Destailleur
9a506ff9b3 css 2020-07-20 03:29:22 +02:00
Laurent Destailleur
d823bb73c0 Change order of fields for mass stock movement 2020-07-20 01:01:40 +02:00
Laurent Destailleur
9d9f865f37 fetch_optionals must be included into a fetch 2020-07-20 00:24:14 +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
e5688e2641 Fix phpcs 2020-07-19 02:54:25 +02:00
Laurent Destailleur
87cd4b11bd Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
 2020-07-19 02:24:26 +02:00
Laurent Destailleur
acdb61b640 Merge pull request #14227 from defrance/patch-154 
NEW : add class for ticket edition (pdf or odt)
 2020-07-19 02:11:13 +02:00
Laurent Destailleur
e17fbf9dcd Merge pull request #14206 from atm-josselin/NEW_show_label_on_batch_card 
NEW Show label on batch card
 2020-07-19 02:03:46 +02:00
Laurent Destailleur
3c3be1b04f Merge pull request #14188 from aspangaro/13a1 
NEW: Add column quantity in product margin page
 2020-07-19 02:02:30 +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
1f52d99726 Merge pull request #14211 from bb2a/add_zip_town_on_SEARCH_THIRDPARTY 
Add zip town on search thirdparty
 2020-07-18 23:58:36 +02:00
Laurent Destailleur
31cb57afc9 Fix regression with ecoterm 2020-07-18 23:27:43 +02:00
Laurent Destailleur
c30491284f Fix phpcs 2020-07-18 23:16:05 +02:00
Laurent Destailleur
52fd424812 Merge pull request #14226 from cfoellmann/thirdparty-leftmenu 
Thirdparty leftmenu
 2020-07-18 23:13:40 +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
Laurent Destailleur
090d913017 Merge pull request #14248 from megalogi/patch-1 
FIX Lose HTML tags when adding a new product/service into a document
 2020-07-18 23:10:33 +02:00
Laurent Destailleur
3bfa86c52d Merge pull request #14251 from fmarcet/develop 
New: ##12972 Update supplier price also when product has batch
 2020-07-18 23:08:20 +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
0179800236 Merge pull request #14257 from cmfpmatik/cmfpmatik-order_prospect-1 
Add the possibility for the prospect to order
 2020-07-18 23:03:34 +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
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
ab32e3e1a9 Merge pull request #14222 from pstructures/PSdevelop 
Error Caused by $taskid Variable not existing
 2020-07-18 19:15:28 +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