Bloomberg Rate has changed their wrapper from span to div.

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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 6e35437e6902767fb4de998f719ef6f3a4ad4c19..ec03796d2635246b934282691ca37f8e68e36824 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -437,7 +437,8 @@ function handle_commit_order()
                        //Direct GRN
                        if ($cart->trans_type == ST_SUPPRECEIVE)
                                $cart->reference = $ref;
-                       $cart->Comments = $cart->reference; //grn does not hold supp_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);
@@ -457,19 +458,25 @@ function handle_commit_order()
                        $inv->tax_included = $cart->tax_included;
                        $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 = $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), '');
                                $inv->ov_amount += 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());
+                       $inv->tax_overrides = $cart->tax_overrides;
+                       if (!$inv->tax_included) {
+                               $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
+                               foreach( $taxes as $taxitem) {
+                                       $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+                               }
                        }
+                       $inv->ex_rate = $cart->ex_rate;
+
                        $inv_no = add_supp_invoice($inv);
                        commit_transaction(); // save PO+GRN+PI
                        // FIXME payment for cash terms. (Needs cash account selection)
@@ -477,7 +484,7 @@ function handle_commit_order()
                        meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
                }
                else { // order modification
-               
+
                        $order_no = update_po($cart);
                        unset($_SESSION['PO']);
                meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");