Added Purchase Delivery edition.

[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 6d74bcbe43572f1a803c7bcd734d11065c22cd39..88385649307122e43961df37c0f61557ed92497c 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -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->orig_order_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;
 }
 
@@ -166,7 +174,7 @@ function display_po_header(&$order)
        if ($order->trans_type==ST_SUPPINVOICE)
                date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
 
-       text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+       text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60);
 
        if (get_company_pref('use_dimension'))
                dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);