lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

1990 Commits

Author SHA1 Message Date
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
0feb6e8275
Update fournisseur.facture.class.php 2022-02-15 11:18:14 +01:00
Frédéric FRANCE
11fc0da398
Update fournisseur.commande.class.php 2022-02-15 11:00:05 +01:00
Laurent Destailleur
9ba998e3ba Fix some regressions 2022-02-10 19:36:33 +01:00
Laurent Destailleur
2c6b6ce4d1 Fix sql syntax error 2022-02-10 16:35:50 +01:00
Laurent Destailleur
024f12aa9b Fix php5.6 2022-02-10 13:18:21 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
6c8fafddf6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:20:09 +01:00
Laurent Destailleur
a40f76c1d8 Merge 2022-02-10 11:15:59 +01:00
Laurent Destailleur
40f0aa45c8 Merge 2022-02-10 11:15:45 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php 2022-02-10 09:29:11 +01:00
noec764
d9bac75a63
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet 2022-02-09 15:33:45 +01:00
Noé Courtier
e4c1978e12 Change of SQL request when fetching CommandeFournisseurLigne 2022-02-09 12:24:33 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
 2022-01-23 13:04:37 +01:00
Cserveny, Tamás
ca588852df fix code review errors 2022-01-23 12:00:33 +01:00
stickler-ci
bd6fdbd3be Fixing style errors. 2022-01-23 12:00:24 +01:00
Cserveny, Tamás
93edbf1cda missing supplierorder api 2022-01-23 12:00:16 +01:00
stickler-ci
400d28238c Fixing style errors. 2022-01-20 00:09:52 +00:00
Cserveny, Tamás
115f022ae9 Check if the lines in create is type object (like supplier invoice) 2022-01-20 00:55:52 +01:00
Francis Appels
d4adeba1fc FIX: origin missing for supplier order dispatchProduct 2022-01-18 16:22:41 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Gauthier PC portable 024
1910423684 FIX : conf name is MAIN_ADD_LINE_AT_POSITION 2022-01-11 09:54:27 +01:00
Laurent Destailleur
12044fa67a Debug v15 2022-01-10 03:24:01 +01:00
Laurent Destailleur
423a4ea104 Debug v15 2022-01-09 19:48:38 +01:00
oscim
f157a22cd0
Update paiementfourn.class.php 
For stock in fetch object payment id type
 2022-01-06 16:55:24 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
 2022-01-04 09:45:31 +01:00
Laurent Destailleur
a919ade1c6 Fixunit price 2021-12-30 20:00:04 +01:00
Laurent Destailleur
3967ce9c20 Fix unit price 2021-12-30 19:48:59 +01:00
Laurent Destailleur
8085c32b85
Merge pull request #19681 from atm-florianm/FIX_14.0_best_supplier_price_discount_applied_twice 
FIX: discounts are applied twice for displaying best supplier price
 2021-12-30 19:47:07 +01:00
Laurent Destailleur
64777acfc1 Fix unit price 2021-12-30 19:46:58 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
atm-florian
67910db532 FIX: discounts are applied both when fetching the best supplier price and when displaying it 
cf. PR #18873
commit 2be2423dee
 2021-12-23 19:00:39 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
f09e603bf4 Try for FIX #19562 2021-12-19 20:43:24 +01:00
Laurent Destailleur
6d94c6150b FIX sign of unit price into the supplier credit note 2021-12-13 17:56:28 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Frédéric FRANCE
99cddfa235
can merge products but experimental 2021-11-23 22:36:14 +01:00
Frédéric FRANCE
429e5cf517
can merge products but experimental 2021-11-23 22:02:55 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc FIX : use $linecount = count($this->lines); 2021-11-23 10:44:43 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Laurent Destailleur
63cd06394f Debug permission on supplier order. 
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
 2021-11-20 15:41:31 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
 2021-11-19 23:14:39 +01:00
Laurent Destailleur
635e9e9747 CSS 2021-11-19 22:28:20 +01:00
Laurent Destailleur
271f42e761 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/societe/list.php
 2021-11-19 10:06:35 +01:00
Laurent Destailleur
e7a4f04da4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-11-18 21:41:12 +01:00
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
f664a977c6 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:05:17 +01:00
Gauthier PC portable 024
c55008e8af NEW : insert_discount() functions handle 2021-11-16 16:02:55 +01:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Ferran Marcet
7af883abc1 Fix: Bad date conversion 2021-11-15 16:43:54 +01:00
Laurent Destailleur
f2bfa8b2a1
Merge pull request #18940 from PyroShape/develop2 
NEW : info of number of product still to dispatched in a supplier order
 2021-11-15 13:58:43 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
