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 = '" . $supplier_id . "'";
+ $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due,
+ 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
+ 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->tax_included = $myrow['tax_included'];
$supp_trans->supplier_name = $myrow['supp_name'];
- $supp_trans->terms_description = $myrow['terms'];
+ $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'];
- 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 ($chg_price != null)
{
$sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE
- po_detail_item = $po_detail_item";
+ 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];
$unit_price = $row[1]; //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=$id";
+ ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id AND "
+ .TB_PREF."grn_items.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];
$unit_price = 0; // Added by Rasmus
}
$sql = "UPDATE ".TB_PREF."purch_order_details
- SET qty_invoiced = qty_invoiced + $qty_invoiced ";
+ SET qty_invoiced = qty_invoiced + ".db_escape($qty_invoiced);
if ($chg_price != null)
- $sql .= " , act_price = $chg_price ";
+ $sql .= " , act_price = ".db_escape($chg_price);
- $sql .= " WHERE po_detail_item = $po_detail_item";
+ $sql .= " WHERE po_detail_item = ".db_escape($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 quantity_inv = quantity_inv + $qty_invoiced
- WHERE id = $id";
+ SET quantity_inv = quantity_inv + ".db_escape($qty_invoiced)."
+ WHERE id = ".db_escape($id);
db_query($sql, "The quantity invoiced off the items received record could not be updated");
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=13 AND stock_id='$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();
+ price_decimal_format($amount2, $dec);
$currency = get_supplier_currency($supplier);
- $amount1 = to_home_currency($amount1, $currency, $old_date);
- $amount2 = to_home_currency($amount2, $currency, $date);
- return $amount2 - $amount1;
+ $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);
+ $amount2 = $amount2 / $ex_rate;
+ $diff = $amount2 - $amount1;
+ //return round2($diff, $dec);
+ return $diff;
}
//----------------------------------------------------------------------------------------
function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref because we change locally
{
+ global $Refs;
+
//$company_currency = get_company_currency();
/*Start an sql transaction */
begin_transaction();
-
+ hook_db_prewrite($supp_trans, $supp_trans->trans_type);
$tax_total = 0;
$taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
- foreach ($taxes as $taxitem)
+ 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();
+// $invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id);
- if ($supp_trans->is_invoice)
- $trans_type = 20;
- else
+ if($supp_trans->tax_included==0) {
+ $item_added_tax = $tax_total;
+ } else {
+ $item_added_tax = 0;
+
+ }
+
+ $trans_type = $supp_trans->trans_type;
+
+ if ($trans_type == ST_SUPPCREDIT)
{
- $trans_type = 21;
// 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_);
/*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);
$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),
+ -($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_;
$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $entered_gl_code->gl_code,
- $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id);
+ $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id, "", 0, $memo_);
add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code,
$entered_gl_code->amount, $memo_);
// store tax details if the gl account is a tax account
+ 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_);
}
-
$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);
-
- $total += 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 * $line_taxfree, $supp_trans->supplier_id);
- // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt
- if($supp_trans->is_invoice)
+
+ 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);
+ }
+ 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,
//{
//$diff = $entered_grn->chg_price - $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,
+ $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);
+
+ // 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"],
+ $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");
+
+ //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."),
+ $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $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_, $stock_gl_code["inventory_account"],
- 0, 0, _("Cost diff."), -$amt, null, null, null,
+ add_gl_trans($trans_type, $invoice_id, $date_, $iv_act,
+ 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(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);
- }
- update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
+ 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);
//}
}
// ----------------------------------------------------------------------
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 */
+ $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id, 0, false); // 2009.08-18 Joe Hunt. We have already got the gl lines
foreach ($taxes as $taxitem)
{
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 ($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,
}
/*Post a balance post if $total != 0 */
- add_gl_balance($trans_type, $invoice_id, $date_, -$total, payment_person_types::supplier(), $supp_trans->supplier_id);
+ add_gl_balance($trans_type, $invoice_id, $date_, -$total, PT_SUPPLIER, $supp_trans->supplier_id);
add_comments($trans_type, $invoice_id, $date_, $supp_trans->Comments);
- references::save_last($supp_trans->reference, $trans_type);
+ $Refs->save($trans_type, $invoice_id, $supp_trans->reference);
if ($invoice_no != 0)
{
- $invoice_alloc_balance = get_supp_trans_allocation_balance(20, $invoice_no);
+ $invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $invoice_no);
if ($invoice_alloc_balance > 0)
{ //the invoice is not already fully allocated
- $trans = get_supp_trans($invoice_no, 20);
+ $trans = get_supp_trans($invoice_no, 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(20, $invoice_no, $allocate_amount);
- update_supp_trans_allocation(21, $invoice_id, $allocate_amount); // ***
- add_supp_allocation($allocate_amount, 21, $invoice_id, 20, $invoice_no,
+ update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $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,
$date_);
// Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
- exchange_variation(21, $invoice_id, 20, $invoice_no, $date_,
- $allocate_amount, payment_person_types::supplier());
+ exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_,
+ $allocate_amount, PT_SUPPLIER);
///////////////////////////////////////////////////////////////////////////
}
}
}
-
+ $supp_trans->trans_no = $invoice_id;
+ hook_db_postwrite($supp_trans, $supp_trans->trans_type);
commit_transaction();
return $invoice_id;
$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
+ 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_order_details.order_no = $po_number";
+ 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");
}
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
- WHERE trans_no = $trans_no AND type = $trans_type
+ 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");
$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"];
$id = $trans_row["trans_no"];
{
$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);
+ 0, 0);
}
else
{
//----------------------------------------------------------------------------------------
+function get_matching_invoice_item($stock_id, $po_item_id)
+{
+ $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";
+ $result = db_query($sql, "Cannot retreive supplier transaction detail records");
+ return db_fetch($result);
+}
+
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);
$batch = get_grn_batch_from_item($details_row["grn_item_id"]);
$grn = get_grn_batch($batch);
- if ($type == 21) // credit note 2009-06-14 Joe Hunt Must restore the po and grn
- {
+ 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)
+ $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']);
$sql = "UPDATE ".TB_PREF."purch_order_details
- SET quantity_ordered = quantity_ordered + ".-$details_row["quantity"].",
- quantity_received = quantity_received + ".-$details_row["quantity"]."
+ SET quantity_ordered = quantity_ordered + ".-$details_row["quantity"].", ";
+ if ($match !== false)
+ $sql .= "act_price=".$match['unit_price'].", ";
+ $sql .= "quantity_received = quantity_received + ".-$details_row["quantity"]."
WHERE po_detail_item = ".$details_row["po_detail_item_id"];
db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed ");
$sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=qty_recd+".-$details_row["quantity"]."
WHERE id=".$details_row["grn_item_id"];
db_query($sql);
- $mat_cost = update_average_material_cost($grn["supplier_id"], $details_row["stock_id"],
- $details_row["FullUnitPrice"], -$details_row["quantity"], $date_);
}
else
{
$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(13, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost);
+ update_stock_move_pid(ST_CUSTDELIVERY, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost);
}
- update_stock_move_pid(25, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost);
+ update_stock_move_pid(ST_SUPPRECEIVE, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost);
}
}
}
- if ($type == 21) // void the credits in stock moves
- void_stock_move(21, $type_no);
+ if ($type == ST_SUPPCREDIT) // void the credits in stock moves
+ void_stock_move($type, $type_no);
void_supp_invoice_items($type, $type_no);
void_trans_tax_details($type, $type_no);
}
//----------------------------------------------------------------------------------------
+function get_gl_account_info($acc)
+{
+ $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($acc);
+ return db_query($sql,"get account information");
+}
+
+function is_reference_already_there($supplier_id, $supp_reference)
+{
+ $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
+
+ $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);
+}
+function remove_not_invoice_item($id)
+{
+ begin_transaction();
+
+ $myrow = get_grn_item_detail($id);
+
+ $grn = get_grn_batch($myrow['grn_batch_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());
+
+ 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();
+}
?>
projects / fa-stable.git / blobdiff