X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=844994521b9dace304d612dc28e80f459596e5c5;hb=0dfa3ce0411c9d123d25d6a0079668e551a88b14;hp=11ce9f931ca33d0c4835a8c9184c5600055ab0fa;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 11ce9f93..84499452 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']; + } //------------------------------------------------------------------------------------------------- @@ -70,17 +74,19 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi $sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE po_detail_item = ".db_escape($po_detail_item); $result = db_query($sql, "The old actual price of the purchase order line could not be retrieved"); - $row = db_fetch_row($result); - $ret = $row[0]; + $row = db_fetch($result); + $ret = $row['act_price']; - $unit_price = $row[1]; //Added by Rasmus + $unit_price = $row['unit_price']; //Added by Rasmus - $sql = "SELECT delivery_date FROM ".TB_PREF."grn_batch,".TB_PREF."grn_items WHERE - ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id AND " - .TB_PREF."grn_items.id=".db_escape($id); + $sql = "SELECT delivery_date + FROM ".TB_PREF."grn_batch grn," + .TB_PREF."grn_items line + WHERE + grn.id = line.grn_batch_id AND line.id=".db_escape($id); $result = db_query($sql, "The old delivery date from the received record cout not be retrieved"); - $row = db_fetch_row($result); - $date = $row[0]; + $row = db_fetch($result); + $date = $row['delivery_date']; } else { @@ -118,7 +124,6 @@ function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun return $diff; } //---------------------------------------------------------------------------------------- - function add_supp_invoice(&$supp_trans) { global $Refs; @@ -127,19 +132,23 @@ 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); $tax_total = 0; $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); if ($trans_no) { - $allocs = get_payments_for($trans_no, $trans_type); // save allocations - void_transaction($trans_type, $trans_no, Today(), _("Document reentered.")); + $allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations + 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) { @@ -156,7 +165,6 @@ function add_supp_invoice(&$supp_trans) foreach ($taxes as $n => $taxitem) $item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], user_price_dec()); } - if ($trans_type == ST_SUPPCREDIT) { // let's negate everything because it's a credit note @@ -167,7 +175,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, @@ -205,7 +213,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"); } @@ -215,7 +223,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"); @@ -301,7 +309,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); @@ -333,7 +341,6 @@ function add_supp_invoice(&$supp_trans) $ref = $Refs->get_next(ST_JOURNAL, null, $date_); add_journal(ST_JOURNAL, $id, $diff, $date_, get_company_currency(), $ref); $stock_id = $entered_grn->item_code; - $stock_gl_code = get_stock_gl_code($stock_id); $memo = _("Supplier invoice adjustment for zero inventory of ").$stock_id." "._("Invoice")." ".$supp_trans->reference; //Reverse the inventory effect if $qoh <=0 add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, @@ -352,7 +359,7 @@ function add_supp_invoice(&$supp_trans) } add_or_update_purchase_data($supp_trans->supplier_id, $entered_grn->item_code, $entered_grn->chg_price); } - + update_purchase_value($entered_grn->item_code, $entered_grn->chg_price * $ex_rate); add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code, $entered_grn->item_description, 0, $entered_grn->chg_price, $line_tax/$entered_grn->this_quantity_inv, $entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, ""); @@ -365,8 +372,9 @@ function add_supp_invoice(&$supp_trans) $Refs->save($trans_type, $invoice_id, $supp_trans->reference); - if ($supp_trans->src_docs) + if (count($supp_trans->src_docs) == 1) { + $invoice_no = key($supp_trans->src_docs); $invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $supp_trans->src_docs); if ($invoice_alloc_balance > 0) { //the invoice is not already fully allocated @@ -390,11 +398,7 @@ function add_supp_invoice(&$supp_trans) } } -//_vd($allocs); - reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs); -//_vd(get_payments_for($sales_order, ST_PURCHORDER)); -//_vd(get_payments_for($invoice_id, ST_SUPPINVOICE)); -//exit; + reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs, $supp_trans->supplier_id); $supp_trans->trans_no = $invoice_id; hook_db_postwrite($supp_trans, $supp_trans->trans_type); commit_transaction(); @@ -408,17 +412,18 @@ function add_supp_invoice(&$supp_trans) function get_po_invoices_credits($po_number) { - $sql = "SELECT DISTINCT ".TB_PREF."supp_trans.trans_no, ".TB_PREF."supp_trans.type, - ov_amount+ov_discount+ov_gst AS Total, - ".TB_PREF."supp_trans.tran_date - FROM ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items, " - .TB_PREF."purch_order_details, ".TB_PREF."purch_orders - WHERE ".TB_PREF."supp_invoice_items.supp_trans_no = ".TB_PREF."supp_trans.trans_no - AND ".TB_PREF."supp_invoice_items.supp_trans_type = ".TB_PREF."supp_trans.type - AND ".TB_PREF."supp_invoice_items.po_detail_item_id = ".TB_PREF."purch_order_details.po_detail_item - AND ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."supp_trans.supplier_id - AND ".TB_PREF."purch_orders.order_no = ".TB_PREF."purch_order_details.order_no - AND ".TB_PREF."purch_order_details.order_no = ".db_escape($po_number); + $sql = "SELECT DISTINCT trans.trans_no, trans.type, ov_amount+ov_discount+ov_gst AS Total, + trans.tran_date + FROM ".TB_PREF."supp_trans trans," + .TB_PREF."supp_invoice_items line," + .TB_PREF."purch_order_details poline," + .TB_PREF."purch_orders po + WHERE line.supp_trans_no = trans.trans_no + AND line.supp_trans_type = trans.type + AND line.po_detail_item_id = poline.po_detail_item + AND po.supplier_id = trans.supplier_id + AND po.order_no = poline.order_no + AND poline.order_no = ".db_escape($po_number); return db_query($sql, "The invoices/credits for the po $po_number could not be retreived"); } @@ -447,10 +452,11 @@ function get_tax_overrides($trans_type, $trans_no) function read_supp_invoice($trans_no, $trans_type, &$supp_trans) { - $sql = "SELECT ".TB_PREF."supp_trans.*, supp_name - FROM ".TB_PREF."supp_trans,".TB_PREF."suppliers + $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)." - AND ".TB_PREF."suppliers.supplier_id=".TB_PREF."supp_trans.supplier_id"; + AND sup.supplier_id=trans.supplier_id"; $result = db_query($sql, "Cannot retreive a supplier transaction"); @@ -469,6 +475,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"]; @@ -485,14 +494,15 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) $supp_trans->add_grn_to_trans($details_row["grn_item_id"], $details_row["po_detail_item_id"], $details_row["stock_id"], $details_row["description"], $details_row['qty_recd'], - $details_row['quantity_inv']-$details_row["quantity"], - $details_row["quantity"], 0, $details_row["FullUnitPrice"], + $details_row['quantity_inv'], + ($trans_type == ST_SUPPCREDIT ? -1 : 1) * $details_row["quantity"], 0, $details_row["FullUnitPrice"], // SUPPCREDIT quantities are stored negative in database 0, 0); } else { - $supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 0, 0, - $details_row["FullUnitPrice"], $details_row["memo_"], $details_row["dimension_id"], $details_row["dimension2_id"]); + $supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), + $details_row["dimension_id"], $details_row["dimension2_id"], + $details_row["FullUnitPrice"], $details_row["memo_"]); } } $supp_trans->tax_overrides = get_tax_overrides($trans_type, $trans_no); @@ -513,7 +523,9 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) function get_matching_invoice_item($stock_id, $po_item_id) { - $sql = "SELECT *, tran_date FROM ".TB_PREF."supp_invoice_items, ".TB_PREF."supp_trans + $sql = "SELECT *, tran_date + FROM ".TB_PREF."supp_invoice_items," + .TB_PREF."supp_trans WHERE supp_trans_type = ".ST_SUPPINVOICE." AND stock_id = " .db_escape($stock_id)." AND po_detail_item_id = ".db_escape($po_item_id)." AND supp_trans_no = trans_no"; @@ -605,11 +617,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); @@ -669,14 +681,14 @@ function remove_not_invoice_item($id) update_average_material_cost($grn["supplier_id"], $myrow["item_code"], $myrow["unit_price"], -$myrow["QtyOstdg"], Today()); - + $price = $myrow['unit_price']; if ($supp['tax_included']) $price = get_tax_free_price_for_item($myrow['item_code'], $myrow['unit_price'], $supp['tax_group_id'], $supp['tax_included']); 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'], $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'])) @@ -689,7 +701,7 @@ function remove_not_invoice_item($id) -$myrow['QtyOstdg'] * $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();