// management of discount addition when no invoice on current order

// update the discount form when new invoice is created
This commit is contained in:
aFolletete
2011-12-19 18:24:03 +00:00
parent e97baff814
commit f6d29cc757
7 changed files with 139 additions and 108 deletions
+16 -3
View File
@@ -332,9 +332,11 @@ class OrderInvoiceCore extends ObjectModel
foreach ($taxes_infos as $tax_infos)
{
if (!isset($tmp_tax_infos[$tax_infos['rate']]))
$tmp_tax_infos[$tax_infos['rate']] = array('total_amount' => 0,
'name' => 0,
'total_price_tax_excl' => 0);
$tmp_tax_infos[$tax_infos['rate']] = array(
'total_amount' => 0,
'name' => 0,
'total_price_tax_excl' => 0
);
$tmp_tax_infos[$tax_infos['rate']]['total_amount'] += $tax_infos['total_amount'];
$tmp_tax_infos[$tax_infos['rate']]['name'] = $tax_infos['name'];
@@ -506,4 +508,15 @@ class OrderInvoiceCore extends ObjectModel
$order_payments->where('id_order_invoice', '=', $this->id);
return $order_payments;
}
/**
* Get the formatted number of invoice
* @since 1.5.0.2
* @param int $id_lang for invoice_prefix
* @return string
*/
public function getInvoiceNumberFormatted($id_lang)
{
return '#'.Configuration::get('PS_INVOICE_PREFIX', $id_lang).sprintf('%06d', $this->number);
}
}