Journal Entry: cleanup in reconcillation status update during edition.

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

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 9ec89b569eede7069de04c40653e9714a729ca54..ba0c8a413ffe7618c0311f3713bb6847f1864186 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -160,16 +160,15 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
        }
        else {
                $order_no = $_GET['InvoicePrepayments'];
-               $payments =  get_payments_for($_GET['InvoicePrepayments'], ST_SALESORDER);
        }
        processing_start();
 
-       $_SESSION['Items'] = new Cart(ST_SALESORDER, $order_no, ST_SALESINVOICE);
+       $_SESSION['Items'] = new cart(ST_SALESORDER, $order_no, ST_SALESINVOICE);
        $_SESSION['Items']->order_no = $order_no;
        $_SESSION['Items']->src_docs = array($order_no);
        $_SESSION['Items']->trans_no = 0;
        $_SESSION['Items']->trans_type = ST_SALESINVOICE;
-       $_SESSION['Items']->prepayments = $payments;
+
        $_SESSION['Items']->update_payments();
 
        copy_from_cart();
@@ -234,7 +233,7 @@ function set_delivery_shipping_sum($delivery_notes)
     
     foreach($delivery_notes as $delivery_num) 
     {
-        $myrow = get_customer_trans($delivery_num, 13);
+        $myrow = get_customer_trans($delivery_num, ST_CUSTDELIVERY);
 
         $shipping += $myrow['ov_freight'];
     }
@@ -342,7 +341,7 @@ function check_data()
                        return false;
                }
        } else {
-               if (($_SESSION['Items']->payment_terms['days_before_due'] < 0) && !count($_SESSION['Items']->prepayments)) {
+               if (($_SESSION['Items']->payment_terms['days_before_due'] == -1) && !count($_SESSION['Items']->prepayments)) {
                        display_error(_("There is no non-invoiced payments for this order. If you want to issue final invoice, select delayed or cash payment terms."));
                        return false;
                }
@@ -355,6 +354,7 @@ 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);
 
@@ -467,13 +467,13 @@ start_row();
 if (!isset($_POST['ship_via'])) {
        $_POST['ship_via'] = $_SESSION['Items']->ship_via;
 }
-label_cell(_("Shipping Company"), "class='tableheader2'");
+label_cell(_("Shipping"), "class='tableheader2'");
 if ($prepaid)
 {
-       $shipper = get_shipper($_SESSION['Items']->ship_via);
-       label_cells(null, $shipper['shipper_name']);
+       $shipping = get_item($_SESSION['Items']->ship_via);
+       label_cells(null, $shipping['description']);
 } else
-       shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
+       shipping_methods_list_cells(null, 'ship_via', $_POST['ship_via']);
 
 if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
        $_POST['InvoiceDate'] = new_doc_date();