X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=4f8024a62420a57ee8009b5e8cbeb0d56d047ab1;hb=14901648b0ec51c107f84c4431634834b5dbf261;hp=8b7afeea3d2d6632e114d66eb9ba943aaa7e74bb;hpb=da996b57bbeeb3e83c37526b3ae687b291ca6045;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 8b7afeea..4f8024a6 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -203,16 +203,19 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $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 = $clearing_act ? $clearing_act : (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : + 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); - - // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt - if ($trans_type == ST_SUPPINVOICE) + $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, @@ -222,18 +225,30 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b //$old_price = $old[0]; $old_price = $old[2]; + // adjust for tax included. + $old_price = get_tax_free_price_for_item($entered_grn->item_code, $old_price, + $supp_trans->tax_group_id, $entered_grn->tax_included); /* If statement is removed. Should always check for deliveries nomatter if there has been a price change. */ - //if ($old_price != $entered_grn->chg_price) // price-change, so update + //if ($old_price != $line_taxfree) // price-change, so update //{ - //$diff = $entered_grn->chg_price - $old_price; + //$diff = $line_taxfree - $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); + $line_taxfree); // always return due to change in currency. /*$mat_cost = update_average_material_cost(null, $entered_grn->item_code, @@ -245,14 +260,61 @@ 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"); + "The general ledger transaction could not be added for the GRN of the inventory item"); + + //Chaitanya + //If QOH is 0 or negative then update_average_material_cost will be skipped + //Thus difference in PO and Supp Invoice should be handled separately - 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"); + $qoh = get_qoh_on_date($entered_grn->item_code); + if ($qoh <= 0) + { + global $Refs; + + //Chaitanya : Post a journal entry + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + $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_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], + $memo, -$entered_grn->this_quantity_inv * $diff); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], + $memo, $entered_grn->this_quantity_inv * $diff); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } + + /*$qoh = get_qoh_on_date($entered_grn->item_code); + if ($qoh <= 0) + { + $memo = "Diff. in cost: ".$diff; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_supplier($trans_type, $invoice_id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], + -$entered_grn->this_quantity_inv * $diff, $supp_trans->supplier_id, "", null, $memo); + //GL Posting to inventory adjustment account + add_gl_trans_supplier($trans_type, $invoice_id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], + $entered_grn->this_quantity_inv * $diff, $supp_trans->supplier_id, "", null, $memo); + }*/ + + //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 @@ -278,9 +340,10 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b "The general ledger transaction could not be added for the price variance of the inventory item"); } update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $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); + */ //} } // ---------------------------------------------------------------------- @@ -367,8 +430,10 @@ function get_po_invoices_credits($po_number) 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); return db_query($sql, "The invoices/credits for the po $po_number could not be retreived"); @@ -482,14 +547,18 @@ function void_supp_invoice($type, $type_no) $batch = get_grn_batch_from_item($details_row["grn_item_id"]); $grn = get_grn_batch($batch); if ($type == ST_SUPPCREDIT) // credit note 2009-06-14 Joe Hunt Must restore the po and grn - { // We must get the corresponding invoice item to check for price chg. + { $match = get_matching_invoice_item($details_row["stock_id"], $details_row["po_detail_item_id"]); - if ($match !== false) + + //Chaitanya : Skipped costing block & handle in void_stock_move + // We must get the corresponding invoice item to check for price chg. + /*if ($match !== false) $mat_cost = update_average_material_cost($grn["supplier_id"], $details_row["stock_id"], $match["unit_price"], -$details_row["quantity"], sql2date($match['tran_date']), $match['tran_date'] !== $trans['tran_date']); else $mat_cost = update_average_material_cost($grn["supplier_id"], $details_row["stock_id"], - $details_row["FullUnitPrice"], -$details_row["quantity"], $old_date, $old[1] !== $trans['tran_date']); + $details_row["FullUnitPrice"], -$details_row["quantity"], $old_date, $old[1] !== $trans['tran_date']);*/ + $sql = "UPDATE ".TB_PREF."purch_order_details SET quantity_ordered = quantity_ordered + ".-$details_row["quantity"].", "; if ($match !== false) @@ -508,13 +577,45 @@ function void_supp_invoice($type, $type_no) // Only adjust the avg for the diff $mat_cost = update_average_material_cost(null, $details_row["stock_id"], $diff, -$details_row["quantity"], $old_date, true); + + //Chaitanya : Reverse effect + //If QOH is 0 or negative then update_average_material_cost will be skipped + //Thus difference in PO and Supp Invoice should be handled separately + + $qoh = get_qoh_on_date($details_row["stock_id"]); + if ($diff*$details_row["quantity"] !=0 && $qoh <= 0) + { + global $Refs; + + //Chaitanya : Post a journal entry + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + $stock_id = $details_row["stock_id"]; + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "Reversing Supplier invoice adjustment for zero inventory of ".$stock_id." Invoice: ".$trans['reference']; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $old_date, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['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"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], + $memo, -$details_row["quantity"] * $diff); + + add_audit_trail(ST_JOURNAL, $id, $old_date); + add_comments(ST_JOURNAL, $id, $old_date, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } } - $deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_); + /*$deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_); if ($deliveries[0] != 0) // have deliveries been done during the period? { update_stock_move_pid(ST_CUSTDELIVERY, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost); } update_stock_move_pid(ST_SUPPRECEIVE, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost); + */ } } } @@ -568,6 +669,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(); }