Moving backend procedures from Direct GRN/Direct Supplier Invoice to purchasing_db...

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index be484631115353f32db1e28a419328a66d33573f..8fc50b41e6c461870e7d525946f8e9c10a0eadec 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -36,6 +36,7 @@ class purch_order
        var $stored_algorithm; // copy to find the change after invoice in processed
        var $terms;
        var $ex_rate;
+       var $cash_account;
 
        var $reference;
        var $tax_overrides = array();           // array of taxes manually inserted during sales invoice entry (direct invoice)

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index ac9e5e5e6d4991144517ba4c5527b55eb2add739..8e49f5902710c6937b1d2724ecae4fe1d3bd41d7 100644 (file)
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -140,4 +140,89 @@ function get_po_prepayments($supp_trans)
 
        return $allocations;
 }
-?>
\ No newline at end of file
+
+//---------------------------------------------------------------------------------------------------
+//
+//     Add Purchase Order, GRN or Purchase Invoice with parent auto documents (if any)
+//
+function add_direct_supp_trans($cart)
+{
+       global $Refs, $type_shortcuts;
+
+       if ($cart->trans_type != ST_PURCHORDER) {
+               // for direct grn/invoice set same dates for lines as for whole document
+               foreach ($cart->line_items as $line_no =>$line)
+                       $cart->line_items[$line_no]->req_del_date = $cart->orig_order_date;
+       }
+
+       $ref = $cart->reference;
+       if ($cart->trans_type != ST_PURCHORDER) {
+               $cart->reference = 'auto';
+               begin_transaction();    // all db changes as single transaction for direct document
+       }
+       $order_no = add_po($cart);
+       $cart->order_no = $order_no;
+
+       if ($cart->trans_type == ST_PURCHORDER)
+               return $order_no;
+
+       //Direct GRN
+       if ($cart->trans_type == ST_SUPPRECEIVE)
+               $cart->reference = $ref;
+       if ($cart->trans_type != ST_SUPPINVOICE)
+               $cart->Comments = $cart->reference; //grn does not hold supp_ref
+       foreach($cart->line_items as $key => $line)
+               $cart->line_items[$key]->receive_qty = $line->quantity;
+       $grn_no = add_grn($cart);
+       if ($cart->trans_type == ST_SUPPRECEIVE) {
+               commit_transaction(); // save PO+GRN
+               return $grn_no;
+       }
+       //      Direct Purchase Invoice
+       $inv = new supp_trans(ST_SUPPINVOICE);
+       $inv->Comments = $cart->Comments;
+       $inv->supplier_id = $cart->supplier_id;
+       $inv->tran_date = $cart->orig_order_date;
+       $inv->due_date = $cart->due_date;
+       $inv->reference = $ref;
+       $inv->supp_reference = $cart->supp_ref;
+       $inv->tax_included = $cart->tax_included;
+       $inv->tax_algorithm = $cart->tax_algorithm;
+       $inv->stored_algorithm = $cart->stored_algorithm;
+       $supp = get_supplier($cart->supplier_id);
+       $inv->tax_group_id = $supp['tax_group_id'];
+       $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
+       $total = 0;
+               foreach($cart->line_items as $key => $line) {
+               $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
+                       $line->item_description, $line->receive_qty, 0, $line->receive_qty,
+                       $line->price, $line->price, true, get_standard_cost($line->stock_id), '');
+               $total += round2(($line->receive_qty * $line->price), user_price_dec());
+       }
+       $inv->tax_overrides = $cart->tax_overrides;
+       if (!$inv->tax_included) {
+               $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
+               foreach( $taxes as $taxitem) {
+                       $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+               }
+       }
+       $inv->ex_rate = $cart->ex_rate;
+
+       $inv_no = add_supp_invoice($inv);
+       // presume supplier data need correction
+       if ($inv->stored_algorithm != $inv->tax_algorithm)
+               update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
+
+       if ($cart->cash_account) {
+
+               $pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, $cart->cash_account,
+                       $total, 0,      $Refs->get_next(ST_SUPPAYMENT), 
+                       _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
+               add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date);
+               update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no);
+               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);
+       }
+       commit_transaction(); // save PO+GRN+PI(+SP)
+       return $inv_no;
+}
+

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index f13a197b0ea0a8c26c203d5d418dcfa4d4aff7e2..ba60460976fd8ad4037f84e2f1939df18c1db7e4 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -29,6 +29,7 @@ function copy_from_cart()
     $_POST['tax_algorithm'] = $cart->tax_algorithm;
        $_POST['prep_amount'] = price_format($cart->prep_amount);
        $_POST['_ex_rate'] = $cart->ex_rate;
+       $_POST['cash_account'] = $cart->cash_account;
     foreach($cart->tax_overrides as $id => $value)
            $_POST['mantax'][$id] = price_format($value);
 }
@@ -40,7 +41,10 @@ function copy_to_cart()
        $cart->supplier_id = $_POST['supplier_id'];     
        $cart->orig_order_date = $_POST['OrderDate'];
        if ($cart->trans_type == ST_SUPPINVOICE)
