fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [17550] property: invoice remark


From: sigurdne
Subject: [Fmsystem-commits] [17550] property: invoice remark
Date: Thu, 11 Jan 2018 06:48:42 -0500 (EST)

Revision: 17550
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17550
Author:   sigurdne
Date:     2018-01-11 06:48:42 -0500 (Thu, 11 Jan 2018)
Log Message:
-----------
property: invoice remark

Modified Paths:
--------------
    trunk/property/inc/class.sotts.inc.php
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.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.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2018-01-11 03:41:10 UTC (rev 
17549)
+++ trunk/property/inc/class.sotts.inc.php      2018-01-11 11:48:42 UTC (rev 
17550)
@@ -897,6 +897,7 @@
                                $ticket['entry_date'] = 
$this->db->f('entry_date');
                                $ticket['modified_date'] = 
$this->db->f('modified_date');
                                $ticket['order_sent'] = 
$this->db->f('order_sent');
+                               $ticket['invoice_remark'] = 
$this->db->f('invoice_remark', true);
                                $ticket['order_received'] = 
$this->db->f('order_received');
                                $ticket['order_received_amount'] = 
$this->db->f('order_received_amount');
                                $mail_recipients = 
trim($this->db->f('mail_recipients'), ',');
@@ -1291,8 +1292,8 @@
                        $old_order_cat_id = $this->db->f('order_cat_id');
                        $old_building_part = $this->db->f('building_part', 
true);
                        $old_order_dim1 = (int)$this->db->f('order_dim1');
+                       $order_sent = $this->db->f('order_sent');
 
-
                        if ($oldcat_id == 0)
                        {
                                $oldcat_id = '';
@@ -1625,6 +1626,8 @@
                                {
                                        $this->db->query("UPDATE fm_tts_tickets 
SET order_id = {$order_id}, ordered_by = {$this->account} WHERE id={$id}", 
__LINE__, __FILE__);
                                        $this->db->query("INSERT INTO fm_orders 
(id,type) VALUES ({$order_id},'ticket')");
+
+                                       $ticket['invoice_remark'] = 
$ticket['subject'];
                                }
                        }
 
@@ -1748,6 +1751,11 @@
                                $value_set['order_deadline'] = 
$ticket['order_deadline'];// delete value if empty
                                $value_set['order_deadline2'] = 
$ticket['order_deadline2'];// delete value if empty
 
+                               if(!empty($ticket['invoice_remark']) && 
!$order_sent)
+                               {
+                                       $value_set['invoice_remark'] = 
$this->db->db_addslashes($ticket['invoice_remark']);
+                               }
+
                                if(!empty($ticket['order_deadline']))
                                {
                                        $value_set['order_deadline'] = 
phpgwapi_datetime::date_to_timestamp($ticket['order_deadline']);

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2018-01-11 03:41:10 UTC (rev 
17549)
+++ trunk/property/inc/class.uitts.inc.php      2018-01-11 11:48:42 UTC (rev 
17550)
@@ -2989,6 +2989,7 @@
                                'enable_order_service_id' => 
$enable_order_service_id,
                                'value_order_id' => $ticket['order_id'],
                                'value_order_descr' => $ticket['order_descr'],
+                               'value_invoice_remark' => 
$ticket['invoice_remark'],
                                'vendor_data' => $vendor_data,
                                'b_account_data' => $b_account_data,
                                'ecodimb_data' => $ecodimb_data,

Modified: trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2018-01-11 03:41:10 UTC (rev 17549)
+++ trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2018-01-11 11:48:42 UTC (rev 17550)
@@ -147,6 +147,7 @@
                                        'OrderType]' => 'WB',
                                        'Status' => 'N',
                                        'OrderDate' => date('Y-m-d'),
+                                       'HeaderText' => 
$param['invoice_remark'], // Fakturanotat
                                        'Currency' => 'NOK',
                                        'Seller' => array($Seller),
                                        'Buyer' => array($param['buyer']),

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  
2018-01-11 03:41:10 UTC (rev 17549)
+++ trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2018-01-11 11:48:42 UTC (rev 17550)
@@ -44,7 +44,7 @@
                var $debug = true;
                function __construct()
                {
-                       
+
                }
 
                public function transfer( $id )
@@ -211,6 +211,7 @@
                                'order_id' => $_ticket['order_id'],
                                'tax_code' => $tax_code,
                                'buyer' => $buyer,
+                               'invoice_remark' => $_ticket['invoice_remark'],
                                'lines' => array(
                                        array(
                                                'unspsc_code' => 
$_ticket['unspsc_code'] ? $_ticket['unspsc_code'] : 'UN-72000000',
@@ -219,7 +220,7 @@
                                        )
                                )
                        );
-       
+
                        $exporter_ordre = new 
BkBygg_exporter_data_til_Agresso(array(
                                'order_id' => $_ticket['order_id'],
                                'voucher_type' => $voucher_type

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2018-01-11 03:41:10 UTC (rev 17549)
+++ trunk/property/setup/phpgw_no.lang  2018-01-11 11:48:42 UTC (rev 17550)
@@ -2393,4 +2393,5 @@
 FM settings    property        no      Innstillinger for eiendomsforvaltning
 pending action type    property        no      Handlingstyper
 comma separated email addresses to be notified about tenant claim      
property        no      Kommmaseparert liste over hvem som skal ha e-post om 
leietakerkrav
-record has been saved  property        no      Posten er lagret
\ No newline at end of file
+record has been saved  property        no      Posten er lagret
+invoice remark property        no      Fakturanotat
\ No newline at end of file

Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php  2018-01-11 03:41:10 UTC (rev 17549)
+++ trunk/property/setup/setup.inc.php  2018-01-11 11:48:42 UTC (rev 17550)
@@ -11,7 +11,7 @@
         * @version $Id$
        */
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.724';
+       $setup_info['property']['version']              = '0.9.17.725';
        $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 2018-01-11 03:41:10 UTC (rev 
17549)
+++ trunk/property/setup/tables_current.inc.php 2018-01-11 11:48:42 UTC (rev 
17550)
@@ -1184,6 +1184,7 @@
                                'continuous' => array('type' => 'int', 
'precision' => 2, 'nullable' => True),
                                'order_deadline' => array('type' => 'int', 
'precision' => 8, 'nullable' => True),
                                'order_deadline2' => array('type' => 'int', 
'precision' => 8, 'nullable' => True),
+                               'invoice_remark' => array('type' => 'text', 
'nullable' => True),
                        ),
                        'pk' => array('id'),
                        'ix' => array(),

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2018-01-11 03:41:10 UTC (rev 
17549)
+++ trunk/property/setup/tables_update.inc.php  2018-01-11 11:48:42 UTC (rev 
17550)
@@ -9946,3 +9946,26 @@
                        return $GLOBALS['setup_info']['property']['currentver'];
                }
        }
