X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=322c12911edb8ccf88deb88823f11cd90f26fa43;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=1b7d3aaa22aea133c0ae4ddd50dfe0f985e39ef5;hpb=9478a0cdeaf9201d2f3947e11e58d90354050025;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 1b7d3aaa..322c1291 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -15,48 +15,54 @@ include_once($path_to_root . "/purchasing/includes/db/invoice_items_db.inc"); function read_supplier_details_to_trans(&$supp_trans, $supplier_id) { - $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."payment_terms.terms, " - .TB_PREF."payment_terms.days_before_due, - ".TB_PREF."payment_terms.day_in_following_month, - ".TB_PREF."suppliers.tax_group_id, ".TB_PREF."tax_groups.name As tax_group_name - From ".TB_PREF."suppliers, ".TB_PREF."payment_terms, ".TB_PREF."tax_groups - WHERE ".TB_PREF."suppliers.tax_group_id = ".TB_PREF."tax_groups.id - AND ".TB_PREF."suppliers.payment_terms=".TB_PREF."payment_terms.terms_indicator - AND ".TB_PREF."suppliers.supplier_id = ".db_escape($supplier_id); + $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due, + terms.day_in_following_month, supp.tax_included, supp.tax_algorithm, + 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)." GROUP BY supp.supp_name"; $result = db_query($sql, "The supplier record selected: " . $supplier_id . " cannot be retrieved"); $myrow = db_fetch($result); - $supp_trans->supplier_id = $supplier_id; - $supp_trans->supplier_name = $myrow['supp_name']; - $supp_trans->terms_description = $myrow['terms']; - - 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']; - if ($supp_trans->tran_date == "") { $supp_trans->tran_date = Today(); + if (!is_date_in_fiscalyear($supp_trans->tran_date)) $supp_trans->tran_date = end_fiscalyear(); } - //if ($supp_trans->due_date=="") { - // get_duedate_from_terms($supp_trans); - //} - get_duedate_from_terms($supp_trans); -} + 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->tax_algorithm = $supp_trans->stored_algorithm = $myrow['tax_algorithm']; + $supp_trans->supplier_name = $myrow['supp_name']; + $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']; + + $supp_trans->tax_description = $myrow['tax_group_name']; + $supp_trans->tax_group_id = $myrow['tax_group_id']; + +} + +//------------------------------------------------------------------------------------------------- +// Updates invoiced quantity in PO and GRN line, and act_price in PO +// Returns: +// if chg_price is set: previous act_price, delivery date and unit_price from PO +// function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoiced, $chg_price=null) { if ($chg_price != null) @@ -98,18 +104,6 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi return array($ret, $date, $unit_price); } -function get_deliveries_between($stock_id, $from, $to) -{ - $from = date2sql($from); - $to = date2sql($to); - $sql = "SELECT SUM(-qty), SUM(-qty*standard_cost) FROM ".TB_PREF."stock_moves - WHERE type=".ST_CUSTDELIVERY." AND stock_id=".db_escape($stock_id)." AND - tran_date>='$from' AND tran_date<='$to' GROUP BY stock_id"; - - $result = db_query($sql, "The deliveries could not be updated"); - return db_fetch_row($result); -} - function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amount2) { $dec = user_price_dec(); @@ -117,77 +111,85 @@ function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun $currency = get_supplier_currency($supplier); $ex_rate = get_exchange_rate_to_home_currency($currency, $old_date); $amount1 = $amount1 / $ex_rate; - $ex_rate = get_exchange_rate_to_home_currency($currency, $date_); + $ex_rate = get_exchange_rate_to_home_currency($currency, $date); $amount2 = $amount2 / $ex_rate; $diff = $amount2 - $amount1; - return round2($diff, $dec); + //return round2($diff, $dec); + return $diff; } //---------------------------------------------------------------------------------------- -function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref because we change locally +function add_supp_invoice(&$supp_trans) // do not receive as ref because we change locally { global $Refs; //$company_currency = get_company_currency(); + $trans_no = $supp_trans->trans_no; + $trans_type = $supp_trans->trans_type; /*Start an sql transaction */ 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.")); + $Refs->restore_last($trans_type, $trans_no); + } else + $allocs = get_po_prepayments($supp_trans); - foreach ($taxes as $taxitem) + $supplier = get_supplier($supp_trans->supplier_id); + + foreach ($taxes as $n => $taxitem) { - $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); - $tax_total += $taxitem['Value']; + $taxes[$n]['Value'] = round2($taxitem['Value'], user_price_dec()); + $tax_total += $taxes[$n]['Value']; } - $invoice_items_total = $supp_trans->get_total_charged($supp_trans->tax_group_id); + $invoice_items_total = $supp_trans->get_items_total(); // get total with/without tax dep. on tax_included +// $invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id); - if ($supp_trans->is_invoice) - $trans_type = ST_SUPPINVOICE; - else + if($supp_trans->tax_included==0) { + $item_added_tax = $tax_total; + } else { + $item_added_tax = 0; + } + + if ($trans_type == ST_SUPPCREDIT) { - $trans_type = ST_SUPPCREDIT; // let's negate everything because it's a credit note $invoice_items_total = -$invoice_items_total; $tax_total = -$tax_total; $supp_trans->ov_discount = -$supp_trans->ov_discount; // this isn't used at all... + $item_added_tax = -$item_added_tax; } $date_ = $supp_trans->tran_date; - $ex_rate = get_exchange_rate_from_home_currency(get_supplier_currency($supp_trans->supplier_id), $date_); + $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $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, $tax_total, $supp_trans->ov_discount); + $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included, + $supp_trans->tax_algorithm); + + + $supp_trans->trans_no = $invoice_id; $total = 0; /* Now the control account */ - $supplier_accounts = get_supplier_accounts($supp_trans->supplier_id); - $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, - -($invoice_items_total + $tax_total + $supp_trans->ov_discount), + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], 0, 0, + -($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"); - /*Loop through the GL Entries and create a debit posting for each of the accounts entered */ - - /*the postings here are a little tricky, the logic goes like this: - if its a general ledger amount it goes straight to the account specified - - if its a GRN amount invoiced then : - - The cost as originally credited to GRN suspense on arrival of items is debited to GRN suspense. Any difference - between the std cost and the currency cost charged as converted at the ex rate of of the invoice is written off - to the purchase price variance account applicable to the item being invoiced. - */ foreach ($supp_trans->gl_codes as $entered_gl_code) { /*GL Items are straight forward - just do the debit postings to the GL accounts specified - the credit is to creditors control act done later for the total invoice value + tax*/ - if (!$supp_trans->is_invoice) + if ($trans_type == ST_SUPPCREDIT) $entered_gl_code->amount = -$entered_gl_code->amount; $memo_ = $entered_gl_code->memo_; @@ -198,16 +200,18 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $entered_gl_code->amount, $memo_); // store tax details if the gl account is a tax account - if (!$supp_trans->is_invoice) + if ($trans_type == ST_SUPPCREDIT) $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 $entered_grn) + + $clearing_act = get_company_pref('grn_clearing_act'); + foreach ($supp_trans->grn_items as $line_no => $entered_grn) { - if (!$supp_trans->is_invoice) + if ($trans_type == ST_SUPPCREDIT) { $entered_grn->this_quantity_inv = -$entered_grn->this_quantity_inv; set_grn_item_credited($entered_grn, $supp_trans->supplier_id, $invoice_id, $date_); @@ -215,13 +219,20 @@ 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 = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_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($supp_trans->is_invoice) + $dim = $supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id']; + $dim2 = $supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id']; + if ($trans_type == ST_SUPPCREDIT) + { + $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : + ($supplier["purchase_account"] ? $supplier["purchase_account"] : $stock_gl_code["cogs_account"])); + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, + $dim, $dim2, $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["purchase_account"] ? $supplier["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, @@ -231,45 +242,123 @@ 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]); - $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); + if (!is_inventory_item($entered_grn->item_code)) + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, + $dim, $dim2, $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, + $dim, $dim2, $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, + $line_taxfree); + + // 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; + $total += add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + $dim, $dim2, 'GRN Provision', $diff_amt, null, null, null, + "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 + + $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"], + $dim, $dim2, $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"], + $dim, $dim2, $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"], + $dim, $dim2, -$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"], + $dim, $dim2, $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 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. + /*$deliveries = get_deliveries_between($entered_grn->item_code, $old_date, Today()); // extend the period, if invoice is before any deliveries. if ($deliveries[0] != 0) // have deliveries been done during the period? { $deliveries[1] /= $deliveries[0]; $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency if ($amt != 0.0) { + $_s = $entered_grn->item_code; + $_d = $deliveries[0]; + $_od = $old_date; + $_cd = $mat_cost - $deliveries[1]; + $memo = _("Cost difference adjustment for $_s. $_d items delivered since $_od. The cost difference is $_cd"); add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), - $amt, null, null, null, + $dim, $dim2, $memo, $amt, null, null, null, "The general ledger transaction could not be added for the price variance of the inventory item"); add_gl_trans($trans_type, $invoice_id, $date_, $iv_act, - 0, 0, _("Cost diff."), -$amt, null, null, null, + 0, 0, $memo, -$amt, null, null, null, "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); - } - 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); + */ //} } // ---------------------------------------------------------------------- add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code, - $entered_grn->item_description, 0, $line_taxfree, $line_tax, + $entered_grn->item_description, 0, $entered_grn->chg_price, $line_tax, $entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, ""); } /* end of GRN postings */ /* Now the TAX account */ @@ -279,22 +368,24 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b if ($taxitem['Net'] != 0) { - if (!$supp_trans->is_invoice) + if ($trans_type == ST_SUPPCREDIT) { $taxitem['Net'] = -$taxitem['Net']; $taxitem['Value'] = -$taxitem['Value']; } - // here we suppose that tax is never included in price (we are company customer). add_trans_tax_details($trans_type, $invoice_id, - $taxitem['tax_type_id'], $taxitem['rate'], 0, $taxitem['Value'], + $taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'], $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference); - if (!$supp_trans->is_invoice) - $taxitem['Value'] = -$taxitem['Value']; - $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, - $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'], - $supp_trans->supplier_id, - "A general ledger transaction for the tax amount could not be added"); + if (isset($taxitem['purchasing_gl_code'])) + { + 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'], + $supp_trans->supplier_id, + "A general ledger transaction for the tax amount could not be added"); + } } } @@ -305,34 +396,39 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $Refs->save($trans_type, $invoice_id, $supp_trans->reference); - if ($invoice_no != 0) + if ($supp_trans->src_docs) { - $invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $invoice_no); + $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 - $trans = get_supp_trans($invoice_no, ST_SUPPINVOICE); + $trans = get_supp_trans($supp_trans->src_docs, ST_SUPPINVOICE); $total = $trans['Total']; $allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance; /*Now insert the allocation record if > 0 */ if ($allocate_amount != 0) { - update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $allocate_amount); + update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs, $allocate_amount); update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount); // *** - add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, + add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_); // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// - exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_, + exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_, $allocate_amount, PT_SUPPLIER); /////////////////////////////////////////////////////////////////////////// } } } - +//_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; + hook_db_postwrite($supp_trans, $supp_trans->trans_type); commit_transaction(); return $invoice_id; @@ -350,8 +446,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"); @@ -361,9 +459,11 @@ function get_po_invoices_credits($po_number) 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 ".TB_PREF."supp_trans.*, supp_name + FROM ".TB_PREF."supp_trans,".TB_PREF."suppliers 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"; + $result = db_query($sql, "Cannot retreive a supplier transaction"); if (db_num_rows($result) == 1) @@ -374,13 +474,14 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) $supp_trans->supplier_name = $trans_row["supp_name"]; $supp_trans->tran_date = sql2date($trans_row["tran_date"]); $supp_trans->due_date = sql2date($trans_row["due_date"]); - //$supp_trans->Comments = $trans_row["TransText"]; - $supp_trans->Comments = ""; + $supp_trans->Comments = get_comments_string($trans_type, $trans_no); $supp_trans->reference = $trans_row["reference"]; $supp_trans->supp_reference = $trans_row["supp_reference"]; $supp_trans->ov_amount = $trans_row["ov_amount"]; $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->stored_algorithm = $supp_trans->tax_algorithm = $trans_row["tax_algorithm"]; $id = $trans_row["trans_no"]; @@ -395,8 +496,11 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) if ($details_row["gl_code"] == 0) { $supp_trans->add_grn_to_trans($details_row["grn_item_id"], $details_row["po_detail_item_id"], $details_row["stock_id"], - $details_row["description"], 0, 0, $details_row["quantity"], 0, $details_row["FullUnitPrice"], - false, 0, 0); + $details_row["description"], + $details_row['qty_recd'], + $details_row['quantity_inv']-$details_row["quantity"], + $details_row["quantity"], 0, $details_row["FullUnitPrice"], + 0, 0); } else { @@ -433,6 +537,7 @@ function void_supp_invoice($type, $type_no) { begin_transaction(); + hook_db_prevoid($type, $type_no); $trans = get_supp_trans($type_no, $type); void_bank_trans($type, $type_no, true); @@ -465,12 +570,15 @@ function void_supp_invoice($type, $type_no) 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) @@ -489,13 +597,43 @@ 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"], + $dim, $dim2, $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); + + 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); + */ } } } @@ -515,41 +653,82 @@ function get_gl_account_info($acc) return db_query($sql,"get account information"); } -function is_reference_already_there($supplier_id, $supp_reference) +function is_reference_already_there($supplier_id, $supp_reference, $trans_no=0) { - $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id=" + $sql = "SELECT COUNT(*) FROM ".TB_PREF."supp_trans WHERE supplier_id=" .db_escape($supplier_id) . " AND supp_reference=" .db_escape($supp_reference) . " AND ov_amount!=0"; // ignore voided invoice references - + if ($trans_no) + $sql .= " AND trans_no!=$trans_no"; $result=db_query($sql,"The sql to check for the previous entry of the same invoice failed"); $myrow = db_fetch_row($result); - return ($myrow[0] == 1); + return $myrow[0] > 0; } function remove_not_invoice_item($id) { begin_transaction(); - $myrow = get_grn_item_detail($id); + $myrow = get_grn_item_detail($id); - $grn = get_grn_batch($myrow['grn_batch_id']); + $grn = get_grn_batch($myrow['grn_batch_id']); + + $supp = get_supplier($grn["supplier_id"]); $sql = "UPDATE ".TB_PREF."purch_order_details SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"]; db_query($sql, "The quantity invoiced of the purchase order line could not be updated"); - $sql = "UPDATE ".TB_PREF."grn_items - SET qty_recd = quantity_inv WHERE id = ".$myrow["id"]; - db_query($sql, "The quantity invoiced off the items received record could not be updated"); - - update_average_material_cost($grn["supplier_id"], $myrow["item_code"], - $myrow["unit_price"], -$myrow["QtyOstdg"], Today()); + $sql = "UPDATE ".TB_PREF."grn_items + SET qty_recd = quantity_inv WHERE id = ".$myrow["id"]; + db_query($sql, "The quantity invoiced off the items received record could not be updated"); + + 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'], $grn["supplier_id"], 1, $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'] * $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")); + } + } - 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']); + commit_transaction(); +} - commit_transaction(); +function find_src_invoices($cart) +{ + $invoices = $po_ids = array(); + foreach($cart->grn_items as $item) + $po_ids[] = "'$item->po_detail_item'"; // credit item lines + + if (count($po_ids)) { + $sql = "SELECT DISTINCT trans.trans_no, trans.reference, trans.supp_reference + FROM ".TB_PREF."supp_invoice_items items + LEFT JOIN ".TB_PREF."supp_trans trans ON trans.trans_no=items.supp_trans_no AND trans.`type`=items.supp_trans_type + WHERE items.po_detail_item_id IN (" . implode(',', $po_ids). ")"." AND items.supp_trans_type=20"; + $result = db_query($sql, "cannot find source invoice details"); + while ($rec = db_fetch($result)) + { + $invoices[$rec['trans_no']] = $rec['supp_reference']; // array($rec['reference'], $rec['supp_reference']); + } + } + return $invoices; } -?>