From 443214a800fa66cd1473b48f6fadd1b09144a5d4 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 21 Sep 2017 00:38:26 +0200 Subject: [PATCH] Right align numbers in inquiries and lists. --- includes/ui/allocation_cart.inc | 2 +- inventory/inquiry/stock_movements.php | 2 +- purchasing/allocations/supplier_allocation_main.php | 2 +- purchasing/includes/ui/invoice_ui.inc | 4 ++-- purchasing/inquiry/po_search_completed.php | 2 +- purchasing/inquiry/supplier_allocation_inquiry.php | 2 +- purchasing/inquiry/supplier_inquiry.php | 2 +- sales/allocations/customer_allocation_main.php | 2 +- sales/create_recurrent_invoices.php | 2 +- sales/inquiry/customer_allocation_inquiry.php | 4 ++-- sales/inquiry/sales_deliveries_view.php | 2 +- sales/inquiry/sales_orders_view.php | 4 ++-- sales/manage/recurrent_invoices.php | 2 +- sales/manage/sales_groups.php | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc index 4519db73..f51046b0 100644 --- a/includes/ui/allocation_cart.inc +++ b/includes/ui/allocation_cart.inc @@ -298,7 +298,7 @@ function show_allocatable($show_totals) { { alt_table_row_color($k); label_cell($systypes_array[$alloc_item->type]); - label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no)); + label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no), "nowrap align='right'"); label_cell($alloc_item->ref); label_cell($alloc_item->date_, "align=right"); label_cell($alloc_item->due_date, "align=right"); diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php index 24c12e7c..d6fdce42 100644 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@ -154,7 +154,7 @@ while ($myrow = db_fetch($result)) label_cell($type_name); - label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"])); + label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]), "nowrap align='right'"); label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"], $myrow["reference"])); diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index c8264626..9d1cb8d9 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -92,7 +92,7 @@ $sql = get_allocatable_from_supp_sql($supplier_id, $settled); $cols = array( _("Transaction Type") => array('fun'=>'systype_name'), - _("#") => array('fun'=>'trans_view'), + _("#") => array('fun'=>'trans_view', 'align'=>'right'), _("Reference"), _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Supplier") => array('ord'=>''), diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index e3328cc2..c8b45637 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -385,7 +385,7 @@ function display_grn_items_for_selection(&$supp_trans, $k) alt_table_row_color($k); $n = $myrow["id"]; - label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"])); + label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'"); hidden('qty_recd'.$n, $myrow["qty_recd"]); hidden('item_code'.$n, $myrow["item_code"]); hidden('item_description'.$n, $myrow["description"]); @@ -393,7 +393,7 @@ function display_grn_items_for_selection(&$supp_trans, $k) hidden('order_price'.$n, $myrow['unit_price']); hidden('std_cost_unit'.$n, $myrow['std_cost_unit']); hidden('po_detail_item'.$n, $myrow['po_detail_item']); - label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"])); + label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'"); label_cell($myrow["item_code"]); label_cell($myrow["description"]); label_cell(sql2date($myrow["delivery_date"])); diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index e173bd34..8c939aba 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -107,7 +107,7 @@ $sql = get_sql_for_po_search_completed(get_post('OrdersAfterDate'), get_post('Or get_post('SelectStockFromList'), get_post('also_closed')); $cols = array( - _("#") => array('fun'=>'trans_view', 'ord'=>''), + _("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'), _("Reference"), _("Supplier") => array('ord'=>''), _("Location"), diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 7f3b6196..2dba05e4 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -134,7 +134,7 @@ $sql = get_sql_for_supplier_allocation_inquiry(get_post('TransAfterDate'),get_po $cols = array( _("Type") => array('fun'=>'systype_name'), - _("#") => array('fun'=>'view_link', 'ord'=>''), + _("#") => array('fun'=>'view_link', 'ord'=>'', 'align'=>'right'), _("Reference"), _("Supplier") => array('ord'=>''), _("Supp Reference"), diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index f316c412..72169cda 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -168,7 +168,7 @@ $sql = get_sql_for_supplier_inquiry(get_post('filterType'), get_post('TransAfter $cols = array( _("Type") => array('fun'=>'systype_name', 'ord'=>''), - _("#") => array('fun'=>'trans_view', 'ord'=>''), + _("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'), _("Reference"), _("Supplier"), _("Supplier's Reference"), diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php index 9c60415e..5059735f 100644 --- a/sales/allocations/customer_allocation_main.php +++ b/sales/allocations/customer_allocation_main.php @@ -85,7 +85,7 @@ $sql = get_allocatable_from_cust_sql($customer_id, $settled); $cols = array( _("Transaction Type") => array('fun'=>'systype_name'), - _("#") => array('fun'=>'trans_view'), + _("#") => array('fun'=>'trans_view', 'align'=>'right'), _("Reference"), _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Customer") => array('ord'=>''), diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php index 06c045ec..2cc0de7e 100644 --- a/sales/create_recurrent_invoices.php +++ b/sales/create_recurrent_invoices.php @@ -215,7 +215,7 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); label_cell($myrow["description"]); - label_cell(get_customer_trans_view_str(ST_SALESORDER, $myrow["order_no"])); + label_cell(get_customer_trans_view_str(ST_SALESORDER, $myrow["order_no"]), "nowrap align='right'"); if ($myrow["debtor_no"] == 0) { label_cell(""); diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index e3aa9567..2bd2d58e 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -144,9 +144,9 @@ $sql = get_sql_for_customer_allocation_inquiry(get_post('TransAfterDate'), get_p //------------------------------------------------------------------------------------------------ $cols = array( _("Type") => array('fun'=>'systype_name'), - _("#") => array('fun'=>'view_link'), + _("#") => array('fun'=>'view_link', 'align'=>'right'), _("Reference"), - _("Order") => array('fun'=>'order_link', 'ord'=>''), + _("Order") => array('fun'=>'order_link', 'ord'=>'', 'align'=>'right'), _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Due Date") => array('type'=>'date', 'fun'=>'due_date'), _("Customer") => array('name' =>'name', 'ord'=>'asc'), diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index 86091ebf..3cbb0f86 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -165,7 +165,7 @@ $sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post get_post('SelectStockFromList'), get_post('StockLocation'), get_post('DeliveryNumber'), get_post('OutstandingOnly')); $cols = array( - _("Delivery #") => array('fun'=>'trans_view'), + _("Delivery #") => array('fun'=>'trans_view', 'align'=>'right'), _("Customer"), 'branch_code' => 'skip', _("Branch") => array('ord'=>''), diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index f275bc70..2241e1f9 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -249,7 +249,7 @@ $sql = get_sql_for_sales_orders_view($trans_type, get_post('OrderNumber'), get_p if ($trans_type == ST_SALESORDER) $cols = array( - _("Order #") => array('fun'=>'view_link'), + _("Order #") => array('fun'=>'view_link', 'align'=>'right'), _("Ref") => array('type' => 'sorder.reference', 'ord' => '') , _("Customer") => array('type' => 'debtor.name' , 'ord' => '') , _("Branch"), @@ -263,7 +263,7 @@ if ($trans_type == ST_SALESORDER) ); else $cols = array( - _("Quote #") => array('fun'=>'view_link'), + _("Quote #") => array('fun'=>'view_link', 'align'=>'right'), _("Ref"), _("Customer"), _("Branch"), diff --git a/sales/manage/recurrent_invoices.php b/sales/manage/recurrent_invoices.php index 55c99864..fef2ddc0 100644 --- a/sales/manage/recurrent_invoices.php +++ b/sales/manage/recurrent_invoices.php @@ -137,7 +137,7 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); label_cell($myrow["description"]); - label_cell(get_customer_trans_view_str(ST_SALESORDER, $myrow["order_no"])); + label_cell(get_customer_trans_view_str(ST_SALESORDER, $myrow["order_no"]), "nowrap align='right'"); if ($myrow["debtor_no"] == 0) { label_cell(""); diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php index 287ba1f2..c85d8f6d 100644 --- a/sales/manage/sales_groups.php +++ b/sales/manage/sales_groups.php @@ -93,7 +93,7 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); - label_cell($myrow["id"]); + label_cell($myrow["id"], "nowrap align='right'"); label_cell($myrow["description"]); inactive_control_cell($myrow["id"], $myrow["inactive"], 'groups', 'id'); edit_button_cell("Edit".$myrow["id"], _("Edit")); -- 2.30.2