From 32dd1e448083b1307000c43f6152bef4eb11d6a9 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 22 Aug 2013 10:45:42 +0200 Subject: [PATCH 1/2] fix display of buying price on line edit when no supplier price is defined --- htdocs/fourn/ajax/getSupplierPrices.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php index 938b3af2279..3953bce6caf 100644 --- a/htdocs/fourn/ajax/getSupplierPrices.php +++ b/htdocs/fourn/ajax/getSupplierPrices.php @@ -115,8 +115,8 @@ if (! empty($idprod)) $db->free($result); } } - - echo json_encode($prices); } +echo json_encode($prices); + ?> From e00f02616d43d5da391703d0ac88002761089d16 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 22 Aug 2013 10:49:13 +0200 Subject: [PATCH 2/2] update changelog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1fc49395c57..9bb45d8013f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ English Dolibarr ChangeLog -------------------------------------------------------------- ***** ChangeLog for 3.4.1 compared to 3.4.0 ***** +Fix: Display buying price on line edit when no supplier price is defined +Fix: Retrieving of margin info when invoice created automatically from order +Fix: Reordering supplier products in list by supplier or supplier ref was crashing Fix: [ bug #1029 ] Tulip numbering mask Fix: Supplier invoice and supplier order are not displayed into object link into agenda event card Fix: [ bug #1033 ] SUPPLIER REF disappeared