fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [14669] more on property


From: Sigurd Nes
Subject: [Fmsystem-commits] [14669] more on property
Date: Fri, 22 Jan 2016 13:11:29 +0000

Revision: 14669
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14669
Author:   sigurdne
Date:     2016-01-22 13:11:24 +0000 (Fri, 22 Jan 2016)
Log Message:
-----------
more on property

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.menu.inc.php
    branches/dev-syncromind/property/inc/class.sogeneric.inc.php
    branches/dev-syncromind/property/inc/class.uiXport.inc.php
    branches/dev-syncromind/property/inc/class.uibudget.inc.php
    branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
    branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
    branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
    branches/dev-syncromind/property/inc/class.uiproject.inc.php
    branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
    branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
    branches/dev-syncromind/property/js/portico/project.edit.js
    branches/dev-syncromind/property/js/portico/workorder.edit.js
    branches/dev-syncromind/property/setup/phpgw_no.lang
    branches/dev-syncromind/property/templates/base/project.xsl
    branches/dev-syncromind/property/templates/base/workorder.xsl

Modified: branches/dev-syncromind/property/inc/class.menu.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.menu.inc.php     2016-01-22 
12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.menu.inc.php     2016-01-22 
13:11:24 UTC (rev 14669)
@@ -1004,6 +1004,7 @@
                        if($acl->check('.invoice', PHPGW_ACL_READ, 'property'))
                        {
                                $children = array();
+                               $children_invoice = array();
                                if($acl->check('.invoice', PHPGW_ACL_PRIVATE, 
'property'))
                                {
                                        $children['investment'] = array
@@ -1012,18 +1013,25 @@
                                                'text' => lang('Investment 
value')
                                        );
 
-                                       $children['import'] = array
+                                       $children_invoice['invoice'] = array
                                                (
+                                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
"property.{$invoicehandler}.index")),
+                                                       'text' => 
lang('Invoice'),
+                                                       'image' => 
array('property', 'invoice'),
+                                       );
+
+                                       $children_invoice['import'] = array
+                                               (
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiXport.import')),
                                                'text' => lang('Import invoice')
                                        );
 
-                                       $children['export'] = array
+                                       $children_invoice['export'] = array
                                                (
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiXport.export')),
                                                'text' => lang('Export invoice')
                                        );
-                                       $children['rollback'] = array
+                                       $children_invoice['rollback'] = array
                                                (
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiXport.rollback')),
                                                'text' => lang('Roll back')
@@ -1032,20 +1040,23 @@
 
                                if($acl->check('.invoice', PHPGW_ACL_ADD, 
'property'))
                                {
-                                       $children['add'] = array
+                                       $children_invoice['add'] = array
                                                (
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiinvoice.add')),
                                                'text' => lang('Add')
                                        );
                                }
 
-                               $menus['navigation']['invoice'] = array
+
+                               $invoice = array_merge(array
                                        (
-                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
"property.{$invoicehandler}.index")),
-                                       'text' => lang('Invoice'),
-                                       'image' => array('property', 'invoice'),
-                                       'children' => array_merge(array
-                                               (
+                                               'invoice' => array
+                                                       (
+                                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
"property.{$invoicehandler}.index")),
+                                                       'text' => 
lang('Invoice'),
+                                                       'image' => 
array('property', 'invoice'),
+                                                       'children'      => 
$children_invoice,
+                                               ),
                                                'deposition' => array
                                                        (
                                                        'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiinvoice.reporting',
@@ -1093,13 +1104,13 @@
                                                        'text' => lang('Tenant 
claim'),
                                                        'image' => 
array('property', 'project_tenant_claim')
                                                )
-                                       ), $children)
-                               );
+                                       ), $children);
                        }
 
+                       $budget = array();
                        if($acl->check('.budget', PHPGW_ACL_READ, 'property'))
                        {
-                               $menus['navigation']['budget'] = array
+                               $budget['budget'] = array
                                        (
                                        'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uibudget.index')),
                                        'text' => lang('Budget'),
