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 0ff9af64ef

Browse Source
This commit is contained in:
Christophe Simonis
2017-03-29 13:34:41 +02:00
parent c04dfec023 0ff9af64ef
commit 79975f7cec
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/models/hr_expense.py
+10 -16
View File
@@ -172,24 +172,19 @@ class HrExpense(models.Model):
''' '''
main function that is called when trying to create the accounting entries related to an expense main function that is called when trying to create the accounting entries related to an expense
''' '''
move_group_by_sheet = {}
for expense in self: for expense in self:
journal = expense.sheet_id.bank_journal_id if expense.payment_mode == 'company_account' else expense.sheet_id.journal_id journal = expense.sheet_id.bank_journal_id if expense.payment_mode == 'company_account' else expense.sheet_id.journal_id
#create the move that will contain the accounting entries #create the move that will contain the accounting entries
acc_date = expense.sheet_id.accounting_date or expense.date acc_date = expense.sheet_id.accounting_date or expense.date
if not expense.sheet_id.id in move_group_by_sheet: move = self.env['account.move'].create({
move = self.env['account.move'].create({ 'journal_id': journal.id,
'journal_id': journal.id, 'company_id': self.env.user.company_id.id,
'company_id': self.env.user.company_id.id, 'date': acc_date,
'date': acc_date, 'ref': expense.sheet_id.name,
'ref': expense.sheet_id.name, # force the name to the default value, to avoid an eventual 'default_name' in the context
# force the name to the default value, to avoid an eventual 'default_name' in the context # to set it to '' which cause no number to be given to the account.move when posted.
# to set it to '' which cause no number to be given to the account.move when posted. 'name': '/',
'name': '/', })
})
move_group_by_sheet[expense.sheet_id.id] = move
else:
move = move_group_by_sheet[expense.sheet_id.id]
company_currency = expense.company_id.currency_id company_currency = expense.company_id.currency_id
diff_currency_p = expense.currency_id != company_currency diff_currency_p = expense.currency_id != company_currency
#one account.move.line per expense (+taxes..) #one account.move.line per expense (+taxes..)
@@ -240,10 +235,9 @@ class HrExpense(models.Model):
lines = map(lambda x: (0, 0, expense._prepare_move_line(x)), move_lines) lines = map(lambda x: (0, 0, expense._prepare_move_line(x)), move_lines)
move.with_context(dont_create_taxes=True).write({'line_ids': lines}) move.with_context(dont_create_taxes=True).write({'line_ids': lines})
expense.sheet_id.write({'account_move_id': move.id}) expense.sheet_id.write({'account_move_id': move.id})
move.post()
if expense.payment_mode == 'company_account': if expense.payment_mode == 'company_account':
expense.sheet_id.paid_expense_sheets() expense.sheet_id.paid_expense_sheets()
for move in move_group_by_sheet.values():
move.post()
return True return True
@api.multi @api.multi