From d527c4cf73b8e41aeb545f41b9fdbd62f301fe8e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 22 Apr 2014 09:57:43 +0200 Subject: [PATCH] Fix: Price min of composition is not supplier price min by quantity --- ChangeLog | 3 ++- htdocs/product/composition/fiche.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2aa466a76dd..5deebade85b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,7 +45,8 @@ For users: - New: Can filter on status for supplier order. - Fix: Project Task numbering customs rule works. - 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 - New: Predefined product and free product use same form. diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index 7b35aa158c6..f7485fdc49d 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -4,7 +4,7 @@ * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011-2014 Juanjo Menent * * 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 @@ -346,7 +346,7 @@ if ($id > 0 || ! empty($ref)) $productstatic->ref=$value['fullpath']; print ''.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')'; print ''; - 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").': '; if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0,0);