See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
include_once($path_to_root . "/purchasing/includes/db/invoice_items_db.inc");
+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,
- terms.day_in_following_month, supp.tax_included, supp.tax_algorithm,
+ $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)
- * (ov_amount + ov_gst + ov_discount),0)) as cur_credit
+ supp.credit_limit - Sum((ov_amount + ov_gst + ov_discount)) as cur_credit, curr_code
FROM ".TB_PREF."suppliers supp LEFT JOIN "
.TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, "
.TB_PREF."payment_terms terms, "
if (!is_date_in_fiscalyear($supp_trans->tran_date))
$supp_trans->tran_date = end_fiscalyear();
}
- 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'] );
+ if ($supp_trans->supplier_id != $supplier_id)
+ get_duedate_from_terms($supp_trans);
+
+ $supp_trans->supplier_id = $supplier_id;
+
$supp_trans->credit = $myrow['cur_credit'];
$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'];
+ $supp_trans->currency = $myrow['curr_code'];
+
}
//-------------------------------------------------------------------------------------------------
$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
{
}
//----------------------------------------------------------------------------------------
-function add_supp_invoice(&$supp_trans) // do not receive as ref because we change locally
+function add_supp_invoice(&$supp_trans)
{
global $Refs;
//$company_currency = get_company_currency();
$trans_no = $supp_trans->trans_no;
$trans_type = $supp_trans->trans_type;
- /*Start an sql transaction */
+ $supplier = get_supplier($supp_trans->supplier_id);
+ $dim = !empty($supp_trans->dimension) ? $supp_trans->dimension :
+ ($supplier['dimension_id'] ? $supplier['dimension_id'] : 0);
+ $dim2 = !empty($supp_trans->dimension2) ? $supp_trans->dimension2 :
+ ($supplier['dimension2_id'] ? $supplier['dimension2_id'] : 0);
+
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."));
+ $allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations
+ void_transaction($trans_type, $trans_no, $supp_trans->tran_date, _("Document reentered."));
$Refs->restore_last($trans_type, $trans_no);
} else
$allocs = get_po_prepayments($supp_trans);
- $supplier = get_supplier($supp_trans->supplier_id);
-
- add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate);
+ add_new_exchange_rate($supp_trans->currency, $supp_trans->tran_date, $supp_trans->ex_rate);
foreach ($taxes as $n => $taxitem)
{
}
$date_ = $supp_trans->tran_date;
- $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $date_);
+ $ex_rate = get_exchange_rate_from_home_currency($supp_trans->currency, $date_);
/*First insert the invoice into the supp_trans table*/
$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, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included,
- $supp_trans->tax_algorithm);
+ $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included);
+ if ($trans_no)
+ move_trans_attachments($trans_type, $trans_no, $invoice_id);
$supp_trans->trans_no = $invoice_id;
}
add_trans_tax_details($trans_type, $invoice_id,
$taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'],
- $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference);
+ $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference, TR_INPUT);
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'],
+ $taxitem['purchasing_gl_code'], $dim, $dim2, $taxitem['Value'],
$supp_trans->supplier_id,
"A general ledger transaction for the tax amount could not be added");
}
$net_diff = -$net_diff;
/* Now the AP account */
- $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], 0, 0,
+ $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], $dim, $dim2,
-($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");
$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, "", 0, $memo_);
- add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code,
- $entered_gl_code->amount, $memo_);
+ add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code, $entered_gl_code->amount, $memo_,
+ $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2);
// store tax details if the gl account is a tax account
if ($trans_type == ST_SUPPCREDIT)
$stock_gl_code = get_stock_gl_code($entered_grn->item_code);
- $dim = $supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id'];
- $dim2 = $supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id'];
+ $dim = !empty($supp_trans->dimension) ? $supp_trans->dimension :
+ ($supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id']);
+ $dim2 = !empty($supp_trans->dimension2) ? $supp_trans->dimension2 :
+ ($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"] :
$dim, $dim2, $taxfree_line, $supp_trans->supplier_id);
else
{
- $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $old_date);
+ $ex_rate = get_exchange_rate_from_home_currency($supp_trans->currency, $old_date);
$old_value = get_tax_free_price_for_item($entered_grn->item_code, $entered_grn->this_quantity_inv * $old_price,
$supp_trans->tax_group_id, $supp_trans->tax_included);
$currency = get_supplier_currency($supp_trans->supplier_id);
$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);
+ $dim, $dim2, $old_value, $supp_trans->supplier_id, "", $ex_rate);
$diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_value,
$taxfree_line);
global $Refs;
$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, $diff, $date_, get_company_currency(), $ref);
$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;
}
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, "");
$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
- $trans = get_supp_trans($supp_trans->src_docs, ST_SUPPINVOICE);
- $total = $trans['Total'];
+ $trans = get_supp_trans($invoice_id, ST_SUPPCREDIT);
+ $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, $supp_trans->src_docs);
- update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id);
- add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs,
- $date_);
+ add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no,
+ $supp_trans->supplier_id, $date_);
+ update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $supp_trans->supplier_id);
+ update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $supp_trans->supplier_id);
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;
+ 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();
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");
}
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, curr_code
+ 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");
$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"];
+ $supp_trans->dimension = $trans_row["dimension_id"];
+ $supp_trans->dimension2 = $trans_row["dimension2_id"];
+ $supp_trans->currency = $trans_row["curr_code"];
$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"],
$details_row['qty_recd'],
- $details_row['quantity_inv']-$details_row["quantity"],
+ $details_row['quantity_inv'],
$details_row["quantity"], 0, $details_row["FullUnitPrice"],
0, 0);
}
else
{
- $supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 0, 0,
+ $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_"]);
}
}
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";
//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);
$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);
+ $details_row['dimension_id'], $details_row['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"],
- $dim, $dim2, $memo, -$details_row["quantity"] * $diff);
+ $details_row['dimension_id'], $details_row['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_);
- 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);
+ $Refs->save(ST_JOURNAL, $id, $ref);
+ }
}
- update_stock_move_pid(ST_SUPPRECEIVE, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost);
- */
}
}
}
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);
-
+ -$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']))
-$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();
projects / fa-stable.git / blobdiff