X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=7804072564152232b224ec0760ac31090a3b1b34;hb=bb991dc5b071e966b39954bb53d3b0efe8420938;hp=73a5894f0da52d6713af96b1ac4b1418d887c7e4;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index 73a5894f..78040725 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -15,9 +15,9 @@ include_once($path_to_root . "/includes/ui.inc"); function display_credit_header(&$order) { - global $table_style, $Ajax, $Refs; + global $Ajax, $Refs; - start_outer_table("width=80% $table_style"); + start_outer_table(TABLESTYLE, "width=80%"); table_section(1); $customer_error = ""; @@ -159,11 +159,11 @@ function display_credit_header(&$order) function display_credit_items($title, &$order) { - global $table_style, $path_to_root; + global $path_to_root; 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"),''); @@ -212,22 +212,25 @@ function display_credit_items($title, &$order) if ($id==-1) credit_edit_item_controls($order, $k); + $colspan = 6; $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'] == "")) - $_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'); + end_row(); $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)); - 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(); @@ -305,14 +308,14 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) function credit_options_controls($credit) { - global $table_style2, $Ajax; - echo "
"; + 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);