$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 (!$supp_trans->is_invoice)
+ $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);
$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)
+ {
+ $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['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,
$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
+ 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.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";
return db_query($sql, "The invoices/credits for the po $po_number could not be retreived");
//----------------------------------------------------------------------------------------
+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 = 20 AND stock_id = '$stock_id' AND po_detail_item_id = $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();
+ $trans = get_supp_trans($type_no, $type);
+
void_bank_trans($type, $type_no, true);
void_gl_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
- {
+ { // 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);
- }
- $diff = get_diff_in_home_currency($grn["supplier_id"], $old_date, $date_, $old[2],
- $details_row["FullUnitPrice"]);
- // Only adjust the avg for the diff
- $mat_cost = update_average_material_cost(null, $details_row["stock_id"],
- $diff, -$details_row["quantity"], $date_, true);
-
+ }
+ else
+ {
+ $diff = get_diff_in_home_currency($grn["supplier_id"], $old_date, sql2date($trans['tran_date']), $old[2],
+ $details_row["FullUnitPrice"]);
+ // 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);
+ }
$deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_);
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)
- {
- $stock_gl_code = get_stock_gl_code($details_row["stock_id"]);
- add_gl_trans($type, $type_no, $date_, $stock_gl_code["cogs_account"],
- $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."),
- -$amt, null, null, null,
- "The general ledger transaction could not be added for the price variance of the inventory item");
- add_gl_trans($type, $type_no, $date_, $stock_gl_code["inventory_account"],
- 0, 0, _("Cost diff."), $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, $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);
projects / fa-stable.git / blobdiff