Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

3640 Commits

Author SHA1 Message Date
Frédéric FRANCE
83f6e9dfc2 doxygen 2020-11-25 18:08:13 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
 2020-11-24 11:07:35 +01:00
Laurent Destailleur
890f7a0602 Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to 
FIX  Dol print error : conf usage thirdparty propagate extrafields to
 2020-11-23 21:43:03 +01:00
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
ATM john
fbc911aea1 Fix conf usage thirdparty propagate extrafields to 2020-11-23 16:40:31 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
lvessiller
e87bdd02bd FIX date order param not empty 2020-11-20 16:10:11 +01:00
lvessiller
4fef8d80a5 FIX keep dates filters parameters on order list 2020-11-20 16:01:51 +01:00
Laurent Destailleur
772d401a64 FIX Restore a more common behavior. Add a hidden constant to switch to a 
mode when we must enabled load of shippable status.
 2020-11-19 19:56:00 +01:00
Laurent Destailleur
06545e005b Use status constant 2020-11-19 18:55:37 +01:00
lvessiller
7e207e80ae FIX spaces before IF 2020-11-19 14:29:37 +01:00
lvessiller
73dab143a3 NEW Add an option to hide by default icon shippable order in command list 2020-11-19 14:14:24 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Laurent Destailleur
1dd697767e Merge branch 'develop' into 13_doc 2020-11-18 18:08:14 +01:00
Laurent Destailleur
6150d3bb2c Merge pull request #15430 from fappels/13_fix_supplier_barcode 
Improve doc for customer order delivery date
 2020-11-18 12:54:34 +01:00
Francis Appels
9936d8c559 Revert "doc for delivery_date" 
This reverts commit aed6afc3bf.
 2020-11-16 17:54:52 +01:00
Francis Appels
aed6afc3bf doc for delivery_date 2020-11-16 17:37:38 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
96b15420f0 Fix regression 2020-11-16 12:56:13 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
6536208a14 Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile 
NEW include tpl for loading lang file for extra fields in list
 2020-11-10 14:42:21 +01:00
Laurent Destailleur
560b8db44a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-09 15:29:17 +01:00
Laurent Destailleur
1d90ee2765 FIX #15336 set_thirdparty was not used anymore. Removed dead code. 2020-11-09 15:28:18 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00
Laurent Destailleur
5be634cbd4 Clean code 2020-11-09 11:34:58 +01:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
Laurent Destailleur
9e967a578e FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE 2020-11-03 02:17:51 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8190711342 doxygen 2020-10-30 18:01:01 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Florian HENRY
d77a0b40a8 tested and approuve feaure #15036 2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4 Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-28 08:52:29 +01:00
Laurent Destailleur
1b939ab8f4 Merge pull request #15183 from frederic34/dol_fiche_end 
end of dol_fiche_end
 2020-10-27 19:00:32 +01:00
Laurent Destailleur
50cf7704fe Log 2020-10-27 18:30:03 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Francis Appels
93ab281d81 Fix tab indent 2020-10-26 18:21:47 +01:00
Francis Appels
91496682fb Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison 2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a Move phpcs enable to correct location @frederic34 2020-10-26 18:13:25 +01:00
stickler-ci
d803c7f429 Fixing style errors. 2020-10-26 16:06:05 +00:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function. 
Use correct naming convention for new method naming.
 2020-10-26 16:50:52 +01:00
Florian HENRY
7c2b5b614f NEW: preload product description on selection for customer propal/order/invoice 2020-10-25 19:13:09 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225 Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00