fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [16289] Stable: Merge 16286:16288 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [16289] Stable: Merge 16286:16288 from trunk
Date: Thu, 9 Feb 2017 07:24:22 -0500 (EST)

Revision: 16289
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16289
Author:   sigurdne
Date:     2017-02-09 07:24:21 -0500 (Thu, 09 Feb 2017)
Log Message:
-----------
Stable: Merge 16286:16288 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
    branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
    branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
    branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
    branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
    branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
    branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
    
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch 2017-02-09 12:24:21 UTC (rev 16289)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16188
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288
\ No newline at end of property
Modified: 
branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php   
2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php   
2017-02-09 12:24:21 UTC (rev 16289)
@@ -57,6 +57,11 @@
                        $contact_name,
                        $contact_email,
                        $contact_phone,
+                       $contact2_name,
+                       $contact2_email,
+                       $contact2_phone,
+                       $number_of_users,
+                       $max_events,
                        $account_number,
                        $description,
                        $remark,
@@ -146,7 +151,7 @@
                                        'required' => true),
                                'account_number' => array('action'=> 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
                                        'type' => 'string',
-                                       'required' => true),
+                                       'required' => false),
                                'description' => array('action'=> PHPGW_ACL_ADD 
| PHPGW_ACL_EDIT,
                                        'type' => 'string',
                                        'label' => 'description',
@@ -180,6 +185,35 @@
                                        'query' => true,
                                        'label' => 'contact phone',
                                        ),
+                               'contact2_name' => array(
+                                       'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
+                                       'type' => 'string',
+                                       'required' => false,
+                                       'query' => true,
+                                       'label' => 'contact name 2',
+                                       ),
+                               'contact2_email' => array(
+                                       'action'=> PHPGW_ACL_READ | 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                       'type' => 'string',
+                                       'required' => false,
+                                       'query' => true,
+                                       'sf_validator' => 
createObject('booking.sfValidatorEmail', array(), array('invalid' => '%field% 
is invalid')),
+                                       'label' => 'contact email 2',
+                                       ),
+                               'contact2_phone' => array(
+                                       'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
+                                       'type' => 'string',
+                                       'required' => false,
+                                       'query' => true,
+                                       'label' => 'contact phone 2',
+                                       ),
+                               'number_of_users' => array(
+                                       'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
+                                       'type' => 'int',
+                                       'required' => true,
+                                       'query' => true,
+                                       'label' => 'number of users',
+                                       ),
                                'organization_number' => array(
                                        'action'=> PHPGW_ACL_READ | 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
                                        'type' => 'string',
@@ -211,7 +245,14 @@
                                                'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
                                                'type' => 'string',
                                                'related' => true,
-                                               )
+                                               ),
+                                       'max_events' => array(
+                                               'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
+                                               'type' => 'int',
+                                               'required' => true,
+                                               'query' => false,
+                                               'label' => 'maximum number of 
events',
+                                               ),
                                        );
 
                                foreach ($backend_fields as $key => $field_info)

Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang        
2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang        
2017-02-09 12:24:21 UTC (rev 16289)
@@ -109,4 +109,6 @@
 customer contact email eventplanner    no      Epost
 showall        eventplanner    no      Vis alle
 read   eventplanner    no      Les
-permission     eventplanner    no      Rettighet
\ No newline at end of file
+permission     eventplanner    no      Rettighet
+maximum number of events       eventplanner    no      Maksimum antall 
arrangement
+number of users        eventplanner    no      Ca. antall brukere
\ No newline at end of file

Modified: branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/setup.inc.php        
2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch/eventplanner/setup/setup.inc.php        
2017-02-09 12:24:21 UTC (rev 16289)
@@ -11,7 +11,7 @@
         * @version $Id: setup.inc.php 14728 2016-02-11 22:28:46Z sigurdne $
         */
        $setup_info['eventplanner']['name'] = 'eventplanner';
-       $setup_info['eventplanner']['version'] = '0.9.18.006';
+       $setup_info['eventplanner']['version'] = '0.9.18.007';
        $setup_info['eventplanner']['app_order'] = 20;
        $setup_info['eventplanner']['enable'] = 1;
        $setup_info['eventplanner']['app_group'] = 'office';

