pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 10.0 up to 41af298d9d

Browse Source
This commit is contained in:
Christophe Simonis
2018-03-08 11:37:10 +01:00
parent 622399c796 41af298d9d
commit 85fd5cc147
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/models/hr_expense.py
+2 -1
View File
@@ -354,7 +354,8 @@ class HrExpense(models.Model):
product = default_product product = default_product
else: else:
expense_description = expense_description.replace(product_code.group(), '') 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+)?' pattern = '[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?'
# Match the last occurence of a float in the string # Match the last occurence of a float in the string
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+1
View File
@@ -35,6 +35,7 @@ class HrPayslipEmployees(models.TransientModel):
'date_from': from_date, 'date_from': from_date,
'date_to': to_date, 'date_to': to_date,
'credit_note': run_data.get('credit_note'), 'credit_note': run_data.get('credit_note'),
'company_id': employee.company_id.id,
} }
payslips += self.env['hr.payslip'].create(res) payslips += self.env['hr.payslip'].create(res)
payslips.compute_sheet() payslips.compute_sheet()