+
+       /**
+       * Update property version from 0.9.17.724 to 0.9.17.725
+       *
+       */
+       $test[] = '0.9.17.724';
+
+       function property_upgrade0_9_17_724()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_tickets', 
'invoice_remark', array(
+                               'type' =>       'text',
+                               'nullable' => true
+                       )
+               );
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.725';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }

Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2018-01-11 03:41:10 UTC (rev 
17549)
+++ trunk/property/templates/base/tts.xsl       2018-01-11 11:48:42 UTC (rev 
17550)
@@ -154,7 +154,7 @@
                                                        <xsl:value-of 
select="php:function('lang', 'subject')"/>
                                                </label>
 
-                                               <input type="text" 
name="values[subject]" value="{value_subject}" class="pure-input-1-2" >
+                                               <input type="text" id="subject" 
name="values[subject]" value="{value_subject}" class="pure-input-1-2" >
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="php:function('lang', 'Enter the subject of this ticket')"/>
                                                        </xsl:attribute>
@@ -371,7 +371,7 @@
                                                        <xsl:text> </xsl:text>
                                                        <xsl:value-of 
select="value_id"/>
                                                </label>
-                                               <input class="pure-input-1-2" 
type="text" name="values[subject]" value="{value_subject}">
+                                               <input class="pure-input-1-2" 
type="text" id="subject" name="values[subject]" value="{value_subject}">
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="php:function('lang', 'update subject')"/>
                                                        </xsl:attribute>
@@ -993,6 +993,25 @@
                                                                        </div>
                                                                        <div 
class="pure-control-group">
                                                                                
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'invoice remark')"/>
+                                                                               
</label>
+                                                                               
<xsl:choose>
+                                                                               
        <xsl:when test="value_order_sent != 1">
+                                                                               
                <textarea class="pure-input-1-2" rows="{textarearows}" 
id="invoice_remark" name="values[invoice_remark]" wrap="virtual">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'invoice remark')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                        <xsl:value-of select="value_invoice_remark"/>
+                                                                               
                </textarea>
+                                                                               
        </xsl:when>
+                                                                               
        <xsl:otherwise>
+                                                                               
                <xsl:value-of select="value_invoice_remark"/>
+
+                                                                               
        </xsl:otherwise>
+                                                                               
</xsl:choose>
+                                                                       </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
                                                                                
        <xsl:value-of select="php:function('lang', 'deadline')"/>
                                                                                
</label>
                                                                                
<table class="pure-table pure-u-md-1-2">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]