Merge lp:~vauxoo/addons-vauxoo/7.0-account_voucher_requester-rev-1824-kty into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa

[Katherine Zaoral (Vauxoo)]

[MERGE] account voucher requester is a user instead of a employee and the account voucher department is cauclate using the current logged user.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

waiting for runbot.

[lp:~vauxoo/addons-vauxoo/7.0-account_voucher_requester-rev-1824-kty]

1073. By Katherine Zaoral (Vauxoo) on 2014-07-14

[ADD] add the current user as the default value of the requester field.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

the runbot is green.
And the functional test works propertly.
I will proceed with the merge.

review: Approve

=== modified file 'account_voucher_department/i18n/account_voucher_department.pot'
--- account_voucher_department/i18n/account_voucher_department.pot	2014-07-08 20:08:57 +0000
+++ account_voucher_department/i18n/account_voucher_department.pot	2014-07-14 21:12:56 +0000
@@ -30,8 +30,3 @@
 msgid "Accounting Voucher"
 msgstr ""
 
-#. module: account_voucher_department
-#: view:account.voucher:0
-msgid "onchange_employee_id(employee_id)"
-msgstr ""
-
 
=== modified file 'account_voucher_department/model/account_voucher.py'
--- account_voucher_department/model/account_voucher.py	2014-07-08 19:26:51 +0000
+++ account_voucher_department/model/account_voucher.py	2014-07-14 21:12:56 +0000
@@ -38,16 +38,6 @@
             help='Department were the requester belongs.'),
     }
 
-    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
-        """ Return the department depending of the employee.
-        @param employee_id: employee id
-        """
-        context = context or {}
-        res = {}
-        he_obj = self.pool.get('hr.employee')
-        if employee_id:
-            he_brw = he_obj.browse(cr, uid, employee_id, context=context)
-            department_id = (he_brw.department_id and he_brw.department_id.id
-                or False)
-            res.update({'value': {'department_id': department_id}})
-        return res
+    _defaults = {
+        'department_id': lambda self, cur, uid, cxt: self.pool.get('res.users').browse(cur, uid, uid, cxt).employee_ids[0].department_id.id,
+    }
 
=== modified file 'account_voucher_department/view/account_voucher_view.xml'
--- account_voucher_department/view/account_voucher_view.xml	2014-07-08 19:29:40 +0000
+++ account_voucher_department/view/account_voucher_view.xml	2014-07-14 21:12:56 +0000
@@ -7,10 +7,7 @@
             <field name="model">account.voucher</field>
             <field name="inherit_id" ref="account_voucher_requester.account_voucher_requester_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='employee_id']" position="attributes">
-                    <attribute name="on_change">onchange_employee_id(employee_id)</attribute>
-                </xpath>
-                <xpath expr="//field[@name='employee_id']" position="after">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="department_id"/>
                 </xpath>
             </field>
 
=== modified file 'account_voucher_requester/__openerp__.py'
--- account_voucher_requester/__openerp__.py	2014-07-08 18:40:48 +0000
+++ account_voucher_requester/__openerp__.py	2014-07-14 21:12:56 +0000
@@ -33,11 +33,11 @@
 Account Voucher Requester
 =========================
 
-This module add an employee field to the account voucher model. 
+This module add an user field to the account voucher model to be the account
+voucher requester. 
 ''',
     'depends': [
         'account_voucher',
-        'hr',
         ],
     'data': [
         'view/account_voucher_view.xml',
 
=== modified file 'account_voucher_requester/i18n/account_voucher_requester.pot'
--- account_voucher_requester/i18n/account_voucher_requester.pot	2014-07-08 20:08:57 +0000
+++ account_voucher_requester/i18n/account_voucher_requester.pot	2014-07-14 21:12:56 +0000
@@ -21,12 +21,12 @@
 msgstr ""
 
 #. module: account_voucher_requester
-#: help:account.voucher,employee_id:0
+#: help:account.voucher,user_id:0
 msgid "Requester Employee"
 msgstr ""
 
 #. module: account_voucher_requester
-#: field:account.voucher,employee_id:0
+#: field:account.voucher,user_id:0
 msgid "Requester"
 msgstr ""
 
 
=== modified file 'account_voucher_requester/model/account_voucher.py'
--- account_voucher_requester/model/account_voucher.py	2014-07-08 18:37:04 +0000
+++ account_voucher_requester/model/account_voucher.py	2014-07-14 21:12:56 +0000
@@ -32,8 +32,12 @@
 
     _inherit = 'account.voucher'
     _columns = {
-        'employee_id': fields.many2one(
-            'hr.employee',
+        'user_id': fields.many2one(
+            'res.users',
             string='Requester',
-            help='Requester Employee'),
+            help='Requester User'),
+    }
+
+    _defaults = {
+        'user_id': lambda self, cur, uid, cxt: uid,
     }
 
=== modified file 'account_voucher_requester/view/account_voucher_view.xml'
--- account_voucher_requester/view/account_voucher_view.xml	2014-07-08 18:46:43 +0000
+++ account_voucher_requester/view/account_voucher_view.xml	2014-07-14 21:12:56 +0000
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='journal_id']" position="after">
-                    <field name="employee_id"/>
+                    <field name="user_id"/>
                 </xpath>
             </field>
         </record>