Commit Graph
127612 Commits
Author SHA1 Message Date
Christophe Simonis 8747d72f1e [FIX] hr_{holidays,payroll}: force no validity start date for test leave types
Oversight of previous forward-port.
2019-06-21 12:21:36 +02:00
Christophe Simonis 355ef10a82 [FIX] website_slides: correctly forward-port cfa1e101e2 2019-06-21 11:55:09 +02:00
Christophe Simonis e6cf33bd32 [FIX] hr_holidays: force empty validity start date on data/demo leave types
Oversight of previous forward-port.
2019-06-21 11:45:54 +02:00
Christophe Simonis 02b6b4db4a [FIX] test_access_rights: adapt test to forward-ported changes 2019-06-21 11:24:25 +02:00
Christophe Simonis be780012bf [MERGE] forward port branch 12.0 up to 0e72b983c3 2019-06-21 11:06:04 +02:00
Christophe Simonis 0e72b983c3 [MERGE] forward port branch saas-11.3 up to 35aeabb647 2019-06-21 10:17:10 +02:00
Басхүү 290c92e46f [IMP] base: Add Mongolian states to res.country.state.csv
As we will move those from other localizations to base,
we add those for Mongolia to base already.

closes odoo/odoo#34281

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
2019-06-20 10:12:29 +00:00
Басхүү badc246afc [FIX] l10n_mn: update account chart template data
We correct the income/expense account and add
the stock input/output/valuation accounts.
Mn also uses Anglo-Saxon accounting.

Closes #34002
2019-06-20 10:12:23 +00:00
Christophe Simonis 35aeabb647 [MERGE] forward port branch 11.0 up to cc3f45ae0b 2019-06-20 12:11:43 +02:00
Christophe Simonis cc3f45ae0b [MERGE] forward port branch saas-15 up to e7fb3e2f1a 2019-06-20 12:06:59 +02:00
Christophe Simonis e7fb3e2f1a [MERGE] forward port branch saas-14 up to a7ad19d7fd 2019-06-20 12:05:26 +02:00
Christophe Simonis a7ad19d7fd [MERGE] forward port branch 10.0 up to c5c955db7a 2019-06-20 12:04:52 +02:00
Christophe Simonis 7b16abbae1 [IMP] core: add support for multi-version migration scripts
A special folder named `0.0.0` can contain scripts that are run on
upgrade of any version.
They are useful to make some sanity checks or other verifications to
ensure database consistency.

The first version of this patch used the more eye-catching `any` for
the migration folder, but it was problematic for upgrading from an older
version that doesn't contain this patch.

Using a version "number" containing two dots is required to avoid it
being prefixed with the server version (see `convert_version` method) and
resulting in a version like `10.0.any`.
Such version would have been executed, even without this patch, when
upgrading from an older major server version (9.0.1.0 < 10.0.any).

closes odoo/odoo#34268

Signed-off-by: Christophe Simonis <chs@odoo.com>
2019-06-20 10:01:31 +00:00
Nicolas Martinelli ea4ddff117 [FIX] point_of_sale: apply fiscal position
- Create 2 included taxes: 21 % and 6 %
- Create a product A with 21 % as default tax
- Create a fiscal position to map the tax 21 % to tax 6 %
- Allow the fiscal position in the POS
- Add product in a POS order
- Apply the fiscal position

The subtotal is not recomputed correctly. On the other hand, if the
fiscal is first set then the product added, there is no problem.

This is because the `fix_tax_included_price` is only called by
`add_product` and not when changing the fiscal position.

opw-2020755

closes odoo/odoo#34260

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
2019-06-20 08:16:10 +00:00
Xavier Morel c5c955db7a [FIX] core: work around ir_logging deadlock
DROP CONSTRAINT (even with IF EXISTS is specified) acquires an ACCESS
EXCLUSIVE lock on the table, preventing e.g. inserts in an other
transaction, so ir_logging would systematically deadlock if configured
to the same database and a warning would be triggered during install
or update (if that ran ir.logging's init).

1. hand-roll the "IF EXISTS" bit, to avoid taking an ACCESS EXCLUSIVE
lock on the table if the problematic constraint does not exist and
thus doesn't need to be dropped (which by now should be the vast
majority of cases).

Replacing DROP CONSTRAINT with DISABLE TRIGGER does not fix the
issue as *that* acquires SHARE ROW EXCLUSIVE. While that's less
constraitning than ACCESS EXCLUSIVE, it still conflicts with an
insert's ROW_EXCLUSIVE.

2. add a timeout to the logging INSERT anyway, the deadlock is still
an issue if we're updating a database which does have the
problematic constraint, and we want to preclude the possible
eventual introduction of new deadlocks in the future.

