Commit Graph

3496 Commits

Author SHA1 Message Date
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