+       {
                $cart->due_date = $_POST['due_date'];
+               $cart->cash_account = get_post('cash_account');
+       }
        $cart->reference = $_POST['ref'];
        $cart->supp_ref = $_POST['supp_ref'];
        $cart->Comments = $_POST['Comments'];   

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 0dfa4ebba560b9ec5854727fcf5df5839a20893c..dd2cc3bcabd7feb880d31b1b1141c7061a73bfc5 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -133,9 +133,6 @@ if (isset($_GET['AddedID']))
 
        display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Invoice")), 1);
 
-       hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
-               "PInvoice=".$trans_no);
-
        hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), 
                "filterType=$trans_type&trans_no=$trans_no");
 
@@ -413,104 +410,26 @@ function can_commit()
        return true;
 }
 
-//---------------------------------------------------------------------------------------------------
-
 function handle_commit_order()
 {
-       global $Refs, $type_shortcuts;
-
        $cart = &$_SESSION['PO'];
 
        if (can_commit()) {
 
                copy_to_cart();
-               if ($cart->trans_type != ST_PURCHORDER) {
-                       // for direct grn/invoice set same dates for lines as for whole document
-                       foreach ($cart->line_items as $line_no =>$line)
-                               $cart->line_items[$line_no]->req_del_date = $cart->orig_order_date;
-               }
+               new_doc_date($cart->orig_order_date);
                if ($cart->order_no == 0) { // new po/grn/invoice
-                       /*its a new order to be inserted */
-                       $ref = $cart->reference;
-                       if ($cart->trans_type != ST_PURCHORDER) {
-                               $cart->reference = 'auto';
-                               begin_transaction();    // all db changes as single transaction for direct document
-                       }
-                       $order_no = add_po($cart);
-                       new_doc_date($cart->orig_order_date); 
-               $cart->order_no = $order_no;
-
-                       if ($cart->trans_type == ST_PURCHORDER) {
-                               unset($_SESSION['PO']);
-                       meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no");
-               }
-                       //Direct GRN
-                       if ($cart->trans_type == ST_SUPPRECEIVE)
-                               $cart->reference = $ref;
-                       if ($cart->trans_type != ST_SUPPINVOICE)        
-                               $cart->Comments = $cart->reference; //grn does not hold supp_ref
-                       foreach($cart->line_items as $key => $line)
-                               $cart->line_items[$key]->receive_qty = $line->quantity;
-                       $grn_no = add_grn($cart);
-                       if ($cart->trans_type == ST_SUPPRECEIVE) {
-                               commit_transaction(); // save PO+GRN
+                       $trans_no = add_direct_supp_trans($cart);
+                       if ($trans_no) {
                                unset($_SESSION['PO']);
-                       meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no");
-                       }
-//                     Direct Purchase Invoice
-                       $inv = new supp_trans(ST_SUPPINVOICE);
-                       $inv->Comments = $cart->Comments;
-                       $inv->supplier_id = $cart->supplier_id;
-                       $inv->tran_date = $cart->orig_order_date;
-                       $inv->due_date = $cart->due_date;
-                       $inv->reference = $ref;
-                       $inv->supp_reference = $cart->supp_ref;
-                       $inv->tax_included = $cart->tax_included;
-                       $inv->tax_algorithm = $cart->tax_algorithm;
-                       $inv->stored_algorithm = $cart->stored_algorithm;
-                       $supp = get_supplier($cart->supplier_id);
-                       $inv->tax_group_id = $supp['tax_group_id'];
-                       $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
-
-                       $total = 0;
-                       foreach($cart->line_items as $key => $line) {
-                               $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
-                                       $line->item_description, $line->receive_qty, 0, $line->receive_qty,
-                                       $line->price, $line->price, true, get_standard_cost($line->stock_id), '');
-                               $total += round2(($line->receive_qty * $line->price), user_price_dec());
-                       }
-                       $inv->tax_overrides = $cart->tax_overrides;
-                       if (!$inv->tax_included) {
-                               $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
-                               foreach( $taxes as $taxitem) {
-                                       $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
-                               }
+                               if ($cart->trans_type == ST_PURCHORDER)
+                                       meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+                               elseif ($cart->trans_type == ST_SUPPRECEIVE)
+                                       meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$trans_no");
+                               else
+                                       meta_forward($_SERVER['PHP_SELF'], "AddedPI=$trans_no");
                        }
-                       $inv->ex_rate = $cart->ex_rate;
-
-                       $inv_no = add_supp_invoice($inv);
-                       // presume supplier data need correction
-                       if ($inv->stored_algorithm != $inv->tax_algorithm)
-                               update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
-
-                       if (get_post('cash_account')) {
-
-                               $pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, get_post('cash_account'),
-                                       $total, 0,      $Refs->get_next(ST_SUPPAYMENT), 
-                                       _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
-                               add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date);
-                               update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no);
-                               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);
-
-                       }
-
-                       commit_transaction(); // save PO+GRN+PI(+SP)
-
-                       unset($_SESSION['PO']);
-                       meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
-               }
-               else { // order modification
-
+               } else { // order modification
                        $order_no = update_po($cart);
                        unset($_SESSION['PO']);
                meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");