Add denorm_qoh

[order_line_extra.git] / includes / order_lines.inc

diff --git a/includes/order_lines.inc b/includes/order_lines.inc
index b02993a2274c31449ad08404d442badaec0bd232..52d315de4b1c84d41cf8262ba28c2294bfb07324 100644 (file)
--- a/includes/order_lines.inc
+++ b/includes/order_lines.inc
@@ -1,5 +1,33 @@
 <?php
 include_once($path_to_root."/includes/ui/ui_input.inc");
+/* This utility function remove beginning <td> and </td> from a string
+ * generated by the above *_cell function.
+ * This is usefull to use the result of the function within a pager
+ * which already include the <td>...</td>
+ * However, for function which doesn't return a string
+ * but echo, we need to capture the output of the echo first.
+ */
+function start_extract_cell() {
+       // We need 
+       ob_start();
+}
+
+function end_extract_cell() {
+       $content = ob_get_contents();
+       ob_end_clean();
+       return extract_cell($content);
+}
+
+function extract_cell($td) {
+       if(preg_match('/\s*<td>(.*)<\/td>\s*/s', $td, $matches)) {
+               return $matches[1];
+       }
+       else {
+print_r('cacou');
+               return $td;
+       }
+}
+
 
 function update_extra_order_details() {
        if(!isset($_POST['Update']) || $_POST['Update'] != 'Update')  return;
@@ -45,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)
 {
@@ -53,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);
@@ -66,8 +103,8 @@ function aggregate_comment($row) {
                if(count($comments) == 0)
                        return $first;
                else {
-                       $tooltip = implode('<br>', $comments);
-                       return "$first <span class='before-tooltip'>more</span><span class='tooltip'>&nbsp$tooltip</span>";
+                       $tooltip = implode('<br> - ', $comments);
+                       return "$first <span class='before-tooltip'>more<span class='tooltip'>&nbsp$tooltip</span><span>";
                }
        }
        return '';