projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main trunk up to 2.2.5
[fa-stable.git]
/
purchasing
/
supplier_credit.php
diff --git
a/purchasing/supplier_credit.php
b/purchasing/supplier_credit.php
index 102184b03b48fd3364f2f9414dafd5a8ca374f6e..69ead86d7e8ea2c6c2b6c77577a74f4d1651c66a 100644
(file)
--- a/
purchasing/supplier_credit.php
+++ b/
purchasing/supplier_credit.php
@@
-25,7
+25,7
@@
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Supplier Credit Note"), false, false, "", $js);
+page(_(
$help_context =
"Supplier Credit Note"), false, false, "", $js);
//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
@@
-36,7
+36,7
@@
check_db_has_suppliers(_("There are no suppliers defined in the system."));
if (isset($_GET['AddedID']))
{
$invoice_no = $_GET['AddedID'];
if (isset($_GET['AddedID']))
{
$invoice_no = $_GET['AddedID'];
- $trans_type =
21
;
+ $trans_type =
ST_SUPPCREDIT
;
echo "<center>";
echo "<center>";
@@
-97,8
+97,7
@@
if (isset($_POST['AddGLCodeToTrans'])){
$Ajax->activate('gl_items');
$input_error = false;
$Ajax->activate('gl_items');
$input_error = false;
- $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code='" . $_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."));
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."));
@@
-137,7
+136,7
@@
if (isset($_POST['AddGLCodeToTrans'])){
function check_data()
{
function check_data()
{
- global $total_grn_value, $total_gl_value;
+ global $total_grn_value, $total_gl_value
, $Refs
;
if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
{
if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
{
@@
-146,21
+145,21
@@
function check_data()
return false;
}
return false;
}
- if (!
references::
is_valid($_SESSION['supp_trans']->reference))
+ if (!
$Refs->
is_valid($_SESSION['supp_trans']->reference))
{
display_error(_("You must enter an credit note reference."));
set_focus('reference');
return false;
}
{
display_error(_("You must enter an credit note reference."));
set_focus('reference');
return false;
}
- if (!is_new_reference($_SESSION['supp_trans']->reference,
21
))
+ if (!is_new_reference($_SESSION['supp_trans']->reference,
ST_SUPPCREDIT
))
{
display_error(_("The entered reference is already in use."));
set_focus('reference');
return false;
}
{
display_error(_("The entered reference is already in use."));
set_focus('reference');
return false;
}
- if (!
references::
is_valid($_SESSION['supp_trans']->supp_reference))
+ if (!
$Refs->
is_valid($_SESSION['supp_trans']->supp_reference))
{
display_error(_("You must enter a supplier's credit note reference."));
set_focus('supp_reference');
{
display_error(_("You must enter a supplier's credit note reference."));
set_focus('supp_reference');