Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 35 Branches 179 Tags 1.7 GiB
0fd2e91ccc
Commit Graph

3770 Commits

Author SHA1 Message Date
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
Laurent Destailleur
58597bc8fe
Merge pull request #15058 from Hystepik/develop 
FIX pb of duplicate event on command
 2020-10-23 14:12:42 +02:00
lmarcouiller
42aafeb8b5 FIX pb of duplicate event on command with eldy's recommendations 2020-10-23 09:56:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
lmarcouiller
1ee8c34bf5 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:20:49 +02:00
lmarcouiller
90b2d41b02 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:19:34 +02:00
lmarcouiller
64d8d5334c FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:12:32 +02:00
lmarcouiller
edd391da3a FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:09:55 +02:00
lmarcouiller
511943c052 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:05:32 +02:00
lmarcouiller
71db2603e1 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 13:52:12 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Laurent Destailleur
bc1ad96ad1 FIX #14993 2020-10-14 19:28:59 +02:00
Laurent Destailleur
fcd4645509 Standardize code: Property product_libelle renamed into product_label 
Move common vars declaration into parent class.
 2020-10-12 19:33:00 +02:00
Rüdiger Hahn
d789aaad7f
Fix for #14239 
Message: Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before
 2020-10-09 11:29:39 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Laurent Destailleur
70fa262293 CSS 2020-10-08 09:30:15 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6
change variable #14697 2020-10-06 11:37:55 +02:00
Laurent Destailleur
a6fe03bd14 Fix doc 2020-10-04 23:30:41 +02:00
Laurent Destailleur
c806ae2654
Merge pull request #14792 from c3do/patch-15 
FIX API Order unlink contact did not work like expected
 2020-10-03 15:30:07 +02:00
Laurent Destailleur
5256229089 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 13:51:47 +02:00
Laurent Destailleur
10deb1baad Clean code - Removed no more used files orderstoinvoice.php 2020-10-02 13:51:32 +02:00
Laurent Destailleur
193c9ac803
Merge pull request #14892 from atm-john/develop_new_search_param_for_order_close_date 
NEW Add search param for close date on order list
 2020-10-02 13:42:02 +02:00
Florian HENRY
18c946dc75 add missing translation 2020-10-02 10:37:02 +02:00
Florian HENRY
1bbd4da0fe add missing translation 2020-10-02 10:36:16 +02:00
stickler-ci
a7b4f0ec49 Fixing style errors. 2020-10-02 07:43:29 +00:00
John Botella
f31e689480 Fix new look and feel 2020-10-02 09:39:54 +02:00
John Botella
ac7a747004 Merge branch '12.0_new_search_param_for_order_close_date' into develop 2020-10-02 09:19:25 +02:00
Laurent Destailleur
d912908aef NEW Can build vendor invoice from vendor orders 2020-10-01 19:05:20 +02:00
Laurent Destailleur
ece8037f42 The button "Invoice orders" switch to page with lines autoselected. 2020-10-01 18:08:46 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
John Botella
afbe5f6017 Add search param for close date 2020-09-30 15:26:13 +02:00
Laurent Destailleur
a3da2afe7a Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES 2020-09-30 11:58:40 +02:00
Cédric
3bc9c49307
Update api_orders.class.php 2020-09-28 16:57:30 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Laurent Destailleur
f851ce2f0f
Merge pull request #14741 from Tim-Otte/fix-zero-price-lines 
FIX: Allow product price equal zero in new lines
 2020-09-27 20:46:36 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Tim Otte
