[Fmsystem-commits] [17017] FDV-228

[sigurdne]

Revision: 17017
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17017
Author:   sigurdne
Date:     2017-08-31 07:03:58 -0400 (Thu, 31 Aug 2017)
Log Message:
-----------
FDV-228

Modified Paths:
--------------
    trunk/rental/inc/class.socontract.inc.php
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/templates/base/party.xsl

Modified: trunk/rental/inc/class.socontract.inc.php
===================================================================
--- trunk/rental/inc/class.socontract.inc.php   2017-08-31 10:51:08 UTC (rev 
17016)
+++ trunk/rental/inc/class.socontract.inc.php   2017-08-31 11:03:58 UTC (rev 
17017)
@@ -122,6 +122,9 @@
                                                $like_clauses[] = 
"party.last_name $this->like $like_pattern";
                                                $like_clauses[] = 
"party.company_name $this->like $like_pattern";
                                                break;
+                                       case "customer_id":
+                                               $like_clauses[] = 
"party.customer_id  = " . (int)$search_for;
+                                               break;
                                        case "composite":
                                                $like_clauses[] = 
"composite.name $this->like $like_pattern";
                                                break;
@@ -132,7 +135,6 @@
                                                $like_clauses[] = 
"r_u.location_code like '{$search_for}%'";
                                                break;
                                        case "all":
-
                                                $like_clauses[] = 
"contract.old_contract_id $this->like $like_pattern";
                                                $like_clauses[] = 
"contract.comment $this->like $like_pattern";
                                                $like_clauses[] = 
"party.first_name $this->like $like_pattern";
@@ -140,6 +142,7 @@
                                                $like_clauses[] = 
"party.company_name $this->like $like_pattern";
                                                $like_clauses[] = 
"composite.name $this->like $like_pattern";
                                                $like_clauses[] = 
"r_u.location_code $this->like $like_pattern";
+                                               $like_clauses[] = 
"party.customer_id  = " . (int)$search_for;
                                                break;
                                }
 

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2017-08-31 10:51:08 UTC (rev 
17016)
+++ trunk/rental/inc/class.uicontract.inc.php   2017-08-31 11:03:58 UTC (rev 
17017)
@@ -109,6 +109,7 @@
                                array('id' => 'all', 'name' => lang('all')),
                                array('id' => 'id', 'name' => 
lang('contract_id')),
                                array('id' => 'party_name', 'name' => 
lang('party_name')),
+                               array('id' => 'customer_id', 'name' => 
lang('customer id') . ' (Agresso)'),
                                array('id' => 'composite', 'name' => 
lang('composite_name')),
                                array('id' => 'composite_address', 'name' => 
lang('composite_address')),
                                array('id' => 'location_code', 'name' => 
lang('object_number'))

Modified: trunk/rental/templates/base/party.xsl
===================================================================
--- trunk/rental/templates/base/party.xsl       2017-08-31 10:51:08 UTC (rev 
17016)
+++ trunk/rental/templates/base/party.xsl       2017-08-31 11:03:58 UTC (rev 
17017)
@@ -374,6 +374,13 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'customer id')"/>
+                                                       </label>
+                                                       <xsl:value-of 
select="value_customer_id"/>
+                                               </div>
+
+                                               <div class="pure-control-group">
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'firstname')"/>
                                                        </label>
                                                        <xsl:value-of 
select="value_firstname"/>