Modified: branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php       
2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php       
2017-02-09 12:24:21 UTC (rev 16289)
@@ -86,12 +86,17 @@
                                'address_2' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => true),
                                'zip_code' => array('type' => 'varchar', 
'precision' => '10', 'nullable' => False),
                                'city' => array('type' => 'varchar', 
'precision' => '64', 'nullable' => False),
-                               'account_number' => array('type' => 'varchar', 
'precision' => '20', 'nullable' => False),
+                               'account_number' => array('type' => 'varchar', 
'precision' => '20', 'nullable' => true),
                                'category_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => false),
                                'active' => array('type' => 'int', 'nullable' 
=> False, 'precision' => '4', 'default' => 1),
                                'contact_name' => array('type' => 'text', 
'nullable' => False),
                                'contact_email' => array('type' => 'text', 
'nullable' => False),
                                'contact_phone' => array('type' => 'text', 
'nullable' => False),
+                               'contact2_name' => array('type' => 'text', 
'nullable' => true),
+                               'contact2_email' => array('type' => 'text', 
'nullable' => true),
+                               'contact2_phone' => array('type' => 'text', 
'nullable' => true),
+                               'number_of_users' => array('type' => 'int', 
'precision' => '4', 'nullable' => true),
+                               'max_events' => array('type' => 'int', 
'precision' => '4', 'nullable' => true),
                                'description' => array('type' => 'text', 
'nullable' => False),
                                'remark' => array('type' => 'text', 'nullable' 
=> True),
                                'secret' => array('type' => 'text', 'nullable' 
=> False),

Modified: branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php        
2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php        
2017-02-09 12:24:21 UTC (rev 16289)
@@ -153,6 +153,7 @@
                }
                return $GLOBALS['setup_info']['eventplanner']['currentver'];
        }
+
        $test[] = '0.9.18.005';
 
        function eventplanner_upgrade0_9_18_005()
@@ -183,3 +184,43 @@
                }
                return $GLOBALS['setup_info']['eventplanner']['currentver'];
        }
+
+       $test[] = '0.9.18.006';
+       function eventplanner_upgrade0_9_18_006()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer', 
'contact2_name', array(
+                       'type' => 'text',
+                       'nullable' => true
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer', 
'contact2_email', array(
+                       'type' => 'text',
+                       'nullable' => true
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer', 
'contact2_phone', array(
+                       'type' => 'text',
+                       'nullable' => true
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer', 
'max_events', array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer', 
'number_of_users', array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true
+               ));
+
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('eventplanner_customer','account_number',
 array(
+                       'type' => 'varchar',
+                       'precision' => '20',
+                       'nullable' => true));
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['eventplanner']['currentver'] = 
'0.9.18.007';
+               }
+               return $GLOBALS['setup_info']['eventplanner']['currentver'];
+       }

Modified: branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl        
2017-02-09 10:24:05 UTC (rev 16288)
+++ branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl        
2017-02-09 12:24:21 UTC (rev 16289)
@@ -34,6 +34,10 @@
                                <input type="hidden" id="active_tab" 
name="active_tab" value="{value_active_tab}"/>
                                <div id="first_tab">
                                        <fieldset>
+                                               <legend>
+                                                       <xsl:value-of 
select="php:function('lang', 'customer')"/>
+                                               </legend>
+
                                                <xsl:if test="customer/id > 0">
                                                        <div 
class="pure-control-group">
                                                                <label>
@@ -44,16 +48,6 @@
                                                        </div>
                                                </xsl:if>
                                                <div class="pure-control-group">
-                                                       <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'active')"/>
-                                                       </label>
-                                                       <input type="checkbox" 
name="active" id="active" value="1">
-                                                               <xsl:if 
test="customer/active = 1">
-                                                                       
<xsl:attribute name="checked" value="checked"/>
-                                                               </xsl:if>
-                                                       </input>
-                                               </div>
-                                               <div class="pure-control-group">
                                                        <xsl:variable 
name="lang_category">
                                                                <xsl:value-of 
select="php:function('lang', 'category')"/>
                                                        </xsl:variable>
@@ -152,6 +146,35 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'account number')"/>
+                                                       </label>
+                                                       <input type="text" 
id="account_number" name="account_number" value="{customer/account_number}">
+                                                               <xsl:attribute 
name="data-validation">
+                                                                       
<xsl:text>account_number</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'account number')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'number of users')"/>
+                                                       </label>
+                                                       <input type="text" 
name="number_of_users" value="{customer/number_of_users}">
+                                                               <xsl:attribute 
name="data-validation">
+                                                                       
<xsl:text>number</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'integer')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'contact name')"/>
                                                        </label>
                                                        <input type="text" 
name="contact_name" value="{customer/contact_name}">
@@ -199,22 +222,62 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'account number')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'contact name')"/>
+                                                               <xsl:text> 
2</xsl:text>
                                                        </label>
