X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Forder_lines.inc;h=52d315de4b1c84d41cf8262ba28c2294bfb07324;hb=dcfbc4cb92372d78e5647ecf4b303453737190db;hp=54b2a7faec8eb4f309827d4492f7b8afe39f0f35;hpb=fbf564796dcf1a6a077bf38ffd5727cfac167694;p=order_line_extra.git diff --git a/includes/order_lines.inc b/includes/order_lines.inc index 54b2a7f..52d315d 100644 --- a/includes/order_lines.inc +++ b/includes/order_lines.inc @@ -28,9 +28,6 @@ print_r('cacou'); } } -?> - - function update_extra_order_details() { if(!isset($_POST['Update']) || $_POST['Update'] != 'Update') return; @@ -76,6 +73,11 @@ function view_link($dummy, $order_no) return get_customer_trans_view_str(ST_SALESORDER, $order_no); } +function item_link($dummy, $stock_id) +{ + return pager_link( _($stock_id), + "/modules/order_line_extra/item_schedule.php?stock_id=" .$stock_id); +} function order_link($row) { @@ -84,12 +86,16 @@ function order_link($row) } function customer_link($row) { - return pager_link(_($row['debtor_ref']), "/modules/order_line_extra/order_lines_view.php?customer_id=${row['debtor_no']}"); + return customer_link2($row['debtor_ref'], $row['debtor_no']); +} + +function customer_link2($name, $id) { + return pager_link(_($name), "/modules/order_line_extra/order_lines_view.php?customer_id=${id}"); } function aggregate_comment($row) { - $comment = $row['order_comment'].$row['detail_comment']; + $comment = $row['order_comment'].";".$row['detail_comment']; if($comment) { $comments = array_map('trim', explode(';', $comment)); $comments = array_filter($comments); @@ -97,8 +103,8 @@ function aggregate_comment($row) { if(count($comments) == 0) return $first; else { - $tooltip = implode('
', $comments); - return "$first more $tooltip"; + $tooltip = implode('
- ', $comments); + return "$first more $tooltip"; } } return '';