e373de91d9 Fixed a bug where a price equal zero would be replaced with the product price 2020-09-22 14:43:09 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Cédric
68ccbac49c
Update api_orders.class.php 2020-09-19 22:35:33 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
d1f70a37df Preselect thirparty on new from list (part 1) 2020-09-18 07:56:13 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
ca6e57b2f7 FIX Filter in "billed" of orders was not saved 2020-09-07 14:25:50 +02:00
stickler-ci
ebb69e9d6e Fixing style errors. 2020-09-04 19:38:49 +00:00
Cédric
e84a2ab07c
Fix addline commande.class.php 2020-09-04 21:26:57 +02:00
Cédric
c06cb1eff3
NEW ref_ext for order lines 2020-09-04 21:25:20 +02:00
Cédric
1f82fcc1f0
NEW ref_ext field for order lines 2020-09-04 21:11:58 +02:00
Cédric
9141b6b092
NEW endpoint getContacts and Clean results 
NEW Get contacts list of a given order
FIX bad function used to unlink a contact
FIX Result for link contact and unlink contact
 2020-09-04 12:36:03 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Anthony Berton
458bc66327 Update list.php 2020-08-25 17:25:34 +02:00
florian HENRY
0453dd8f09 fix php warning : count parameters must be countable 2020-08-20 16:39:14 +02:00
Laurent Destailleur
7217dc3114 Better perf for phpunit on very large databases 2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
 2020-07-24 00:07:57 +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
4fd970af28 Fix phpcs 2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b NEW Can change VAT rate of all lines of a draft object in one step. 2020-07-06 22:48:22 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php 2020-07-03 00:14:22 +02:00
quentin
642e75c3dd FIX wrong origin 2020-07-02 14:16:31 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
9e6bb6f784 Sanitize params 2020-06-02 20:19:45 +02:00
Laurent Destailleur
7ceb236a09 Fix look and field v12 2020-05-26 14:45:45 +02:00
Laurent Destailleur
48137f8cad Fix look and field v12 2020-05-26 14:43:50 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339 2020-05-23 15:14:06 +02:00
Frédéric FRANCE
70995d3499
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 15:03:09 +02:00
Laurent Destailleur
2f8b364454 Code comment 2020-05-22 13:18:47 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
ptibogxiv
70ea77ce8f
Update list.php 2020-05-12 15:37:37 +02:00
stickler-ci
83ec39f55a Fixing style errors. 2020-05-12 11:44:12 +00:00
ptibogxiv
e1ff1bf865
Update card.php 2020-05-12 13:42:43 +02:00
stickler-ci
9e49e02efb Fixing style errors. 2020-05-12 11:42:18 +00:00
ptibogxiv
014c013f83
Update card.php 2020-05-12 13:40:31 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)
790cffb7ae Correct select label for categories in stats pages 2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
1bd9372022 Forgot comments to document news params for the modified methods 2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0 Add possibility to filter stats by ThirdParty type and categorie 2020-04-29 09:17:44 +02:00
Laurent Destailleur
6b1a1e5e58 FIX #13743 2020-04-27 15:09:27 +02:00
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
Marc Guenneugues
be46b2062e Clean line extrafields when deleting order 2020-04-23 17:51:06 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
fe674f08d9 Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER 2020-04-20 03:00:10 +02:00
Laurent Destailleur
6472f521ac css 2020-04-20 00:54:38 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2 
add  in default search
 2020-04-10 12:12:28 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/perms.php
 2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used 
#13547
 2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Anthony Berton
620161f0e7
Update list.php 2020-04-10 10:47:34 +02:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
a27a499727
Merge pull request #13157 from bb2a/patch-17 
Add search order to assign to a warehouse
 2020-04-08 14:54:36 +02:00
Laurent Destailleur
4170580d88 Rename const 2020-04-03 12:54:23 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Florian Mortgat
4d2b4583d0 FIX - This error logs an Orderline::delete error, but this is an Orderline::insert error 2020-04-02 09:28:56 +02:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5 FIX Bad position of total in column 2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46 Align color of graph of status on status color 2020-03-24 13:06:59 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
 2020-03-18 18:50:55 +01:00
Laurent Destailleur
9525289488 Fix return code of some API 2020-03-17 13:50:20 +01:00
Anthony Berton
fa2ccf6c44
Merge branch 'develop' into patch-17 2020-03-17 11:22:07 +01:00
Laurent Destailleur
8192e9dc67 FIX Missing token in form 2020-03-14 03:02:49 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink 
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
 2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink 2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5 NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type 2020-03-12 09:44:43 +01:00