kamel
82b7f0e9e4 FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286) 2021-11-02 15:21:14 +01:00
Benjamin Chantalat
5be40b926b Clean function not use anymore 2021-11-01 19:56:24 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Florian HENRY
9d15a7a18c fix: warning on delete wupplier order 2021-10-28 17:37:30 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Richard Franks
98eb07d6f2 FIX #18695 Added ref_ext to supplier invoice 
Added ref_ext to the fields for create, fetch and update functions
on fournisseur.facture class. This enables the REST API to use
this field for additional information.
 2021-10-22 10:39:14 +01:00
stickler-ci
4d63586e2a Fixing style errors. 2021-10-22 08:22:23 +00:00
Dennis Priskorn
e2e3e8ef7b
Update api_supplier_invoices.class.php 
Add 2 examples
 2021-10-22 10:18:23 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
b43dcb24f0
Update fournisseur.commande.class.php 2021-10-11 11:04:21 +02:00
Benjamin Chantalat
a7563ff62e Fix : Found non quoted or not casted var into sql request 2021-10-10 21:15:14 +02:00
stickler-ci
73bd05606c Fixing style errors. 2021-10-10 18:53:22 +00:00
Benjamin Chantalat
65c0167d07 ADD : info of number of product still to dispatched in a supplier order 2021-10-10 20:50:51 +02:00
Benjamin Chantalat
6e60e1f453 Fix date format into supplier order info tab 2021-10-09 20:38:46 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
JR-Polyline
2be2423dee
Fix dynamic prices not updating 
When Dynamic price module active and an a math expression is used to compute buy price on supplier product card, the calculated price does not update on the card when saved.
Changing line 849 appears to solve this without any ill effect.
 2021-10-01 21:30:25 +08:00
Laurent Destailleur
89ac5a5be6
Merge pull request #18723 from PyroShape/develop 
Explicit date_creation instead of date
 2021-09-28 13:34:44 +02:00
Benjamin Chantalat
5623e5f98a Correct isset 2021-09-26 19:09:09 +02:00
Benjamin Chantalat
5cf90d0247 Correct date format 2021-09-24 14:10:19 +02:00
Benjamin Chantalat
c1e1a53503 Update Explicit date_creation instead of date 2021-09-23 13:23:16 +02:00
Benjamin Chantalat
14f8d7c56b
Merge branch 'Dolibarr:develop' into develop 2021-09-22 15:49:43 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Alexandre SPANGARO
ce56f52a30 FIX #18698 Supplier invoice list - "alert" checkbox not working 2021-09-20 03:28:30 +02:00
Benjamin Chantalat
5035ad9be1 Explicit date_creation instead of date 2021-09-15 12:32:18 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
lmarcouiller
4928d03c4f update to have modify ! to empty() 2021-09-09 14:44:17 +02:00
lmarcouiller
8af6b8679e update with fournisseur && supplier_order 2021-09-09 14:40:39 +02:00
lmarcouiller
022f3e640d Fix #18660 : fix rights of supplier order with API 2021-09-09 13:28:30 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
feb2e71f0c Fix regression 2021-08-28 18:59:12 +02:00
Laurent Destailleur
8ab9c96b7e Fix 0 insert instead of null 2021-08-28 18:56:48 +02:00
Laurent Destailleur
5f08ed84f8 Fix 0 insert instead of null 2021-08-28 18:53:57 +02:00
Laurent Destailleur
97ee69e88f Fix 0 insert instead of null 2021-08-28 18:52:43 +02:00
Laurent Destailleur
978511e127 Update fournisseur.facture.class.php 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-08-28 17:59:45 +02:00
Laurent Destailleur
5ec286fdb7
Merge pull request #18500 from francisbesset/fix-fk_unit 
Fix bad comparison for fk_unit to avoid always null value for all case
 2021-08-28 17:57:26 +02:00
Laurent Destailleur
97064f1550
Update fournisseur.facture.class.php 2021-08-28 17:55:49 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Francis Besset
22ec43f4a3 Fix bad comparison for fk_unit to avoid always null value for all case 2021-08-25 13:46:18 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
henrynopo
3c1bdd163f
Update paiementfourn.class.php 2021-08-24 18:34:34 +08:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Maxime Kohlhaas
96a820476c Fix supplier invoice clone : missing data on lines (#18055) 2021-08-13 10:45:43 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Gauthier PC portable 024
087e269103 FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref) 2021-08-10 17:34:47 +02:00
Josep Lluís
20f347cd4c
Add missing line product variables 
Add missing line product variables: product_tobatch and product_barcode
 2021-07-20 07:07:01 +02:00
Laurent Destailleur
af1c43c70d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/modBarcode.class.php
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
 2021-07-16 14:05:42 +02:00
