From 301dc491b4a2378dd2192ec12b3de44abf166221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 2 Jan 2013 16:21:54 +0100 Subject: [PATCH 1/2] [-] BO: Fix #PSCFV-6415 php notice --- controllers/admin/AdminInvoicesController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php index c2658675a..242d71e5c 100644 --- a/controllers/admin/AdminInvoicesController.php +++ b/controllers/admin/AdminInvoicesController.php @@ -273,11 +273,14 @@ class AdminInvoicesControllerCore extends AdminController protected function getInvoicesModelsFromDir($directory) { - $templates = array(); + $templates = false; if (is_dir($directory)) $templates = glob($directory.'invoice-*.tpl'); + if (!$templates) + $templates = array(); + return $templates; } } From 384c610d819bf03267099bd03a0173e7efc31605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 2 Jan 2013 16:48:30 +0100 Subject: [PATCH 2/2] [-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form --- js/admin-products.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/admin-products.js b/js/admin-products.js index 997e8c776..dc001421a 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -63,9 +63,9 @@ product_tabs['Combinations'] = new function(){ self.removeButtonCombination('update'); $.scrollTo('#add_new_combination', 1200, { offset: -100 }); var wholesale_price = Math.abs(data[0]['wholesale_price']); - var price = Math.abs(data[0]['price']); - var weight = Math.abs(data[0]['weight']); - var unit_impact = Math.abs(data[0]['unit_price_impact']); + var price = data[0]['price']; + var weight = data[0]['weight']; + var unit_impact = data[0]['unit_price_impact']; var reference = data[0]['reference']; var ean = data[0]['ean13']; var quantity = data[0]['quantity'];