X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=04bc5c6a03296cb11f4c59bb2ed72c7e0f67a1db;hb=aa4e64cfb4f81292f825a2ffa295d3aae427d65a;hp=503ed275e3b165f338d1a32683f9ac1eddc5c868;hpb=8b9cba025d8d4a14d40d3d49f4e40cd5faf14c0a;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 503ed275..04bc5c6a 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -16,11 +16,10 @@ include_once($path_to_root . "/admin/db/attachments_db.inc"); function read_supplier_details_to_trans(&$supp_trans, $supplier_id) { - $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due, + $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due, supp.dimension_id, supp.dimension2_id, terms.day_in_following_month, supp.tax_included, 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 + supp.credit_limit - Sum((ov_amount + ov_gst + ov_discount)) as cur_credit, curr_code FROM ".TB_PREF."suppliers supp LEFT JOIN " .TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, " .TB_PREF."payment_terms terms, " @@ -40,10 +39,7 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) if (!is_date_in_fiscalyear($supp_trans->tran_date)) $supp_trans->tran_date = end_fiscalyear(); } - if ($supp_trans->supplier_id != $supplier_id) - get_duedate_from_terms($supp_trans); - $supp_trans->supplier_id = $supplier_id; $supp_trans->tax_included = $myrow['tax_included']; $supp_trans->supplier_name = $myrow['supp_name']; $supp_trans->terms = array( @@ -51,11 +47,19 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) 'days_before_due' => $myrow['days_before_due'], 'day_in_following_month' => $myrow['day_in_following_month'] ); + if ($supp_trans->supplier_id != $supplier_id) + get_duedate_from_terms($supp_trans); + + $supp_trans->supplier_id = $supplier_id; + $supp_trans->credit = $myrow['cur_credit']; $supp_trans->tax_description = $myrow['tax_group_name']; $supp_trans->tax_group_id = $myrow['tax_group_id']; - + $supp_trans->dimension = $myrow['dimension_id']; + $supp_trans->dimension2 = $myrow['dimension2_id']; + $supp_trans->currency = $myrow['curr_code']; + } //------------------------------------------------------------------------------------------------- @@ -129,6 +133,10 @@ function add_supp_invoice(&$supp_trans) $trans_no = $supp_trans->trans_no; $trans_type = $supp_trans->trans_type; $supplier = get_supplier($supp_trans->supplier_id); + $dim = !empty($supp_trans->dimension) ? $supp_trans->dimension : + ($supplier['dimension_id'] ? $supplier['dimension_id'] : 0); + $dim2 = !empty($supp_trans->dimension2) ? $supp_trans->dimension2 : + ($supplier['dimension2_id'] ? $supplier['dimension2_id'] : 0); begin_transaction(); hook_db_prewrite($supp_trans, $trans_type); @@ -136,12 +144,12 @@ function add_supp_invoice(&$supp_trans) $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); if ($trans_no) { $allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations - void_transaction($trans_type, $trans_no, Today(), _("Document reentered.")); + void_transaction($trans_type, $trans_no, $supp_trans->tran_date, _("Document reentered.")); $Refs->restore_last($trans_type, $trans_no); } else $allocs = get_po_prepayments($supp_trans); - add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate); + add_new_exchange_rate($supp_trans->currency, $supp_trans->tran_date, $supp_trans->ex_rate); foreach ($taxes as $n => $taxitem) { @@ -169,7 +177,7 @@ function add_supp_invoice(&$supp_trans) } $date_ = $supp_trans->tran_date; - $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $date_); + $ex_rate = get_exchange_rate_from_home_currency($supp_trans->currency, $date_); /*First insert the invoice into the supp_trans table*/ $invoice_id = write_supp_trans($trans_type, 0, $supp_trans->supplier_id, $date_, $supp_trans->due_date, @@ -207,7 +215,7 @@ function add_supp_invoice(&$supp_trans) if ($trans_type == ST_SUPPCREDIT) $taxitem['Value'] = -$taxitem['Value']; $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, - $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'], + $taxitem['purchasing_gl_code'], $dim, $dim2, $taxitem['Value'], $supp_trans->supplier_id, "A general ledger transaction for the tax amount could not be added"); } @@ -217,7 +225,7 @@ function add_supp_invoice(&$supp_trans) $net_diff = -$net_diff; /* Now the AP account */ - $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], 0, 0, + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], $dim, $dim2, -($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"); @@ -303,7 +311,7 @@ function add_supp_invoice(&$supp_trans) $dim, $dim2, $taxfree_line, $supp_trans->supplier_id); else { - $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $old_date); + $ex_rate = get_exchange_rate_from_home_currency($supp_trans->currency, $old_date); $old_value = get_tax_free_price_for_item($entered_grn->item_code, $entered_grn->this_quantity_inv * $old_price, $supp_trans->tax_group_id, $supp_trans->tax_included); @@ -447,7 +455,7 @@ function get_tax_overrides($trans_type, $trans_no) function read_supp_invoice($trans_no, $trans_type, &$supp_trans) { - $sql = "SELECT trans.*, supp_name + $sql = "SELECT trans.*, supp_name, dimension_id, dimension2_id, curr_code FROM ".TB_PREF."supp_trans trans," .TB_PREF."suppliers sup WHERE trans_no = ".db_escape($trans_no)." AND type = ".db_escape($trans_type)." @@ -470,6 +478,9 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) $supp_trans->ov_discount = $trans_row["ov_discount"]; $supp_trans->ov_gst = $trans_row["ov_gst"]; $supp_trans->tax_included = $trans_row["tax_included"]; + $supp_trans->dimension = $trans_row["dimension_id"]; + $supp_trans->dimension2 = $trans_row["dimension2_id"]; + $supp_trans->currency = $trans_row["curr_code"]; $id = $trans_row["trans_no"]; @@ -609,11 +620,11 @@ function void_supp_invoice($type, $type_no) //Reverse the inventory effect if $qoh <=0 add_gl_trans_std_cost(ST_JOURNAL, $id, $old_date, $stock_gl_code["inventory_account"], - $dim, $dim2, $memo, $details_row["quantity"] * $diff); + $details_row['dimension_id'], $details_row['dimension2_id'], $memo, $details_row["quantity"] * $diff); //GL Posting to inventory adjustment account add_gl_trans_std_cost(ST_JOURNAL, $id, $old_date, $stock_gl_code["adjustment_account"], - $dim, $dim2, $memo, -$details_row["quantity"] * $diff); + $details_row['dimension_id'], $details_row['dimension2_id'], $memo, -$details_row["quantity"] * $diff); add_audit_trail(ST_JOURNAL, $id, $old_date); add_comments(ST_JOURNAL, $id, $old_date, $memo);