@@ -1121,7 +1132,7 @@
 
                                if($acl->check('.budget.basis', PHPGW_ACL_READ, 
'property'))
                                {
-                                       
$menus['navigation']['budget']['children']['basis'] = array
+                                       $budget['budget']['children']['basis'] 
= array
                                                (
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uibudget.basis')),
                                                'text' => lang('basis')
@@ -1129,6 +1140,14 @@
                                }
                        }
 
+                       $menus['navigation']['economy'] = array
+                                       (
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
"property.{$invoicehandler}.index")),
+                                       'text' => lang('economy'),
+                                       'image' => array('property', 'invoice'),
+                                       'children' => 
array_merge($invoice,$budget)
+                                       );
+
                        if($acl->check('.agreement', PHPGW_ACL_READ, 
'property'))
                        {
                                $admin_menu = array();

Modified: branches/dev-syncromind/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sogeneric.inc.php        
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.sogeneric.inc.php        
2016-01-22 13:11:24 UTC (rev 14669)
@@ -815,7 +815,7 @@
                                                'name' => lang('vendor'),
                                                'acl_app' => 'property',
                                                'acl_location' => '.vendor',
-                                               'menu_selection' => 
'property::invoice::vendor',
+                                               'menu_selection' => 
'property::economy::vendor',
                                                'default' => array
                                                        (
                                                        'owner_id' => 
array('add' => '$this->account'),
@@ -1668,7 +1668,7 @@
                                                'name' => lang('budget 
account'),
                                                'acl_app' => 'property',
                                                'acl_location' => '.b_account',
-                                               'menu_selection' => 
'property::invoice::budget_account',
+                                               'menu_selection' => 
'property::economy::budget_account',
                                                'default' => array
                                                        (
                                                        'user_id' => 
array('add' => '$this->account'),

Modified: branches/dev-syncromind/property/inc/class.uiXport.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiXport.inc.php  2016-01-22 
12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uiXport.inc.php  2016-01-22 
13:11:24 UTC (rev 14669)
@@ -52,7 +52,7 @@
                {
 
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::invoice';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::invoice';
                        $this->bo = CreateObject('property.boXport', true);
                        $this->invoice = CreateObject('property.boinvoice');
                        $this->bocommon = CreateObject('property.bocommon');
@@ -569,7 +569,7 @@
                                        'perm' => 16, 'acl_location' => 
$this->acl_location));
                        }
 
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::invoice::rollback';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::invoice::rollback';
 
                        $GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
                                'search_field'));

Modified: branches/dev-syncromind/property/inc/class.uibudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uibudget.inc.php 2016-01-22 
12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uibudget.inc.php 2016-01-22 
13:11:24 UTC (rev 14669)
@@ -69,7 +69,7 @@
                        parent::__construct();
 
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::budget';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::budget';
 
                        $this->account = 
$GLOBALS['phpgw_info']['user']['account_id'];
 

Modified: branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvestment.inc.php     
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uiinvestment.inc.php     
2016-01-22 13:11:24 UTC (rev 14669)
@@ -59,7 +59,7 @@
                        parent::__construct();
 
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::invoice::investment';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::investment';
 
                        $this->account = 
$GLOBALS['phpgw_info']['user']['account_id'];
 

Modified: branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice.inc.php        
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uiinvoice.inc.php        
2016-01-22 13:11:24 UTC (rev 14669)
@@ -70,7 +70,7 @@
                        parent::__construct();
 
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::invoice';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::invoice';
                        $this->account = 
$GLOBALS['phpgw_info']['user']['account_id'];
 
                        $this->bo = CreateObject('property.boinvoice', true);
@@ -308,8 +308,12 @@
                        //-- ubica focus del menu derecho
                        if($paid)
                        {
-                               
$GLOBALS['phpgw_info']['flags']['menu_selection'] .= '::paid';
+                               
$GLOBALS['phpgw_info']['flags']['menu_selection'] = 'property::economy::paid';
                        }
+                       else
+                       {
+                               
$GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::invoice::invoice';
+                       }
                        //-- captura datos de URL
                        $start_date = urldecode($start_date);
                        $end_date = urldecode($end_date);
