projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d61463
)
Right align numbers in inquiries and lists.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 20 Sep 2017 22:38:26 +0000
(
00:38
+0200)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 20 Sep 2017 22:38:26 +0000
(
00:38
+0200)
14 files changed:
includes/ui/allocation_cart.inc
patch
|
blob
|
history
inventory/inquiry/stock_movements.php
patch
|
blob
|
history
purchasing/allocations/supplier_allocation_main.php
patch
|
blob
|
history
purchasing/includes/ui/invoice_ui.inc
patch
|
blob
|
history
purchasing/inquiry/po_search_completed.php
patch
|
blob
|
history
purchasing/inquiry/supplier_allocation_inquiry.php
patch
|
blob
|
history
purchasing/inquiry/supplier_inquiry.php
patch
|
blob
|
history
sales/allocations/customer_allocation_main.php
patch
|
blob
|
history
sales/create_recurrent_invoices.php
patch
|
blob
|
history
sales/inquiry/customer_allocation_inquiry.php
patch
|
blob
|
history
sales/inquiry/sales_deliveries_view.php
patch
|
blob
|
history
sales/inquiry/sales_orders_view.php
patch
|
blob
|
history
sales/manage/recurrent_invoices.php
patch
|
blob
|
history
sales/manage/sales_groups.php
patch
|
blob
|
history
diff --git
a/includes/ui/allocation_cart.inc
b/includes/ui/allocation_cart.inc
index 4519db73e5af4f57231f119345d94f7d2d4f6b98..f51046b064aaf2b4fe3b4c497f14f805224c0f71 100644
(file)
--- 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]);
{
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");
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 24c12e7cd4b32884f5211d30f1b0db0e6d50d3f6..d6fdce42646bec2abb3d9ea58f7aae8487eacbfa 100644
(file)
--- 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($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"]));
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 c826462670c49053749edf8b62778df3a1c11249..9d1cb8d9b238236d4ab99e340c5c9ec432b3c924 100644
(file)
--- 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'),
$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'=>''),
_("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 e3328cc26f06237a14015dcf54bc90c0987e71a2..c8b45637b8dfe3abec9b4b461700163d8ebeb226 100644
(file)
--- 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"];
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"]);
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']);
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"]));
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 e173bd3454e4ec9777ffd33e9d3227e0d5a0e8d6..8c939aba7717cc474867caf8750512813b3b150f 100644
(file)
--- 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(
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"),
_("Reference"),
_("Supplier") => array('ord'=>''),
_("Location"),
diff --git
a/purchasing/inquiry/supplier_allocation_inquiry.php
b/purchasing/inquiry/supplier_allocation_inquiry.php
index 7f3b6196a5c07c251421d1363439fb4c9be3998e..2dba05e495a40394cd2c880d5574d3ce11b5e2f5 100644
(file)
--- 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'),
$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"),
_("Reference"),
_("Supplier") => array('ord'=>''),
_("Supp Reference"),
diff --git
a/purchasing/inquiry/supplier_inquiry.php
b/purchasing/inquiry/supplier_inquiry.php
index f316c4122baaa9b23c8beb8d2c6419f63c970c66..72169cda3ecb79a7dd644f4d2e8a6f78e9284756 100644
(file)
--- 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'=>''),
$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"),
_("Reference"),
_("Supplier"),
_("Supplier's Reference"),
diff --git
a/sales/allocations/customer_allocation_main.php
b/sales/allocations/customer_allocation_main.php
index 9c60415e7101e95afa2e4e49216eaeb2821e1012..5059735f6a9d8019d9992d488468e1e5d94e3273 100644
(file)
--- 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'),
$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'=>''),
_("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 06c045ec3fbde8b1976d7fb05284d42cdbc25cf6..2cc0de7efa9fa95920682a18a5c0e59e5a7cbb8f 100644
(file)
--- 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"]);
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("");
if ($myrow["debtor_no"] == 0)
{
label_cell("");
diff --git
a/sales/inquiry/customer_allocation_inquiry.php
b/sales/inquiry/customer_allocation_inquiry.php
index e3aa9567082a2e45dea005cd09e260808ee3a04f..2bd2d58e38f94c1d648e87065280d04c84f539fc 100644
(file)
--- 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'),
//------------------------------------------------------------------------------------------------
$cols = array(
_("Type") => array('fun'=>'systype_name'),
- _("#") => array('fun'=>'view_link'),
+ _("#") => array('fun'=>'view_link'
, 'align'=>'right'
),
_("Reference"),
_("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'),
_("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 86091ebf3c5e745984fa912abded3367d35197e1..3cbb0f86446d525211d83eb08e48638d73aa56a7 100644
(file)
--- 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(
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'=>''),
_("Customer"),
'branch_code' => 'skip',
_("Branch") => array('ord'=>''),
diff --git
a/sales/inquiry/sales_orders_view.php
b/sales/inquiry/sales_orders_view.php
index f275bc7055c2957c14781c143f64188631ef6cf6..2241e1f9dc05a7fe9c157f64d8e738280ec16a9c 100644
(file)
--- 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(
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"),
_("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(
);
else
$cols = array(
- _("Quote #") => array('fun'=>'view_link'),
+ _("Quote #") => array('fun'=>'view_link'
, 'align'=>'right'
),
_("Ref"),
_("Customer"),
_("Branch"),
_("Ref"),
_("Customer"),
_("Branch"),
diff --git
a/sales/manage/recurrent_invoices.php
b/sales/manage/recurrent_invoices.php
index 55c99864c892462085fc76e129c450527973377f..fef2ddc06ec07e14f71e5be188b612856077fa24 100644
(file)
--- 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"]);
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("");
if ($myrow["debtor_no"] == 0)
{
label_cell("");
diff --git
a/sales/manage/sales_groups.php
b/sales/manage/sales_groups.php
index 287ba1f2f5010623651d8f37dabae72a4b3bca91..c85d8f6d96847fac671747258e9b07280c25777d 100644
(file)
--- 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);
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"));
label_cell($myrow["description"]);
inactive_control_cell($myrow["id"], $myrow["inactive"], 'groups', 'id');
edit_button_cell("Edit".$myrow["id"], _("Edit"));