Rewritten sales shipping cost taxation, improved shipping cost handling in sales...

[fa-stable.git] / purchasing / includes / ui / po_ui.inc

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index b71359576c1f5b06759d925a69c22e7489bff8cc..092e801c58952f2df1d07514d5790d49217eedc1 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -18,7 +18,7 @@ function copy_from_cart()
        $cart = &$_SESSION['PO'];
 
        $_POST['supplier_id'] = $cart->supplier_id;
-       $_POST['OrderDate'] = $cart->orig_order_date;
+       $_POST['OrderDate'] = $cart->tran_date;
        if ($cart->trans_type == ST_SUPPINVOICE)
                $_POST['due_date'] = $cart->due_date;
     $_POST['supp_ref'] = $cart->supp_ref;
@@ -40,7 +40,7 @@ function copy_to_cart()
        $cart = &$_SESSION['PO'];
 
        $cart->supplier_id = $_POST['supplier_id'];     
-       $cart->orig_order_date = $_POST['OrderDate'];
+       $cart->tran_date = $_POST['OrderDate'];
        if ($cart->trans_type == ST_SUPPINVOICE)
        {
                $cart->due_date = $_POST['due_date'];
@@ -64,7 +64,7 @@ function copy_to_cart()
 
 //---------------------------------------------------------------------------------------------------
 
-function create_new_po($trans_type, $trans_no)
+function create_cart($trans_type, $trans_no)
 {
        global $Refs;
 
@@ -72,20 +72,28 @@ function create_new_po($trans_type, $trans_no)
                unset ($_SESSION['PO']->line_items, $_SESSION['PO']);
 
        $cart = new purch_order;
-       $_POST['OrderDate'] = new_doc_date();
-       if (!is_date_in_fiscalyear($_POST['OrderDate']))
-               $_POST['OrderDate'] = end_fiscalyear();
-       $cart->due_date = $cart->orig_order_date = $_POST['OrderDate'];
-
        $cart->trans_type = $trans_type;
-       $cart->order_no = $trans_no;
-       /*read in all the selected order into the Items cart  */
-       if ($trans_no) {
-               read_po($trans_no, $cart);
+
+       if ($trans_type == ST_SUPPRECEIVE && $trans_no != 0) {
+               read_grn($trans_no, $cart);
+               foreach($cart->line_items as &$line) {
+                       $line->qty_old = $line->quantity; // for concurrency checks
+                       $line->qty_received -= $line->quantity;
+               }
+       } else {
                $cart->order_no = $trans_no;
-       } else
-               $cart->reference = $Refs->get_next($trans_type, null,
-                       array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+               $_POST['OrderDate'] = new_doc_date();
+               if (!is_date_in_fiscalyear($_POST['OrderDate']))
+                       $_POST['OrderDate'] = end_fiscalyear();
+               $cart->due_date = $cart->tran_date = $_POST['OrderDate'];
+               /* read in all the selected order into the Items cart  */
+               if ($trans_no) {
+                       read_po($trans_no, $cart);
+                       $cart->order_no = $trans_no;
+               } else
+                       $cart->reference = $Refs->get_next($trans_type, null,
+                               array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+       }
        $_SESSION['PO'] = &$cart;
 }
 
@@ -137,7 +145,7 @@ function display_po_header(&$order)
                'OrderDate', '', true, 0, 0, 0, null, true);
 
        if (isset($_POST['_OrderDate_changed'])) {
-               $order->orig_order_date = $_POST['OrderDate'];
+               $order->tran_date = $_POST['OrderDate'];
            get_duedate_from_terms($order);
            $_POST['due_date'] = $order->due_date;
                $Ajax->activate('due_date');
@@ -275,11 +283,11 @@ function display_po_items(&$order, $editable=true)
 
        label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
 
-       $taxes = $order->get_taxes(input_num('freight_cost'));
+       $taxes = $order->get_taxes();
        
        $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE);
 
-       $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+       $display_total = price_format(($total + $tax_total));
 
        start_row();
        label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
@@ -313,7 +321,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
     }
        end_row();
        start_row();
-    label_cells(_("Date"), $po->orig_order_date, "class='tableheader2'");
+    label_cells(_("Date"), $po->tran_date, "class='tableheader2'");
 
     if ($editable)
     {
@@ -394,7 +402,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
                if ($order->fixed_asset)
                        stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
                else
-                       stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
+                       stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
 
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');