@@ -2351,7 +2355,7 @@
                        $ecodimb = phpgw::get_var('ecodimb');
 
                        //-- ubica focus del menu derecho
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] .= 
'::consume';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::consume';
 
                        //-- captura datos de URL
                        $start_date = urldecode($start_date);
@@ -3363,7 +3367,7 @@
 
                        $type = phpgw::get_var('type', 'string', 'GET', 
'deposition');
 
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] .= 
"::{$type}";
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"property::economy::{$type}";
 
                        $values = phpgw::get_var('values');
 

Modified: branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php       
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php       
2016-01-22 13:11:24 UTC (rev 14669)
@@ -75,8 +75,7 @@
                        $this->status_id = $this->bo->status_id;
                        $this->allrows = $this->bo->allrows;
 
-                       self::set_active_menu('property::invoice::invoice');
-//                     $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::invoice::invoice2';
+                       self::set_active_menu('property::economy::invoice');
                        $this->config = CreateObject('phpgwapi.config', 
'property');
                        $this->config->read();
                }

Modified: branches/dev-syncromind/property/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiproject.inc.php        
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uiproject.inc.php        
2016-01-22 13:11:24 UTC (rev 14669)
@@ -2027,7 +2027,7 @@
                        $msgbox_data = 
$this->bocommon->msgbox_data($this->receipt);
 
                        $project_type_id = isset($values['project_type_id']) && 
