From edffac80b13b5aa45faaaed77839e3b618e107e3 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 14 Aug 2009 19:13:00 +0000
Subject: [PATCH] Fixed edition of reference field on sales
 invoice/credit/delivery [0000161]

---
 CHANGELOG.txt                     |  6 ++++++
 sales/customer_credit_invoice.php | 31 +++++++++++++++++--------------
 sales/customer_delivery.php       |  3 ++-
 sales/customer_invoice.php        |  5 ++++-
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 56f66f34..bf6a61d1 100644
--- 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 4959c23c..b1974612 100644
--- 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 97f04590..4aa1723d 100644
--- 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 d935978f..0a3c36a1 100644
--- 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'");
 }
-- 
2.30.2