Laurent Destailleur
82f0d8a3bc Fix bad params 2020-03-09 17:38:47 +01:00
Laurent Destailleur
3edc3dd382 Fix fields definition 2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d Fix table fields 2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472 Fix graph of product distribution when too much record 2020-03-06 12:45:02 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201 FIX #13263 2020-03-04 00:53:07 +01:00
Laurent Destailleur
88059a52d8
Merge branch 'develop' into patch-17 2020-03-03 23:24:14 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency 
NEW: add multicurrency columns to document lists
 2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Marc de Lima Lucio
5f5824daaa FIX: order list: remove useless multicurrency lines 2020-03-03 10:43:23 +01:00
florian HENRY
dbb80aecd1 Fix line origin and Id when create order from 2020-03-02 15:22:35 +01:00
Anthony Berton
5520df4e4f
Update list.php 2020-03-02 08:25:18 +01:00
Marc de Lima Lucio
5d1f91f8ac FIX: muticurrency columns: remove useless column totals that mix currencies together 2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
341e4ae856 NEW: order list: enable multicurrency columns 2020-02-27 14:49:34 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18 
Default warehouse to create order
 2020-02-26 16:45:25 +01:00
Anthony Berton
54b23a1e1c
Update card.php 2020-02-21 22:54:12 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Anthony Berton
02a5c1b8d6
Update card.php 2020-02-20 22:40:43 +01:00
Anthony Berton
8777033bff
Update list.php 2020-02-20 22:18:34 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
18b99254a1 Experiment ORDER_ENABLE_NEGATIVE 2020-02-18 20:55:22 +01:00
Laurent Destailleur
dc3a15945d Add method getKanbanView() 2020-02-16 12:05:00 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
842a9b9ef7
Merge pull request #12917 from ptibogxiv/patch-294 
fix sql on order list
 2020-01-26 22:25:33 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
ptibogxiv
13045748f3
fix sql on order list 2020-01-23 15:26:22 +01:00
Laurent Destailleur
3c2d0b97f4
Merge pull request #12895 from atm-quentin/NEW_author_order_list 
NEW author on order list
 2020-01-22 13:58:53 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085 Fix init of specimen 2020-01-21 00:20:03 +01:00
atm-quentin
61c0940c20 NEW user on order list 2020-01-20 15:42:09 +01:00
Laurent Destailleur
526ae83e8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/exports/export.php
 2020-01-19 19:01:46 +01:00
Laurent Destailleur
f4ae869678 Fix error return when creating order with not enough stock 2020-01-19 12:15:47 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
c556f60c89 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:35 +01:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Laurent Destailleur
2b7e45cb09 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:54 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
5dde548133
Merge pull request #12377 from aspangaro/11.0_a6 
NEW Customer command list - Add date start & date end
 2020-01-15 17:55:47 +01:00
Laurent Destailleur
e2e06b47ff FIX #12617 2020-01-13 15:58:03 +01:00
Alexandre SPANGARO
0f81fbe1c5 Merge remote-tracking branch 'upstream/develop' into 11.0_a6 2019-12-23 21:19:32 +01:00
Laurent Destailleur
2dee5e6bf1 Fix delay and useless code 2019-12-21 14:35:39 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
84e1e6ccf1
Update document.php 2019-11-25 23:58:14 +01:00
Laurent Destailleur
19fb6bfd17 FIX Use PROV as temporary ID for leaves 2019-11-24 18:25:55 +01:00
Laurent Destailleur
31956d8912 Standard of REST API URL 2019-11-22 15:11:28 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:16:38 +00:00
Philippe GRAND
2c183fe279 fix : invoid sql injection 2019-11-21 09:22:44 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Alexandre SPANGARO
556bdd35d9 Merge remote-tracking branch 'upstream/develop' into 11.0_a6 2019-11-17 21:11:41 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Frédéric FRANCE
2148d6ed05
css 2019-11-11 20:33:34 +01:00
Alexandre SPANGARO
9ff10d430b NEW Customer command list - Add date start & date end 2019-11-07 13:57:04 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
71a83b4d7e Fix phpcs 2019-11-05 15:49:54 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Laurent Destailleur
ab7c300f43 NEW Can change supplier when cloning a Purchase Order 2019-11-02 20:50:25 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
3aed55caa6
Merge pull request #12204 from dolibarr95/patch-57 
NEW: Reduce the $companystatic calls
 2019-11-02 13:46:53 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Frédéric FRANCE
