X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=7804072564152232b224ec0760ac31090a3b1b34;hb=fe053abb14541530e5dc0fe821cbe6edfcde8a6f;hp=4594758c583518a69c564dc97c671946342fd5ca;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 4594758c..78040725 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -15,18 +15,18 @@ include_once($path_to_root . "/includes/ui.inc");
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;
- 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);
+ customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true);
if ($order->customer_id != $_POST['customer_id'] /*|| $order->sales_type != $_POST['sales_type_id']*/)
{
@@ -35,7 +35,7 @@ function display_credit_header(&$order)
}
customer_branches_list_row(_("Branch:"), $_POST['customer_id'],
- 'branch_id', null, false, true, true);
+ 'branch_id', null, false, true, true, true);
//if (($_SESSION['credit_items']->order_no == 0) ||
// ($order->customer_id != $_POST['customer_id']) ||
@@ -80,7 +80,7 @@ function display_credit_header(&$order)
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
@@ -91,11 +91,9 @@ function display_credit_header(&$order)
{
table_section(2);
- div_start('currency');
label_row(_("Customer Currency:"), $order->customer_currency);
exchange_rate_display($order->customer_currency, get_company_currency(),
$_POST['OrderDate']);
- div_end();
}
table_section(3);
@@ -120,13 +118,13 @@ function display_credit_header(&$order)
if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
$_POST['OrderDate'] = $order->document_date;
- date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true);
+ date_row(_("Date:"), 'OrderDate', '', $order->trans_no==0, 0, 0, 0, null, true);
if (isset($_POST['_OrderDate_changed'])) {
if (!is_company_currency($order->customer_currency)
&& (get_base_sales_type()>0)) {
$change_prices = 1;
}
- $Ajax->activate('currency');
+ $Ajax->activate('_ex_rate');
}
// 2008-11-12 Joe Hunt added dimensions
$dim = get_company_pref('use_dimension');
@@ -161,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"),'');
@@ -187,7 +185,7 @@ function display_credit_items($title, &$order)
{
alt_table_row_color($k);
- label_cell("$line->stock_id");
+ label_cell("$line->stock_id");
label_cell($line->item_description, "nowrap");
qty_cell($line->qty_dispatched, false, get_qty_dec($line->stock_id));
label_cell($line->units);
@@ -214,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();
@@ -307,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);