Commit Graph

282 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Florian HENRY
df4b208de1 fix: add missing edit field with pakaging option on 2020-10-12 11:10:49 +02:00
Laurent Destailleur
f57b4fd2fd Fix escaping 2020-09-20 02:30:53 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Francis Appels
c2030a7db5 jdate already in function listProductFournisseurPriceLog
So no conversion needed.
2020-07-19 09:43:15 +02:00
Francis Appels
1bc1fd4cb4 Fix date in supplier price log tooltip. 2020-07-15 11:24:11 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +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
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
Laurent Destailleur
19084286be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.product.class.php
2020-04-02 16:49:37 +02:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00