Commit Graph
1634 Commits
Author SHA1 Message Date
Christophe Simonis f3fa5a5ef7 [MERGE] forward port branch saas-11.3 up to 1e0a92c996 2018-09-13 19:30:33 +02:00
Christophe Simonis 1e0a92c996 [MERGE] forward port branch 11.0 up to 5cb9f8e9d5 2018-09-13 12:42:01 +02:00
Christophe Simonis 5cb9f8e9d5 [MERGE] forward port branch saas-15 up to a27a24c5ed 2018-09-13 12:11:17 +02:00
Nicolas Martinelli ad584540d4 [FIX] account: tax account
Use the cash basis account for cash basis taxes.

Follow-up of 1b47575372

opw-1858492
2018-09-13 11:43:12 +02:00
Christophe Simonis a27a24c5ed [MERGE] forward port branch saas-14 up to 7322b7ee56 2018-09-13 11:33:56 +02:00
Christophe Simonis 7322b7ee56 [MERGE] forward port branch 10.0 up to dd20539ffe 2018-09-13 11:32:43 +02:00
Christophe Simonis dd20539ffe [MERGE] forward port branch 9.0 up to cbdb7383e9 2018-09-13 11:07:53 +02:00
Richard Mathot cbdb7383e9 [REV] account: revert 8781286f1c
Causes a traceback "Expected singleton" when opening the Reconciliation
from the accounting dashboard
2018-09-13 11:00:15 +02:00
Christophe Simonis a651e8eed8 [MERGE] forward port branch saas-14 up to 72b2bab8c8 2018-09-13 10:58:54 +02:00
Christophe Simonis b1999a0e87 [MERGE] forward port branch 11.0 up to db0e84f3e3 2018-09-12 19:37:17 +02:00
Mathieu Duckerts-Antoine 4cbc9b8d61 [FIX] account: translate default overdue_msg
opw-1880132

Closes #26852
2018-09-12 16:52:29 +02:00
Wolfgang Taferner 8e15dc87a4 [IMP] account: extract_payment_vals + explicit communication hand-over 2018-09-12 15:12:42 +02:00
Christophe Simonis 2b92f04289 [MERGE] forward port branch 11.0 up to cf7cb147f2 2018-09-11 19:50:13 +02:00
Christophe Simonis 49a7295ce9 [MERGE] forward port branch saas-15 up to 48aac01c13 2018-09-11 19:06:22 +02:00
Christophe Simonis 48aac01c13 [MERGE] forward port branch saas-14 up to 55ab1ac691 2018-09-11 18:54:08 +02:00
Christophe Simonis 55ab1ac691 [MERGE] forward port branch 10.0 up to cd66b0984e 2018-09-11 17:44:14 +02:00
Christophe Simonis 63afaf438b [MERGE] forward port branch 9.0 up to 415aa05806 2018-09-11 17:07:35 +02:00
Laurent Smet 415aa05806 [IMP] account: add error when setting a foreign currency on account
If currency set on account, all journal items part of this account must have either the same
currency or no currency.
2018-09-11 16:04:52 +02:00
Christophe Simonis babfca1cf4 [MERGE] forward port branch 11.0 up to 5a1f874602 2018-09-11 14:57:25 +02:00
Nicolas Martinelli 1b47575372 [FIX] account: cash basis in statement
- Set up a 10 % tax with a 'Tax Due' as 'Based on Payment'
- Create a bank statement of 110, Reconcile
- Create a new AML for the reconciliation using the mentioned tax for an
  amount of 100
- Validate

The tax amount does not appear in the Generic Tax Report.

This is a specific case where the reconciliation process creates the
payment itself. Therefore, the tax amount should appear in the report.

To do so, we explicitly send the `tax_exigible` value on the AML, and
propagate it to the tax line.

opw-1858492
2018-09-11 10:30:45 +02:00
Yannick Tivisse 7978d4ba0f Revert "[IMP] *: Define groups on res.users models"
This reverts commit 99f497b390.
2018-09-10 14:23:42 +02:00
Iván Todorovich 8781286f1c [FIX] account: multi-company bank statement reconciliation
In a multicompany environment, if the user is not logged-in in the same company as the statement's company (even though he might have access to it), the reconcile interface was filtering on the user's company instead of the bank statement lines's company.

Was PR #26782
2018-09-07 15:24:33 +02:00
Christophe Simonis 49c3264ce0 [MERGE] forward port branch saas-11.3 up to 4850fb0838 2018-09-07 14:43:48 +02:00
Christophe Simonis 21a186dadd [MERGE] forward port branch 11.0 up to 737ca0eb42 2018-09-06 18:13:56 +02:00
Nicolas Martinelli 765a3bf23f [FIX] account: unreconcile cash basis
- Set up a tax as 'Based on Payment'
- Create an invoice at date D with this tax
- Pay the invoice at date D+1
- Unreconcile

A reversal entry is made at the current date, while it should be at the
payment date D+1.

We make sure to use the payment date only if the payment period has not
been locked.

Fixes #25738
opw-1870467
2018-09-06 14:45:40 +02:00
Christophe Simonis 13e91ac467 [FIX] base,account,product: correct currency convertion when company is get from context
Method `_convert` expect a browserecord, not an integer.
2018-09-06 14:24:01 +02:00
Lucas Perais (lpe) c2b684654b [FIX] account: unreconcile payment from invoice with exchange difference
backport 1dbc655676

Company in USD
Invoice in EUR with rate A
Register a payment in EUR with rate B

