From 51e08891ba98a44051505de399d0521bfbe9fe6b Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 30 Sep 2011 15:33:30 +0200 Subject: [PATCH] Option for changing dimensions when editing Sales Invoice. --- sales/customer_invoice.php | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 4068fea..9c9e171 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -230,6 +230,8 @@ function copy_to_cart() $cart->Comments = $_POST['Comments']; if ($_SESSION['Items']->trans_no == 0) $cart->reference = $_POST['ref']; + $cart->dimension_id = $_POST['dimension_id']; + $cart->dimension2_id = $_POST['dimension2_id']; } //----------------------------------------------------------------------------- @@ -245,6 +247,8 @@ function copy_from_cart() $_POST['cart_id'] = $cart->cart_id; $_POST['ref'] = $cart->reference; $_POST['payment'] = $cart->payment; + $_POST['dimension_id'] = $cart->dimension_id; + $_POST['dimension2_id'] = $cart->dimension2_id; } //----------------------------------------------------------------------------- @@ -397,8 +401,15 @@ label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableh label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'"); // 2010-09-03 Joe Hunt -if ($dim > 0) - label_cells(_("Dimension"), get_dimension_string($_SESSION['Items']->dimension_id), "class='tableheader2'"); +//if ($dim > 0) +// label_cells(_("Dimension"), get_dimension_string($_SESSION['Items']->dimension_id), "class='tableheader2'"); +if ($dim > 0) { + label_cell(_("Dimension").":", "class='tableheader2'"); + $_POST['dimension_id'] = $_SESSION['Items']->dimension_id; + dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false); +} +else + hidden('dimension_id', 0); end_row(); start_row(); @@ -424,11 +435,19 @@ if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { } date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'"); +/* if ($dim > 1) label_cells(_("Dimension"). " 2", get_dimension_string($_SESSION['Items']->dimension2_id), "class='tableheader2'"); else if ($dim > 0) label_cell(" ", "colspan=2"); - +*/ +if ($dim > 1) { + label_cell(_("Dimension")." 2:", "class='tableheader2'"); + $_POST['dimension2_id'] = $_SESSION['Items']->dimension2_id; + dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false); +} +else + hidden('dimension2_id', 0); end_row(); end_table(); -- 2.30.2