X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=06d27cde04265d5093cd79c1647c729b1a85678e;hb=4e4ce8577f8582967995919860c66aa94d633afd;hp=308c2c25440ef5129b88262448d32ac910d024bd;hpb=a52174853a7922acd6626ac61032ec7674bce9cd;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 308c2c25..06d27cde 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -17,11 +17,13 @@ function read_supplier_details_to_trans(&$supp_trans, $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 + supp.tax_group_id, tax_group.name AS tax_group_name, + supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) + * (ov_amount + ov_gst + ov_discount),0)) as cur_credit + FROM ".TB_PREF."suppliers supp LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, ".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); + AND supp.supplier_id = ".db_escape($supplier_id)." GROUP BY supp.supp_name"; $result = db_query($sql, "The supplier record selected: " . $supplier_id . " cannot be retrieved"); @@ -30,16 +32,13 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) $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']; + $supp_trans->terms = array( + 'description' => $myrow['terms'], + 'days_before_due' => $myrow['days_before_due'], + 'day_in_following_month' => $myrow['day_in_following_month'] ); + + $supp_trans->credit = $myrow['cur_credit']; - if ($myrow['days_before_due'] == 0) - { - $supp_trans->terms = "1" . $myrow['day_in_following_month']; - } - else - { - $supp_trans->terms = "0" . $myrow['days_before_due']; - } $supp_trans->tax_description = $myrow['tax_group_name']; $supp_trans->tax_group_id = $myrow['tax_group_id']; @@ -120,7 +119,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b //$company_currency = get_company_currency(); /*Start an sql transaction */ begin_transaction(); - + hook_db_prewrite($supp_trans, $supp_trans->trans_type); $tax_total = 0; $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); @@ -155,9 +154,9 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $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, + $invoice_id = write_supp_trans($trans_type, 0, $supp_trans->supplier_id, $date_, $supp_trans->due_date, $supp_trans->reference, $supp_trans->supp_reference, - $invoice_items_total, $item_added_tax, $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 */ @@ -188,8 +187,10 @@ 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); } + + $clearing_act = get_company_pref('grn_clearing_act'); foreach ($supp_trans->grn_items as $line_no => $entered_grn) { @@ -201,17 +202,20 @@ 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"] : - ($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) + + if ($trans_type == ST_SUPPCREDIT) + { + $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); + } + else { + // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt + $iv_act = is_inventory_item($entered_grn->item_code) ? ($clearing_act ? $clearing_act : $stock_gl_code["inventory_account"]) : + ($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"]); $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item, $entered_grn->this_quantity_inv, $entered_grn->chg_price); // Since the standard cost is always calculated on basis of the po unit_price, @@ -229,8 +233,17 @@ 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]); - if (is_inventory_item($entered_grn->item_code)) + if (!is_inventory_item($entered_grn->item_code)) + $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); + else { + $currency = get_supplier_currency($supp_trans->supplier_id); + $ex_rate = get_exchange_rate_from_home_currency($currency, $old_date); + $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 * $old_price, $supp_trans->supplier_id, "", $ex_rate); $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, $entered_grn->chg_price); @@ -244,14 +257,14 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b 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, + $total += add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], $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"); + //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 @@ -346,8 +359,9 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b } } } - + $supp_trans->trans_no = $invoice_id; + hook_db_postwrite($supp_trans, $supp_trans->trans_type); commit_transaction(); return $invoice_id; @@ -449,6 +463,7 @@ function void_supp_invoice($type, $type_no) { begin_transaction(); + hook_db_prevoid($type, $type_no); $trans = get_supp_trans($type_no, $type); void_bank_trans($type, $type_no, true); @@ -565,6 +580,21 @@ function remove_not_invoice_item($id) add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "", -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']); + + $clearing_act = get_company_pref('grn_clearing_act'); + if ($clearing_act) { // otherwise GRN clearing account is not used + if (is_inventory_item($myrow['item_code'])) + { + $total = 0; + $stock_gl_code = get_stock_gl_code($myrow['item_code']); + $date = sql2date($grn["delivery_date"]); + $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], + -$myrow['QtyOstdg'] * $myrow['unit_price'], $grn["supplier_id"], "", 0, _("GRN Removal")); + $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $clearing_act, + 0, 0, -$total, null, "", 0, _("GRN Removal")); + } + } commit_transaction(); }