[Fmsystem-commits] [16170] more on eventplanner

[sigurdne]

Revision: 16170
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16170
Author:   sigurdne
Date:     2017-01-19 10:47:50 -0500 (Thu, 19 Jan 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uivendor_report.inc.php
    trunk/eventplanner/inc/model/class.customer.inc.php
    trunk/eventplanner/inc/model/class.vendor.inc.php
    trunk/eventplanner/setup/phpgw_no.lang

Modified: trunk/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor_report.inc.php        2017-01-19 
14:08:10 UTC (rev 16169)
+++ trunk/eventplanner/inc/class.uivendor_report.inc.php        2017-01-19 
15:47:50 UTC (rev 16170)
@@ -29,7 +29,7 @@
        phpgw::import_class('phpgwapi.uicommon');
        phpgw::import_class('phpgwapi.datetime');
 
-       include_class('eventplanner', 'vendor_report', 'inc/model/');
+//     include_class('eventplanner', 'vendor_report', 'inc/model/');
 
        class eventplanner_uivendor_report extends phpgwapi_uicommon
        {

Modified: trunk/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.customer.inc.php 2017-01-19 14:08:10 UTC 
(rev 16169)
+++ trunk/eventplanner/inc/model/class.customer.inc.php 2017-01-19 15:47:50 UTC 
(rev 16170)
@@ -200,7 +200,7 @@
                                        'required' => true,
                                        'query' => true,
                                        'sf_validator' => 
createObject('booking.sfValidatorNorwegianOrganizationNumber', array(), 
array('invalid' => '%field% is invalid')),
-                                       'label' => 'organization_number'
+                                       'label' => 'organization number'
                                        ),
                                'comments' => array(
                                        'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,

Modified: trunk/eventplanner/inc/model/class.vendor.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.vendor.inc.php   2017-01-19 14:08:10 UTC 
(rev 16169)
+++ trunk/eventplanner/inc/model/class.vendor.inc.php   2017-01-19 15:47:50 UTC 
(rev 16170)
@@ -200,7 +200,7 @@
                                        'required' => true,
                                        'query' => true,
                                        'sf_validator' => 
createObject('booking.sfValidatorNorwegianOrganizationNumber', array(), 
array('invalid' => '%field% is invalid')),
-                                       'label' => 'organization_number'
+                                       'label' => 'organization number'
                                        ),
                                'comments' => array(
                                        'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-01-19 14:08:10 UTC (rev 
16169)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-01-19 15:47:50 UTC (rev 
16170)
@@ -71,4 +71,7 @@
 reports        eventplanner    no      Rapporter
 location       eventplanner    no      Lokalisering
 who    eventplanner    no      Hvem
-note   eventplanner    no      Merknad
\ No newline at end of file
+note   eventplanner    no      Merknad
+customer       eventplanner    no      Mottakersted
+customer report        eventplanner    no      Rapport fra mottakersted
+organization number    eventplanner    no      Organisasjonsnummer
\ No newline at end of file