projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun Report Work Order Listing. More space in subtitles.
[fa-stable.git]
/
sales
/
includes
/
ui
/
sales_order_ui.inc
diff --git
a/sales/includes/ui/sales_order_ui.inc
b/sales/includes/ui/sales_order_ui.inc
index 7b91967b97ab7bb734e393d297781c7496f53c17..febabc4df7a3a115d603a57a9a12c65723b9f279 100644
(file)
--- a/
sales/includes/ui/sales_order_ui.inc
+++ b/
sales/includes/ui/sales_order_ui.inc
@@
-499,13
+499,17
@@
function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
}
else // prepare new line
{
}
else // prepare new line
{
- sales_items_list_cells(null,'stock_id', null, false, true, true);
+ if ($order->fixed_asset)
+ stock_disposable_fa_list_cells(null,'stock_id', null, _('[Select item]'), true, $order->line_items);
+ else
if (list_updated('stock_id')) {
if (list_updated('stock_id')) {
+ sales_items_list_cells(null,'stock_id', null, false, true, true);
$Ajax->activate('price');
$Ajax->activate('units');
$Ajax->activate('qty');
$Ajax->activate('line_total');
$Ajax->activate('price');
$Ajax->activate('units');
$Ajax->activate('qty');
$Ajax->activate('line_total');
- }
+ } else
+ sales_items_list_cells(null,'stock_id', last_sales_order_detail($order, 'stk_code'), false, true, true);
$item_info = get_item_edit_info($_POST['stock_id']);
$units = $item_info["units"];
$item_info = get_item_edit_info($_POST['stock_id']);
$units = $item_info["units"];
@@
-519,7
+523,11
@@
function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
$_POST['Disc'] = percent_format($order->default_discount * 100);
}
$_POST['Disc'] = percent_format($order->default_discount * 100);
}
- qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
+ if ($order->fixed_asset) {
+ label_cell(1, '', 'qty');
+ hidden('qty', 1);
+ } else
+ qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
if ($order->trans_no!=0) {
qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec);
if ($order->trans_no!=0) {
qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec);
@@
-599,8
+607,8
@@
function display_delivery_details(&$order)
start_outer_table(TABLESTYLE2, "width='90%'");
table_section(1);
start_outer_table(TABLESTYLE2, "width='90%'");
table_section(1);
- locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
- if ($order->payment_terms['days_before_due']
< 0
)
+ locations_list_row(_("Deliver from Location:"), 'Location', null, false, true
, $order->fixed_asset
);
+ if ($order->payment_terms['days_before_due']
== -1
)
{
$Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update
if (!$order->is_started())
{
$Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update
if (!$order->is_started())