closes odoo/odoo#34243

Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
2019-06-19 13:43:53 +00:00
Thanh Dodeur f3e10f6980 [FIX] base, web: set 304 status in binary_content
Before this commit, the No Change status wasn't properly set because
the `filehash` wasn't passed to `_binary_set_headers` and because
the status was not changed to 304 if it was already set to 200 earlier.

This commit fixes this issue and also prevents images to be processed
in `content_image` if the status is 304.

opw-2008426

closes odoo/odoo#34032

Signed-off-by: Christophe Simonis <chs@odoo.com>
2019-06-19 12:31:07 +00:00
Gorash 82bf73fe30 [FIX] web_editor: avoid dialog error on email edition
Under certain unknown conditions, the range cannot be applied and
triggered an error. In order to allow the user to keep editing, we need
to prevent the dialog from showing, hence the use of `console.error`.
If this error appears, the carret is moved to the beginning of the focused
node.
If this error appears, then bullet can generate an error (I managed to
have the bug once or simulate it by manually breaking the dom and range)

closes odoo/odoo#34284

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
2019-06-20 13:25:37 +00:00
Jeremy Kersten 2349cba9c0 [FIX] website_slides: remove duplicated code
closes odoo/odoo#34283

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
2019-06-20 07:38:54 +00:00
Jeremy Kersten ac39b8f554 [FIX] website_slides: allow to edit completion_time 2019-06-19 18:23:48 +00:00
qsm-odoo 8401c6bfac [FIX] gamification: restore broken images in non-demo data
For some strange reasons, the e-learning ranks are created in data but
the demo data override their motivational message fields.
Unfortunately, the demo data were ok but the normal data had broken
images in them.

closes odoo/odoo#34282

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
2019-06-20 12:42:06 +00:00
qsm-odoo 6f653ac6a6 [FIX] web_editor: allow fullscreen editor even when inside modal
The new editor of https://github.com/odoo/odoo/pull/29775 came with a
fullscreen option. When using the toggle when the editor is in inside
a modal, the editor stretched only to match the size of the modal
instead of the viewport.

This is because the 'position: fixed' rule which is used to achieve the
fullscreen layout cannot work if a parent of the element has a CSS
transform applied on it. Indeed in that case, that element acts like the
viewport for 'position: fixed' elements.

closes odoo/odoo#34272

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
2019-06-20 12:52:34 +00:00
mgh-odoo 42413faf61 [FIX] point_of_sale: discount applied twice
* Setup an IoTBox connected to a receipt printer
* In POS Config:
- IoT Box: check "IoTBox", set the IP of the Box and check "Receipt Printer"
- Pricing: Select "Tax-Included Price"
* Start the POS, select any product
* Click on "Disc" on the virutal keyboard on the bottom left of the POS
* Enter the amount of the discount
* Validatate payment (Click "Payment" > "Cash" > Enter Amount > "Validate")
* A ticket should print on the receipt printer:
- The price in the rigth column is correct

Current behaviour:
* In the left column, it shows : Product name, Base price, Discount: X%, 1 x Price --> This price is not correct, it shows the price with the discount applied twice.

Expected behaviour:
* Discount applied once everywhere on ticket.

task-1978564

closes odoo/odoo#34278

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
2019-06-20 11:23:39 +00:00
mgh-odoo 1f62977d5d [FIX] point_of_sale: wrong price on receipt fix
Before this commit, if a user select option 'tax-Included Price' in pricing
from pos.config and sale product with a discount, it is first displaying
price without tax instead of the price including tax.

Task-2002464
Closes #33733

closes odoo/odoo#34259

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
2019-06-20 09:24:37 +00:00
qsm-odoo 684f14d8f4 [FIX] website_mass_mailing: restore basic edition of mailing popups
Following the new editor at https://github.com/odoo/odoo/pull/29775,
the html field to edit the mass mailing popups in the backend appeared
entirely broken.

This was because the editor css was not loaded for that field.

closes odoo/odoo#34250

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
2019-06-19 16:04:02 +00:00
Lucas Lefèvre 7cbea1dcff [FIX] hr_holidays: Don't set all employees absent
When computing `is_absent` for multiple employees
(multiple records in `self`), if one employee is really absent
(leave), all employee in the recordset are also considered
absent.

Note: it never happens in saas-12.2 but in master
and possibly custo.

closes odoo/odoo#34241

Signed-off-by: Romain Libert (rli) <rli@odoo.com>
2019-06-19 12:53:42 +00:00
Patrick Hoste be5e8fdab8 [FIX] eLearning: allow portal user to share a slide by mail
Before, a portal user who tried to share a slide by mail got
a Odoo Server Error. He will now be able to share it without
any error.

