projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Helper function for searching indexed submit POST vars
[fa-stable.git]
/
sales
/
credit_note_entry.php
diff --git
a/sales/credit_note_entry.php
b/sales/credit_note_entry.php
index 5b43a17352f7b6d443c08d2d296064fb001b7093..89ccd9909389a88d9b1558eea8bca2e50c2ad045 100644
(file)
--- a/
sales/credit_note_entry.php
+++ b/
sales/credit_note_entry.php
@@
-61,9
+61,9
@@
function copy_to_cn()
{
$_SESSION['Items']->Comments = $_POST['CreditText'];
$_SESSION['Items']->document_date = $_POST['OrderDate'];
{
$_SESSION['Items']->Comments = $_POST['CreditText'];
$_SESSION['Items']->document_date = $_POST['OrderDate'];
- $_SESSION['Items']->freight_cost =
$_POST['ChargeFreightCost']
;
+ $_SESSION['Items']->freight_cost =
input_num('ChargeFreightCost')
;
$_SESSION['Items']->Location = $_POST["Location"];
$_SESSION['Items']->Location = $_POST["Location"];
- $_SESSION['Items']->
default_
sales_type = $_POST['sales_type_id'];
+ $_SESSION['Items']->sales_type = $_POST['sales_type_id'];
$_SESSION['Items']->reference = $_POST['ref'];
$_SESSION['Items']->ship_via = $_POST['ShipperID'];
}
$_SESSION['Items']->reference = $_POST['ref'];
$_SESSION['Items']->ship_via = $_POST['ShipperID'];
}
@@
-74,9
+74,9
@@
function copy_from_cn()
{
$_POST['CreditText'] = $_SESSION['Items']->Comments;
$_POST['OrderDate'] = $_SESSION['Items']->document_date;
{
$_POST['CreditText'] = $_SESSION['Items']->Comments;
$_POST['OrderDate'] = $_SESSION['Items']->document_date;
- $_POST['ChargeFreightCost'] =
$_SESSION['Items']->freight_cost
;
+ $_POST['ChargeFreightCost'] =
price_format($_SESSION['Items']->freight_cost)
;
$_POST['Location'] = $_SESSION['Items']->Location;
$_POST['Location'] = $_SESSION['Items']->Location;
- $_POST['sales_type_id'] = $_SESSION['Items']->
default_
sales_type;
+ $_POST['sales_type_id'] = $_SESSION['Items']->sales_type;
$_POST['ref'] = $_SESSION['Items']->reference;
$_POST['ShipperID'] = $_SESSION['Items']->ship_via;
}
$_POST['ref'] = $_SESSION['Items']->reference;
$_POST['ShipperID'] = $_SESSION['Items']->ship_via;
}
@@
-97,17
+97,18
@@
function can_process()
$input_error = 0;
$input_error = 0;
- if ($_SESSION['Items']->count_items() == 0
- && (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] <= 0))
+ if ($_SESSION['Items']->count_items() == 0 && (!check_num('ChargeFreightCost',0)))
return false;
return false;
-
- if (!references::is_valid($_POST['ref'])) {
+ if($_SESSION['Items']->trans_no == 0) {
+
if (!references::is_valid($_POST['ref'])) {
display_error( _("You must enter a reference."));
$input_error = 1;
display_error( _("You must enter a reference."));
$input_error = 1;
-
} elseif (!is_new_reference($_POST['ref'], 11))
{
+
} elseif (!is_new_reference($_POST['ref'], 11))
{
display_error( _("The entered reference is already in use."));
$input_error = 1;
display_error( _("The entered reference is already in use."));
$input_error = 1;
- } elseif (!is_date($_POST['OrderDate'])) {
+ }
+ }
+ if (!is_date($_POST['OrderDate'])) {
display_error(_("The entered date for the credit note is invalid."));
$input_error = 1;
} elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
display_error(_("The entered date for the credit note is invalid."));
$input_error = 1;
} elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
@@
-139,15
+140,15
@@
if (isset($_POST['ProcessCredit']) && can_process()) {
function check_item_data()
{
function check_item_data()
{
- if (
$_POST['qty'] <= 0
) {
+ if (
!check_num('qty',0)
) {
display_error(_("The quantity must be greater than zero."));
return false;
}
display_error(_("The quantity must be greater than zero."));
return false;
}
- if (!
is_numeric($_POST['price']) || $_POST['price'] < 0
) {
+ if (!
check_num('price',0)
) {
display_error(_("The entered price is negative or invalid."));
return false;
}
display_error(_("The entered price is negative or invalid."));
return false;
}
- if (!
is_numeric($_POST['Disc']) || $_POST['Disc'] > 100 || $_POST['Disc'] < 0
) {
+ if (!
check_num('Disc', 0, 100)
) {
display_error(_("The entered discount percent is negative, greater than 100 or invalid."));
return false;
}
display_error(_("The entered discount percent is negative, greater than 100 or invalid."));
return false;
}
@@
-159,16
+160,16
@@
function check_item_data()
function handle_update_item()
{
if ($_POST['UpdateItem'] != "" && check_item_data()) {
function handle_update_item()
{
if ($_POST['UpdateItem'] != "" && check_item_data()) {
- $_SESSION['Items']->update_cart_item($_POST['line_no'],
$_POST['qty']
,
-
$_POST['price'], ($_POST['Disc'] / 100)
);
+ $_SESSION['Items']->update_cart_item($_POST['line_no'],
input_num('qty')
,
+
input_num('price'), input_num('Disc') / 100
);
}
}
//-----------------------------------------------------------------------------
}
}
//-----------------------------------------------------------------------------
-function handle_delete_item()
+function handle_delete_item(
$line_no
)
{
{
- $_SESSION['Items']->remove_from_cart($
_GET['Delete']
);
+ $_SESSION['Items']->remove_from_cart($
line_no
);
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
@@
-179,15
+180,13
@@
function handle_new_item()
if (!check_item_data())
return;
if (!check_item_data())
return;
- add_to_order($_SESSION['Items'], $_POST['stock_id'],
$_POST['qty']
,
-
$_POST['price'], $_POST['Disc']
/ 100);
+ add_to_order($_SESSION['Items'], $_POST['stock_id'],
input_num('qty')
,
+
input_num('price'), input_num('Disc')
/ 100);
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
- copy_from_cn();
-
-if (isset($_GET['Delete']))
- handle_delete_item();
+$id = find_submit('Delete');
+if ($id!=-1)
+ handle_delete_item($id);
if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
copy_to_cn();
if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
copy_to_cn();