lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Price min of composition is not supplier price min by quantity

Browse Source
This commit is contained in:
Juanjo Menent 2014-04-22 09:57:43 +02:00
parent 0a8ab84b1d
commit d527c4cf73
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -45,7 +45,8 @@ For users:
- New: Can filter on status for supplier order. - New: Can filter on status for supplier order.
- Fix: Project Task numbering customs rule works. - Fix: Project Task numbering customs rule works.
- Fix: Add actions events not implemented. - Fix: Add actions events not implemented.
- New: Add filter date in bank writing list page - New: Add filter date in bank writing list page.
- Fix: Price min of composition is not supplier price min by quantity
TODO TODO
- New: Predefined product and free product use same form. - New: Predefined product and free product use same form.

4
htdocs/product/composition/fiche.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -346,7 +346,7 @@ if ($id > 0 || ! empty($ref))
$productstatic->ref=$value['fullpath']; $productstatic->ref=$value['fullpath'];
print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')</td>'; print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')</td>';
print '<td align="right">'; print '<td align="right">';
if ($product_fourn->find_min_price_product_fournisseur($productstatic->id, $value['nb']) > 0) if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0)
{ {
print $langs->trans("BuyingPriceMinShort").': '; print $langs->trans("BuyingPriceMinShort").': ';
if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0,0); if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0,0);