Florian Mortgat
180527d23a FIX 13.0: class CommandeFournisseurDispatch provides trigger for UPDATE but not for CREATE / DELETE 2021-07-16 10:10:57 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
lmarcouiller
2a30c699ac Fix #18063 : search filter status lost "Back to list" 2021-07-02 16:05:28 +02:00
Laurent Destailleur
a1e6236df0 Fix regression sql error 2021-06-15 02:15:45 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
c00bef83a8 Fix php unit 2021-06-09 18:05:56 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks 
New Hooks to rename Supplier Orders statuses
 2021-06-05 02:11:29 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php 2021-06-05 01:04:09 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch 
Fix dispatch receipt edit and delete
 2021-06-04 12:37:05 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
Francis Appels
8ed24d6796 Add missing trigger LINERECEPTION_DELETE 2021-05-27 16:02:12 +02:00
Laurent Destailleur
fb6aea72b8 Fix syntax error 2021-05-25 12:06:29 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1 
FIX wrong variable fk_code_ventilation register for addline
 2021-05-20 14:31:52 +02:00
Alexandre SPANGARO
f86e10b453 FIX wrong variable fk_code_ventilation register for addline 2021-05-19 06:37:02 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Antonin MARCHAL
779c868eae fix mistake and removed hookmanager unused 2021-05-17 13:48:21 +02:00
Antonin MARCHAL
c6aa078892 renamed LibStatut hook + removed useless hook 2021-05-17 13:46:01 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
stickler-ci
ea0d860593 Fixing style errors. 2021-05-12 14:55:32 +00:00
Antonin MARCHAL
1bfcfc3a0c rename Hook and moved it into LibStatut method 2021-05-12 16:55:03 +02:00
Laurent Destailleur
d7a5e342ab Optimize some widgets 2021-05-10 20:16:51 +02:00
Antonin MARCHAL
9ab12e2455 add (getNomUrl) 2021-05-07 17:06:53 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
kamel
c645241327 Corrections 2021-04-27 12:11:28 +02:00
kamel
9f3bcbc39d Fix Stickler CI 2021-04-26 17:48:42 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
89d960f6dd Field tva is deprecated 2021-04-17 08:13:59 +02:00
Laurent Destailleur
7e4dcde089
Merge pull request #17257 from ibuiv/patch-4 
Fix Infinite Loop in trigger
 2021-04-13 23:01:28 +02:00
Laurent Destailleur
1c8a2ce15a Fix phpcs 2021-04-13 22:12:47 +02:00
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +02:00
stickler-ci
0511d5848e Fixing style errors. 2021-04-13 18:24:18 +00:00
ibuiv
2a391dc13f
Fix Loop in trigger with CommandeFournisseur::createFromClone 
added param $notrigger to avoid an infinite loop when createFromClone calls create
 2021-04-13 20:19:02 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
fb221a0541 Add right supplier_order 2021-04-12 09:59:03 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
2d77b9bdf0 Work on split module fournisseur 2021-04-12 06:15:47 +02:00
Laurent Destailleur
280d534b7a Fix phpcs 2021-04-10 00:29:32 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Laurent Destailleur
60711f415d Fix permission on external user 2021-04-08 19:52:07 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Marc de Lima Lucio
7df09b6e9e FIX: esupplier order: error 500 when using packaging with product where it is not defined 2021-04-07 10:41:36 +02:00
Pierre Payet
113db33a24 fix paiementfourn ref is now different from id 2021-04-07 10:24:02 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
Laurent Destailleur
60e13f6727 FIX #17060 2021-04-02 22:20:13 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
d93fbcd00b Fix sql error 2021-03-29 21:17:41 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
2d5fbfc105 Fix php8 2021-03-22 23:43:28 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
39849de96e Look and feel v14 2021-03-16 10:19:56 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
c55932090a Fix phpcs 2021-03-04 19:48:08 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
23e8401e61 FIX #16296 2021-03-02 01:22:23 +01:00
Laurent Destailleur
5b771eb798 Fix merge of 2 record. 2021-03-01 21:56:14 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Frédéric FRANCE
6823eabe63
add update CommandeFournisseur for api use 2021-02-27 10:10:28 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory 2021-02-25 23:21:30 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
lmarcouiller
b83b5e0a42 Fix format error in graph in fourn/commande/index.php 2021-02-11 15:36:11 +01:00
Laurent Destailleur
09629d32d7 Fix missing properties in fetch 2021-02-11 14:53:29 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Laurent Destailleur
d588086c47 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 21:21:28 +01:00
Laurent Destailleur
e1af57f540 FIX status late on purchase orders 2021-02-09 20:46:17 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions 2021-02-09 09:55:48 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions 2021-02-09 09:49:37 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
153d3855ad Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-03 17:20:26 +01:00
Laurent Destailleur
92942870dc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-02-03 17:12:44 +01:00
Laurent Destailleur
8b6de8fe26 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 17:09:56 +01:00
Laurent Destailleur
6ab723e85c Fix bad path of include 2021-02-03 17:09:26 +01:00
Laurent Destailleur
641885d814 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:05:27 +01:00
Laurent Destailleur
3801dd34cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 19:02:57 +01:00
Laurent Destailleur
d023afb66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-31 18:55:11 +01:00
Laurent Destailleur
08aa3eac00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 18:54:19 +01:00
Laurent Destailleur
9ef5f26624
Merge pull request #14022 from OPEN-DSI/fix_supplier_order_dispatching 
FIX: Fix detect dispatched product and set to received completely when the supplier order have services
 2021-01-31 18:51:57 +01:00
