Stable merged into unstable again (due to failure on binary file during previous...

[fa-stable.git] / purchasing / po_entry_items.php

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index a23b7a0754b94603dc9e8e1d22931b4d6df3f337..388eb772158c7449dee682d35dfc5b0d8e91705c 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -57,6 +57,9 @@ if (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber']))
 
 page($_SESSION['page_title'], false, false, "", $js);
 
+if (isset($_GET['ModifyOrderNumber']))
+       check_is_closed(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
+
 //---------------------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
@@ -327,17 +330,16 @@ function can_commit()
                set_focus('supplier_id');
                return false;
        } 
-       
+
        if (!is_date($_POST['OrderDate'])) 
        {
                display_error(_("The entered order date is invalid."));
                set_focus('OrderDate');
                return false;
        } 
-       
-       if ($_SESSION['PO']->trans_type != ST_PURCHORDER && !is_date_in_fiscalyear($_POST['OrderDate'])) 
-       {
-               display_error(_("The entered date is not in fiscal year"));
+       if (($_SESSION['PO']->trans_type == ST_SUPPRECEIVE || $_SESSION['PO']->trans_type == ST_SUPPINVOICE) 
+               && !is_date_in_fiscalyear($_POST['OrderDate'])) {
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('OrderDate');
                return false;
        }
@@ -348,7 +350,7 @@ function can_commit()
                set_focus('due_date');
                return false;
        } 
-       
+
        if (!$_SESSION['PO']->order_no) 
        {
        if (!$Refs->is_valid(get_post('ref'))) 
@@ -357,7 +359,7 @@ function can_commit()
                        set_focus('ref');
                return false;
        } 
-       
+
        if (!is_new_reference(get_post('ref'), $_SESSION['PO']->trans_type)) 
        {
                display_error(_("The entered reference is already in use."));
@@ -365,7 +367,7 @@ function can_commit()
                return false;
        }
        }
-       
+
        if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE && !$Refs->is_valid(get_post('supp_ref'))) 
        {
                display_error(_("You must enter a supplier's invoice reference."));
@@ -405,6 +407,8 @@ function can_commit()
 
 function handle_commit_order()
 {
+       global $Refs, $type_shortcuts;
+
        $cart = &$_SESSION['PO'];
 
        if (can_commit()) {
@@ -451,24 +455,43 @@ function handle_commit_order()
                        $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_discount 'this isn't used at all'
-                       $inv->ov_amount = $inv->ov_gst = 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), '');
-                               $inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec());
+                               $total += round2(($line->receive_qty * $line->price), user_price_dec());
                        }
-                       $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
-                       foreach( $taxes as $taxitem) {
-                               $inv->ov_gst += round2($taxitem['Value'], user_price_dec());
+                       if (!$inv->tax_included) {
+                               $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
+                               foreach( $taxes as $taxitem) {
+                                       $total += $taxitem['Value'];
+                               }
                        }
+
                        $inv_no = add_supp_invoice($inv);
-                       commit_transaction(); // save PO+GRN+PI
-                       // FIXME payment for cash terms. (Needs cash account selection)
+                       // 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, $total);
+                               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $total);
+
+                       }
+
+                       commit_transaction(); // save PO+GRN+PI(+SP)
+
                        unset($_SESSION['PO']);
                        meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
                }
@@ -515,6 +538,17 @@ echo "<br>";
 display_po_items($_SESSION['PO']);
 
 start_table(TABLESTYLE2);
+
+if (list_updated('tax_algorithm')) {
+       $_SESSION['PO']->tax_algorithm = $_POST['tax_algorithm'];
+    $Ajax->activate('items_table');
+}
+
+if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) {
+       tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
+       cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
+}
+
 textarea_row(_("Memo:"), 'Comments', null, 70, 4);
 
 end_table(1);