Commit Graph

1934 Commits

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