-                                                       <input type="text" 
id="account_number" name="account_number" value="{customer/account_number}">
+                                                       <input type="text" 
name="contact2_name" id="contact2_name" value="{customer/contact2_name}">
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'contact name')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'email')"/>
+                                                               <xsl:text> 
2</xsl:text>
+                                                       </label>
+                                                       <input type="text" 
name="contact2_email" id="contact2_email" value="{customer/contact2_email}">
                                                                <xsl:attribute 
name="data-validation">
-                                                                       
<xsl:text>account_number</xsl:text>
+                                                                       
<xsl:text>email</xsl:text>
                                                                </xsl:attribute>
                                                                <xsl:attribute 
name="data-validation-optional">
                                                                        
<xsl:text>true</xsl:text>
                                                                </xsl:attribute>
                                                                <xsl:attribute 
name="placeholder">
-                                                                       
<xsl:value-of select="php:function('lang', 'account number')"/>
+                                                                       
<xsl:value-of select="php:function('lang', 'email')"/>
                                                                </xsl:attribute>
                                                        </input>
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="valid_email = 1">
+                                                                       
<xsl:text> </xsl:text>
+                                                                       <a 
href="{link_create_user}">
+                                                                               
<xsl:value-of select="php:function('lang', 'create_user_based_on_email_link')"/>
+                                                                       </a>
+                                                               </xsl:when>
+                                                       </xsl:choose>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'contact phone')"/>
+                                                               <xsl:text> 
2</xsl:text>
+                                                       </label>
+                                                       <input type="text" 
name="contact2_phone" id="contact2_phone" value="{customer/contact2_phone}">
+                                                               <xsl:attribute 
name="data-validation-depends-on">
+                                                                       
<xsl:text>contact2_name</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'contact phone')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'description')"/>
                                                        </label>
                                                        <textarea cols="47" 
rows="7" name="description">
@@ -229,8 +292,36 @@
                                                                <xsl:value-of 
select="customer/remark"/>
                                                        </textarea>
                                                </div>
+                                       </fieldset>
+                                       <fieldset>
+                                               <legend>
+                                                       <xsl:value-of 
select="php:function('lang', 'proceedings')"/>
+                                               </legend>
                                                <div class="pure-control-group">
                                                        <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'active')"/>
+                                                       </label>
+                                                       <input type="checkbox" 
name="active" id="active" value="1">
+                                                               <xsl:if 
test="customer/active = 1">
+                                                                       
<xsl:attribute name="checked" value="checked"/>
+                                                               </xsl:if>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'maximum number of events')"/>
+                                                       </label>
+                                                       <input type="text" 
name="max_events" value="{customer/max_events}">
+                                                               <xsl:attribute 
name="data-validation">
+                                                                       
<xsl:text>number</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'integer')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'comment')"/>
                                                        </label>
                                                        <textarea cols="47" 
rows="7" name="comment">

Modified: 
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
===================================================================
--- 
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl    
    2017-02-09 10:24:05 UTC (rev 16288)
+++ 
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl    
    2017-02-09 12:24:21 UTC (rev 16289)
@@ -142,6 +142,35 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'account number')"/>
+                                                       </label>
+                                                       <input type="text" 
id="account_number" name="account_number" value="{customer/account_number}">
+                                                               <xsl:attribute 
name="data-validation">
+                                                                       
<xsl:text>account_number</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'account number')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'number of users')"/>
+                                                       </label>
+                                                       <input type="text" 
name="number_of_users" value="{customer/number_of_users}">
+                                                               <xsl:attribute 
name="data-validation">
+                                                                       
<xsl:text>number</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'integer')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'contact name')"/>
                                                        </label>
                                                        <input type="text" 
name="contact_name" value="{customer/contact_name}">
@@ -165,14 +194,6 @@
                                                                        
<xsl:value-of select="php:function('lang', 'email')"/>
                                                                </xsl:attribute>
                                                        </input>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="valid_email = 1">
-                                                                       
<xsl:text> </xsl:text>
-                                                                       <a 
href="{link_create_user}">
-                                                                               
<xsl:value-of select="php:function('lang', 'create_user_based_on_email_link')"/>
-                                                                       </a>
-                                                               </xsl:when>
-                                                       </xsl:choose>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
@@ -189,22 +210,54 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'account number')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'contact name')"/>
+                                                               <xsl:text> 
2</xsl:text>
                                                        </label>
-                                                       <input type="text" 
id="account_number" name="account_number" value="{customer/account_number}">
+                                                       <input type="text" 
name="contact2_name" id="contact2_name" value="{customer/contact2_name}">
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'contact name')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'email')"/>
+                                                               <xsl:text> 
2</xsl:text>
+                                                       </label>
+                                                       <input type="text" 
name="contact2_email" id="contact2_email" value="{customer/contact2_email}">
                                                                <xsl:attribute 
