projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ajax and some smaller fixes in sales module files
[fa-stable.git]
/
sales
/
customer_credit_invoice.php
diff --git
a/sales/customer_credit_invoice.php
b/sales/customer_credit_invoice.php
index 0a1e103c136310233b23e5a3b003e2e032014562..9b8c0d86000a80efe85afb8966a92a058d0d3d2f 100644
(file)
--- a/
sales/customer_credit_invoice.php
+++ b/
sales/customer_credit_invoice.php
@@
-73,25
+73,30
@@
function can_process()
{
if (!is_date($_POST['CreditDate'])) {
display_error(_("The entered date is invalid."));;
{
if (!is_date($_POST['CreditDate'])) {
display_error(_("The entered date is invalid."));;
+ set_focus('CreditDate');
return false;
} elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) {
display_error(_("The entered date is not in fiscal year."));
return false;
} elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) {
display_error(_("The entered date is not in fiscal year."));
+ set_focus('CreditDate');
return false;
}
if ($_SESSION['Items']->trans_no==0) {
if (!references::is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));;
return false;
}
if ($_SESSION['Items']->trans_no==0) {
if (!references::is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));;
+ set_focus('ref');
return false;
}
if (!is_new_reference($_POST['ref'], 11)) {
display_error(_("The entered reference is already in use."));;
return false;
}
if (!is_new_reference($_POST['ref'], 11)) {
display_error(_("The entered reference is already in use."));;
+ set_focus('ref');
return false;
}
}
return false;
}
}
- if (!
is_numeric($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] < 0
) {
+ if (!
check_num('ChargeFreightCost', 0)
) {
display_error(_("The entered shipping cost is invalid or less than zero."));;
display_error(_("The entered shipping cost is invalid or less than zero."));;
+ set_focus('ChargeFreightCost');
return false;
}
return false;
}
@@
-138,9
+143,9
@@
if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
} else {
foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
if (isset($_POST['Line'.$line_no])) {
} else {
foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
if (isset($_POST['Line'.$line_no])) {
- $line_qty = $_POST['Line'.$line_no];
- if (is_numeric($line_qty) && $_POST['Line'.$line_no] <= ($itm->quantity - $itm->qty_done)) {
-
$_SESSION['Items']->line_items[$line_no]->qty_dispatched = $line_qty
;
+ if (check_num('Line'.$line_no, ($itm->quantity - $itm->qty_done))) {
+ $_SESSION['Items']->line_items[$line_no]->qty_dispatched =
+
input_num('Line'.$line_no)
;
}
}
}
}
@@
-158,7
+163,7
@@
function copy_to_cart()
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ShipperID'];
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ShipperID'];
- $cart->freight_cost =
$_POST['ChargeFreightCost']
;
+ $cart->freight_cost =
input_num('ChargeFreightCost')
;
$cart->document_date = $_POST['CreditDate'];
$cart->Location = $_POST['Location'];
$cart->Comments = $_POST['CreditText'];
$cart->document_date = $_POST['CreditDate'];
$cart->Location = $_POST['Location'];
$cart->Comments = $_POST['CreditText'];
@@
-169,7
+174,7
@@
function copy_from_cart()
{
$cart = &$_SESSION['Items'];
$_POST['ShipperID'] = $cart->ship_via;
{
$cart = &$_SESSION['Items'];
$_POST['ShipperID'] = $cart->ship_via;
- $_POST['ChargeFreightCost'] =
$cart->freight_cost
;
+ $_POST['ChargeFreightCost'] =
price_format($cart->freight_cost)
;
$_POST['CreditDate']= $cart->document_date;
$_POST['Location']= $cart->Location;
$_POST['CreditText']= $cart->Comments;
$_POST['CreditDate']= $cart->document_date;
$_POST['Location']= $cart->Location;
$_POST['CreditText']= $cart->Comments;
@@
-223,7
+228,7
@@
function display_credit_items()
// $_POST['ref'] = references::get_next(11);
if ($_SESSION['Items']->trans_no==0) {
// $_POST['ref'] = references::get_next(11);
if ($_SESSION['Items']->trans_no==0) {
- ref_cells(_("Reference"), 'ref', $_SESSION['Items']->reference, "class='tableheader2'");
+ ref_cells(_("Reference"), 'ref',
'',
$_SESSION['Items']->reference, "class='tableheader2'");
} else {
label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
}
} else {
label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
}
@@
-249,7
+254,7
@@
function display_credit_items()
label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
- date_row(_("Credit Note Date"), 'CreditDate', null, 0, 0, 0, "class='tableheader2'");
+ date_row(_("Credit Note Date"), 'CreditDate',
'',
null, 0, 0, 0, "class='tableheader2'");
end_table();
end_table();
@@
-275,42
+280,39
@@
function display_credit_items()
label_cell($ln_itm->stock_id);
text_cells(null, 'Line'.$line_no.'Desc', $ln_itm->item_description, 30, 50);
label_cell($ln_itm->stock_id);
text_cells(null, 'Line'.$line_no.'Desc', $ln_itm->item_description, 30, 50);
-
- qty_cell($ln_itm->quantity);
+ $dec = get_qty_dec($ln_itm->stock_id);
+ qty_cell($ln_itm->quantity
, false, $dec
);
label_cell($ln_itm->units);
label_cell($ln_itm->units);
- text_cells(null, 'Line'.$line_no, $ln_itm->qty_dispatched, 13, 15);
+
+ amount_cells(null, 'Line'.$line_no, number_format2($ln_itm->qty_dispatched, $dec));
$line_total =($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
amount_cell($ln_itm->price);
$line_total =($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
amount_cell($ln_itm->price);
-
amou
nt_cell($ln_itm->discount_percent*100);
+
perce
nt_cell($ln_itm->discount_percent*100);
amount_cell($line_total);
end_row();
}
amount_cell($line_total);
end_row();
}
- if (!
isset($_POST['ChargeFreightCost']) || ($_POST['ChargeFreightCost'] == ""
)) {
- $_POST['ChargeFreightCost'] =
$_SESSION['Items']->freight_cost
;
+ if (!
check_num('ChargeFreightCost'
)) {
+ $_POST['ChargeFreightCost'] =
price_format($_SESSION['Items']->freight_cost)
;
}
}
- if (!is_numeric($_POST['ChargeFreightCost']))
- {
- $_POST['ChargeFreightCost'] = 0;
- }
start_row();
label_cell(_("Credit Shipping Cost"), "colspan=7 align=right");
start_row();
label_cell(_("Credit Shipping Cost"), "colspan=7 align=right");
-
tex
t_cells(null, "ChargeFreightCost", $_POST['ChargeFreightCost'], 6, 6);
+
amoun
t_cells(null, "ChargeFreightCost", $_POST['ChargeFreightCost'], 6, 6);
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
- $display_sub_total =
number_format2($inv_items_total + $_POST['ChargeFreightCost'],user_price_dec(
));
+ $display_sub_total =
price_format($inv_items_total + input_num($_POST['ChargeFreightCost']
));
label_row(_("Sub-total"), $display_sub_total, "colspan=7 align=right", "align=right");
label_row(_("Sub-total"), $display_sub_total, "colspan=7 align=right", "align=right");
- $taxes = $_SESSION['Items']->get_taxes(
$_POST['ChargeFreightCost']
);
+ $taxes = $_SESSION['Items']->get_taxes(
input_num($_POST['ChargeFreightCost'])
);
$tax_total = display_edit_tax_items($taxes, 7, $_SESSION['Items']->tax_included);
$tax_total = display_edit_tax_items($taxes, 7, $_SESSION['Items']->tax_included);
- $display_total =
number_format2(($inv_items_total + $_POST['ChargeFreightCost'] + $tax_total), user_price_dec(
));
+ $display_total =
price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total
));
label_row(_("Credit Note Total"), $display_total, "colspan=7 align=right", "align=right");
label_row(_("Credit Note Total"), $display_total, "colspan=7 align=right", "align=right");