lmarcouiller
21141f0788 Fix #16010 update fournisseur.product.class.php 2021-01-18 19:18:10 +01:00
Laurent Destailleur
0a422f44dc
Merge pull request #16011 from Hystepik/develop#3 
Fix #16010 update fournisseur.product.class.php
 2021-01-18 19:16:41 +01:00
lmarcouiller
494bb3ee5c Fix #16010 update fournisseur.product.class.php 2021-01-18 16:39:36 +01:00
Frédéric FRANCE
171a4e7935
fix variable declaration 
The variable $label seems to be never defined.
The variable $label does not seem to be defined for all execution paths leading up to this point.
 2021-01-18 08:09:12 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
eed14bd9af Fix warnings 2020-12-17 17:04:42 +01:00
Laurent Destailleur
c092c88dd7 Fix warning 2020-12-17 13:48:28 +01:00
Laurent Destailleur
663d52fef1 Fix warning 2020-12-17 12:31:53 +01:00
Laurent Destailleur
b7876f54cf Fix warning 2020-12-16 19:10:37 +01:00
Laurent Destailleur
2c7d872320 Fix warning 2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790 Fix warning 2020-12-16 10:55:33 +01:00
Laurent Destailleur
b991badb8c Fix warning 2020-12-14 13:03:43 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
 2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Laurent Destailleur
c6d253ba94
Merge pull request #15660 from Ahuahuachi/develop 
Translate phpDocs
 2020-12-07 22:41:51 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Alfredo Altamirano
6332ce5eea Translate phpDocs 2020-12-04 17:01:56 -06:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +01:00
Laurent Destailleur
9cbdbc460d Fix multicurrency 2020-12-04 19:10:43 +01:00
Florian HENRY
94d57cd462 fix rounding 2020-12-04 10:03:06 +01:00
Alexandre SPANGARO
0a24298385 FIX: Problem on supplier payment card 2020-12-04 02:57:40 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
c994b3b6f2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-11-26 17:02:19 +01:00
Laurent Destailleur
22c2cfd9ec FIX warning for purchase order delivery late. 2020-11-26 16:57:39 +01:00
Laurent Destailleur
bd780a8c51 FIX Warning on late purchase order delivery 2020-11-26 15:29:18 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Francis Appels
89e101e0b6 Fix wrong value for deprecated 2020-11-21 11:38:07 +01:00
Francis Appels
064b5acff5 List supplier barcode 2020-11-20 17:16:49 +01:00
Laurent Destailleur
0760a268f6 Fix warning 2020-11-18 22:25:03 +01:00
Laurent Destailleur
1dd697767e
Merge branch 'develop' into 13_doc 2020-11-18 18:08:14 +01:00
Francis Appels
aade8e7adb Add deprecated fourn_barcode incase already used external. 2020-11-18 14:58:04 +01:00
Francis Appels
22985e7b61 Revert "use barcode iso supplier_barcode" 
This reverts commit 57705e225b.
 2020-11-18 14:27:29 +01:00
Laurent Destailleur
1a21ace02d
Update fournisseur.commande.class.php 2020-11-18 12:42:33 +01:00
Francis Appels
57705e225b use barcode iso supplier_barcode 2020-11-16 18:02:54 +01:00
Francis Appels
5af557c902 Fix supplier barcode should be same in fetch and fetch list. 
Refactor fourn to supplier for barcode
 2020-11-16 17:36:53 +01:00
Frédéric FRANCE
4ef4792469
Update fournisseur.commande.class.php 2020-11-16 13:57:59 +01:00
Frédéric FRANCE
1abef27a1a
fix delivery_date 2020-11-16 13:52:35 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
cbe9fec51d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/ticket/list.php
 2020-11-15 17:29:19 +01:00
BlueGarm
2425cf82d3 Add Partially Received Order and Delay 
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
 2020-11-14 13:25:02 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
ac6f8e4e7c Debug v13 2020-11-06 11:52:48 +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
21a933f15c
fix undefined variable 2020-10-31 09:37:56 +01: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
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
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +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
Maxime Kohlhaas
680ae60b6f Fix #15064 : error when supplier invoice numbering module is not configured 2020-10-25 08:56:34 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Florian HENRY
b0641e6d69 better rix 2020-10-21 13:22:32 +02:00