385cb1a26c
doxygen Commande class 2019-11-02 09:27:06 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
dolibarr95
5b57bf1f61
array name error 2019-10-30 08:42:43 +01:00
iouston
e88af13101
NEW : add name_alias in fields to search all 2019-10-29 11:22:15 +01:00
Laurent Destailleur
2201b11fd3 NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL 
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
 2019-10-24 13:41:04 +02:00
stickler-ci
393c671b26 Fixing style errors. 2019-10-23 06:59:14 +00:00
dolibarr95
da136ef641
Reduce the $companystatic calls 
Store $companystatic->getNomUrl() in $getNomUrl_cache[];
 2019-10-23 08:57:07 +02:00
stickler-ci
e807cb6b03 Fixing style errors. 2019-10-22 15:00:58 +00:00
dolibarr95
d0a599a1d8
Reduce the $companystatic calls 2019-10-22 15:51:30 +02:00
Laurent Destailleur
05fed5358a
Merge pull request #12179 from c3do/develop 
NEW Add API to get objects by ref, ref_ext, ...
 2019-10-20 13:42:18 +02:00
Laurent Destailleur
54b7886331
Update api_orders.class.php 2019-10-20 13:40:18 +02:00
Frédéric FRANCE
66b0c27645
clean indent in commande dir 2019-10-20 09:58:31 +02:00
c3do
4292d72ea3 Can get order by ref, ref_ext, ref_int 2019-10-19 23:42:55 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Laurent Destailleur
e94d47daf7 Work on MRP module 2019-10-15 19:57:23 +02:00
Laurent Destailleur
c8d3aea18a
Update document.php 2019-10-14 21:20:17 +02:00
iouston
720245422e
Update document.php 
add 2 hidden options for sort files on document page
 2019-10-14 15:04:49 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Laurent Destailleur
072a0a26d6 Use a font awesome icon to show "shippable" flag on orders. 2019-10-09 18:07:00 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
c83f40fc7e Debug contact by default 2019-10-07 15:42:37 +02:00
Laurent Destailleur
f56da782ab
Merge pull request #12038 from Ahuahuachi/develop 
NEW Add hidden options to send by email even for draft status
 2019-10-07 14:18:53 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alfredo Altamirano
140784d741 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6 Add hidden options to send by email for all status 2019-10-03 20:21:13 -05:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
68055e579f Check array is array 2019-10-01 16:26:55 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
f3a38ef1af
Update api_orders.class.php 2019-09-30 21:41:07 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Regis Houssin
5f23ba5467 FIX avoid non numeric warning 2019-09-12 08:04:53 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
626e3fd90e Fix look and feel v10 2019-09-06 02:34:24 +02:00
Christophe Battarel
32c6c754c4 Merge branch 'develop' into oldline 2019-09-05 16:19:38 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use 
getOutstandingBills() instead.
 2019-08-29 00:45:02 +02:00
