projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Marged fixes from ain trunk up to 2.2.11
[fa-stable.git]
/
sales
/
includes
/
ui
/
sales_credit_ui.inc
diff --git
a/sales/includes/ui/sales_credit_ui.inc
b/sales/includes/ui/sales_credit_ui.inc
index 6adfa4ceeeecd0b1577efb870b7c35c0e368cf36..7804072564152232b224ec0760ac31090a3b1b34 100644
(file)
--- a/
sales/includes/ui/sales_credit_ui.inc
+++ b/
sales/includes/ui/sales_credit_ui.inc
@@
-15,15
+15,15
@@
include_once($path_to_root . "/includes/ui.inc");
function display_credit_header(&$order)
{
function display_credit_header(&$order)
{
- global $
table_style, $Ajax
;
+ global $
Ajax, $Refs
;
- start_outer_table(
"width=80% $table_style
");
+ start_outer_table(
TABLESTYLE, "width=80%
");
table_section(1);
$customer_error = "";
$change_prices = 0;
table_section(1);
$customer_error = "";
$change_prices = 0;
- if (!isset($_POST['customer_id']) && (get_global_customer() !=
reserved_words::get_all()
))
+ if (!isset($_POST['customer_id']) && (get_global_customer() !=
ALL_TEXT
))
$_POST['customer_id'] = get_global_customer();
customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true);
$_POST['customer_id'] = get_global_customer();
customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true);
@@
-80,7
+80,7
@@
function display_credit_header(&$order)
set_global_customer($_POST['customer_id']);
if (!isset($_POST['ref']))
set_global_customer($_POST['customer_id']);
if (!isset($_POST['ref']))
- $_POST['ref'] =
references::
get_next(11);
+ $_POST['ref'] =
$Refs->
get_next(11);
if ($order->trans_no==0)
ref_row(_("Reference").':', 'ref');
else
if ($order->trans_no==0)
ref_row(_("Reference").':', 'ref');
else
@@
-159,11
+159,11
@@
function display_credit_header(&$order)
function display_credit_items($title, &$order)
{
function display_credit_items($title, &$order)
{
- global $
table_style, $
path_to_root;
+ global $path_to_root;
display_heading($title);
div_start('items_table');
display_heading($title);
div_start('items_table');
- start_table(
"$table_style
width=90%");
+ start_table(
TABLESTYLE, "
width=90%");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
_("Price"), _("Discount %"), _("Total"),'');
$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
_("Price"), _("Discount %"), _("Total"),'');
@@
-212,22
+212,25
@@
function display_credit_items($title, &$order)
if ($id==-1)
credit_edit_item_controls($order, $k);
if ($id==-1)
credit_edit_item_controls($order, $k);
+ $colspan = 6;
$display_sub_total = price_format($subtotal);
$display_sub_total = price_format($subtotal);
- label_row(_("Sub-total"), $display_sub_total, "colspan=
6
align=right", "align=right", 2);
+ label_row(_("Sub-total"), $display_sub_total, "colspan=
$colspan
align=right", "align=right", 2);
if (!isset($_POST['ChargeFreightCost']) OR ($_POST['ChargeFreightCost'] == ""))
if (!isset($_POST['ChargeFreightCost']) OR ($_POST['ChargeFreightCost'] == ""))
- $_POST['ChargeFreightCost'] = price_format(0);
-
- amount_cells_ex(_("Shipping"), 'ChargeFreightCost', 8, 8, $_POST['ChargeFreightCost'], "colspan=6 align=right");
+ $_POST['ChargeFreightCost'] = 0;
+ start_row();
+ label_cell(_("Shipping"), "colspan=$colspan align=right");
+ small_amount_cells(null, 'ChargeFreightCost', price_format(get_post('ChargeFreightCost',0)));
label_cell('', 'colspan=2');
label_cell('', 'colspan=2');
+ end_row();
$taxes = $order->get_taxes($_POST['ChargeFreightCost']);
$taxes = $order->get_taxes($_POST['ChargeFreightCost']);
- $tax_total = display_edit_tax_items($taxes,
6, $order->tax_included
);
+ $tax_total = display_edit_tax_items($taxes,
$colspan, $order->tax_included, 2
);
$display_total = price_format(($subtotal + $_POST['ChargeFreightCost'] + $tax_total));
$display_total = price_format(($subtotal + $_POST['ChargeFreightCost'] + $tax_total));
- label_row(_("Credit Note Total"), $display_total, "colspan=
6
align=right","class='amount'", 2);
+ label_row(_("Credit Note Total"), $display_total, "colspan=
$colspan
align=right","class='amount'", 2);
end_table();
div_end();
end_table();
div_end();
@@
-305,14
+308,14
@@
function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
function credit_options_controls($credit)
{
function credit_options_controls($credit)
{
- global $
table_style2, $
Ajax;
-
echo "<br>"
;
+ global $Ajax;
+
br()
;
-if (isset($_POST['_CreditType_update']))
- $Ajax->activate('options');
+
if (isset($_POST['_CreditType_update']))
+
$Ajax->activate('options');
- div_start('options');
- start_table(
"$table_style2"
);
+
div_start('options');
+ start_table(
TABLESTYLE2
);
credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true);
credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true);