$values['project_type_id'] ? $values['project_type_id'] : 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_type'];
-                       $selected_tab = phpgw::get_var('tab', 'string', 
'REQUEST', 'general');
+                       $active_tab = phpgw::get_var('tab', 'string', 
'REQUEST', 'general');
 
                        $data = array
                                (
@@ -2043,7 +2043,7 @@
                                'b_account_data' => $b_account_data,
                                'ecodimb_data' => $ecodimb_data,
                                'contact_data' => $contact_data,
-                               'tabs' => self::_generate_tabs($tabs, 
$selected_tab, array('documents' => $id ? false : true,
+                               'tabs' => self::_generate_tabs($tabs, 
$active_tab, array('documents' => $id ? false : true,
                                        'history' => $id ? false : true)),
                                'msgbox_data' => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'value_origin' => isset($values['origin']) ? 
$values['origin'] : '',

Modified: branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php   
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php   
2016-01-22 13:11:24 UTC (rev 14669)
@@ -58,7 +58,7 @@
                        parent::__construct();
 
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::invoice::claim';
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::economy::claim';
 
                        $this->account = 
$GLOBALS['phpgw_info']['user']['account_id'];
 

Modified: branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiworkorder.inc.php      
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/inc/class.uiworkorder.inc.php      
2016-01-22 13:11:24 UTC (rev 14669)
@@ -868,7 +868,7 @@
                {
                        if(!$_POST)
                        {
-                               return  $this->edit();
+                               return $this->edit();
                        }
 
                        $id = phpgw::get_var('id', 'int');
@@ -1806,6 +1806,7 @@
                        $sum_oblications = 0;
                        $actual_cost = 0;
                        $diff = 0;
+                       $deviation = 0;
                        foreach($content_budget as & $b_entry)
                        {
                                $checked = $b_entry['active'] ? 
'checked="checked"' : '';
@@ -1830,14 +1831,18 @@
                                        $b_entry['closed'] = $b_entry['closed'] 
? 'X' : '';
                                }
 
+                               if($b_entry['active'] == 1)
+                               {
+                                       $budget += $b_entry['budget'];
+                                       $sum_orders += $b_entry['sum_orders'];
+                                       $sum_oblications += 
$b_entry['sum_oblications'];
+                                       $actual_cost += $b_entry['actual_cost'];
+                                       $diff += $b_entry['diff'];
+                                       $deviation += 
$b_entry['deviation_period'];
+                               }
+
                                $b_entry['active'] = "<input type='checkbox' 
name='values[active_b_period][]' value='{$b_entry['year']}_{$b_entry['month']}' 
title='{$lang_active}' {$checked} {$disabled}>";
-                               $b_entry['active_orig'] = "<input 
type='checkbox' name='values[active_orig_b_period][]' 
value='{$b_entry['year']}_{$b_entry['month']}' {$checked} {$disabled}>";
-
-                               $budget += $b_entry['budget'];
-                               $sum_orders += $b_entry['sum_orders'];
-                               $sum_oblications += $b_entry['sum_oblications'];
-                               $actual_cost += $b_entry['actual_cost'];
-                               $diff += $b_entry['diff'];
+                               $b_entry['active_orig'] = "<input 
type='checkbox' name='values[active_orig_b_period][]' 
value='{$b_entry['year']}_{$b_entry['month']}' {$checked} {$disabled} 
style='display:none'>";
                        }
                        unset($b_entry);
 
@@ -1857,7 +1862,7 @@
                                array('key' => 'diff', 'label' => 
lang('difference'), 'sortable' => false, 'className' => 'right',
                                        'formatter' => 
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($diff, 0, 
$this->decimal_separator, ' ')),
                                array('key' => 'deviation_period', 'label' => 
lang('deviation'), 'sortable' => false,
-                                       'className' => 'right', 'formatter' => 
'JqueryPortico.FormatterAmount0'),
+                                       'className' => 'right', 'formatter' => 
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($deviation, 
0, $this->decimal_separator, ' ')),
                                array('key' => 'deviation_acc', 'label' => 
lang('deviation') . '::' . lang('accumulated'),
                                        'sortable' => false, 'className' => 
'right', 'formatter' => 'JqueryPortico.FormatterAmount0'),
                                array('key' => 'deviation_percent_period', 
'label' => lang('deviation') . '::' . lang('percent'),
@@ -1865,9 +1870,8 @@
                                array('key' => 'deviation_percent_acc', 'label' 
=> lang('percent') . '::' . lang('accumulated'),
                                        'sortable' => false, 'className' => 
'right', 'formatter' => 'JqueryPortico.FormatterAmount2'),
                                array('key' => 'closed', 'label' => 
lang('closed'), 'sortable' => false, 'className' => 'center'),
-                               array('key' => 'active', 'label' => 
lang('active'), 'sortable' => false, 'className' => 'center'),
-                               array('key' => 'active_orig', 'hidden' => true),
-                               array('key' => 'flag_active', 'hidden' => true),
+                               array('key' => 'active', 'label' => 
lang('active'), 'sortable' => false, 'className' => 'center',
+                                       'formatter' => 
'JqueryPortico.FormatterActive'),
                                array('key' => 'delete_period', 'label' => 
lang('Delete'), 'sortable' => false,
                                        'className' => 'center')
                        );
@@ -1948,6 +1952,8 @@
 
                        $msgbox_data = 
$this->bocommon->msgbox_data($this->receipt);
 
+                       $active_tab = phpgw::get_var('tab', 'string', 
'REQUEST', 'general');
+
                        $data = array
                                (
                                'datatable_def' => $datatable_def,
@@ -1960,7 +1966,7 @@
                                'lang_claim' => lang('claim'),
                                'suppressmeter' => 
isset($config->config_data['project_suppressmeter']) && 
$config->config_data['project_suppressmeter'] ? 1 : '',
                                'suppresscoordination' => $suppresscoordination,
-                               'tabs' => self::_generate_tabs(array(), 
array('documents' => $id ? false : true,
+                               'tabs' => self::_generate_tabs(array(), 
$active_tab, array('documents' => $id ? false : true,
                                        'history' => $id ? false : true)),
                                'msgbox_data' => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'value_origin' => isset($values['origin']) ? 
$values['origin'] : '',
@@ -2505,17 +2511,15 @@
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('delete' => $data));
                }
 
-               protected function _generate_tabs($tabs_ = array(), $suppress = 
array(), $selected = 'general')
+               protected function _generate_tabs($tabs_ = array(), $active_tab 
= 'general', $suppress = array())
                {
                        $tabs = array
                                (
                                'general' => array('label' => lang('general'), 
'link' => '#general', 'function' => "set_tab('general')"),
-                               'budget' => array('label' => lang('Time and 
budget'), 'link' => '#budget',
-                                       'function' => "set_tab('budget')"),
+                               'budget' => array('label' => lang('Time and 
budget'), 'link' => '#budget', 'function' => "set_tab('budget')"),
                                'coordination' => array('label' => 
lang('coordination'), 'link' => '#coordination',
                                        'function' => 
"set_tab('coordination')"),
-                               'documents' => array('label' => 
lang('documents'), 'link' => '#documents',
-                                       'function' => "set_tab('documents')"),
+                               'documents' => array('label' => 
lang('documents'), 'link' => '#documents', 'function' => 
"set_tab('documents')"),
                                'history' => array('label' => lang('history'), 
'link' => '#history', 'function' => "set_tab('history')"),
                        );
                        $tabs = array_merge($tabs, $tabs_);
@@ -2528,6 +2532,6 @@
                                }
                        }
 
-                       return phpgwapi_jquery::tabview_generate($tabs, 
$selected);
+                       return phpgwapi_jquery::tabview_generate($tabs, 
$active_tab);
                }
        }
\ No newline at end of file

Modified: branches/dev-syncromind/property/js/portico/project.edit.js
===================================================================
--- branches/dev-syncromind/property/js/portico/project.edit.js 2016-01-22 
12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/js/portico/project.edit.js 2016-01-22 
13:11:24 UTC (rev 14669)
@@ -212,7 +212,7 @@
 
 function set_tab(tab)
 {
-       document.form.tab.value = tab;
+       $("#project_tab").val(tab);
 }
 
 $(document).ready(function () {

Modified: branches/dev-syncromind/property/js/portico/workorder.edit.js
===================================================================
--- branches/dev-syncromind/property/js/portico/workorder.edit.js       
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/js/portico/workorder.edit.js       
2016-01-22 13:11:24 UTC (rev 14669)
@@ -84,7 +84,7 @@
 }
 function set_tab(tab)
 {
-       document.form.tab.value = tab;
+       $("#order_tab").val(tab);
 }
 
 this.showlightbox_manual_invoide = function (workorder_id)
@@ -137,4 +137,8 @@
                        d.addEventListener('DOMAttrModified', 
onDOMAttrModified, false);
                }
        }
-});
\ No newline at end of file
+});
+
+JqueryPortico.FormatterActive = function (key, oData) {
+       return "<div align=\"center\">" + oData['active'] + 
oData['active_orig'] + "</div>";
+};

