X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=c4e4c1c918d9b1d6d52fcb25d4f3aa0494d3a8d3;hb=9ff22040ec9e77b56c71df9bd95f9b2c2d50bd7e;hp=543df442ce77c51ae1081256879220205e2bb129;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 543df442..c4e4c1c9 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -16,7 +16,7 @@ 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) @@ -55,7 +55,9 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) $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']; + } //------------------------------------------------------------------------------------------------- @@ -70,17 +72,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 { @@ -133,7 +137,7 @@ function add_supp_invoice(&$supp_trans) $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 + $allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations void_transaction($trans_type, $trans_no, Today(), _("Document reentered.")); $Refs->restore_last($trans_type, $trans_no); } else @@ -352,7 +356,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 +369,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 +395,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 +409,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 +449,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 + 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 +472,8 @@ 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"]; $id = $trans_row["trans_no"]; @@ -491,8 +496,9 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) } 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 +519,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"; @@ -597,7 +605,7 @@ function void_supp_invoice($type, $type_no) //Chaitanya : Post a journal entry $id = get_next_trans_no(ST_JOURNAL); - $ref = $Refs->get_next(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL, null, $date_); add_journal(ST_JOURNAL, $id, $details_row["quantity"] * $diff, $old_date, get_company_currency(), $ref); $stock_id = $details_row["stock_id"]; $stock_gl_code = get_stock_gl_code($stock_id); @@ -669,14 +677,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 +697,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();