name="data-validation">
-                                                                       
<xsl:text>account_number</xsl:text>
+                                                                       
<xsl:text>email</xsl:text>
                                                                </xsl:attribute>
                                                                <xsl:attribute 
name="data-validation-optional">
                                                                        
<xsl:text>true</xsl:text>
                                                                </xsl:attribute>
                                                                <xsl:attribute 
name="placeholder">
-                                                                       
<xsl:value-of select="php:function('lang', 'account number')"/>
+                                                                       
<xsl:value-of select="php:function('lang', 'email')"/>
                                                                </xsl:attribute>
                                                        </input>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'contact phone')"/>
+                                                               <xsl:text> 
2</xsl:text>
+                                                       </label>
+                                                       <input type="text" 
name="contact2_phone" id="contact2_phone" value="{customer/contact2_phone}">
+                                                               <xsl:attribute 
name="data-validation-depends-on">
+                                                                       
<xsl:text>contact2_name</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:attribute 
name="placeholder">
+                                                                       
<xsl:value-of select="php:function('lang', 'contact phone')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'description')"/>
                                                        </label>
                                                        <textarea cols="47" 
rows="7" name="description">

Modified: 
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
--- 
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
   2017-02-09 10:24:05 UTC (rev 16288)
+++ 
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
   2017-02-09 12:24:21 UTC (rev 16289)
@@ -45,7 +45,6 @@
                protected $default_kostra_id = 9999; //dummy
                protected $debug = false;
                protected $skip_import = false;
-               protected $skip_email = false;
                protected $export;
                protected $skip_update_voucher_id = false;
 
@@ -65,21 +64,10 @@
                        $this->dateformat = $this->db->date_format();
                        $this->datetimeformat = $this->db->datetime_format();
                        $this->config = CreateObject('admin.soconfig', 
$GLOBALS['phpgw']->locations->get_id('property', '.invoice'));
-                       $this->send = CreateObject('phpgwapi.send');
 
                        include (PHPGW_SERVER_ROOT . 
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/Agresso_X114");
                        $this->export = new export_conv;
 
-                       $now = time() + 
(int)$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'] * 
3600;
-
-                       $now_hour = date('G', $now);
-                       $now_day = date('N', $now);
-
-                       if (($now_hour < 6 || $now_hour > 17) || $now_day > 5)
-                       {
-
-                               $this->skip_email = true;
-                       }
                }
 
                public function execute()
@@ -158,8 +146,6 @@
                        {
                                $this->receipt['error'][] = array('msg' => 
"Arkiv katalog '{$dirname}/archive/' ikke er ikke skrivbar - kontakt 
systemadminstrator for å korrigere");
                        }
-
-                       $this->remind();
                }
 
                protected function check_archive()
@@ -215,72 +201,6 @@
                        }
                }
 