closes odoo/odoo#34320

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
2019-06-19 11:50:33 +00:00
Christophe Simonis f3b6ff0c19 [FIX] test_rpc: adapt test to new version
Oversight of previous forward-port
2019-07-05 11:32:31 +02:00
Christophe Simonis 039e6bae99 [MERGE] forward port branch 12.0 up to 9c742d0c65 2019-07-05 11:13:53 +02:00
Jeremy Kersten 50d21df156 [FIX] base_geolocalize: allow to force country in request
Before this commit, using google geoloc, we only provide a string as address
withtout more information.

Now by defaut, we force the country as components:
https://developers.google.com/maps/documentation/geocoding/intro#geocoding

Related to task-2030886

**setup:**
```python
url = "https://maps.googleapis.com/maps/api/geocode/json"
```

**before:**
```python
params = {'address': 'Georgia', 'key': apikey}
requests.get(url, params).json()
```

>       ==> Return coordinate of "Georgia, United States"
>           What is completely wrong
>

**after:**
```python
params = {'address': 'Georgia', 'components':'country:Georgia', 'key': apikey}
requests.get(url, params).json()
```

>       ==> Return Nothing
>          What is strange but less wrong than US
>

```python
params = {'address': 'Belgium', 'components':'country:Belgium', 'key': apikey}
requests.get(url, params).json()
```

>       ==> Return coordinate of Belgium

closes odoo/odoo#34582

Signed-off-by: Christophe Simonis <chs@odoo.com>
2019-07-04 13:08:42 +00:00
qsm-odoo 3431751c1c [FIX] web: load editor assets in the right order
Before this commit, 50% of the time, the design of the editor in the
website appeared broken. This was because the two editor assets (the
web_editor one and the website one) are lazy loaded... but their load
order was not deterministic. The bug was introduced with the new editor
merged with https://github.com/odoo/odoo/pull/29775.

In fact the lazy loading system introduced by the `loadLibs` function
of the ajax module was designed to allow sequential and/or parallel
loading of JS files... but not of assets bundles (for CSS it is always
forced to parallel because only the DOM order matters anyway). This
commit shares the code to allow sequential and/or parallel loading of
assets bundles. It also forces the asset bundle resources to be loaded
after css and js resources.

closes odoo/odoo#34544

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
2019-07-04 12:46:50 +00:00
Richard Mathot fc53b1102a [FIX] hr: missing view block about "Education" on employee form
This block has been lost in 1f2766a955
We bring it back to life.

opw-2031797

closes odoo/odoo#34574

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2019-07-04 07:49:35 +00:00
Xavier Morel 7f8473cd1d [FIX] base: don't overwrite existing extensions
The point was to fix files attachments without an extension,
potentially appending to existing extensions was not a smart idea.

See #34299, 5eb15c01b5
2019-07-02 10:05:35 +02:00
Yannick Tivisse 7fc9421042 [FIX] hr_contract: Track employee_id modification on contracts
closes odoo/odoo#34483

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2019-07-01 11:20:48 +00:00
Pierre Masereel b9889e081e [FIX] pos_cache: eval domain before sending it to server
Since changes made on 'product.product' model in rev: 30e4d89a62
the domain is not represented as a string, but as a function, and that
leads to error as the javascript function is sent to the server instead
of a string representing a domain.

So we check the type of domain to see if we have to evaluate a function
or send the domain as a string

closes odoo/odoo#34453

Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
2019-06-28 14:05:58 +00:00
Robot Odoo f40ca3bbb7 [MERGE][FIX] website_slides: merge rank related fixes
See sub commits for more details.

Linked to task 2005840

closes odoo/odoo#34220

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
2019-06-28 16:24:19 +02:00
Thibault Delavallée cd039b64d4 [FIX] gamification, website_{profile, slides}: correctly display next rank
This fix correctly displayed motivational of next rank to achieve depending
on current karma. Indeed description_motivational field is not the
motivational to reach next rank but to reach the current rank, taken from
previous rank point of view. That way a given rank is configured by modifying
only 1 data.

When not having any karma points (newly created user) the next rank is computed
as being the first available rank. Motivational phrases and badges are updated
accordingly. This commit partially reverts 489c8623e2.

Result

  * new user with no karma: next rank is the first rank;
  * user with karma and next rank: as currently;
  * user being at final rank: next rank is just current rank with a 100%
    circle;

Linked to task 2005840
Related to PR #34220
2019-06-28 13:45:33 +00:00
Thibault Delavallée d5f8e39923 [FIX] website_profile: fix leaderboard / top3 computation
Contains some small fixes

  * correctly order leaderboard by descending karma, not creation date;
  * top 3 users displayed in footer banner should be published, otherwise
    displayed images do not match the top 3 displayed in the page displayed
    when clicking;
  * correctly say Leaderboard is an overall leaderboard, not only limited
    to the current week;