Modified: branches/dev-syncromind/property/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/property/setup/phpgw_no.lang        2016-01-22 
12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/setup/phpgw_no.lang        2016-01-22 
13:11:24 UTC (rev 14669)
@@ -1,3 +1,4 @@
+economy        property        no      Økonomi
 %1 buildings has been updated to not active of %2 already not active   
property        no      %1 Bygninger er oppdatert til IKKE AKTIVE av %2 som var 
IKKE AKTIVE fra før
 %1 entrances has been updated to not active of %2 already not active   
property        no      %1 Innganger er oppdatert til IKKE AKTIVE av %2 som var 
IKKE AKTIVE fra før
 %1 entries is added!   property        no      %1 poster er lagt til

Modified: branches/dev-syncromind/property/templates/base/project.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/project.xsl 2016-01-22 
12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/templates/base/project.xsl 2016-01-22 
13:11:24 UTC (rev 14669)
@@ -56,7 +56,7 @@
                <xsl:variable name="decimal_separator">
                        <xsl:value-of select="decimal_separator"/>
                </xsl:variable>
-               <input type="hidden" name="tab" value=""/>
+               <input id="project_tab" type="hidden" name="tab" value=""/>
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                        <div id="general">

Modified: branches/dev-syncromind/property/templates/base/workorder.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/workorder.xsl       
2016-01-22 12:33:38 UTC (rev 14668)
+++ branches/dev-syncromind/property/templates/base/workorder.xsl       
2016-01-22 13:11:24 UTC (rev 14669)
@@ -157,7 +157,7 @@
                        <xsl:value-of select="decimal_separator"/>
                </xsl:variable>
 
-               <input type="hidden" name="tab" value=""/>
+               <input id="order_tab" type="hidden" name="tab" value=""/>
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                        <div id="general">




reply via email to

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