Substitute invoice numbers on complete once again (#163, #150)

This commit is contained in:
jekkos committed 2015-09-22 18:21:19 +02:00
1 parent 0646200f6c
commit 7dfcec394f
2 files changed
+2 -9

No files matched your search

+1 -4
View File
@@ -268,10 +268,7 @@ class Receivings extends Secure_area
private function _substitute_invoice_number($supplier_info='')
{
$invoice_number=$this->receiving_lib->get_invoice_number();
if (empty($invoice_number))
{
$invoice_number=$this->config->config['recv_invoice_format'];
}
$invoice_number=$this->config->config['recv_invoice_format'];
$invoice_number = $this->_substitute_variables($invoice_number,$supplier_info);
$this->receiving_lib->set_invoice_number($invoice_number);
return $invoice_number;
+1 -5
View File
@@ -528,13 +528,9 @@ class Sales extends Secure_area
private function _substitute_invoice_number($cust_info)
{
$invoice_number=$this->sale_lib->get_invoice_number();
if (empty($invoice_number))
{
$invoice_number=$this->config->config['sales_invoice_format'];
}
$invoice_number=$this->config->config['sales_invoice_format'];
$invoice_number = $this->_substitute_variables($invoice_number, $cust_info);
$this->sale_lib->set_invoice_number($invoice_number);
return $invoice_number;
}