Laurent Destailleur
f9094cfc44
Update card.php 2019-08-27 15:00:41 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65 Move $selectedlines to parameter 2019-08-27 14:33:28 +02:00
Laurent Destailleur
3eb32360ce Fix escape 2019-08-27 14:10:23 +02:00
Laurent Destailleur
9e04eccf54 Fix syntax error 2019-08-26 23:28:06 +02:00
Frans Bosman
23311abd6a
Update card.php 2019-08-25 19:57:49 +02:00
Frans Bosman
a822a34a51
Update card.php 2019-08-25 19:54:42 +02:00
Frans Bosman
e15d91640b
Update card.php 2019-08-22 09:43:04 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Laurent Destailleur
ee37cbd412
Merge pull request #11638 from ptibogxiv/patch-212 
NEW list by date_cloture on order list
 2019-08-10 01:06:16 +02:00
Laurent Destailleur
14fabeb377 Variable rangtouse -> ranktouse 2019-08-10 00:46:20 +02:00
ptibogxiv
0cbb144628
Update list.php 
sometimes we need to get last update or closed order
 2019-08-05 20:52:27 +02:00
ptibogxiv
f417c85186
NEW list by date_cloture on order list 2019-08-05 20:49:41 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Maxime Kohlhaas
5c2763d0dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin 2019-07-27 10:53:43 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
e5c3945ec3 FIX delete of links between objects 2019-07-19 18:10:45 +02:00
Laurent Destailleur
361fc53685 FIX div not balanced 2019-07-19 17:47:54 +02:00
Regis Houssin
cbda42d146 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-07-19 09:37:34 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Maxime Kohlhaas
9c47cb6f91 NEW : can choose lines while creating order from origin 2019-07-08 23:16:32 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
7de92070d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
 2019-06-29 16:46:16 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
ptibogxiv
174e531d69
Update commande.class.php 2019-06-25 18:12:16 +02:00
ptibogxiv
9e88bf1f1c
NEW multilangs in fetch_lines 2019-06-25 15:41:20 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +02:00
ptibogxiv
651f4158ac
Fix add / delete contact access 2019-06-16 14:18:26 +02:00
ptibogxiv
70d9d3ab4c
FIX contact default list with adding job/function 
as my last commit it's same contact but  différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)
 2019-06-04 18:23:25 +02:00
Regis Houssin
38246b4088 NEW add new function "setEntity()" 2019-06-03 11:13:26 +02:00
Regis Houssin
7b8b1a9052 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-03 11:04:28 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Lionel VESSILLER
1c1b3c376e Fix check if order line is not in a shipment line before deleting 2019-05-23 15:57:02 +02:00
Regis Houssin
4f2f23f522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-22 08:45:31 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Regis Houssin
2cf630c213 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-20 16:10:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Laurent Destailleur
5876582030 Fix responsive 2019-05-12 15:56:29 +02:00
Regis Houssin
b73df2698d FIX better compatibility with Multicompany 2019-05-12 14:25:41 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
9de0e69456 FIX column project into list 2019-05-10 15:11:06 +02:00
Laurent Destailleur
5625c94c44 Fix missing label on project tooltip 2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e Fix missing label on project tooltip 2019-05-10 14:39:05 +02:00
Laurent Destailleur
a94c291b76 Dolibarization 2019-05-09 16:59:06 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
f45462b409 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-17 10:39:49 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Francis Appels
d08db86ba1 Fix customer order updateline 2019-04-11 18:55:16 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
917b9d69fa Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and 
not recommanded to use in Dolibarr.
 2019-04-08 14:55:31 +02:00
Laurent Destailleur
31963be6a0
Merge pull request #10922 from altatof/cloneorder 
clone of order like in propal (ref_client, contacts)
 2019-03-31 18:25:48 +02:00
Laurent Destailleur
361254a4c0 Fix regression after renamind valdate_invoices 2019-03-31 18:23:54 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Christophe Battarel
631be04d5d better clone oldline and avoid emptylabel on update 2019-03-27 12:15:50 +01:00
Christophe Battarel
3006e2bf75 memorize line before delete (for triggers) 2019-03-27 12:05:42 +01:00
Christophe Battarel
c9b321ded4 add global conf to createfromclone 2019-03-27 10:32:40 +01:00
Christophe Battarel
f1548bd253 fix objfrom 2019-03-27 10:27:08 +01:00
Christophe Battarel
9efb1b9525 copy internal and external contacts when cloning like in propal 2019-03-27 10:09:45 +01:00
Christophe Battarel
1b9cdd021a test constant for keeping customer ref on clone of order like in propal 2019-03-27 10:00:29 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates 
FIX: Disallow line start date after end date
 2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-23 22:44:14 +01:00