-               protected function remind()
-               {
-                       if 
(!isset($GLOBALS['phpgw_info']['server']['smtp_server']) || 
!$GLOBALS['phpgw_info']['server']['smtp_server'])
-                       {
-                               return;
-                       }
-
-                       if ($this->skip_email || $this->debug)
-                       {
-                               return;
-                       }
-
-                       // max. one mail each day
-                       if 
((int)$GLOBALS['phpgw_info']['server']['invoice_mail_reminder_time'] < (time() 
- (3600 * 24)))
-                       {
-                               $toarray = array();
-                               $sql = 'SELECT DISTINCT oppsynsmannid as 
responsible FROM fm_ecobilag WHERE oppsynsigndato IS NULL AND oppsynsmannid IS 
NOT NULL AND saksigndato IS NULL';
-                               $this->db->query($sql, __LINE__, __FILE__);
-                               while ($this->db->next_record())
-                               {
-                                       $toarray[$this->db->f('responsible')] = 
true;
-                               }
-                               $sql = 'SELECT DISTINCT saksbehandlerid as 
responsible FROM fm_ecobilag WHERE saksigndato IS NULL AND saksbehandlerid IS 
NOT NULL AND oppsynsigndato IS NULL';
-                               $this->db->query($sql, __LINE__, __FILE__);
-                               while ($this->db->next_record())
-                               {
-                                       $toarray[$this->db->f('responsible')] = 
true;
-                               }
-                               $sql = 'SELECT DISTINCT budsjettansvarligid as 
responsible FROM fm_ecobilag WHERE saksigndato IS NOT NULL AND budsjettsigndato 
IS NULL AND budsjettansvarligid IS NOT NULL';
-                               $this->db->query($sql, __LINE__, __FILE__);
-
-                               while ($this->db->next_record())
-                               {
-                                       $toarray[$this->db->f('responsible')] = 
true;
-                               }
-
-                               $subject = 'Du har faktura til behandling';
-
-
-                               $from = "Ikke svar<address@hidden>";
-
-                               foreach ($toarray as $lid => $dummy)
-                               {
-                                       $prefs = 
$this->bocommon->create_preferences('property', 
$GLOBALS['phpgw']->accounts->name2id($lid));
-                                       if (isset($prefs['email']) && 
$prefs['email'])
-                                       {
-                                               $body = '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiinvoice2.index',
-                                                               'voucher_id' => 
$bilagsnr, 'user_lid' => $lid), false, true) . '">Link til 
fakturabehandling</a>';
-                                               try
-                                               {
-                                                       $rc = 
$this->send->msg('email', $prefs['email'], $subject, stripslashes($body), '', 
'', '', $from, '', 'html');
-                                               }
-                                               catch (phpmailerException $e)
-                                               {
-                                                       
$this->receipt['error'][] = array('msg' => $e->getMessage());
-                                               }
-                                       }
-                               }
-                               // save time of mail, to not send to many mails
-                               $config = createObject('phpgwapi.config', 
'phpgwapi');
-                               $config->read_repository();
-                               $config->value('invoice_mail_reminder_time', 
time());
-                               $config->save_repository();
-                       }
-               }
-
                protected function get_files()
                {
                        $server = $this->config->config_data['common']['host'];
@@ -571,29 +491,7 @@
                                {
                                        $this->receipt['error'][] = array('msg' 
=> "Importeres ikke: Ikke gyldig LeverandørId: {$_data['SUPPLIER.CODE']}, 
Skanningreferanse: {$_data['SCANNINGNO']}, FakturaNr: {$fakturanr}, fil: 
{$file}");
                                        $this->skip_import = true;
-
-                                       $to = 
isset($this->config->config_data['import']['email_on_error']) && 
$this->config->config_data['import']['email_on_error'] ? 
$this->config->config_data['import']['email_on_error'] : '';
-
-                                       if ($to && !$this->skip_email)
-                                       {
-                                               $from = "Ikke 
svar<address@hidden>";
-                                               $body = "Ikke gyldig 
leverandør, id: {$_data['SUPPLIER.CODE']}</br>";
-                                               $body .= '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.edit',
-                                                               'appname' => 
'property', 'type' => 'vendor'), false, true) . '">Link til å legge inn ny 
leverandør</a>';
-
-                                               try
-                                               {
-                                                       $rc = 
$this->send->msg('email', $to, 'Ikke gyldig leverandør ved import av faktura 
til Portico', $body, '', '', '', $from, '', 'html');
-                                                       if ($rc)
-                                                       {
-                                                               
$this->receipt['message'][] = array('msg' => "epost sendt til {$to}");
-                                                       }
-                                               }
-                                               catch (phpmailerException $e)
-                                               {
-                                                       
$this->receipt['error'][] = array('msg' => $e->getMessage());
-                                               }
-                                       }
+               
                                }
                                else if ($order_info['vendor_id'] != $vendor_id)
                                {
@@ -663,34 +561,6 @@
                                        }
                                }
 
-                               if ($order_info['toarray'] && 
(!$this->skip_email || !$this->debug))
-                               {
-
-                                       $from = "Ikke svar<address@hidden>";
-
-                                       $to = implode(';', 
$order_info['toarray']);
-
-                                       if 
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) && 
$GLOBALS['phpgw_info']['server']['smtp_server'])
-                                       {
-                                               $subject = 'Ny faktura venter 
på behandling';
-                                               $body = '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiinvoice2.index',
-                                                               'voucher_id' => 
$bilagsnr, 'query' => $bilagsnr, 'user_lid' => 'all'), false, true) . '">Link 
til fakturabehandling</a>';
-
-                                               try
-                                               {
-                                                       $rc = 
$this->send->msg('email', $to, $subject, stripslashes($body), '', $cc, $bcc, 
$from, '', 'html');
-                                               }
-                                               catch (phpmailerException $e)
-                                               {
-                                                       
$this->receipt['error'][] = array('msg' => $e->getMessage());
-                                               }
-                                       }
-                                       else
-                                       {
-                                               $this->receipt['error'][] = 
array('msg' => lang('SMTP server is not set! (admin section)'));
-                                       }
-                               }
-
                                $GLOBALS['phpgw']->db->Exception_On_Error = 
true;
 
                                try




reply via email to

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