[Fmsystem-commits] [17137] property: referenc contract - if any on order

[sigurdne]

Revision: 17137
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17137
Author:   sigurdne
Date:     2017-10-05 05:35:38 -0400 (Thu, 05 Oct 2017)
Log Message:
-----------
property: referenc contract - if any on order

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
    trunk/property/js/portico/workorder.edit.js
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2017-10-04 13:19:36 UTC 
(rev 17136)
+++ trunk/property/inc/class.uiworkorder.inc.php        2017-10-05 09:35:38 UTC 
(rev 17137)
@@ -3142,9 +3142,19 @@
                                'delete' => $data));
                }
 
-               public function get_vendor_contract($vendor_id = 0, $selected = 
'')
+               public function get_vendor_contract($vendor_id = 0, $selected = 
0)
                {
-                       return $this->bocommon->get_vendor_contract($vendor_id, 
$selected);
+                       $contract_list = 
$this->bocommon->get_vendor_contract($vendor_id, $selected);
+
+                       array_unshift($contract_list, array('id' => -1, 'name' 
=> lang('outside contract')));
+                       if($selected)
+                       {
+                               foreach ($contract_list as &$contract)
+                               {
+                                       $contract['selected'] = $selected == 
$contract['id'] ? 1 : 0;
+                               }
+                       }
+                       return $contract_list;
                }
 
                /**

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-10-04 13:19:36 UTC (rev 17136)
+++ trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-10-05 09:35:38 UTC (rev 17137)
@@ -187,7 +187,7 @@
                                'dim1' => $_ticket['ecodimb'],                  
        // Ansvar
                                'dim2' => $_ticket['service_id'] ? 
$_ticket['service_id'] : 9, // Tjeneste liste 30 stk, default 9
                                'dim3' => $dim3,                                
                        // Objekt: eiendom + bygg: 6 siffer
-                               'dim4' => $_ticket['contract_id'],              
        // Kontrakt - frivillig / 9, 7 tegn - alfanumerisk
+                               'dim4' => $_ticket['contract_id'] == '-1' ? '' 
: $_ticket['contract_id'], // Kontrakt - frivillig / 9, 7 tegn - alfanumerisk
                                'dim5' => $_ticket['external_project_id'],      
// Prosjekt
                                'dim6' => $dim6,                                
                        // Aktivitet - frivillig: bygningsdel, 3 siffer + 
bokstavkode
                                'vendor_id' => $_ticket['vendor_id'],

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
===================================================================
--- 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-10-04 13:19:36 UTC (rev 17136)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-10-05 09:35:38 UTC (rev 17137)
@@ -291,7 +291,7 @@
                                        'dim1' => $dim1, // Ansvar
                                        'dim2' => $tjeneste, // Tjeneste liste 
30 stk, default 9
                                        'dim3' => $dim3, // Objekt: eiendom + 
bygg: 6 siffer
-                                       'dim4' => $workorder['contract_id'], // 
Kontrakt - frivillig / 9, 7 tegn - alfanumerisk
+                                       'dim4' => $workorder['contract_id'] == 
'-1' ? '' : $workorder['contract_id'], // Kontrakt - frivillig / 9, 7 tegn - 
alfanumerisk
                                        'dim5' => 
$project['external_project_id'], // Prosjekt
                                        'dim6' => $dim6, // Aktivitet - 
frivillig: bygningsdel, 3 siffer + bokstavkode
                                        'vendor_id' => $workorder['vendor_id'],

Modified: trunk/property/js/portico/workorder.edit.js
===================================================================
--- trunk/property/js/portico/workorder.edit.js 2017-10-04 13:19:36 UTC (rev 
17136)
+++ trunk/property/js/portico/workorder.edit.js 2017-10-05 09:35:38 UTC (rev 
17137)
@@ -211,7 +211,10 @@
                                                return;
                                        }
 
-                                       htmlString = "<option value=''>" + 
data.length + " kontrakter funnet</option>"
+                                       
$("#vendor_contract_id").attr("data-validation", "required");
+
+                                       htmlString = "<option value=''>" + 
data.length + " kontrakter funnet</option>";
+                                       htmlString += "<option 
value='-1'>Utenfor rammeavtale</option>";
                                        var obj = data;
 
                                        $.each(obj, function (i)

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2017-10-04 13:19:36 UTC (rev 17136)
+++ trunk/property/setup/phpgw_no.lang  2017-10-05 09:35:38 UTC (rev 17137)
@@ -2240,4 +2240,5 @@
 please update <a href="%1">your email address here</a> property        no      
Venligst oppdatert din <a href="%1">epost-adresse her</a>
 clear contact  property        no      Fjern kontakperson
 deadline for start     property        no      Frist for oppstart
-deadline for execution property        no      Frist for ferdigstillelse
\ No newline at end of file
+deadline for execution property        no      Frist for ferdigstillelse
+outside contract       property        no      Utenfor rammeavtale
\ No newline at end of file