Laurent Destailleur
5666fbedac FIX If we build one invoice for several orders, we must put the ref of 
order on the line to not lose information.
 2019-03-23 22:30:52 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc 
NEW : add constant NO_CONCAT_DESCRIPTION
 2019-03-22 12:56:46 +01:00
Philippe GRAND
b8d04fa076 translation 2019-03-22 09:43:12 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE 
Standardize code of setDraft.
 2019-03-21 17:37:56 +01:00
Laurent Destailleur
5d21547854 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/price.php
	htdocs/user/perms.php
 2019-03-21 12:20:24 +01:00
Laurent Destailleur
41c737a213 Fix, Oops, test was inverted 2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753 Fix do we really must copy notes when creating an object from another 
source object? Add a hack with hidden option to be able to change this.
 2019-03-18 20:09:09 +01:00
Christophe Battarel
8b3fd2eacf NEW : add constant NO_CONCAT_DESCRIPTION 2019-03-18 16:10:17 +01:00
Philippe GRAND
c13a1dbc63 translation 2019-03-18 13:45:24 +01:00
Laurent Destailleur
7cdfff7263 Fix syntax error 2019-03-15 20:42:49 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Laurent Destailleur
e913f1919f
Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards 
Update call to extrafields from cards
 2019-03-11 21:14:53 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
John BOTELLA
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +01:00
John BOTELLA
ca10b1e403 add new dolGetStatus to LibStatut in product class 2019-03-07 11:37:54 +01:00
John BOTELLA
5ea5d51247 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 09:41:03 +01:00
Laurent Destailleur
401ad65975 Fix API explorer was broken due to corrupted API 2019-03-06 18:04:36 +01:00
John BOTELLA
5fd3a253ab add new dolGetStatus to LibStatut in order class 2019-03-06 14:19:40 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
7e31ca48d8
add visibility 2019-02-28 22:07:48 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
ptibogxiv
25d4be0772
Update commande.class.php 2019-02-20 12:29:47 +01:00
Frédéric FRANCE
2ede3c1a40
Update list.php 2019-02-14 19:04:07 +01:00
ptibogxiv
58a73e7b4c
Update api_orders.class.php 2019-02-14 00:42:00 +01:00
ptibogxiv
7ac47fabda
NEW link/delete contact in order object 2019-02-14 00:36:35 +01:00
Laurent Destailleur
a39b4bcb7d
Update api_orders.class.php 2019-02-13 16:39:45 +01:00
Jimmy L
a172ea00a4 Rest API: Proposal, Orders, Invoices: Add contact details 2019-02-12 17:54:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Philippe GRAND
71e99e0972 update with html5 compliant code 2019-02-04 10:42:40 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
540e6d6f79 update with html5 compliant code 2019-01-23 17:34:30 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
336be085f6 update with html5 compliant code 2019-01-19 12:28:18 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Philippe GRAND
1a55d5fe85 update with html5 compliant code 2019-01-17 14:27:07 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134 
refactoring list.php with dol_sql_datefilter
 2018-12-14 19:06:29 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 
NEW Extend import option to Order's card and Propal's card
 2018-12-14 15:29:27 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
BENKE Charlene
0d35f04cb7
Update list.php 2018-12-01 23:36:26 +01:00
florian HENRY
d928372239 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/commande/class/commande.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 14:51:22 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
JC Prieto
deff4ca4a0
Update list.php 
Missing the following lines to search total_ttc
 2018-11-19 20:03:36 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
John BOTELLA
98548337ae FIX supplier order list keep socid 2018-11-08 15:38:25 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00