fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [6815] Merge 6799:6814 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [6815] Merge 6799:6814 from trunk
Date: Fri, 21 Jan 2011 08:03:57 +0000

Revision: 6815
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6815
Author:   sigurdne
Date:     2011-01-21 08:03:56 +0000 (Fri, 21 Jan 2011)
Log Message:
-----------
Merge 6799:6814 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
    branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
    branches/Version-1_0-branch/property/inc/class.solookup.inc.php
    branches/Version-1_0-branch/property/inc/class.sotts.inc.php
    branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
    branches/Version-1_0-branch/property/inc/class.uitts.inc.php
    branches/Version-1_0-branch/property/setup/phpgw_no.lang
    branches/Version-1_0-branch/property/setup/setup.inc.php
    branches/Version-1_0-branch/property/setup/tables_current.inc.php
    branches/Version-1_0-branch/property/setup/tables_update.inc.php

Added Paths:
-----------
    branches/Version-1_0-branch/phpgwapi/js/yui3/

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


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php   
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php   
2011-01-21 08:03:56 UTC (rev 6815)
@@ -452,7 +452,7 @@
                public function read()
                {
                        if ( !is_object($this->account)
-                               || $this->account->id <> !$this->account_id )
+                               || $this->account->id != $this->account_id )
                        {
                                $this->read_repository();
                        }

Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php    
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php    
2011-01-21 08:03:56 UTC (rev 6815)
@@ -928,6 +928,7 @@
                                        );
                                break;
                        case 'b_account':
+                       case 'b_account_category':
                                $info = array
                                        (
                                                'table' => 
'fm_b_account_category',
@@ -939,11 +940,24 @@
                                                                'name' => 
'descr',
                                                                'descr' => 
lang('descr'),
                                                                'type' => 
'varchar'
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'active',
+                                                               'descr' => 
lang('active'),
+                                                               'type' => 
'checkbox',
+                                                               'default' => 
'checked'
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'project_group',
+                                                               'descr' => 
lang('mandatory project group'),
+                                                               'type' => 
'checkbox'
                                                        )
                                                ),
                                                'edit_msg'      => lang('edit'),
                                                'add_msg'       => lang('add'),
-                                               'name'          => lang('budget 
account'),
+                                               'name'          => lang('budget 
account group'),
                                                'acl_location' => '.admin',
                                                'menu_selection' => 
'admin::property::accounting::accounting_cats'
                                        );
@@ -1748,7 +1762,7 @@
                                                ),
                                                'edit_msg'                      
=> lang('edit'),
                                                'add_msg'                       
=> lang('add'),
-                                               'name'                          
=> lang('responsibility role'),
+                                               'name'                          
=> lang('custom menu items'),
                                                'acl_location'          => 
'.admin',
                                                'menu_selection'        => 
'admin::property::custom_menu_items',
                                                'default'                       
=> array

Modified: branches/Version-1_0-branch/property/inc/class.solookup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solookup.inc.php     
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/inc/class.solookup.inc.php     
2011-01-21 08:03:56 UTC (rev 6815)
@@ -186,6 +186,8 @@
                        $role           = isset($data['role'])?$data['role']:'';
                        $parent         = isset($data['parent']) && 
$data['parent'] ? (int)$data['parent'] : 0;
 
+                       $join = '';
+                       $filter_parent = '';
                        if($role == 'group')
                        {
                                $table = 'fm_b_account_category';
@@ -193,27 +195,21 @@
                        else
                        {
                                $table = 'fm_b_account';
+                               $join = " {$this->join} fm_b_account_category 
ON (fm_b_account.category = fm_b_account_category.id AND 
fm_b_account_category.active = 1)";
                        }
 
                        if ($order)
                        {
-                               $ordermethod = " ORDER BY $order $sort";
+                               $ordermethod = " ORDER BY {$table}.{$order} 
$sort";
                        }
                        else
                        {
-                               $ordermethod = ' ORDER BY id DESC';
+                               $ordermethod = " ORDER BY {$table}.id DESC";
                        }
 
-                       $where = 'WHERE';
+                       $filtermethod = " WHERE {$table}.active = 1";
+                       $where = 'AND';
 
-                       $filtermethod = '';
-
-                       if($role != 'group')
-                       {
-                               $filtermethod .= " {$where} active = 1";
-                               $where = 'AND';
-                       }
-
                        if($parent)
                        {
                                $filtermethod .= " {$where} category = 
{$parent}";
@@ -234,7 +230,7 @@
                                }
                        }
 
-                       $sql = "SELECT * FROM 
{$table}{$filtermethod}{$querymethod}";
+                       $sql = "SELECT {$table}.* FROM 
{$table}{$join}{$filtermethod}{$querymethod}";
 
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db->num_rows();
@@ -252,10 +248,10 @@
                        while ($this->db->next_record())
                        {
                                $b_account[] = array
-                                       (
-                                               'id'                    => 
$this->db->f('id'),
-                                               'descr'                 => 
$this->db->f('descr',true)
-                                       );
+                               (
+                                       'id'                    => 
$this->db->f('id'),
+                                       'descr'                 => 
$this->db->f('descr',true)
+                               );
                        }
 
                        return $b_account;

Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php        
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php        
2011-01-21 08:03:56 UTC (rev 6815)
@@ -312,6 +312,12 @@
                                $filtermethod .= ' OR (assignedto IS NULL AND 
group_id IN (' . implode(',',array_keys($membership)) . ')))'; 
                        }
 
