Commit Graph
91 Commits
Author SHA1 Message Date
Nicolas Martinelli 7413b2624c [FIX] hr_expense: employee on expense
The employee of the expense report should be the same than the employee
on expense lines.

opw-740646
2017-04-27 14:32:22 +02:00
Nicolas Martinelli 831322bb92 [FIX] hr_expense: expense lines > and < 0
- Create an expense sheet
- Line 1 is 500
- Line 2 is -200
- The total is 300 => a payment of 300 is made

When the payment is validated, the expense is not set as paid.

In v10, one expense line = one account move. In order to know if the
expense is paid we check that each account move is completely
reconciled. The account move of 500 is never completely reconciled by
the payment of 300, so the expense stays opened.

This simply cannot be supported in v10, since each expense line is
handled in a separate account move.

opw-740492
2017-04-26 14:49:37 +02:00
Adrien Peiffer (ACSONE) 3a88f7826b [REF] hr_expense: inheritance on move line preparation values
Closes #16351
opw-728271
2017-04-11 10:46:57 +02:00
Goffin Simon 0ff9af64ef [FIX] hr_expense: Creation of entries from several expense lines
When posting journal entries for an hr.expense.sheet with several expense lines
(by clicking on the button "Post journal entries"), all the account move lines
created for the same sheet must be linked to the same account move because
the model hr.expense.sheet has just a field "account_move_id" to access all the entries
(by clicking on button "Accounting Entries")

This commit reverts f97eb0ac2b

opw:715523,709930,725798,716239
2017-03-29 13:11:25 +02:00
Christophe Simonis 27496730d8 [MERGE] forward port branch saas-11 up to c2569b9df1 2017-03-28 14:51:14 +02:00
Goffin Simon f97eb0ac2b [FIX] hr_expense: Creation of entries from several expense lines
When posting journal entries for an hr.expense.sheet with several expense lines
(by clicking on the button "Post journal entries"), all the account move lines
created for the same sheet must be linked to the same account move because
the model hr.expense.sheet has just a field "account_move_id" to access all the entries
(by clicking on button "Accounting Entries")

opw:715523,709930,725798,716239
2017-03-27 13:11:40 +02:00
Nicolas Martinelli 5c0901b9d7 [FIX] hr_expense: expense of zero
Complement of commit cab436819f

Previous commit was not considering a complete expense sheet of zero.

opw-710695
2017-03-27 11:59:15 +02:00
Christophe Simonis 70b770d62e [MERGE] forward port branch 9.0 up to 8376f538b5 2017-03-24 17:57:29 +01:00
Nicolas Martinelli 0ecc9c3034 [FIX] hr_expense: partner on AML
It will cause issues later on. A workaround has to be found.

This reverts commit d69aa2d98b.
2017-03-21 15:28:00 +01:00
Nicolas Martinelli 8ec819418b [FIX] hr_expense: tax on expense
- Create an expense with a tax
- Validate and post entries

3 AML are created, one on the expense account, one on the account
payable, one for the tax. However, the AML of the expense account is not
linked to the tax, and therefore does not appear in the reports.

opw-715488
2017-03-21 13:40:02 +01:00
Nicolas Martinelli d69aa2d98b [FIX] hr_expense: partner on AML
- Create a partner who is a contact of a company
- Associate this partner to an employee
- Create an expense for the employee, validate and post entries

The AML created are linked to the company, not the partner.

Since the bank account account is registered on the partner, and not the
company, this is more logical to link the AML with the partner.

opw-724550
2017-03-21 13:36:19 +01:00
Nicolas Martinelli cab436819f [FIX] hr_expense: expense of zero
- Create an expense of 0.00, validate
- The expense can never be set as paid since it's not possible to create
  a payment of 0.00.

An expense of 0.00 still makes sense in the following use case.

