Commit Graph
109243 Commits
Author SHA1 Message Date
Jeremy Kersten 08bd178e28 [IMP] mass_mailing: allow to don't wrap a template in a table
In some case we don't want to wrap the content to be centered.

Now, you can add a data-nowrap when you define the theme params to
don't wrap it in a table automatically

Eg:
<div data-name="blank"
     data-img="/xxx"
 >>  data-nowrap="1"
     data-images-info='{...}'>
2017-06-16 12:59:55 +02:00
Christophe Simonis 2f6edfef49 [FIX] resource: remove bad test introduced by previous forward-port 2017-06-15 19:00:54 +02:00
Christophe Simonis 9713dc2e1f [MERGE] forward port branch saas-14 up to 96595772e0 2017-06-15 18:39:59 +02:00
Christophe Simonis 96595772e0 [MERGE] forward port branch 10.0 up to dc8b473a03 2017-06-15 18:35:46 +02:00
Christophe Simonis dc8b473a03 [MERGE] forward port branch saas-11 up to dd7b2556c6 2017-06-15 17:52:49 +02:00
Christophe Simonis dd7b2556c6 [MERGE] forward port branch 9.0 up to 9e324c061c 2017-06-15 17:48:26 +02:00
Simon Lejeune cb73aaf71b [FIX] stock: inventory adjustment and negative quants
It is still possible to have negative and positive quants in the same
location because of returns: if you send something to the customer that
is not there and you return it, you will still be able to reserve the
returned goods to send to another client.

Before, if you would do an inventory adjustment, it would not take into
account these returned quants and their negative counterpart, which made
them difficult to get out of the system.

This fix takes them into account by creating two movements for one
inventory line: move the positive counterpart to the inventory location
before getting back from this location the same quantity.

This way, even if you have 0 as quantity on hand but you have those 2
quants, it will eliminate them. (if you are increasing the stock, part
of the process might have done it automatically already).

Test cases contributed by @jir-odoo

Cherry-pick of be9dce625c
2017-06-15 17:42:10 +02:00
Christophe Simonis 9e324c061c [MERGE] forward port branch saas-6 up to 88802b066c 2017-06-15 17:29:17 +02:00
Christophe Simonis 88802b066c [MERGE] forward port branch 8.0 up to 89eca96476 2017-06-15 17:26:15 +02:00
Olivier Dony 89eca96476 [FIX] anonymization: correct pickle protocol and import 2017-06-15 16:36:05 +02:00
Olivier Dony e40a4baf41 [FIX] anonymization: correct pickle protocol and import 2017-06-15 16:34:47 +02:00
Olivier Dony 625c0d5d8e [FIX] anonymization: correct pickle protocol and import 2017-06-15 16:25:25 +02:00
Olivier Dony 16714a7e71 [FIX] auth_oauth: correctly register token field 2017-06-15 16:23:44 +02:00
Olivier Dony eaa3682bb6 [FIX] http: force protocol when missing in URL 2017-06-15 16:23:35 +02:00
Olivier Dony 4acfe3577b [FIX] sql_db: port fix from psycopg/psycopg2#459
NUL characters must not be used in query parameters,
as they will be ignored by libpq, being end-of-string
characters.

Preventing NULs avoids unexpected results from
queries. It is only necessary with psycopg2
versions before 2.7, which includes the upstream
fix.
2017-06-15 16:23:35 +02:00
Olivier Dony 0527564463 [FIX] auth_oauth: correctly register token field 2017-06-15 16:21:32 +02:00
Olivier Dony 692f47da6e [FIX] http: force protocol when missing in URL 2017-06-15 16:21:22 +02:00
Olivier Dony e3a52a9966 [FIX] sql_db: port fix from psycopg/psycopg2#459
NUL characters must not be used in query parameters,
as they will be ignored by libpq, being end-of-string
characters.

Preventing NULs avoids unexpected results from
queries. It is only necessary with psycopg2
versions before 2.7, which includes the upstream
fix.
2017-06-15 16:21:22 +02:00
Olivier Dony 090d7a51be [FIX] auth_oauth: correctly register token field 2017-06-15 16:17:35 +02:00
Florent de Labarre acf7c1460a account: Backport of a5361605
[IMP] account: hide deprecated accounts

To be consistent with other domain added at ee97028

Closes #15432
2017-06-15 16:06:42 +02:00
Olivier Dony d655824028 [FIX] http: force protocol when missing in URL 2017-06-15 16:01:40 +02:00
Olivier Dony eb8d919015 [FIX] sql_db: port fix from psycopg/psycopg2#459
NUL characters must not be used in query parameters,
as they will be ignored by libpq, being end-of-string
characters.

