Included option for Show Service Items in Inventory Sales Report

[fa-stable.git] / sales / customer_invoice.php

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index ee15814a7e33eafc26d11ca39d6d7cf2be7bfb49..f306c08cdfda41888fa0576fe868f5de8518a706 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -63,6 +63,17 @@ if (isset($_GET['AddedID'])) {
 
        hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
 
+       $sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations
+                       WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice_no);
+       $result = db_query($sql, "could not retrieve customer allocation");
+       $row = db_fetch($result);
+
+       if ($row === false)
+               hyperlink_params("$path_to_root/sales/customer_payments.php", _("Entry &customer payment for this invoice"),
+               "SInvoice=".$invoice_no);
+
+       hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
+
        display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID']))  {
@@ -228,6 +239,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'];
 
 }
 //-----------------------------------------------------------------------------
@@ -243,6 +256,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;
 }
 
 //-----------------------------------------------------------------------------
@@ -275,12 +290,6 @@ function check_data()
                        set_focus('ref');
                        return false;
                }
-
-               if (!is_new_reference($_POST['ref'], 10)) {
-                       display_error(_("The entered reference is already in use."));
-                       set_focus('ref');
-                       return false;
-               }
        }
 
        if ($_POST['ChargeFreightCost'] == "") {
@@ -308,19 +317,27 @@ function check_data()
 
 //-----------------------------------------------------------------------------
 if (isset($_POST['process_invoice']) && check_data()) {
-
        $newinvoice=  $_SESSION['Items']->trans_no == 0;
        copy_to_cart();
-       if ($newinvoice) new_doc_date($_SESSION['Items']->document_date);
+       if ($newinvoice) 
+               new_doc_date($_SESSION['Items']->document_date);
 
        $invoice_no = $_SESSION['Items']->write();
-       processing_end();
-
-       if ($newinvoice) {
-               meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
-       } else {
-               meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+       if ($invoice_no == -1)
+       {
+               display_error(_("The entered reference is already in use."));
+               set_focus('ref');
        }
+       else
+       {
+               processing_end();
+
+               if ($newinvoice) {
+                       meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
+               } else {
+                       meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+               }
+       }       
 }
 
 if(list_updated('payment')) {
@@ -362,7 +379,7 @@ $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['It
 start_form();
 hidden('cart_id');
 
-start_table(TABLESTYLE2, "width=80%", 5);
+start_table(TABLESTYLE2, "width='80%'", 5);
 
 start_row();
 $colspan = 1;
@@ -395,8 +412,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();
@@ -422,11 +446,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();
 
@@ -442,7 +474,7 @@ if ($row['dissallow_invoices'] == 1)
 display_heading(_("Invoice Items"));
 
 div_start('Items');
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
        _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 
@@ -496,9 +528,9 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
                if ($dn_line_cnt == 0) {
                        $dn_line_cnt = $dspans[0];
                        $dspans = array_slice($dspans, 1);
-                       label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class=oddrow");
+                       label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class='oddrow'");
                        label_cell("<a href='" . $_SERVER['PHP_SELF'] . "?RemoveDN=".
-                               $ln_itm->src_no."'>" . _("Remove") . "</a>", "rowspan=$dn_line_cnt class=oddrow");
+                               $ln_itm->src_no."'>" . _("Remove") . "</a>", "rowspan=$dn_line_cnt class='oddrow'");
                }
                $dn_line_cnt--;
        }