An expense is paid by salary before the expense is actually made, i.e.
I get 1000 EUR to redecorate my homeoffice, I get the money beginning of
the year. After that I want to book expenses against the initial payment
until the 1000 EUR is gone and I would like to make use of the expense
workflow to approve the costs.

opw-710695
2017-03-13 08:15:26 +01:00
Christophe Simonis b7c7591bfb [MERGE] forward port branch saas-11 up to 71773e1f1c 2017-02-01 19:08:14 +01:00
Christophe Simonis 71773e1f1c [MERGE] forward port branch 9.0 up to a53063606a 2017-02-01 18:16:15 +01:00
qdp-odoo 602d04117a [FIX] hr_expense: don't try to create twice the taxes journal item from hr.expense when one is given. Fixes #15181 Also fix the domain on applicable taxes to filter the purchase taxes only 2017-01-30 12:08:19 +01:00
Nicolas Martinelli 36d3f38d31 [FIX] hr_expense: journal entries
The stat button "Accounting Entries" on the "Expense Report" does not
filter the account moves related to the expense.

opw-706096
2017-01-26 10:55:08 +01:00
Christophe Simonis 1a46fd4968 [MERGE] forward port branch saas-11 up to 995a58cc4b 2016-12-14 14:10:48 +01:00
Christophe Simonis 995a58cc4b [MERGE] forward port branch 9.0 up to a9a7fe15b3 2016-12-14 13:46:11 +01:00
Juan Carlos del Valle 3ea8958014 [FIX] hr_expenses: add missing tax_ids
* ccd6fc6 already fixed the bug of the account move for expenses with more than 1 taxes but the taxes were not used.
Adding in `_prepare_move_line` to be included in the created move line.

* added Contributor License Agreement

Closes #12849
2016-12-13 11:21:43 +01:00
Christophe Simonis 457a705bf0 [MERGE] forward port branch saas-12 up to d1fddd2 2016-11-22 14:02:03 +01:00
Richard Mathot 27d814cb31 [FIX] hr_expense: missing dependencies for total_amount of hr.expense.sheet 2016-11-22 10:02:50 +01:00
Christophe Simonis 3d085f632d [MERGE] forward port branch saas-12 up to 6386037 2016-11-08 15:01:20 +01:00
Goffin Simon 76314f0a3b [FIX] hr_expense: unlink posted expense
Steps to reproduce:

- Create one (or several) expense lines
- Submit them to the manager (create the expense sheet)
- Approve the sheet and post the entries
- Delete the created and posted sheet

Bug:
- The expense is deleted but the accounting entries are still in the database
- The expense lines are in "To submit" and you can submit to manager again and
generate a new report and therefore new accounting entries...

Fix:
It is not allowed to delete posted expense.

opw:692323
2016-11-03 11:34:33 +01:00
Christophe Simonis ab98523315 [MERGE] forward port branch saas-12 up to 0ca99ff 2016-11-02 17:56:37 +01:00
qdp-odoo a699504536 [FIX] hr_expense: give more useful label to journal items created from expenses paid by the company 2016-10-31 16:36:56 +01:00
Christophe Simonis 3bb022d57c [MERGE] forward port branch saas-12 up to 6f8e40c 2016-10-27 18:17:59 +02:00
qdp-odoo 34d3754ae0 [REF] hr_expense: refactoring of expense sheet entry posting + display of a stat button to open journal entries instead of the m2o.
Since commit dabf82870a, the expense sheet now creates one account.move per expense, so there is no point in grouping per journal. Moreover, the account_move_id m2o is not relevant anymore for expense sheet having more than one line. That's why it is now replaced by a button
2016-10-24 17:06:31 +02:00
qdp-odoo b60059f6f3 [FIX] hr_expense: fix errors introduced when forward-porting saas-11 on revision dabf82870a
acc_date was not defined
move's ref should be the sheet's name
date should be given again at the account.move.line level
2016-10-24 13:55:50 +02:00
Christophe Simonis dabf82870a [MERGE] forward port branch saas-11 up to 25e0b25 2016-10-24 13:07:46 +02:00
qdp-odoo f3a721940c [FIX] hr_expense: don't group accounting entries of hr.expense if several are generated at the same time.
This grouping was causing problem at the time of bank statement reconciliation, if the expenses were set as already paid by the company, since we had only one account.move related to several bank statement lines although the DB structure wasn't allowing such a case (the link was made as a m2o from account.move to account.bank.statement.line where a m2m would have been needed).
2016-10-24 10:22:42 +02:00
Nicolas Martinelli eb3b6a6f8d [FIX] hr_expense: traceback
`hr.expense` has no attribute `bank_journal_id`, but `hr.expense.sheet`
has ==> boom boom crash

