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

300 Commits

Author SHA1 Message Date
Laurent Destailleur
6cab758841 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/knowledgemanagement/knowledgerecord_list.php
	htdocs/theme/md/style.css.php
 2022-06-01 21:55:36 +02:00
Francis Appels
74346c6480 Fix sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled. 2022-05-31 16:59:57 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for 
code consistency purpose.
 2022-04-02 10:31:58 +02:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
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
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
64777acfc1 Fix unit price 2021-12-30 19:46:58 +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
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
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01: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
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
60711f415d Fix permission on external user 2021-04-08 19:52:07 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +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
39849de96e Look and feel v14 2021-03-16 10:19:56 +01:00
Laurent Destailleur
c55932090a Fix phpcs 2021-03-04 19:48:08 +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
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
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
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
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