Merge lp:~vauxoo/openobject-addons/7.0-add_partner_field_hr_salary_rule_vauxoo_dev_ernesto into lp:openobject-addons/7.0

[Luis Ernesto García Medina - http://www.vauxoo.com]

partner_employee_ok name field. If this field check with True, it will be create journal entries with partner from partner of employee otherwise the partner of salary rule is assigned. where if the field is not selected and no partner is assigned to the salary rule no partner is assigned to the line

[lp:~vauxoo/openobject-addons/7.0-add_partner_field_hr_salary_rule_vauxoo_dev_ernesto]

10067. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-07-01

[MERGE] merge with lp:openobject-addons/7.0

Unmerged revisions

10067. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-07-01

[MERGE] merge with lp:openobject-addons/7.0

10066. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-06-10

[IMP][hr_payroll_account] Changes partner_employee_ok where if the field is not selected and no partner is assigned to the salary rule no partner is assigned to the line

10065. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-06-09

[REF][hr_payroll, hr_payroll_account] Changes partner_employee_ok name field. If this field check with True, it will be create journal entries with partner from partner of employee otherwise the partner of salary rule is assigned

10064. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-06-02

[IMP][hr_payroll, hr_payroll_account] added partner_employee_ok and partner_id fields to hr_salary_rule, if field partner_employee_ok is active the partner of the salary rule are assigned to the journal entries, if not , is assigned partner employee.

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2014-04-02 08:29:54 +0000
+++ hr_payroll/hr_payroll.py	2014-07-01 15:32:59 +0000
@@ -801,6 +801,8 @@
         'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Eventual third party involved in the salary payment of the employees."),
         'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'),
         'note':fields.text('Description'),
+        'partner_employee_ok': fields.boolean('Use the partner employee', help="If this field check with True, it will be create journal entries with partner from partner of employee."),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
      }
     _defaults = {
         'amount_python_compute': '''
@@ -844,6 +846,7 @@
         'amount_fix': 0.0,
         'amount_percentage': 0.0,
         'quantity': '1.0',
+        'partner_employee_ok': True,
      }
 
     def _recursive_search_of_rules(self, cr, uid, rule_ids, context=None):

=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py	2014-03-04 11:31:17 +0000
+++ hr_payroll_account/hr_payroll_account.py	2014-07-01 15:32:59 +0000
@@ -112,7 +112,7 @@
             }
             for line in slip.details_by_salary_rule_category:
                 amt = slip.credit_note and -line.total or line.total
-                partner_id = line.salary_rule_id.register_id.partner_id and line.salary_rule_id.register_id.partner_id.id or default_partner_id
+                partner_id = (line.salary_rule_id.partner_id and line.salary_rule_id.partner_id.id) or line.salary_rule_id.register_id.partner_id and line.salary_rule_id.register_id.partner_id.id
                 debit_account_id = line.salary_rule_id.account_debit.id
                 credit_account_id = line.salary_rule_id.account_credit.id
 
@@ -121,7 +121,7 @@
                     debit_line = (0, 0, {
                     'name': line.name,
                     'date': timenow,
-                    'partner_id': (line.salary_rule_id.register_id.partner_id or line.salary_rule_id.account_debit.type in ('receivable', 'payable')) and partner_id or False,
+                    'partner_id': (line.salary_rule_id.partner_employee_ok and default_partner_id) or partner_id or False,
                     'account_id': debit_account_id,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
@@ -139,7 +139,7 @@
                     credit_line = (0, 0, {
                     'name': line.name,
                     'date': timenow,
-                    'partner_id': (line.salary_rule_id.register_id.partner_id or line.salary_rule_id.account_credit.type in ('receivable', 'payable')) and partner_id or False,
+                    'partner_id': (line.salary_rule_id.partner_employee_ok and default_partner_id) or partner_id or False,
                     'account_id': credit_account_id,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,

=== modified file 'hr_payroll_account/hr_payroll_account_view.xml'
--- hr_payroll_account/hr_payroll_account_view.xml	2012-11-29 22:26:45 +0000
+++ hr_payroll_account/hr_payroll_account_view.xml	2014-07-01 15:32:59 +0000
@@ -29,6 +29,8 @@
                             <field name="account_credit"/>
                             <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                             <field name="account_tax_id"/>
+                            <field name="partner_employee_ok"/>
+                            <field name="partner_id" attrs="{'readonly':[('partner_employee_ok','=',True)]}"/>
                         </group>
                     </page>
                 </xpath>