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

[-] BO: get the invoice prefix from the right shop

Browse Source
This commit is contained in:
Rémi Gaillard
2013-02-04 15:11:29 +01:00
parent d6bd352844
commit 7bd44ca1b1
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+4 -4
View File
@@ -1102,7 +1102,7 @@ class AdminOrdersControllerCore extends AdminController
foreach ($order_invoices_collection as $order_invoice)
{
if (Tools::getValue('discount_value') > $order_invoice->total_paid_tax_incl)
$this->errors[] = Tools::displayError('Discount value is greater than the order invoice total (Invoice:').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id).')';
$this->errors[] = Tools::displayError('Discount value is greater than the order invoice total (Invoice:').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop).')';
else
{
$cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
@@ -1713,7 +1713,7 @@ class AdminOrdersControllerCore extends AdminController
$invoice_array = array();
foreach ($invoice_collection as $invoice)
{
$invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id);
$invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop);
$invoice_array[] = $invoice;
}
@@ -1916,7 +1916,7 @@ class AdminOrdersControllerCore extends AdminController
$invoice_array = array();
foreach ($invoice_collection as $invoice)
{
$invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id);
$invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop);
$invoice_array[] = $invoice;
}
@@ -2003,7 +2003,7 @@ class AdminOrdersControllerCore extends AdminController
$invoice_array = array();
foreach ($invoice_collection as $invoice)
{
$invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id);
$invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop);
$invoice_array[] = $invoice;
}