[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20110214045210-i0z86auggdmuavcf

addons/account/account_move_line.py

@@ -678,6 +678,13 @@ class account_move_line(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
+        if context and context.get('chart_of_account', False):
+            if context.get('periods', False):
+                args.append(('period_id', 'in', context['periods']))
+            if context.get('state', False) and context['state'] == 'posted':
+                args.append(('state', '=', 'valid'))
+            if context.get('fiscalyear', False):
+                args.append(('period_id.fiscalyear_id', '=', context['fiscalyear']))
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.get_next_partner_only(cr, uid, offset, context)

addons/account/wizard/account_chart_view.xml

@@ -31,6 +31,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_chart"/>
             <field name="target">new</field>
+            <field name="context">{'chart_of_account': 1}</field>
             <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
         </record>
 

addons/hr_holidays/security/ir_rule.xml

@@ -5,7 +5,7 @@
     <record id="property_rule_holidays" model="ir.rule">
         <field name="name">Employee Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id', '=', user.id)]</field>
         <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
     </record>
     <record id="property_rule_holidays_manager" model="ir.rule">

addons/web_uservoice/web/controllers.py

@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.controllers import SecuredController
-from openerp.utils import rpc
+from openobject import rpc
 from openobject.tools import expose
 import cherrypy