From: Joe Hunt Date: Wed, 2 May 2012 20:52:07 +0000 (+0200) Subject: Rerun of /sales/includes/cart_class.inc. X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=e0b4cf0b73424913e9536a85b952d3508ca4fd53;p=textcart.git Rerun of /sales/includes/cart_class.inc. --- diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc index 6330936..40fb2a3 100644 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@ -243,6 +243,11 @@ class cart // $policy - 0 or 1: writeoff/return for IV, back order/cancel for DN function write($policy=0) { begin_transaction(); // prevents partial database changes in case of direct delivery/invoice + if ($this->reference != 'auto' && $this->trans_no == 0 && !is_new_reference($this->reference, $this->trans_type)) + { + commit_transaction(); + return -1; + } if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY)) { // this is direct document - first add parent $ref = $this->reference; @@ -260,11 +265,6 @@ class cart $this->due_date = $due_date; } $this->reference = @html_entity_decode($this->reference, ENT_QUOTES); - if ($this->reference != 'auto' && $this->trans_no == 0 && !is_new_reference($this->reference, $this->trans_type)) - { - commit_transaction(); - return -1; - } $this->Comments = @html_entity_decode($this->Comments, ENT_QUOTES); foreach($this->line_items as $lineno => $line) { $this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id, ENT_QUOTES);