Linked to task 2005840
Related to PR #34220
2019-06-28 13:43:19 +00:00
Thibault Delavallée f66453a0f5 [FIX] website_profile: correctly display rank position image in top 3 users
As user is a loop variable we can directly use its index instead of a rank
position that is not always correctly computed when not being logged due
to access rights issues.

Linked to task 2005840
Related to PR #34220
2019-06-28 13:43:19 +00:00
mgh-odoo 798aa51a00 [FIX] website_{profile, forum}: migrate events from forum to profile
After this commit  https://github.com/odoo/odoo/commit/ff870099c588e56 some of the events are left
in website_forum, that caused some buttons to be inactive. In order to fix that
events moved to website_profile.

Note: code is moved as it is. Cleaning class / namespace will be done in master
to avoid issues due to stable version.

Related to task 2006045

closes odoo/odoo#34138

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
2019-06-28 05:02:45 +00:00
Yannick Tivisse 4a748da4b0 [FIX] hr: Correct implementation for 3be372c 2019-06-28 08:49:21 +02:00
Басхүү f7f58b1062 [CLA] Add CLA for Baskhuu 2019-06-19 11:16:39 +00:00
Rémi Rahir 2ba7114047 [FIX] website_sale: multi-website
The fix added in 3a0f05f334 doesn't work if an already existing user in company A
trys to modify his address on a website linked to company B. The form will try to change the company_id
of the res.partner which will then conflit with the company_id of the associated res.user, ultimately leading
to a UserError and a 500 error on the website.

opw-2025457

closes odoo/odoo#34262

Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
2019-06-20 10:17:00 +00:00
Nicolas Martinelli b59f3e4f99 [FIX] account: fallback journal
Commit 6b14ceb225 introduced a smarter way to find the default
journal based on the currency. However, it missed the fallback if no
journal is found.

opw-2009934
opw-2024204
opw-2011321

closes odoo/odoo#34263

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
2019-06-20 09:00:50 +00:00
Jigar Vaghela e416428669 [FIX] l10n_de: Fix wrong tag name
closes odoo/odoo#34239

Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
2019-06-19 10:34:47 +00:00
Christophe Simonis 132e38beef [MERGE] forward port branch 11.0 up to b5a04fd29f 2019-06-19 12:07:56 +02:00
Olivier Colson c0643ac918 [FIX] account: make cash basis taxes work in case several account move lines are reconciled within the same account.move
Such move lines can be created by POS, when closing a session. Because of commit https://github.com/odoo/odoo/commit/d3453f7d152d486cb5df01b4e40dbde57f59b49e , the cash basis entries are now created *after* reconciling everything (and not during reconciliation anymore). This causes multiple lines of the move created for the sessions to be reconciled together in case a refund was made (partial or not).

Solves ticket 2008085

closes odoo/odoo#34237

Signed-off-by: Cedric Snauwaert (csn) <csn@openerp.com>
2019-06-19 09:24:26 +00:00
Goffin Simon cfd5c90652 [FIX] hr_holidays: Access error when requesting a new leave
Steps to reproduce the bug:
- Create an hr.leave.allocation with mode = 'By Employee Tag'
- Select Employee Tag = 'Employee'
- Set all the other required values
- Log with Demo User(Marc Demo)
- Go to Leaves > My Leaves > New Request

Bug:

An access right error was raised due to the record rule: "Allocations: employee: read own"
With this record rule the user can only read the hr.leave.allocation linked to his employee's user.
But with allocations in mode 'By Employee Tag', in the function get_days it tried to compute
the 'number_of_hours_display' of all the allocations linked to the current employee's user and
in the function _compute_number_of_hours_display, it also computes the parent_id of these allocations.
As the parent_id is not linked to the employee's user, it raised an access right error.

opw:2006686

closes odoo/odoo#34236

Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
2019-06-19 09:14:47 +00:00
Nicolas Lempereur 97cd3dfdf9 [FIX] web: update moment ar locale for month
The months name in momentjs used an arabic translation with the month
then some crap (or the month said a second time) after.

This does not seem expected, and has been solved in moment.js library 2
years ago:
https://github.com/moment/moment/pull/4271

This PR apply this change in moment.js localization included in Odoo.

opw-2006265
closes #34248

Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
2019-06-19 15:00:27 +00:00
Christophe Simonis 37e05d35d2 [MERGE] forward port branch saas-11.3 up to 132e38beef 2019-06-19 14:41:36 +02:00
Julien Castiaux 85ab9238c5 [FIX] google_account: improve logging of errors
There is no guaranty that both the request body and the response body
will contain JSON data. This fix corrects the logging by printing the
raw text in case of json decode error.

opw-2006561
opw-2024242

closes odoo/odoo#34221

Signed-off-by: Julien Castiaux <Julien00859@users.noreply.github.com>
2019-06-19 09:12:27 +00:00