X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=a7a7cba45e0cb210d0ef7a648cc5a90061b4b708;hb=20a29dd033237c2329c6ca3152cb17135e6c4f66;hp=f69ebe404332c9851e05cbfbcbaad3338101030b;hpb=45a5f52abef5d22959d69ec5bc0cde204531f489;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index f69ebe40..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"); //-------------------------------------------------------------------------------------------------- @@ -107,7 +116,7 @@ function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun } //---------------------------------------------------------------------------------------- -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 */ @@ -136,6 +145,7 @@ 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, @@ -176,6 +186,11 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang 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) { @@ -218,6 +233,8 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang // 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? { @@ -247,14 +264,15 @@ 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); $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'], @@ -270,6 +288,34 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang 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; @@ -284,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"); @@ -358,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); @@ -385,39 +434,41 @@ function void_supp_invoice($type, $type_no) $batch = get_grn_batch_from_item($details_row["grn_item_id"]); $grn = get_grn_batch($batch); - - $diff = get_diff_in_home_currency($grn["supplier_id"], $old_date, $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"], $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? { - $deliveries[1] /= $deliveries[0]; - $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(); }