+                       if ($user_id < 0)
+                       {
+                               $filtermethod .= " {$where} 
fm_tts_tickets.user_id=" . (int)abs($user_id);
+                               $where = 'AND';
+                       }
+
                        if ($owner_id > 0)
                        {
                                $filtermethod .= " $where 
fm_tts_tickets.user_id=" . (int)$owner_id;

Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php    
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php    
2011-01-21 08:03:56 UTC (rev 6815)
@@ -1071,6 +1071,27 @@
                                        $error_id=true;
                                }
 
+                               if(!isset($values['b_account_id']) || 
!$values['b_account_id'])
+                               {
+                                       
$receipt['error'][]=array('msg'=>lang('Please select an account group!'));
+                                       $error_id=true;
+                               }
+                               else
+                               {
+                                       $sogeneric              = 
CreateObject('property.sogeneric');
+                                       
$sogeneric->get_location_info('b_account_category',false);
+                                       $status_data    = 
$sogeneric->read_single(array('id' => (int)$values['b_account_id']),array());
+
+                                       if(isset($status_data['project_group']) 
&& $status_data['project_group'])//mandatory for this account group
+                                       {
+                                               
if(!isset($values['project_group']) || !$values['project_group'])
+                                               {
+                                                       
$receipt['error'][]=array('msg'=>lang('Please select a project group!'));
+                                                       $error_id=true;
+                                               }
+                                       }
+                               }
+
                                if(!isset($values['end_date']) || 
!$values['end_date'])
                                {
                                        
$receipt['error'][]=array('msg'=>lang('Please select an end date!'));

Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php        
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php        
2011-01-21 08:03:56 UTC (rev 6815)
@@ -513,7 +513,18 @@
                                        array_unshift 
($values_combo_box[1],$default_value);
 
                                        $values_combo_box[3]  = 
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_EDIT,$this->user_id,$this->acl_location);
-                                       array_unshift 
($values_combo_box[3],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
 tickets')));
+                                       array_unshift 
($values_combo_box[3],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('my
 assigned tickets')));
+                                       $_my_negative_self = (-1 * 
$GLOBALS['phpgw_info']['user']['account_id']);
+       
+                                       $default_value = array
+                                       (
+                                               'id'            => 
$_my_negative_self,
+                                               'name'          => lang('my 
submitted tickets'),
+                                               'selected'      => 
$_my_negative_self == $this->user_id
+                                       );
+                                       unset($_my_negative_self);
+                                       array_unshift 
($values_combo_box[3],$default_value);
+
                                        $default_value = 
array('id'=>'','name'=>lang('no user'));
                                        array_unshift 
($values_combo_box[3],$default_value);
 
@@ -3143,6 +3154,7 @@
                                $tab = 'general';
                        }
 
+
                        $tabs = array
                                (
                                        'general'               => 
array('label' => lang('general'), 'link' => '#general')

Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang    2011-01-20 
18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang    2011-01-21 
08:03:56 UTC (rev 6815)
@@ -1023,6 +1023,8 @@
 multiple checkbox      property        no      Flervalgs avkrysningsknapp
 multiple radio property        no      Flervalgs radioknapp
 my preferences property        no      Mine innstillinger
+my assigned tickets    property        no      Mine tildelte meldinger
+my submitted tickets   property        no      Mine innmeldte meldinger
 name not entered!      property        no      Navn er ikke angitt
 name of the user, eg. %1       property        no      Navn til bruker, %1
 narrow the search by dates     property        no      Avgrens s√łket med dato
@@ -1233,7 +1235,7 @@
 project categories     property        no      Prosjekt kategorier
 project coordinator    property        no      Prosjekt ansvarlig
 project end date       property        no      Prosjekt sluttdato
-project group  property        no      Prosjekt gruppe
+project group  property        no      Agresso prosjekt
 project id     property        no      Prosjekt ID
 project info   property        no      Prosjekt info.
 project name   property        no      Prosjekt navn

Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php    2011-01-20 
18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php    2011-01-21 
08:03:56 UTC (rev 6815)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.606';
+       $setup_info['property']['version']              = '0.9.17.607';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']               = 1;
        $setup_info['property']['app_group']    = 'office';

Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php   
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php   
2011-01-21 08:03:56 UTC (rev 6815)
@@ -468,7 +468,9 @@
                'fm_b_account_category' => array(
                        'fd' => array(
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
-                               'descr' => array('type' => 
'varchar','precision' => '255','nullable' => False)
+                               'descr' => array('type' => 
'varchar','precision' => '255','nullable' => False),
+                               'active' => array('type' => 'int','precision' 
=> '2','nullable' => True,'default' => '0'),
+                               'project_group' => array('type' => 
'int','precision' => '2','nullable' => True,'default' => '0')
                        ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php    
2011-01-20 18:41:26 UTC (rev 6814)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php    
2011-01-21 08:03:56 UTC (rev 6815)
@@ -4975,3 +4975,28 @@
                        return $GLOBALS['setup_info']['property']['currentver'];
                }
        }
+       
+
+       /**
+       * Update property version from 0.9.17.606 to 0.9.17.607
+       * Add authorities demands type to request
+       * 
+       */
+
+       $test[] = '0.9.17.606';
+       function property_upgrade0_9_17_606()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_b_account_category','active', 
array('type' => 'int','precision' => '2','nullable' => True,'default' => '0')); 
                            
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_b_account_category','project_group',
 array('type' => 'int','precision' => '2','nullable' => True,'default' => 
'0'));                              
+               $GLOBALS['phpgw_setup']->oProc->query('UPDATE 
fm_b_account_category SET active = 1',__LINE__,__FILE__);
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.607';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }
+
+




reply via email to

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