X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=48e33987503ab0704e3058224cb8516a0cdd0ec3;hb=dc292b0592ea1035129904f5af26037f2e91c4d2;hp=c584115c858330bc3bd016d50c0939cbb91a674e;hpb=5e5944444f1518e2c622091ceb5e3caefa7fe0d5;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index c584115c..48e33987 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -15,20 +15,20 @@ include_once($path_to_root . "/purchasing/includes/db/invoice_items_db.inc"); function read_supplier_details_to_trans(&$supp_trans, $supplier_id) { - $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."payment_terms.terms, " - .TB_PREF."payment_terms.days_before_due, - ".TB_PREF."payment_terms.day_in_following_month, - ".TB_PREF."suppliers.tax_group_id, ".TB_PREF."tax_groups.name As tax_group_name - From ".TB_PREF."suppliers, ".TB_PREF."payment_terms, ".TB_PREF."tax_groups - WHERE ".TB_PREF."suppliers.tax_group_id = ".TB_PREF."tax_groups.id - AND ".TB_PREF."suppliers.payment_terms=".TB_PREF."payment_terms.terms_indicator - AND ".TB_PREF."suppliers.supplier_id = ".db_escape($supplier_id); + $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due, + terms.day_in_following_month, supp.tax_included, + supp.tax_group_id, tax_group.name AS tax_group_name + FROM ".TB_PREF."suppliers supp, ".TB_PREF."payment_terms terms, ".TB_PREF."tax_groups tax_group + WHERE supp.tax_group_id = tax_group.id + AND supp.payment_terms=terms.terms_indicator + AND supp.supplier_id = ".db_escape($supplier_id); $result = db_query($sql, "The supplier record selected: " . $supplier_id . " cannot be retrieved"); $myrow = db_fetch($result); $supp_trans->supplier_id = $supplier_id; + $supp_trans->tax_included = $myrow['tax_included']; $supp_trans->supplier_name = $myrow['supp_name']; $supp_trans->terms_description = $myrow['terms']; @@ -108,7 +108,8 @@ function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun $ex_rate = get_exchange_rate_to_home_currency($currency, $date); $amount2 = $amount2 / $ex_rate; $diff = $amount2 - $amount1; - return round2($diff, $dec); + //return round2($diff, $dec); + return $diff; } //---------------------------------------------------------------------------------------- @@ -123,13 +124,21 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $tax_total = 0; $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); - foreach ($taxes as $taxitem) + foreach ($taxes as $n => $taxitem) { - $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); - $tax_total += $taxitem['Value']; + $taxes[$n]['Value'] = round2($taxitem['Value'], user_price_dec()); + $tax_total += $taxes[$n]['Value']; } - $invoice_items_total = $supp_trans->get_total_charged($supp_trans->tax_group_id); + $invoice_items_total = $supp_trans->get_items_total(); +// $invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id); + + if($supp_trans->tax_included==0) { + $item_added_tax = $tax_total; + } else { + $item_added_tax = 0; + + } $trans_type = $supp_trans->trans_type; @@ -139,6 +148,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $invoice_items_total = -$invoice_items_total; $tax_total = -$tax_total; $supp_trans->ov_discount = -$supp_trans->ov_discount; // this isn't used at all... + $item_added_tax = -$item_added_tax; } $date_ = $supp_trans->tran_date; @@ -147,27 +157,16 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b /*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); + $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included); $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), + -($invoice_items_total + $item_added_tax + $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 */ - - /*the postings here are a little tricky, the logic goes like this: - if its a general ledger amount it goes straight to the account specified - - if its a GRN amount invoiced then : - - The cost as originally credited to GRN suspense on arrival of items is debited to GRN suspense. Any difference - 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) { @@ -189,9 +188,9 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $entered_gl_code->amount = -$entered_gl_code->amount; add_gl_tax_details($entered_gl_code->gl_code, $trans_type, $invoice_id, $entered_gl_code->amount, - $ex_rate, $date_, $supp_trans->supp_reference); + $ex_rate, $date_, $supp_trans->supp_reference, $supp_trans->tax_included); } - foreach ($supp_trans->grn_items as $entered_grn) + foreach ($supp_trans->grn_items as $line_no => $entered_grn) { if ($trans_type == ST_SUPPCREDIT) @@ -202,10 +201,14 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id); $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); - $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : $stock_gl_code["cogs_account"]); + $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : + ($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"])); $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id); + /*$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, + $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 if ($trans_type == ST_SUPPINVOICE) { @@ -226,14 +229,34 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b //{ //$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); + if (is_inventory_item($entered_grn->item_code)) + { + $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); */ + $mat_cost = update_average_material_cost(null, $entered_grn->item_code, + $diff, $entered_grn->this_quantity_inv, null, true); + + //Add GL transaction for GRN Provision in case of difference + if (($diff * $entered_grn->this_quantity_inv) != 0 ) + { + $diff_amt = $diff * $entered_grn->this_quantity_inv; + add_gl_trans($trans_type, $invoice_id, $date_, $iv_act, + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], 'GRN Provision', + $diff_amt, null, null, null, + "The general ledger transaction could not be added for the GRN of the inventory item"); + + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], + 0, 0, 'GRN Provision', -$diff_amt, null, null, null, + "The general ledger transaction could not be added for the GRN of the inventory item"); + } + } // 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. + /*$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]; @@ -254,14 +277,15 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b "The general ledger transaction could not be added for the price variance of the inventory item"); } update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); - } - update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); + } */ + if (is_inventory_item($entered_grn->item_code)) + update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); //} } // ---------------------------------------------------------------------- add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code, - $entered_grn->item_description, 0, $line_taxfree, $line_tax, + $entered_grn->item_description, 0, $entered_grn->chg_price, $line_tax, $entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, ""); } /* end of GRN postings */ /* Now the TAX account */ @@ -276,9 +300,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $taxitem['Net'] = -$taxitem['Net']; $taxitem['Value'] = -$taxitem['Value']; } - // here we suppose that tax is never included in price (we are company customer). add_trans_tax_details($trans_type, $invoice_id, - $taxitem['tax_type_id'], $taxitem['rate'], 0, $taxitem['Value'], + $taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'], $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference); if ($trans_type == ST_SUPPCREDIT) @@ -373,6 +396,7 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) $supp_trans->ov_amount = $trans_row["ov_amount"]; $supp_trans->ov_discount = $trans_row["ov_discount"]; $supp_trans->ov_gst = $trans_row["ov_gst"]; + $supp_trans->tax_included = $trans_row["tax_included"]; $id = $trans_row["trans_no"];