Unreconcile them.

Before this commit, there was an error because we tried to reconcile the exchange items
with its reversal while the formers were already reconciled with the invoice

After this commit, there is no error

OPW 1864091
closes #26583
2018-08-27 10:26:39 +02:00
Christophe Simonis 9f99eb9cb0 [MERGE] forward port branch saas-11.3 up to 3be46428cc 2018-08-24 22:12:20 +02:00
Christophe Simonis 4a6c3da238 [MERGE] forward port branch 11.0 up to 33981790de 2018-08-24 18:22:27 +02:00
Christophe Simonis 33981790de [MERGE] forward port branch saas-15 up to 4703d649dc 2018-08-24 18:03:00 +02:00
Christophe Simonis 4703d649dc [MERGE] forward port branch saas-14 up to aeb3391a2d 2018-08-24 14:07:40 +02:00
Christophe Simonis aeb3391a2d [MERGE] forward port branch 10.0 up to b50958c40f 2018-08-24 11:42:33 +02:00
Lucas Perais (lpe) b50958c40f [FIX] account: allow range amount search for reconciliation widget
In the reconciliation widget, search for an amount like 5361.61

Before this commit, if the targetted line that you want to see was represented as 5361.61000001
you did not see it in the results of the search

After this commit, you do!

OPW 1872543
closes #26523
2018-08-24 09:43:51 +02:00
Olivier Colson 12fbbacc6d [IMP] account: reconciliation widget: format dates depending on user's language preferences. 2018-08-23 14:53:25 +02:00
Christophe Simonis dabe59df9c [MERGE] forward port branch saas-11.3 up to 27d8daf8a7 2018-08-14 19:43:32 +02:00
Christophe Simonis 27d8daf8a7 [MERGE] forward port branch 11.0 up to 51225c9b9f 2018-08-14 18:59:57 +02:00
Nicolas Martinelli 90cdc91638 [FIX] account: fiscal year last day
Do not replace the day value without notifying the user.

In undetermined circumstances, a fiscal year last day and month can be
replaced by the default December 31st value. Since all settings are
re-written for any setting changed, this is likely to happen in the back
of the user.

Moreover, the `_verify_fiscalyear_last_day` is not correct since it
doesn't accept February 29th, while `compute_fiscalyear_dates` handles
it.

opw-1867978
opw-1873260
2018-08-14 13:32:41 +02:00
Lucas Perais (lpe) abd2b2e2ca [FIX] account: reconcile through widget associate payment/invoice
Create an invoice, validate it

Create a payment from athe account.payment model (not the register payment wizard)

click on the smart button payment matching, and match the invoice with the payment
Reconcile

Before this commit, the invoice was not part of the invoice_ids field of the payment,
So, when printing the payment receipt or check, there was nothing on there

After this commit, we associate the invoice with the payment, and the receipt prints
what is expected

OPW 1871575

closes #26245
2018-08-10 09:35:26 +02:00
Christophe Simonis 7717f082c0 [MERGE] forward port branch saas-11.3 up to af35aea6b0 2018-08-09 19:33:32 +02:00
Christophe Simonis 9cb97a8c2d [MERGE] forward port branch saas-11.2 up to 499af66727 2018-08-09 15:06:31 +02:00
Christophe Simonis cdef8740ec [MERGE] forward port branch 11.0 up to 252bc396b4 2018-08-09 11:10:38 +02:00
Lucas Perais (lpe) f2b2d87236 [FIX] account: default name for analytic line from aml
Create an account_move, with at least one move line having an analytic account on it
AND no label

Save and Post

Before this commit, the post failed because an analytic.line should have a label (required)

After this commit, we fill in a default name for the analytic line, composed of the data of the line,
if available, or '/'

OPW 1863418
closes #26013
2018-08-08 10:54:18 +02:00
Christophe Simonis 32dce83618 [MERGE] forward port branch saas-11.3 up to ff80efd71e 2018-08-06 19:59:53 +02:00
Christophe Simonis ff80efd71e [FIX] account: define method in correct model
Oversight of previous forward-port.
2018-08-06 17:25:15 +02:00
Christophe Simonis 427f717d18 [MERGE] forward port branch saas-11.2 up to 932b229941 2018-08-06 13:44:01 +02:00
Christophe Simonis 932b229941 [MERGE] forward port branch 11.0 up to b29e053436 2018-08-06 11:46:10 +02:00
Goffin Simon ec7109c919 [FIX] account: Wrong payment amount in multi-currency
Steps to reproduce:

- activate the EUR currency

- set a currency rate 1 USD = 1.2 EUR

- create a Bank journal in EUR with a EUR account

- create a Vendor Bill in EUR for 1200 EUR in total

- go in the Vendor Bill list view (Accounting > Purchase > Vendor Bills)

- select the created Vendor Bill

- click "Register Payment" in the action menu

- select the EUR Bank journal you created

Bug:

The payment amount is 1000 EUR instead of 1200 EUR.

opw:1870351
2018-08-02 16:27:34 +02:00
Christophe Simonis 8d9366197e [MERGE] forward port branch saas-11.3 up to 691dd65e0e 2018-08-01 17:23:03 +02:00
Christophe Simonis a9bb3249c6 [MERGE] forward port branch saas-11.2 up to 22b31152ca 2018-08-01 15:17:21 +02:00
Christophe Simonis 22b31152ca [MERGE] forward port branch 11.0 up to f9e0f6663f 2018-08-01 14:20:39 +02:00