X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=2ee490189f08fb2e8233061deff7b00905752ed7;hb=f338f2d7ea4c0de20a53b83be6442d792735e5e1;hp=b19897da6b2ffd0c1007250f5b4df81488c6ec7f;hpb=d266769382e3bed5a87101346b461b8e261205eb;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index b19897da..2ee49018 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 */ @@ -118,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']; } @@ -135,14 +145,20 @@ 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); + $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"); /*Loop through the GL Entries and create a debit posting for each of the accounts entered */ @@ -155,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. */ - $total = 0; foreach ($supp_trans->gl_codes as $entered_gl_code) { @@ -171,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) { @@ -213,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? { @@ -242,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'], @@ -257,13 +280,42 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang "A general ledger transaction for the tax amount could not be added"); } } - add_gl_trans($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, "", - -$total, null, payment_person_types::supplier(), $supp_trans->supplier_id, - "The general ledger transaction for the control total 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; @@ -411,7 +463,7 @@ function void_supp_invoice($type, $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(); }