dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
vAugagneur
2013-01-02 17:09:44 +01:00
parent dd49bfb464 f33a0d2f9f
commit 9cdd7c8a0d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminInvoicesController.php
+4 -1
View File
@@ -273,11 +273,14 @@ class AdminInvoicesControllerCore extends AdminController
protected function getInvoicesModelsFromDir($directory) protected function getInvoicesModelsFromDir($directory)
{ {
$templates = array(); $templates = false;
if (is_dir($directory)) if (is_dir($directory))
$templates = glob($directory.'invoice-*.tpl'); $templates = glob($directory.'invoice-*.tpl');
if (!$templates)
$templates = array();
return $templates; return $templates;
} }
} }
js/admin-products.js
+3 -3
View File
@@ -63,9 +63,9 @@ product_tabs['Combinations'] = new function(){
self.removeButtonCombination('update'); self.removeButtonCombination('update');
$.scrollTo('#add_new_combination', 1200, { offset: -100 }); $.scrollTo('#add_new_combination', 1200, { offset: -100 });
var wholesale_price = Math.abs(data[0]['wholesale_price']); var wholesale_price = Math.abs(data[0]['wholesale_price']);
var price = Math.abs(data[0]['price']); var price = data[0]['price'];
var weight = Math.abs(data[0]['weight']); var weight = data[0]['weight'];
var unit_impact = Math.abs(data[0]['unit_price_impact']); var unit_impact = data[0]['unit_price_impact'];
var reference = data[0]['reference']; var reference = data[0]['reference'];
var ean = data[0]['ean13']; var ean = data[0]['ean13'];
var quantity = data[0]['quantity']; var quantity = data[0]['quantity'];