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

5254 Commits

Author SHA1 Message Date
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
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Maxime Kohlhaas
96a820476c Fix supplier invoice clone : missing data on lines (#18055) 2021-08-13 10:45:43 +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
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
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
2bef8a27c8 Trans 2021-07-09 12:34:51 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
affe6d9631 Sync transifex 2021-07-03 19:00:58 +02:00
lmarcouiller
2a30c699ac Fix #18063 : search filter status lost "Back to list" 2021-07-02 16:05:28 +02:00
lmarcouiller
903adadcc4 Fix Error type ent in fourn/commande/list.php 2021-07-02 16:05:14 +02:00
Francis Appels
69affc5df5 Fix php 8 warnings 2021-06-28 16:25:16 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
9c657206b3
Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +02:00
Laurent Destailleur
a1e6236df0 Fix regression sql error 2021-06-15 02:15:45 +02:00
Laurent Destailleur
8b0c2d997c Clean code 2021-06-14 19:28:38 +02:00
stickler-ci
745ad8b403 Fixing style errors. 2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347 FIX : same thing on supplier orders 2021-06-14 17:01:59 +02:00
Laurent Destailleur
dd27d38d5e
Merge pull request #17869 from aspangaro/14b13 
NEW Add field date from/to in supplier invoice list
 2021-06-14 16:02:50 +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
Frédéric FRANCE
4138353d7f
fix warnings 2021-06-12 09:11:12 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
ac965bf49a FIX #16551 2021-06-11 17:40:04 +02:00
Laurent Destailleur
77efbda148 Fix responsive 2021-06-10 20:04:21 +02:00
Laurent Destailleur
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction 
bugfix/supplierBankTransfertWrongCodeCheckMassAction
 2021-06-10 16:44:32 +02:00
Alexis LAURIER
03cd88d145 bugfix/supplierBankTransfertWrongCodeCheckMassAction 2021-06-10 16:29:56 +02:00
stickler-ci
17bdd0b5bc Fixing style errors. 2021-06-10 04:03:51 +00:00
Alexandre SPANGARO
3d26ad4cf8 NEW Add field date from/to in supplier invoice list 2021-06-10 05:59:29 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +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
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Frédéric FRANCE
4e530c2486
Update card.php 2021-06-08 12:05:45 +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
Francis Appels
01f5a5fb18 Fix update receipt eatby 2021-06-04 12:38:04 +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
Laurent Destailleur
82757f0989
Merge pull request #17775 from dolibit-ut/patch-337 
Update list.php
 2021-06-04 10:35:51 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338 
Update card.php
 2021-06-04 10:35:28 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339 
Update card.php
 2021-06-04 10:35:11 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note 
ADD note to supplier order refusal
 2021-06-04 10:10:17 +02:00
Laurent Destailleur
c7e21daee7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 09:36:20 +02:00