opw-690690
2016-10-20 13:33:58 +02:00
Christophe Simonis 53d8f76a40 [MERGE] forward port branch saas-12 up to e8e4145 2016-10-17 16:00:39 +02:00
Christophe Simonis e8e4145c99 [MERGE] forward port branch saas-11 up to ba6ca78 2016-10-17 15:17:48 +02:00
qdp-odoo 4cfc0f7232 [FIX] hr_expense: create the account.payment objects when an expense is paid by the company.
This is required in order to have those bank journal items appearing afterwards in the bank statement reconciliation widget (blue line) for reconciliation.
2016-10-17 10:11:59 +02:00
qdp-odoo 81ec36a709 [FIX] hr_expense: fix accounting entries created from hr.expense
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 (which is totally wrong).
2016-10-14 16:23:28 +02:00
Christophe Simonis 0acd63d073 [MERGE] forward port branch saas-12 up to 27dc061 2016-10-12 17:03:55 +02:00
Nicolas Martinelli 42797ebfbb [FIX] hr_expense: set company of expense
When an expense is received by email, make sure to set the expense in
the emloyee's company.

opw-688671
2016-10-11 19:01:59 +02:00
Christophe Simonis 341bea8f88 [MERGE] forward port branch saas-12 up to 43cb4ac 2016-10-10 13:00:05 +02:00
Olivier Dony 2e71496695 [FIX] hr_expense: order sheets even when not paid 2016-10-04 00:21:09 +02:00
Christophe Simonis a7ba6cde9c [MERGE] forward port branch saas-12 up to 7134aff 2016-09-28 16:28:31 +02:00
Christophe Simonis 2c6d32ca7d [MERGE] forward port branch saas-11 up to 34186fd 2016-09-28 14:46:29 +02:00
Christophe Simonis 12548d3e73 [MERGE] forward port branch saas-10 up to e8b8784 2016-09-28 13:17:37 +02:00
Christophe Simonis e8b8784d5c [MERGE] forward port branch 9.0 up to 9ba5698 2016-09-28 12:59:25 +02:00
tdi-odoo ccd6fc621b [FIX] expense: fixes #13446 mutliple taxes on expenses 2016-09-27 10:45:38 +02:00
Christophe Simonis f4fc3985b6 [MERGE] forward port branch saas-12 up to 10cde43 2016-09-16 11:03:50 +02:00
Yannick Tivisse 35318e6a8a [FIX] hr_expense: Add coherence with expenses to submit
Sometimes we use 'to report' and 'to submit' for the same state, or either twice the terms in the action title and the menuitem.
2016-09-15 09:40:32 +02:00
Christophe Simonis 25f271c099 [MERGE] forward port branch saas-12 up to 13765b5 2016-09-14 12:39:12 +02:00
Christophe Simonis 19b4f5efe4 [MERGE] forward port branch saas-10 up to fa7430c 2016-09-14 11:58:45 +02:00
Christophe Simonis fa7430c157 [MERGE] forward port branch 9.0 up to 5be4086 2016-09-14 11:56:05 +02:00
Richard Mathot b917cf968b [FIX] hr_expense: wrong mailto: link
Parce que tester c'est douter.
2016-09-14 09:49:25 +02:00