Preventing NULs avoids unexpected results from
queries. It is only necessary with psycopg2
versions before 2.7, which includes the upstream
fix.
2017-06-15 16:01:40 +02:00
Martin Trigaux b144e09a10 [FIX] sale_margin: apply same logic than sale override
If some required fields are not present in the created values, they are computed
based on the onchange.
This was introduced at 5c4765130 to allow to import sale order lines without
specifying uom.

If sale_margin is installed, the same issue will occure as it assumes there is
a value for product_uom

Add test, courtesy of Mourad Elhadj Mimoune, Akretion

Closes #17613
2017-06-15 15:43:36 +02:00
Nicolas Martinelli 2bf6005e6a [FIX] point_of_sale: tax on line
Complement of commit f0f45c8fa2

The result of the onchange is incorrectly interpreted by the web client,
leading to taxes not saved.

opw-746827
2017-06-15 13:55:41 +02:00
Nicolas Lempereur b79b27c2b2 [FIX] website: browser lang > default lang revert 174d7e8
This reverts commit 174d7e8e49.

The default language is the language if no lang corresponding to
the current language is found. Thus the browser language if available in
languages has priority over the default language.

opw-746776
closes #17637
2017-06-15 13:39:05 +02:00
qsm-odoo 89fdd259ac [FIX] web_kanban: restore elements which broke over 2 lines
Since commit https://github.com/odoo/odoo/commit/577311c0e11edca5740b232881a16dda2ffd32dc,
some elements are now put in a <span/>. This broke the layout in some
cases as the <span/> elements are displayed as blocks in dashboards since
https://github.com/odoo/odoo/commit/a86d6a7df980d55dd0af007f77c6bb039771525a#diff-4b309c73c7896544c509c1374cc3b682R58

As there is no apparent reason for this, this commit fixes the
problem by making these elements have the `inline-block` display.

opw-747119
2017-06-15 12:13:35 +02:00
qdp-odoo b5eec3414b [FIX] l10n_fr_certification: don't copy hash strings and sequence numbers.
copy() was created corrupted data since copied moves already had the parent's info
2017-06-15 12:11:43 +02:00
Nicolas Martinelli baad8f934e [FIX] mail: format amount
Similarly to functions `format_date` and `format_tz`, we add a function
in order to format amounts in the mail template.

It can be used, for example:
`${format_amount(object.amount_total, object.pricelist_id.currency_id)}`

opw-746088
2017-06-15 10:27:38 +02:00
mourad-ehm f75667bba9 [CLA] Update akretion CCLA
add mourad-ehm

Closes #17605
2017-06-15 10:20:59 +02:00
Nicolas Martinelli 261aa927b6 [FIX] point_of_sale: add_payment
Ease the extension of `add_payment`.

From work of @benwillig

Closes #17598
opw-747348
2017-06-15 10:13:53 +02:00
qdp-odoo df4a81c697 [FIX] l10n_fr_certification: fix wrong xpath.
Bug introduced with the latest forward-port. Since the invoice's workflow has been removed in bc8d5dbf2c, the button name to cancel an invoice changed also.
2017-06-15 10:12:00 +02:00
Lucas Perais (lpe) 46263eb398 [FIX] stock: backport fix negative quants
Original commit (in 10.0) be9dce625c

From original commit:
It is still possible to have negative and positive quants in the same
location because of returns: if you send something to the customer that
is not there and you return it, you will still be able to reserve the
returned goods to send to another client.

Before, if you would do an inventory adjustment, it would not take into
account these returned quants and their negative counterpart, which made
them difficult to get out of the system.

This fix takes them into account by creating two movements for one
inventory line: move the positive counterpart to the inventory location
before getting back from this location the same quantity.

This way, even if you have 0 as quantity on hand but you have those 2
quants, it will eliminate them. (if you are increasing the stock, part
of the process might have done it automatically already).

Also, a key of context has been added which authorizes the process described above in the case of both a tracked product and no lot_id on the stock inventory

OPW 743107
Closes #17167
2017-06-15 08:42:57 +02:00
Joren Van Onder 9f31e50ee9 [FIX] point_of_sale: don't launch Firefox before Odoo has started
When using Wi-Fi the Odoo instance on the POSBox will start after a
Wi-Fi connection is established. This takes a bit longer than when
you're using a wired connection. If Firefox gets started before you
end up with a 'Could not connect to localhost:8069' error.
2017-06-14 14:02:00 -07:00
Christophe Simonis 93e222bc08 [MERGE] forward port branch saas-11 up to 544353c865 2017-06-14 17:29:16 +02:00
Christophe Simonis 544353c865 [MERGE] forward port branch 9.0 up to f4bd1fd9d2 2017-06-14 16:42:49 +02:00
Lucas Perais (lpe) 50e9739eb5 [FIX] point_of_sale: recompute bank statement balance before validating session
Before this commit, the return flow in the pos would not work if closing the pos session intervened before the return payment registration.
The balance of the the statements was not updated before going to the validate step.

