X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=4094e449d101c53bd0af6f9fbbfb55fbe74c7a35;hb=9af96a2e461b905dbb20f2b87ffb5c28f9b3461c;hp=16e25680ce5fa88d9efe97d9e21f611e169dda07;hpb=ddaf32837daa7ffa05298b63ac237b38eef3778a;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 16e25680..4094e449 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']; @@ -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,7 +187,7 @@ 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 $line_no => $entered_grn) { @@ -201,9 +200,8 @@ 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 = $supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : - ((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); @@ -230,29 +228,31 @@ 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); + 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); + // 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 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"); - } - + 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. @@ -277,7 +277,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b } 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); //} } // ---------------------------------------------------------------------- @@ -345,7 +346,6 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b } } - commit_transaction(); return $invoice_id;