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

// Update Accounting, handle errors for Date and fix bug when default_account_number isn't set at all

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10264 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vSchoener
2011-11-18 13:19:13 +00:00
parent eae6b9f67b
commit 6ae7ef6cbb
4 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAccountingExportController.php
+3 -1
View File
@@ -308,6 +308,8 @@ class AdminAccountingExportControllerCore extends AdminController
case 1:
$line[2] = !empty($row['account']) ? $row['account'] :
Configuration::get('default_account_number', NULL, NULL, $row['id_shop']);
// Force an empty string if Configuration send false
$line[2] = empty($line[2]) ? '' : $linep[2];
$line[5] = $row['product_price_ht'];
break;
case 2:
@@ -379,7 +381,7 @@ class AdminAccountingExportControllerCore extends AdminController
WHEN (acc_zs.`account_number` != "" AND acc_zs.`account_number` IS NOT NULL) THEN acc_zs.`account_number`
ELSE ""
END AS account,
CONCAT(\''.Configuration::get('PS_INVOICE_PREFIX').'\', LPAD(o.`invoice_number`, 6, 0)) AS invoice_number,
CONCAT(\''.Configuration::get('PS_INVOICE_PREFIX').'\', LPAD(o.`invoice_number`, 6, "0")) AS invoice_number,
o.`total_paid_real`,
od.`product_price` AS product_price_ht,
pcc.`transaction_id`,