[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17033] FDV-218, FDV-223
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17033] FDV-218, FDV-223 |
|
Date: |
Mon, 4 Sep 2017 09:55:39 -0400 (EDT) |
Revision: 17033
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17033
Author: sigurdne
Date: 2017-09-04 09:55:38 -0400 (Mon, 04 Sep 2017)
Log Message:
-----------
FDV-218, FDV-223
Modified Paths:
--------------
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2017-09-04 12:58:00 UTC (rev
17032)
+++ trunk/property/inc/class.botts.inc.php 2017-09-04 13:55:38 UTC (rev
17033)
@@ -704,7 +704,8 @@
$ticket['delay'] =
round(($ticket['finnish_date2'] - $ticket['finnish_date']) / (24 * 3600));
$ticket['finnish_date'] =
$ticket['finnish_date2'];
}
- $ticket['finnish_date'] =
(isset($ticket['finnish_date']) && $ticket['finnish_date'] ?
$GLOBALS['phpgw']->common->show_date($ticket['finnish_date'],
$this->dateformat) : '');
+ $ticket['finnish_date'] =
!empty($ticket['finnish_date']) ?
$GLOBALS['phpgw']->common->show_date($ticket['finnish_date'],
$this->dateformat) : '';
+ $ticket['order_deadline'] =
!empty($ticket['order_deadline']) ?
$GLOBALS['phpgw']->common->show_date($ticket['order_deadline'],
$this->dateformat) : '';
/*
if ($ticket['status'] == 'X')
@@ -782,6 +783,10 @@
{
$ticket['finnish_date'] =
$GLOBALS['phpgw']->common->show_date($ticket['finnish_date'],
$this->dateformat);
}
+ if ($ticket['order_deadline'])
+ {
+ $ticket['order_deadline'] =
$GLOBALS['phpgw']->common->show_date($ticket['order_deadline'],
$this->dateformat);
+ }
if ($ticket['location_code'])
{
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2017-09-04 12:58:00 UTC (rev
17032)
+++ trunk/property/inc/class.sotts.inc.php 2017-09-04 13:55:38 UTC (rev
17033)
@@ -589,6 +589,7 @@
'unspsc_code' => 'fm_tts_tickets.unspsc_code',
'b_account_id' => 'fm_tts_tickets.b_account_id',
'continuous' => 'fm_tts_tickets.continuous',
+ 'order_deadline' =>
'fm_tts_tickets.order_deadline',
);
$custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
@@ -783,6 +784,7 @@
'unspsc_code' =>
$this->db->f('unspsc_code'),
'b_account_id' =>
$this->db->f('b_account_id'),
'continuous' =>
$this->db->f('continuous'),
+ 'order_deadline' =>
$this->db->f('order_deadline'),
);
foreach ($custom_cols as $custom_col)
@@ -871,6 +873,7 @@
$ticket['contact_id'] =
$this->db->f('contact_id');
$ticket['order_id'] = $this->db->f('order_id');
$ticket['continuous'] =
$this->db->f('continuous');
+ $ticket['order_deadline'] =
$this->db->f('order_deadline');
$ticket['vendor_id'] =
$this->db->f('vendor_id');
$ticket['contract_id'] =
$this->db->f('contract_id',true);
$ticket['service_id'] =
$this->db->f('service_id',true);
@@ -1740,6 +1743,11 @@
$value_set['tax_code'] = $ticket['tax_code'];
$value_set['continuous'] =
$ticket['continuous'];
+ if(!empty($ticket['order_deadline']))
+ {
+ $value_set['order_deadline'] =
phpgwapi_datetime::date_to_timestamp($ticket['order_deadline']);
+ }
+
if(isset($ticket['vendor_email']) &&
is_array($ticket['vendor_email']))
{
$vendor_email = array();
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-09-04 12:58:00 UTC (rev
17032)
+++ trunk/property/inc/class.uitts.inc.php 2017-09-04 13:55:38 UTC (rev
17033)
@@ -1622,7 +1622,6 @@
$GLOBALS['phpgw']->jqcal->add_listener('values_finnish_date');
}
-
$membership =
$GLOBALS['phpgw']->accounts->membership($this->account);
$my_groups = array();
foreach ($membership as $group_id => $group)
@@ -2183,6 +2182,7 @@
if ($access_order)
{
+
$GLOBALS['phpgw']->jqcal->add_listener('order_deadline');
$b_account_data =
$this->bocommon->initiate_ui_budget_account_lookup(array
(
@@ -3018,6 +3018,7 @@
'value_origin' => $ticket['origin'],
'value_target' => $ticket['target'],
'value_finnish_date' => $ticket['finnish_date'],
+ 'value_order_deadline' =>
$ticket['order_deadline'],
'link_entity' => $link_entity,
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data2' => $location_data,
@@ -3386,6 +3387,11 @@
array('col1' => $from, 'col2' =>
$invoice_address)
);
+ if($ticket['order_deadline'])
+ {
+ $data[] = array('col1' => lang('deadline'),
'col2' =>"<b>{$ticket['order_deadline']}</b>");
+ }
+
$pdf->ezTable($data, array('col1' => '', 'col2' => ''),
'', array('showHeadings' => 0,
'shaded' => 0, 'xPos' => 0,
'xOrientation' => 'right', 'width' => 500,
'gridlines' => EZ_GRIDLINE_ALL,
@@ -3759,6 +3765,17 @@
$body .= "</td>";
$body .= "<td valign='top'>" . lang('invoice address')
. "<br/>{$this->bo->config->config_data['invoice_address']}</td>";
+
+ if($ticket['order_deadline'])
+ {
+ $body .= "<tr><td>";
+ $body .= lang('deadline');
+ $body .= "</td>";
+ $body .= "<td>";
+ $body .= "<b>{$ticket['order_deadline']}</b>";
+ $body .= "</td></tr>";
+ }
+
$body .= "</tr></table><br/>";
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2017-09-04 12:58:00 UTC (rev 17032)
+++ trunk/property/setup/phpgw_no.lang 2017-09-04 13:55:38 UTC (rev 17033)
@@ -2235,4 +2235,5 @@
reference property no Referanse
alert vendor property no Varsle leverandør
important information property no Viktig informasjon
-category content property no Tekster for kategori
\ No newline at end of file
+category content property no Tekster for kategori
+order deadline property no Frist for utførelse
\ No newline at end of file
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2017-09-04 12:58:00 UTC (rev 17032)
+++ trunk/property/setup/setup.inc.php 2017-09-04 13:55:38 UTC (rev 17033)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.718';
+ $setup_info['property']['version'] = '0.9.17.719';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2017-09-04 12:58:00 UTC (rev
17032)
+++ trunk/property/setup/tables_current.inc.php 2017-09-04 13:55:38 UTC (rev
17033)
@@ -1149,8 +1149,8 @@
'contact_email' => array('type' => 'varchar',
'precision' => '64', 'nullable' => True),
'tenant_id' => array('type' => 'int',
'precision' => '4', 'nullable' => True),
'entry_date' => array('type' => 'int',
'precision' => '4', 'nullable' => True),
- 'finnish_date' => array('type' => 'int',
'precision' => '4', 'nullable' => True),
- 'finnish_date2' => array('type' => 'int',
'precision' => '4', 'nullable' => True),
+ 'finnish_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
+ 'finnish_date2' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'contact_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'order_id' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'ordered_by' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
@@ -1180,6 +1180,7 @@
'file_attachments' => array('type' =>
'varchar', 'precision' => 255, 'nullable' => True),
'delivery_address' => array('type' => 'text',
'nullable' => True),
'continuous' => array('type' => 'int',
'precision' => 2, 'nullable' => True),
+ 'order_deadline' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
),
'pk' => array('id'),
'ix' => array(),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2017-09-04 12:58:00 UTC (rev
17032)
+++ trunk/property/setup/tables_update.inc.php 2017-09-04 13:55:38 UTC (rev
17033)
@@ -9787,3 +9787,23 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.718 to 0.9.17.719
+ *
+ */
+ $test[] = '0.9.17.718';
+
+ function property_upgrade0_9_17_718()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_tickets',
'order_deadline', array(
+ 'type' => 'int', 'precision' => 8, 'nullable' => true));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.719';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
\ No newline at end of file
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2017-09-04 12:58:00 UTC (rev
17032)
+++ trunk/property/templates/base/tts.xsl 2017-09-04 13:55:38 UTC (rev
17033)
@@ -983,7 +983,18 @@
<xsl:value-of select="value_order_descr"/>
</textarea>
</div>
+ <div
class="pure-control-group">
+
<label>
+
<xsl:value-of select="php:function('lang', 'deadline')"/>
+
</label>
+
<input type="text" id="order_deadline" name="values[order_deadline]" size="10"
value="{value_order_deadline}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'order deadline')"/>
+
</xsl:attribute>
+
</input>
+ </div>
+
<div
class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'cost estimate')"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17033] FDV-218, FDV-223,
sigurdne <=