[Fmsystem-commits] [8425] property: tweaks

[Sigurd Nes]

Revision: 8425
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8425
Author:   sigurdne
Date:     2011-12-23 11:55:13 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
property: tweaks

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice.inc.php
    trunk/property/inc/cron/default/Import_fra_basware_X205.php
    trunk/property/setup/default_records.inc.php
    trunk/property/setup/phpgw_no.lang
    trunk/property/setup/tables_update.inc.php

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2011-12-23 11:37:50 UTC (rev 
8424)
+++ trunk/property/inc/class.uiinvoice.inc.php  2011-12-23 11:55:13 UTC (rev 
8425)
@@ -1634,7 +1634,7 @@
                                array(
                                        'col_name'=>'Remark',                   
'label'=>lang('Remark'),                'className'=>'centerClasss', 
'sortable'=>false, 'sort_field'=>'',                               
'visible'=>true),
                                array(
-                                       'col_name'=>'external_ref'              
,'label'=>lang('external_ref'), 'className'=>'centerClasss', 'sortable'=>false, 
'sort_field'=>'',                       'visible'=>true),
+                                       'col_name'=>'external_ref'              
,'label'=>lang('external ref'), 'className'=>'centerClasss', 'sortable'=>false, 
'sort_field'=>'',                       'visible'=>true),
                                array(
                                        'col_name'=>'counter',          
'visible'=>false),
                                array(

Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-12-23 
11:37:50 UTC (rev 8424)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-12-23 
11:55:13 UTC (rev 8425)
@@ -525,7 +525,7 @@
                        //FIXME - this should be configurable
                        if(!$order_info['budget_responsible'])
                        {
-                               $order_info['budget_responsible'] = 'karhal';
+                               $order_info['budget_responsible'] = 
isset($this->config->config_data['import']['budget_responsible']) && 
$this->config->config_data['import']['budget_responsible'] ? 
$this->config->config_data['import']['budget_responsible'] : 'karhal';
                        }
 
                        return $order_info;

Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php        2011-12-23 11:37:50 UTC 
(rev 8424)
+++ trunk/property/setup/default_records.inc.php        2011-12-23 11:55:13 UTC 
(rev 8425)
@@ -817,6 +817,15 @@
                        )
                );
 
+               $receipt = $custom_config->add_attrib(array
+                       (
+                               'section_id'    => 
$receipt_section_import['section_id'],
+                               'input_type'    => 'text',
+                               'name'                  => 'budget_responsible',
+                               'descr'                 => 'default initials if 
responsible can not be found',
+                       )
+               );
+
                //export
                $receipt_section_export = $custom_config->add_section(array
                        (

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2011-12-23 11:37:50 UTC (rev 8424)
+++ trunk/property/setup/phpgw_no.lang  2011-12-23 11:55:13 UTC (rev 8425)
@@ -1151,6 +1151,7 @@
 owner categories       property        no      Eier kategorier
 owner type     property        no      Eiertype
 paid   property        no      Betalt
+paid percent   property        no      Prosentvis betalt
 part of town   property        no      Bydel
 part of town id        property        no      Bydel
 payment date   property        no      Forfallsdato
@@ -1617,7 +1618,7 @@
 standard id    property        no      standard ID
 standard prefix        property        no      prefiks fo standard
 start  property        no      start
-start date     property        no      start dato
+start date     property        no      Startdato
 started        property        no      startet
 start project  property        no      Start prosjekt
 start this entity      property        no      Start denne entiteten

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2011-12-23 11:37:50 UTC (rev 
8424)
+++ trunk/property/setup/tables_update.inc.php  2011-12-23 11:55:13 UTC (rev 
8425)
@@ -5687,6 +5687,16 @@
                        )
                );
 
+               $receipt = $custom_config->add_attrib(array
+                       (
+                               'section_id'    => 
$receipt_section_import['section_id'],
+                               'input_type'    => 'text',
+                               'name'                  => 'budget_responsible',
+                               'descr'                 => 'default initials if 
responsible can not be found',
+                               'value'                 => 'karhal'
+                       )
+               );
+
                //export
                $receipt_section_export = $custom_config->add_section(array
                        (