Fixed edition of reference field on sales invoice/credit/delivery [0000161]

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 56f66f3441743b95eda4bd1e6a35a9418e465d04..bf6a61d102de576faae97a3b1f98f1db9e205c8b 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+14-Aug-2009 Janusz Dobrowolski
+# [0000161] Fixed reference edition on sales invoice/deliery/credit.
+$ /sales/customer_credit_invoice.php
+  /sales/customer_delivery.php
+  /sales/customer_invoice.php
+
 12-Aug-2009 Joe Hunt
 # [0000159] Memo field's GL entries are not saved (gl_trans) in supplier invoice
 $ /purchasing/includes/purchasing_db.inc

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 4959c23c6ae515fbfd2952fb09d62696cded95af..b19746120882e497d25503e7516ea0edb5395646 100644 (file)
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -178,24 +178,27 @@ function check_quantities()
 
 function copy_to_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $cart->ship_via = $_POST['ShipperID'];
-  $cart->freight_cost = input_num('ChargeFreightCost');
-  $cart->document_date =  $_POST['CreditDate'];
-  $cart->Location = $_POST['Location'];
-  $cart->Comments = $_POST['CreditText'];
+       $cart = &$_SESSION['Items'];
+       $cart->ship_via = $_POST['ShipperID'];
+       $cart->freight_cost = input_num('ChargeFreightCost');
+       $cart->document_date =  $_POST['CreditDate'];
+       $cart->Location = $_POST['Location'];
+       $cart->Comments = $_POST['CreditText'];
+       if ($_SESSION['Items']->trans_no == 0)
+               $cart->reference = $_POST['ref'];
 }
 //-----------------------------------------------------------------------------
 
 function copy_from_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $_POST['ShipperID'] = $cart->ship_via;
-  $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
-  $_POST['CreditDate']= $cart->document_date;
-  $_POST['Location']= $cart->Location;
-  $_POST['CreditText']= $cart->Comments;
-  $_POST['cart_id'] = $cart->cart_id;
+       $cart = &$_SESSION['Items'];
+       $_POST['ShipperID'] = $cart->ship_via;
+       $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+       $_POST['CreditDate']= $cart->document_date;
+       $_POST['Location']= $cart->Location;
+       $_POST['CreditText']= $cart->Comments;
+       $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 //-----------------------------------------------------------------------------
 
@@ -247,7 +250,7 @@ function display_credit_items()
 //             $_POST['ref'] = references::get_next(11);
 
     if ($_SESSION['Items']->trans_no==0) {
-               ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+               ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
        } else {
                label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
        }

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 97f0459003acd6d3fbcf214d4f40e1d7e32a1063..4aa1723dc4b1e09905cb2a96494f43c655697b6f 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -219,6 +219,7 @@ function copy_from_cart()
        $_POST['Location'] = $cart->Location;
        $_POST['Comments'] = $cart->Comments;
        $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 //------------------------------------------------------------------------------
 
@@ -324,7 +325,7 @@ start_row();
 //     $_POST['ref'] = references::get_next(13);
 
 if ($_SESSION['Items']->trans_no==0) {
-       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index d935978f202439f181dee5653b6228fe63367e21..0a3c36a1f11a6ae12c0343bfb61e0c59b64bdf46 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -220,6 +220,8 @@ function copy_to_cart()
        $cart->document_date =  $_POST['InvoiceDate'];
        $cart->due_date =  $_POST['due_date'];
        $cart->Comments = $_POST['Comments'];
+       if ($_SESSION['Items']->trans_no == 0)
+               $cart->reference = $_POST['ref'];
 }
 //-----------------------------------------------------------------------------
 
@@ -232,6 +234,7 @@ function copy_from_cart()
        $_POST['due_date'] = $cart->due_date;
        $_POST['Comments']= $cart->Comments;
        $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 
 //-----------------------------------------------------------------------------
@@ -347,7 +350,7 @@ end_row();
 start_row();
 
 if ($_SESSION['Items']->trans_no == 0) {
-       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }