X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=a7a7cba45e0cb210d0ef7a648cc5a90061b4b708;hb=20a29dd033237c2329c6ca3152cb17135e6c4f66;hp=ec22b1cb2cdde221fff4f02df3c73ad3e5559fb3;hpb=2e7b5edc07f954d93f9aa1570a12458394aa6234;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index ec22b1cb..a7a7cba4 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ include_once($path_to_root . "/purchasing/includes/db/invoice_items_db.inc"); //-------------------------------------------------------------------------------------------------- @@ -91,15 +100,23 @@ function get_deliveries_between($stock_id, $from, $to) { $from = date2sql($from); $to = date2sql($to); - $sql = "SELECT SUM(-qty), AVG(standard_cost) FROM ".TB_PREF."stock_moves + $sql = "SELECT SUM(-qty), SUM(-qty*standard_cost) FROM ".TB_PREF."stock_moves WHERE type=13 AND stock_id='$stock_id' AND tran_date>='$from' AND tran_date<='$to' GROUP BY stock_id"; $result = db_query($sql, "The deliveries could not be updated"); return db_fetch_row($result); } + +function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amount2) +{ + $currency = get_supplier_currency($supplier); + $amount1 = to_home_currency($amount1, $currency, $old_date); + $amount2 = to_home_currency($amount2, $currency, $date); + return $amount2 - $amount1; +} //---------------------------------------------------------------------------------------- -function add_supp_invoice($supp_trans) // do not receive as ref because we change locally +function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref because we change locally { //$company_currency = get_company_currency(); /*Start an sql transaction */ @@ -110,6 +127,7 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang foreach ($taxes as $taxitem) { + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); $tax_total += $taxitem['Value']; } @@ -127,15 +145,17 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang } $date_ = $supp_trans->tran_date; + $ex_rate = get_exchange_rate_from_home_currency(get_supplier_currency($supp_trans->supplier_id), $date_); /*First insert the invoice into the supp_trans table*/ $invoice_id = add_supp_trans($trans_type, $supp_trans->supplier_id, $date_, $supp_trans->due_date, $supp_trans->reference, $supp_trans->supp_reference, $invoice_items_total, $tax_total, $supp_trans->ov_discount); + $total = 0; /* Now the control account */ $supplier_accounts = get_supplier_accounts($supp_trans->supplier_id); - add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, -($invoice_items_total + $tax_total + $supp_trans->ov_discount), $supp_trans->supplier_id, "The general ledger transaction for the control total could not be added"); @@ -151,7 +171,6 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang between the std cost and the currency cost charged as converted at the ex rate of of the invoice is written off to the purchase price variance account applicable to the item being invoiced. */ - foreach ($supp_trans->gl_codes as $entered_gl_code) { @@ -162,11 +181,16 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang $entered_gl_code->amount = -$entered_gl_code->amount; $memo_ = $entered_gl_code->memo_; - add_gl_trans_supplier($trans_type, $invoice_id, $date_, $entered_gl_code->gl_code, + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $entered_gl_code->gl_code, $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id); add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code, $entered_gl_code->amount, $memo_); + + // store tax details if the gl account is a tax account + add_gl_tax_details($entered_gl_code->gl_code, + $trans_type, $invoice_id, $entered_gl_code->amount, + $ex_rate, $date_, $supp_trans->supp_reference); } foreach ($supp_trans->grn_items as $entered_grn) { @@ -181,7 +205,7 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree; $stock_gl_code = get_stock_gl_code($entered_grn->item_code); - add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id); // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt @@ -197,38 +221,39 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang $old_price = $old[2]; - - /* If statement is removed. Should always check for deliveries nomatter if there has been a price change. */ //if ($old_price != $entered_grn->chg_price) // price-change, so update //{ - $diff = $entered_grn->chg_price - $old_price; - $old_date = sql2date($old[1]); - // only update the diff (last parameter, adj_only is set to true). - $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code, - $diff, $entered_grn->this_quantity_inv, $old_date, true); - // function just above this - $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_); - if ($deliveries[0] != 0) // have deliveries been done during the period? + //$diff = $entered_grn->chg_price - $old_price; + $old_date = sql2date($old[1]); + $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, + $entered_grn->chg_price); + // always return due to change in currency. + $mat_cost = update_average_material_cost(null, $entered_grn->item_code, + $diff, $entered_grn->this_quantity_inv, $old_date, true); + // added 2008-12-08 Joe Hunt. Update the purchase data table + add_or_update_purchase_data($supp_trans->supplier_id, $entered_grn->item_code, $entered_grn->chg_price); + $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, Today()); // extend the period, if invoice is before any deliveries. + if ($deliveries[0] != 0) // have deliveries been done during the period? + { + $deliveries[1] /= $deliveries[0]; + $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency + if ($amt != 0.0) { - - $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency - if ($amt != 0.0) - { - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), - $amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], - 0, 0, _("Cost diff."), -$amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - } - update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); - } - update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); - //} + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), + $amt, null, null, null, + "The general ledger transaction could not be added for the price variance of the inventory item"); + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + 0, 0, _("Cost diff."), -$amt, null, null, null, + "The general ledger transaction could not be added for the price variance of the inventory item"); + } + update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); + } + update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); + //} } // ---------------------------------------------------------------------- @@ -239,25 +264,58 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang /* Now the TAX account */ foreach ($taxes as $taxitem) { - if ($taxitem['Value'] != 0) + if ($taxitem['Net'] != 0) { if (!$supp_trans->is_invoice) $taxitem['Value'] = -$taxitem['Value']; // here we suppose that tax is never included in price (we are company customer). - add_supp_invoice_tax_item($trans_type, $invoice_id, $taxitem['tax_type_id'], - $taxitem['rate'], 0, $taxitem['Value']); + add_trans_tax_details($trans_type, $invoice_id, + $taxitem['tax_type_id'], $taxitem['rate'], 0, $taxitem['Value'], + $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference); - add_gl_trans_supplier($trans_type, $invoice_id, $date_, + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'], $supp_trans->supplier_id, "A general ledger transaction for the tax amount could not be added"); } } + + /*Post a balance post if $total != 0 */ + add_gl_balance($trans_type, $invoice_id, $date_, -$total, payment_person_types::supplier(), $supp_trans->supplier_id); + add_comments($trans_type, $invoice_id, $date_, $supp_trans->Comments); references::save_last($supp_trans->reference, $trans_type); + if ($invoice_no != 0) + { + $invoice_alloc_balance = get_supp_trans_allocation_balance(20, $invoice_no); + if ($invoice_alloc_balance > 0) + { //the invoice is not already fully allocated + + $trans = get_supp_trans($invoice_no, 20); + $total = $trans['Total']; + + $allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance; + /*Now insert the allocation record if > 0 */ + if ($allocate_amount != 0) + { + update_supp_trans_allocation(20, $invoice_no, $allocate_amount); + update_supp_trans_allocation(21, $invoice_id, $allocate_amount); // *** + add_supp_allocation($allocate_amount, 21, $invoice_id, 20, $invoice_no, + $date_); + // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// + + exchange_variation(21, $invoice_id, 20, $invoice_no, $date_, + $allocate_amount, payment_person_types::supplier()); + + /////////////////////////////////////////////////////////////////////////// + } + } + } + + commit_transaction(); return $invoice_id; @@ -272,9 +330,10 @@ function get_po_invoices_credits($po_number) $sql = "SELECT DISTINCT ".TB_PREF."supp_trans.trans_no, ".TB_PREF."supp_trans.type, ov_amount+ov_discount+ov_gst AS Total, ".TB_PREF."supp_trans.tran_date - FROM ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items, ".TB_PREF."purch_order_details + FROM ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items, ".TB_PREF."purch_order_details, ".TB_PREF."purch_orders WHERE ".TB_PREF."supp_invoice_items.supp_trans_no = ".TB_PREF."supp_trans.trans_no AND ".TB_PREF."supp_invoice_items.po_detail_item_id = ".TB_PREF."purch_order_details.po_detail_item + AND ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."supp_trans.supplier_id AND ".TB_PREF."purch_order_details.order_no = $po_number"; return db_query($sql, "The invoices/credits for the po $po_number could not be retreived"); @@ -346,6 +405,8 @@ function void_supp_invoice($type, $type_no) { begin_transaction(); + $trans = get_supp_trans($type_no, $type); + void_bank_trans($type, $type_no, true); void_gl_trans($type, $type_no, true); @@ -368,42 +429,46 @@ function void_supp_invoice($type, $type_no) $old = update_supp_received_items_for_invoice($details_row["grn_item_id"], $details_row["po_detail_item_id"], -$details_row["quantity"], $details_row["FullUnitPrice"]); - $diff = $details_row["FullUnitPrice"] - $old[2]; + //$diff = $details_row["FullUnitPrice"] - $old[2]; $old_date = sql2date($old[1]); $batch = get_grn_batch_from_item($details_row["grn_item_id"]); $grn = get_grn_batch($batch); - - // Only adjust the avg for the diff - $mat_cost = update_average_material_cost($grn["supplier_id"], $details_row["stock_id"], - $diff, -$details_row["quantity"], $date_, true); - + if ($type == 21) // credit note 2009-06-14 Joe Hunt Must restore the po and grn + { + $sql = "UPDATE ".TB_PREF."purch_order_details + SET quantity_ordered = quantity_ordered + ".-$details_row["quantity"].", + quantity_received = quantity_received + ".-$details_row["quantity"]." + WHERE po_detail_item = ".$details_row["po_detail_item_id"]; + db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed "); + $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=qty_recd+".-$details_row["quantity"]." + WHERE id=".$details_row["grn_item_id"]; + db_query($sql); + $mat_cost = update_average_material_cost($grn["supplier_id"], $details_row["stock_id"], + $details_row["FullUnitPrice"], -$details_row["quantity"], $date_); + } + else + { + $diff = get_diff_in_home_currency($grn["supplier_id"], $old_date, sql2date($trans['tran_date']), $old[2], + $details_row["FullUnitPrice"]); + // Only adjust the avg for the diff + $mat_cost = update_average_material_cost(null, $details_row["stock_id"], + $diff, -$details_row["quantity"], $old_date, true); + } $deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_); if ($deliveries[0] != 0) // have deliveries been done during the period? { - - $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency - if ($amt != 0.0) - { - $stock_gl_code = get_stock_gl_code($details_row["stock_id"]); - add_gl_trans($type, $type_no, $date_, $stock_gl_code["cogs_account"], - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), - -$amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - add_gl_trans($type, $type_no, $date_, $stock_gl_code["inventory_account"], - 0, 0, _("Cost diff."), $amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - } update_stock_move_pid(13, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost); } update_stock_move_pid(25, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost); - } } } + if ($type == 21) // void the credits in stock moves + void_stock_move(21, $type_no); void_supp_invoice_items($type, $type_no); - void_supp_invoice_tax_items($type, $type_no); + void_trans_tax_details($type, $type_no); commit_transaction(); }