[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14932] more on orders
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14932] more on orders |
|
Date: |
Mon, 25 Apr 2016 12:40:16 +0000 |
Revision: 14932
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14932
Author: sigurdne
Date: 2016-04-25 12:40:15 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
more on orders
Modified Paths:
--------------
trunk/property/inc/class.bocommon.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiwo_hour.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php 2016-04-25 08:24:27 UTC (rev
14931)
+++ trunk/property/inc/class.bocommon.inc.php 2016-04-25 12:40:15 UTC (rev
14932)
@@ -2398,4 +2398,141 @@
}
return $content_email;
}
+
+
+ public function get_vendor_contract($vendor_id = 0, $selected =
'')
+ {
+ if(!$vendor_id)
+ {
+ $vendor_id = phpgw::get_var('vendor_id', 'int');
+ }
+
+ $contract_list =
ExecMethod('property.soagreement.get_vendor_contract', $vendor_id);
+ if($selected)
+ {
+ foreach ($contract_list as &$contract)
+ {
+ $contract['selected'] = $selected ==
$contract['id'] ? 1 : 0;
+ }
+ }
+
+ return $contract_list;
+ }
+
+ /**
+ * Gets vendor canidated to be used as vendor - called as ajax
from edit form
+ *
+ * @param string $query
+ *
+ * @return array
+ */
+ public function get_eco_service()
+ {
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric',
'eco_service');
+ $values = $sogeneric->read(array('query' => $query));
+
+ return array('ResultSet' => array('Result' => $values));
+ }
+
+ public function get_eco_service_name( $id )
+ {
+ $ret = '';
+ if($id = (int)$id)
+ {
+ $sogeneric = CreateObject('property.sogeneric',
'eco_service');
+ $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
+ $ret = $sogeneric_data['name'];
+ }
+ return $ret;
+ }
+
+ public function get_unspsc_code()
+ {
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric',
'unspsc_code');
+ $values = $sogeneric->read(array('query' => $query,
'allrows' => true));
+ foreach ($values as &$value)
+ {
+ $value['name'] = "{$value['id']}
{$value['name']}";
+ }
+
+ return array('ResultSet' => array('Result' => $values));
+ }
+ public function get_unspsc_code_name( $id )
+ {
+ $ret = '';
+ if($id)
+ {
+ $sogeneric = CreateObject('property.sogeneric',
'unspsc_code');
+ $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
+ if($sogeneric_data)
+ {
+ $ret = $sogeneric_data['name'];
+ }
+ }
+ return $ret;
+ }
+
+ public function get_b_account()
+ {
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric',
'budget_account');
+ $values = $sogeneric->read(array('query' => $query));
+
+ foreach ($values as &$value)
+ {
+ $value['name'] = "{$value['id']}
{$value['descr']}";
+ }
+
+ return array('ResultSet' => array('Result' => $values));
+ }
+
+ public function get_external_project()
+ {
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric',
'external_project');
+ $values = $sogeneric->read(array('query' => $query));
+
+ foreach ($values as &$value)
+ {
+ $value['name'] = "{$value['id']}
{$value['name']}";
+ }
+
+ return array('ResultSet' => array('Result' => $values));
+ }
+
+ public function get_external_project_name( $id )
+ {
+ $ret = '';
+ if($id)
+ {
+ $sogeneric = CreateObject('property.sogeneric',
'external_project');
+ $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
+ if($sogeneric_data)
+ {
+ $ret = $sogeneric_data['name'];
+ }
+ }
+ return $ret;
+ }
+
+ public function get_ecodimb()
+ {
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric', 'dimb');
+ $values = $sogeneric->read(array('query' => $query));
+
+ foreach ($values as &$value)
+ {
+ $value['name'] = "{$value['id']}
{$value['descr']}";
+ }
+
+ return array('ResultSet' => array('Result' => $values));
+ }
}
\ No newline at end of file
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2016-04-25 08:24:27 UTC (rev
14931)
+++ trunk/property/inc/class.uiproject.inc.php 2016-04-25 12:40:15 UTC (rev
14932)
@@ -2611,18 +2611,7 @@
{
return;
}
-
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'external_project');
- $values = $sogeneric->read(array('query' => $query));
-
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['name']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_external_project();
}
public function get_ecodimb()
@@ -2631,33 +2620,12 @@
{
return;
}
-
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric', 'dimb');
- $values = $sogeneric->read(array('query' => $query));
-
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['descr']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_ecodimb();
}
private function _get_external_project_name( $id )
{
- $ret = '';
- if($id)
- {
- $sogeneric = CreateObject('property.sogeneric',
'external_project');
- $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
- if($sogeneric_data)
- {
- $ret = $sogeneric_data['name'];
- }
- }
- return $ret;
+ return $this->bocommon->get_external_project_name($id);
}
protected function _generate_tabs( $tabs_ = array(),
$active_tab = 'general', $suppress = array() )
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2016-04-25 08:24:27 UTC (rev
14931)
+++ trunk/property/inc/class.uitts.inc.php 2016-04-25 12:40:15 UTC (rev
14932)
@@ -2717,21 +2717,7 @@
public function get_vendor_contract($vendor_id = 0, $selected =
'')
{
- if(!$vendor_id)
- {
- $vendor_id = phpgw::get_var('vendor_id', 'int');
- }
-
- $contract_list =
ExecMethod('property.soagreement.get_vendor_contract', $vendor_id);
- if($selected)
- {
- foreach ($contract_list as &$contract)
- {
- $contract['selected'] = $selected ==
$contract['id'] ? 1 : 0;
- }
- }
-
- return $contract_list;
+ return $this->bocommon->get_vendor_contract($vendor_id,
$selected);
}
/**
@@ -2748,13 +2734,9 @@
return;
}
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'eco_service');
- $values = $sogeneric->read(array('query' => $query));
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_eco_service();
}
+
public function get_external_project()
{
if (!$this->acl_read)
@@ -2762,12 +2744,7 @@
return;
}
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'external_project');
- $values = $sogeneric->read(array('query' => $query));
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_external_project();
}
public function get_unspsc_code()
@@ -2776,17 +2753,7 @@
{
return;
}
-
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'unspsc_code');
- $values = $sogeneric->read(array('query' => $query,
'allrows' => true));
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['name']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_unspsc_code();
}
public function get_ecodimb()
@@ -2796,17 +2763,7 @@
return;
}
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric', 'dimb');
- $values = $sogeneric->read(array('query' => $query));
-
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['descr']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_ecodimb();
}
public function get_b_account()
@@ -2816,59 +2773,23 @@
return;
}
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'budget_account');
- $values = $sogeneric->read(array('query' => $query));
-
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['descr']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_b_account();
}
private function _get_eco_service_name( $id )
{
- $ret = '';
- if($id = (int)$id)
- {
- $sogeneric = CreateObject('property.sogeneric',
'eco_service');
- $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
- $ret = $sogeneric_data['name'];
- }
- return $ret;
+ return $this->bocommon->get_eco_service_name($id);
}
private function _get_unspsc_code_name( $id )
{
- $ret = '';
- if($id)
- {
- $sogeneric = CreateObject('property.sogeneric',
'unspsc_code');
- $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
- if($sogeneric_data)
- {
- $ret = $sogeneric_data['name'];
- }
- }
- return $ret;
+ return $this->bocommon->get_unspsc_code_name($id);
}
+
private function _get_external_project_name( $id )
{
- $ret = '';
- if($id)
- {
- $sogeneric = CreateObject('property.sogeneric',
'external_project');
- $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
- if($sogeneric_data)
- {
- $ret = $sogeneric_data['name'];
- }
- }
- return $ret;
+ return $this->bocommon->get_external_project_name($id);
}
protected function _generate_tabs( $history = '' )
Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php 2016-04-25 08:24:27 UTC (rev
14931)
+++ trunk/property/inc/class.uiwo_hour.inc.php 2016-04-25 12:40:15 UTC (rev
14932)
@@ -1699,7 +1699,7 @@
'table_send' => $table_send,
'table_done' => $table_done,
'link_view_file' =>
$GLOBALS['phpgw']->link('/index.php', $link_file_data),
- 'files' => isset($workorder['files']) ?
$workorder['files'] : '',
+ 'files' => $content_files,
'lang_files' => lang('files'),
'lang_filename' => lang('Filename'),
'lang_file_action' => lang('attach file'),
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2016-04-25 08:24:27 UTC
(rev 14931)
+++ trunk/property/inc/class.uiworkorder.inc.php 2016-04-25 12:40:15 UTC
(rev 14932)
@@ -2815,21 +2815,7 @@
public function get_vendor_contract($vendor_id = 0, $selected =
'')
{
- if(!$vendor_id)
- {
- $vendor_id = phpgw::get_var('vendor_id', 'int');
- }
-
- $contract_list =
ExecMethod('property.soagreement.get_vendor_contract', $vendor_id);
- if($selected)
- {
- foreach ($contract_list as &$contract)
- {
- $contract['selected'] = $selected ==
$contract['id'] ? 1 : 0;
- }
- }
-
- return $contract_list;
+ return $this->bocommon->get_vendor_contract($vendor_id,
$selected);
}
/**
@@ -2845,13 +2831,7 @@
{
return;
}
-
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'eco_service');
- $values = $sogeneric->read(array('query' => $query));
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_eco_service();
}
public function get_unspsc_code()
@@ -2860,17 +2840,7 @@
{
return;
}
-
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'unspsc_code');
- $values = $sogeneric->read(array('query' => $query,
'allrows' => true));
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['name']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_unspsc_code();
}
public function get_ecodimb()
@@ -2880,17 +2850,7 @@
return;
}
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric', 'dimb');
- $values = $sogeneric->read(array('query' => $query));
-
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['descr']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_ecodimb();
}
public function get_b_account()
@@ -2899,46 +2859,18 @@
{
return;
}
-
- $query = phpgw::get_var('query');
-
- $sogeneric = CreateObject('property.sogeneric',
'budget_account');
- $values = $sogeneric->read(array('query' => $query));
-
- foreach ($values as &$value)
- {
- $value['name'] = "{$value['id']}
{$value['descr']}";
- }
-
- return array('ResultSet' => array('Result' => $values));
+ return $this->bocommon->get_b_account();
}
private function _get_eco_service_name( $id )
{
- $ret = '';
- if($id = (int)$id)
- {
- $sogeneric = CreateObject('property.sogeneric',
'eco_service');
- $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
- $ret = $sogeneric_data['name'];
- }
- return $ret;
+ return $this->bocommon->get_eco_service_name($id);
}
private function _get_unspsc_code_name( $id )
{
- $ret = '';
- if($id)
- {
- $sogeneric = CreateObject('property.sogeneric',
'unspsc_code');
- $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
- if($sogeneric_data)
- {
- $ret = $sogeneric_data['name'];
- }
- }
- return $ret;
+ return $this->bocommon->get_unspsc_code_name($id);
}
protected function _generate_tabs( $tabs_ = array(),
$active_tab = 'general', $suppress = array() )
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14932] more on orders,
Sigurd Nes <=