From 7dfcec394f7b799b28b235f7d8816f981946e128 Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 22 Sep 2015 18:15:02 +0200 Subject: [PATCH] Substitute invoice numbers on complete once again (#163, #150) --- application/controllers/receivings.php | 5 +---- application/controllers/sales.php | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php index 1b7595ac9..013aaf631 100644 --- a/application/controllers/receivings.php +++ b/application/controllers/receivings.php @@ -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; diff --git a/application/controllers/sales.php b/application/controllers/sales.php index 55a86686d..5e3cda0a0 100644 --- a/application/controllers/sales.php +++ b/application/controllers/sales.php @@ -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; }