diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-08 11:37:10 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-08 11:37:10 +0100 |
| commit | 85fd5cc147e54f22cdc2f847f78e984d609033bb (patch) | |
| tree | efc50d9d45b5f639641553ec124937cf307fb46a | |
| parent | 622399c796756827783b1b58017bc61479019747 (diff) | |
| parent | 41af298d9d8a68be29cee57a4352e49d269594b7 (diff) | |
[MERGE] forward port branch 10.0 up to 41af298d9d8
| -rw-r--r-- | addons/hr_expense/models/hr_expense.py | 3 | ||||
| -rw-r--r-- | addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index 7878bc47b3e..66f794043db 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -354,7 +354,8 @@ class HrExpense(models.Model): product = default_product else: expense_description = expense_description.replace(product_code.group(), '') - product = self.env['product.product'].search([('default_code', 'ilike', product_code.group(1))]) or default_product + products = self.env['product.product'].search([('default_code', 'ilike', product_code.group(1))]) or default_product + product = products.filtered(lambda p: p.default_code == product_code.group(1)) or products[0] pattern = '[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?' # Match the last occurence of a float in the string diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py index 73a304daa2e..d9a59cba3a0 100644 --- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py +++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py @@ -35,6 +35,7 @@ class HrPayslipEmployees(models.TransientModel): 'date_from': from_date, 'date_to': to_date, 'credit_note': run_data.get('credit_note'), + 'company_id': employee.company_id.id, } payslips += self.env['hr.payslip'].create(res) payslips.compute_sheet() |