Merge lp:~openerp-dev/openobject-addons/trunk-addons_issue12_hr-cha into lp:openobject-addons

[Ajay Chauhan(OpenERP)]

Hello,

   I have made changes to solve the issues of addons12.

Thanks,
Ajay Chauhan

[Purnendu Singh (OpenERP) (purnendu-singh)]

Seems Ok

Thanks,
Purnendu Singh

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-addons_issue12_hr-cha]

7552. By Ajay Chauhan(OpenERP) on 2012-10-01

[IMP] hr, hr_recruitment: made changes in form view

7553. By Ajay Chauhan(OpenERP) on 2012-10-05

[MERGE] merge with lp:openobject-addons

7554. By Ajay Chauhan(OpenERP) on 2012-10-08

[MERGE] merge with lp:openobject-addons

7555. By Ajay Chauhan(OpenERP) on 2012-10-10

[MERGE] merge with lp:openobject-addons

7556. By Ajay Chauhan(OpenERP) on 2012-10-11

[MERGE] merge with lp:openobject-addons

Unmerged revisions

7556. By Ajay Chauhan(OpenERP) on 2012-10-11

[MERGE] merge with lp:openobject-addons

=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2012-10-09 15:00:45 +0000
+++ hr/hr_view.xml	2012-10-11 05:22:21 +0000
@@ -334,13 +334,18 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                            <field name="department_id" class="oe_inline"/>
-                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                        </h1>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name" class="oe_inline"/></h1>
+                        </div>
+                        <div name="Department">
+                            <label for="department_id" class="oe_edit_only"/>
+                            <h1>
+                                <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                                <field name="department_id" class="oe_inline"/>
+                                <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
                                 <field name="no_of_employee" groups="base.group_user"/>
 
=== modified file 'hr_expense/security/ir.model.access.csv'
--- hr_expense/security/ir.model.access.csv	2012-09-20 08:56:09 +0000
+++ hr_expense/security/ir.model.access.csv	2012-10-11 05:22:21 +0000
@@ -9,6 +9,7 @@
 access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
 access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
 access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,1,1,1
 access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
 access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
 access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
 
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2012-10-04 16:10:09 +0000
+++ hr_holidays/hr_holidays_view.xml	2012-10-11 05:22:21 +0000
@@ -353,6 +353,32 @@
 
         <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
 
+        <record model="ir.actions.act_window" id="request_approve_allocation">
+            <field name="name">Allocation Requests Approve</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday_allocation_tree"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <menuitem name="Allocation Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
+
         <record model="ir.actions.act_window" id="open_company_allocation">
             <field name="name">Leaves Summary</field>
             <field name="res_model">hr.holidays</field>
 
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2012-10-08 10:00:32 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2012-10-11 05:22:21 +0000
@@ -342,7 +342,7 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="/form/sheet/h1" version="7.0" position="after">
+            <xpath expr="//div[@name='Department']" version="7.0" position="after">
                 <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                     <field name="alias_id" invisible="1" required="0"/>
                     <label for="alias_name" class="oe_edit_only"/>
 
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2012-10-02 20:40:23 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2012-10-11 05:22:21 +0000
@@ -135,6 +135,8 @@
     def _default_general_account(self, cr, uid, context=None):
         proxy = self.pool.get('hr.employee')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if not record_ids:
+            raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
         employee = proxy.browse(cr, uid, record_ids[0], context=context)
         if employee.product_id and employee.product_id.property_account_income:
             return employee.product_id.property_account_income.id
 
=== modified file 'hr_timesheet_sheet/wizard/hr_timesheet_current.py'
--- hr_timesheet_sheet/wizard/hr_timesheet_current.py	2012-10-02 15:15:20 +0000
+++ hr_timesheet_sheet/wizard/hr_timesheet_current.py	2012-10-11 05:22:21 +0000
@@ -35,7 +35,7 @@
 
         user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
         if not len(user_ids):
-            raise osv.except_osv(_('Error!'), _('Please define employee for your user!'))
+            raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
         ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
 
         if len(ids) > 1: