[Fmsystem-commits] [8739] property: external ref

[Sigurd Nes]

Revision: 8739
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8739
Author:   sigurdne
Date:     2012-01-31 14:15:23 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
property: external ref

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice.inc.php

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2012-01-31 10:13:46 UTC (rev 
8738)
+++ trunk/property/inc/class.uiinvoice.inc.php  2012-01-31 14:15:23 UTC (rev 
8739)
@@ -1666,7 +1666,9 @@
                                array(
                                        'col_name'=>'counter',          
'visible'=>false),
                                array(
-                                       'col_name'=>'id',               
'visible'=>false)
+                                       'col_name'=>'id',               
'visible'=>false),
+                               array(
+                                       'col_name'=>'_external_ref',            
'visible'=>false)
                                );
 
 
@@ -1915,6 +1917,10 @@
                                                {
                                                        
$json_row[$uicols[$i]['col_name']]  = $invoices['id'];
                                                }                               
        
+                                               else if($i == 18)
+                                               {
+                                                       
$json_row[$uicols[$i]['col_name']]  = $invoices['external_ref'];
+                                               }                               
        
                                        }
 
                                        if($invoices['workorder_id'])
@@ -2024,6 +2030,31 @@
                                        )
                                );
 
+                       $parameters2 = array
+                               (
+                                       'parameter' => array
+                                       (
+                                               array
+                                               (
+                                                       'name'          => 
'docid',
+                                                       'source'        => 
'_external_ref'
+                                               ),
+                                       )
+                               );
+
+
+                       if($this->acl_read && $baseurl_invoice)
+                       {
+                               $_baseurl_invoice = 
rtrim($baseurl_invoice,"?{$parameters2['parameter'][0]['name']}=");
+                               $datatable['rowactions']['action'][] = array
+                                       (
+                                               'my_name'               => 
'picture',
+                                               'text'                  => 
$lang_picture,
+                                               'action'                => 
"{$_baseurl_invoice}?target=_blank",
+                                               'parameters'    => $parameters2
+                                       );
+                       }
+
                        if($this->acl_edit)
                        {
                                $datatable['rowactions']['action'][] = array
@@ -2041,6 +2072,7 @@
                                        );
                        }
 
+
                        if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
                        {
                                $json['rights'] = 
$datatable['rowactions']['action'];