display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
- hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"));
+ hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
+ "PInvoice=".$invoice_no);
hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
unset ($_SESSION['supp_trans']);
}
- //session_register("SuppInv");
- //session_register("supp_trans");
- $_SESSION['supp_trans'] = new supp_trans;
- $_SESSION['supp_trans']->is_invoice = true;
+ $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
}
//--------------------------------------------------------------------------------------------------
$Ajax->activate('gl_items');
set_focus('gl_code');
}
+
+function reset_tax_input()
+{
+ global $Ajax;
+
+ unset($_POST['mantax']);
+ $Ajax->activate('inv_tot');
+}
+
//------------------------------------------------------------------------------------------------
// GL postings are often entered in the same form to two accounts
// so fileds are cleared only on user demand.
$Ajax->activate('gl_items');
$input_error = false;
- $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($_POST['gl_code']);
- $result = db_query($sql,"get account information");
+ $result = get_gl_account_info($_POST['gl_code']);
if (db_num_rows($result) == 0)
{
display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction."));
$_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
$_POST['dimension_id'], $_POST['dimension2_id'],
input_num('amount'), $_POST['memo_']);
+ reset_tax_input();
set_focus('gl_code');
}
}
return false;
}
- $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id="
- .db_escape($_SESSION['supp_trans']->supplier_id) . " AND supp_reference="
- .db_escape( $_POST['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);
- if ($myrow[0] == 1)
+ if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference']))
{ /*Transaction reference already entered */
- display_error(_("This invoice number has already been entered. It cannot be entered again." . " (" . $_POST['supp_reference'] . ")"));
+ display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
return false;
}
}
}
- if ($check_qty_charged_vs_del_qty == True)
+ if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
{
if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
(1+ ($margin / 100)))
{
if (check_item_data($n))
{
- if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
- {
- $complete = true;
- }
- else
- {
- $complete = false;
- }
-
$_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
$_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
$_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
- $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+ $_POST['order_price'.$n], input_num('ChgPrice'.$n),
$_POST['std_cost_unit'.$n], "");
+ reset_tax_input();
}
}
{
$_SESSION['supp_trans']->remove_grn_from_trans($id3);
$Ajax->activate('grn_items');
- $Ajax->activate('inv_tot');
+ reset_tax_input();
}
$id4 = find_submit('Delete2');
{
$_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
clear_fields();
+ reset_tax_input();
$Ajax->activate('gl_items');
- $Ajax->activate('inv_tot');
}
$id2 = -1;
$id2 = find_submit('void_item_id');
if ($id2 != -1)
{
- begin_transaction();
-
- $myrow = get_grn_item_detail($id2);
-
- $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']);
-
- commit_transaction();
+ remove_not_invoice_item($id2);
display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
- }
+ }
}
if (isset($_POST['go']))
$Ajax->activate('gl_items');
display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
$_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
- $Ajax->activate('inv_tot');
+ reset_tax_input();
}
start_form();
invoice_header($_SESSION['supp_trans']);
if ($_POST['supplier_id']=='')
- display_error('No supplier found for entered search text');
+ display_error(_("There is no supplier selected."));
else {
- start_outer_table("$table_style2 width=98%", 5);
-
display_grn_items($_SESSION['supp_trans'], 1);
display_gl_items($_SESSION['supp_trans'], 1);
invoice_totals($_SESSION['supp_trans']);
div_end();
- end_outer_table(0, false);
}
//-----------------------------------------------------------------------------------------
projects / fa-stable.git / blobdiff