After this commit, we force the recomputing of the relevant fields (i.e. balance_end_real), to reflect reality and permitting validatioon afterwards

Backport of e27a3b185e (on #17438)
Closes #17599
OPW 743763
2017-06-14 16:15:50 +02:00
Goffin Simon 6c94264f99 [FIX] website_sale: website payment terms issue with portal users
Steps to reproduce the bug:
-create a child contact of a company C
-invite the child contact as a portal user
-sign into the website and place an order w/ wire transfer as payment acquirer

Bug:
The payment term set on the quotation was not taken from the company C and
the default sales person  was not taken from company C too.

opw:745091
2017-06-14 16:14:53 +02:00
Lucas Perais (lpe) e27a3b185e [FIX] point_of_sale: recompute bank statement balance before validating session
Before this commit, the return flow in the pos would not work if closing the pos session intervened before the return payment registration.
The balance of the the statements was not updated before going to the validate step.

After this commit, we force the recomputing of the relevant fields (i.e. balance_end_real), to reflect reality and permitting validatioon afterwards

OPW 743763

Closes #17438
2017-06-14 16:12:03 +02:00
Dharmang Soni fd1a604b4a [ADD] doc: Mobile JavaScript documentation
* Create mobile.rst

(PR #14144, task 29027)
2017-06-14 14:56:00 +02:00
Raphael Collet 457b2725fe [FIX] ir_translation: validate translations with surrounding spaces 2017-06-14 14:26:50 +02:00
Raphael Collet ce7f31b0b0 [FIX] models: copy in a given lang must keep a field's neutral value intact
Issue: when using `copy` in a given lang, the value of XML/HTML fields is
copied in its translated form, making existing translations useless.  Fix the
value of such fields by storing their original value instead.
2017-06-14 14:26:50 +02:00
qdp-odoo f4bd1fd9d2 [ADD] l10n_fr_certification: module to ensure the inalterability of accounting in France. 2017-06-14 14:09:24 +02:00
Goffin Simon bc34ba015d [FIX] website_sale_options: variant color not selected
The variant color for option product were not visually selected
in website sale option modal.

opw:746425
2017-06-14 13:51:30 +02:00
Christophe Simonis c758e9043a [IMP] addons: rename leftover manifest files 2017-06-14 13:45:10 +02:00
Christophe Matthieu 944f8e3353 [FIX] account: improve performance when validating an invoice
When doing a delete, the cache is cleared, putting an unlink in a loop
multiplies the number of requests made (for access rules, relational
field, recompute ...) by the number of rows. Doing it outside the loop
speeds up the validation of the invoice.

Backport of 10.0's 2687571781
2017-06-14 10:15:47 +02:00
Christophe Matthieu 2687571781 [FIX] account: Improved performance when validating an invoice
When doing a delete, the cache is cleaned, putting an unlink in a loop
multiply the number of requests made (for access rules, relational
field, recompute ...) by the number of rows. The use of a mapped improves
the speed of validation of an invoice.
2017-06-13 15:45:20 +02:00
Nicolas Martinelli 05ef0790c9 [FIX] account_asset: depreciation rate date
- Activate multi-currency
- Define a rate today (e.g. 2017-06-01) and next month (e.g. 2017-07-01)
- Create a deferred revenue on 2017-07-02 in the foreign currency
- Post the first line

The rate taken is the rate of today, not the rate of next month.

opw-745509
2017-06-13 14:35:11 +02:00
Olivier Dony 70d522eb31 [MERGE] Forward-port saas-11 up to 21f93b8035
Empty forward-port because commit 21f93b8035
is only a backport that does not need to be forward-ported again.

The point of this fwd-port was to resolve the conflicts immediately.
2017-06-13 13:19:09 +02:00
Martin Trigaux 21f93b8035 [FIX] point_of_sale: backport #15862 to saas-11 2017-06-13 13:13:33 +02:00
Thibault Delavallée 8b886bd316 [FIX] resource: fix timezone management when planning hours and days
Low-level methods have to convert datetime into a naive user timezone
in order to match the attendances and leaves. Returned values are already
in UTC ready for display. Therefore no postprocessing is necessary for
output.
2017-06-13 12:40:44 +02:00