Commit Graph
117975 Commits
Author SHA1 Message Date
Joren Van Onder 3ae382f8df [FIX] point_of_sale: do not recompute manually set prices
The POS recomputes order lines when the pricelist changes. This is
different from the sale app on purpose: in a usual POS flow the customer
and thus pricelist is selected after taking the order.

But users commonly use a 'Miscellaneous' product when they are selling
something that is not in their POS system. The user can select this
product and manually set the price. When now a customer is
selected (even if the pricelist has not changed) these miscellaneous
order lines get recomputed. So now the cashier is forced to input
these prices again.

To avoid this we keep track of lines that have had their price changed
through the UI and we don't update them.

opw-817353
2018-02-21 16:12:40 -08:00
Christophe Simonis e750bb6e11 [FIX] sale: remove extra line wrongly added by previous forward-port 2018-02-21 20:43:09 +01:00
Christophe Simonis ae6a65753e [MERGE] forward port branch 11.0 up to dbb713c2f8 2018-02-21 20:19:26 +01:00
Christophe Simonis dbb713c2f8 [MERGE] forward port branch saas-16 up to 49f8548557 2018-02-21 19:17:01 +01:00
Christophe Simonis 49f8548557 [MERGE] forward port branch saas-15 up to 085ff2f9c4 2018-02-21 18:36:36 +01:00
Christophe Simonis 085ff2f9c4 [MERGE] forward port branch saas-14 up to 8c692aac88 2018-02-21 18:09:17 +01:00
Christophe Simonis 8c692aac88 [MERGE] forward port branch 10.0 up to aad677c338 2018-02-21 17:57:00 +01:00
Thibault Delavallée 62e8e5f305 [MERGE] various: add menus to configure activity type and move mail data in their file
Purpose of this merge is to ease future tasks improving activity
configuration, generation and tweak of various mail related data and
features. It contains

 * add menus in hr_recruitment and project to configure activity types;
 * split data in various main applications to have mail-related data in
   their own file;

Future tasks will be about generating activities, improving the mail
activity mixin and removing some subtypes. This merge is related to the
task 60962. #Closes #23232 .
2018-02-21 17:47:27 +01:00
Christophe Simonis aad677c338 [MERGE] forward port branch 9.0 up to 4432e1d5c3 2018-02-21 17:35:11 +01:00
Christophe Simonis 4432e1d5c3 [FIX] project: do not reset task's partner when changing project if project is not linked to a specific partner 2018-02-21 17:26:16 +01:00
Josse Colpaert 6ec6d3e8a1 [FIX] stock: remove action_traceability method on lot fixes #22299 2018-02-21 17:14:13 +01:00
jem-odoo cb53485d71 [FIX] sale: reinvoice only vendor bills
When validating a vendor bill, we want the product
with expense policy set to be reinvoice on the open
sales order matching the analytic account of the invoice
line. Applying the same mecanism for customer invoice
does not make sense, as we might confirm a SO and validate
its invoice, we don't want a new SO line to appear (avoid
loop).
Unfortunately, since a long time, this is possible in Odoo,
and really make no sense. We should only take negative
analytic lines (coming from vendor bills and expense, not
the customer invoice) into account for adding SO line.

This commit correct this problem to avoid having
many null SO line created on customer invoice validation.
All test cases are correctly written, but there was no
check to prevent this mecanism to be apply on customer
invoice.
2018-02-21 16:59:39 +01:00
Thibault Delavallée 1aa0f9a4db [MOV] maintenance: split data to separate mail data from other data
It is simpler to have data split by main model or application like we
already do for models and views. It allows to easily have an overview
of data a module holds.

As we will work on mail related data like adding activities or tweaking
subtypes and templates, having them all in a single file and not lost
between other data helps finding and working with it.

This commit only moves code. No functional change should occur.
2018-02-21 16:52:28 +01:00
Thibault Delavallée 12ef8b6312 [MOV] sale: split data to separate mail data from other data
It is simpler to have data split by main model or application like we
already do for models and views. It allows to easily have an overview
of data a module holds.

As we will work on mail related data like adding activities or tweaking
subtypes and templates, having them all in a single file and not lost
between other data helps finding and working with it.

This commit only moves code. No functional change should occur.
2018-02-21 16:52:15 +01:00
Thibault Delavallée 561ae286f9 [MOV] hr_expense: split data to separate mail data from other data
It is simpler to have data split by main model or application like we
already do for models and views. It allows to easily have an overview
of data a module holds.

As we will work on mail related data like adding activities or tweaking
subtypes and templates, having them all in a single file and not lost
between other data helps finding and working with it.

This commit only moves code. No functional change should occur.
2018-02-21 16:51:38 +01:00
Thibault Delavallée 0e595ee81a [MOV] hr_holidays: split data to separate mail data from other data
It is simpler to have data split by main model or application like we
already do for models and views. It allows to easily have an overview
of data a module holds.

As we will work on mail related data like adding activities or tweaking
subtypes and templates, having them all in a single file and not lost
between other data helps finding and working with it.

This commit only moves code. No functional change should occur.
2018-02-21 16:46:53 +01:00
Martin Trigaux 113385fdd7 [FIX] pos_mercury: do not translate mercury XML
untranslatable content
2018-02-21 16:43:30 +01:00
Thibault Delavallée 634a688653 [MOV][IMP] project: improve action to configure activity types and move in its own file
Purpose of this commit is to ease project managers in their daily job
organization by ensuring that newly created activities in project
configuration are by default associated to tasks, and not global.

Activity types actions and views are moved in their own file in order
to match the guidelines.
2018-02-21 16:43:26 +01:00
Thibault Delavallée 883f634ec8 [IMP] hr_recruitment: add menu to configure activity types
Purpose is to ease HR recruitment people in their daily job organization
by allowing to tune activity types. A menu is added in configuration to
access activity types. Those are by default associated to the applicant
models.
2018-02-21 16:41:53 +01:00
Christophe Simonis 68379cadbc [MERGE] forward port branch 10.0 up to 2bdc0cc7eb 2018-02-21 16:37:49 +01:00
Swapnesh Shah d6174dd226 [Fix]mrp: Removed unused copy_data method 2018-02-21 15:55:08 +01:00
Nicolas Martinelli c0fa53e45c [FIX] crm: link in planner
The link to configure incoming emails is not correct anymore after the
Sales reorganization.

opw-813987
2018-02-21 15:49:14 +01:00
Yannick Tivisse 4d614f55c3 [FIX] l10n_be_hr_payroll: Use the warrant costs on gross computation
Purpose
=======

The warrant cost formulae has been modified at 5d22170.

Instead of using the (remaining) warrant costs formulae, use the corresponding field instead.
2018-02-21 15:14:26 +01:00
Christophe Matthieu 5fb21b4db4 [FIX] web: evaluation of xml templates must be retro compatible
Issue:
domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
is converted into a domain equal [('date','=','%2017-%12-%12')]
instead of [('date','=','2017-12-12')]
2018-02-21 15:09:16 +01:00
Aaron Bohy 898cd0a5c1 [FIX] web: Calendar: display period in breadcrumbs
In Calendar views, the displayed period should be written in the
breadcrumbs (e.g. in month mode, '(February 2017)'). This has been
broken by rev. 7b6056a0b5.
2018-02-21 14:56:18 +01:00
Christophe Simonis 2bdc0cc7eb [MERGE] forward port branch 9.0 up to 2120e667b9 2018-02-21 14:36:35 +01:00
Olivier Dony af7860c94c [FIX] project: restore portal visibility
Odoo 11 comes with unified features for Project Tasks and Project
Issues. Specifically, issues were retro-fitted into tasks, and saw their
specific features added to the features of tasks.
During this refactoring, the portal controller for issues was superseded
by a unified portal controller for tasks, via
623ea43268

One case was lost in the process: portal visibility of
tasks/issues/things that are individually followed by customers, without
the customer following the project itself.
This is important for `transversal` projects, such as a "Helpdesk"
project common to all customers, where each customer only sees their own
issues.

This commit restores the feature, previously added to issues by
1cc8252a95

Note: this clearly requires a proper regression test, to be added soon.
2018-02-21 14:12:15 +01:00
jem-odoo 95f6743054 [FIX] sale_timesheet: improve new demo data
Some label or name for new demo data are not clean.
This commit imrpoves them by:
- rewritting clean descirption for timesheets
- set negative amount for expenses analytic lines
2018-02-21 14:04:00 +01:00
Nicolas Martinelli 1fa6b63c0f [FIX] stock_account: groupby
Set the groupby according to what is done in `_read_group_raw`.

opw-816358
2018-02-21 14:03:40 +01:00
Nicolas Lempereur e2280783a2 [FIX] mail: no view edit on forum link in notif
When sending notification from the frontend, if a template is rendered
for it and the user has the group "website.group_website_publisher" he
will get inherit_branding adding on elements things like:

  data-oe-id="42" data-oe-model="ir.ui.view" data-oe-field="arch"

but the chatter system has feature automatically redirecting an element
that have attribute "data-oe-id": this caused for example that a
link notification towards the forum would instead be redirecting to
editing the view of the notification.

This fix distinguish the inherit_branding in the chatter feature and
ignore them.

opw-813333
closes #23225
2018-02-21 13:39:25 +01:00
Thibault Delavallée 1feeff4deb [FIX] mail: fix display of unnecessary : in message about activity done
If the activity had no summary the messages has a : leading to nothing
which is not very nice. If there is no summary, only display the "done
by" message followed directly by the feedback.
2018-02-21 13:35:11 +01:00
Nicolas Martinelli 005614ef72 [FIX] stock_account: apply ir rules
- Enable multi-company: without sharing products and partners
- Create 2 companies (company1 and company2)
- Create 2 users one for each company
- Create inventory transaction (receipt) by user1 in company1
- Create inventory transaction (receipt) by user2 in company2
- Using user2 run inventory valuation report with 'At a specific date'
  option.

You got read access error for product.product.

This is due to commit 5c5098f740. We should apply the `ir.rules` to
the query.

opw-816663
2018-02-21 13:31:20 +01:00
Nicolas Martinelli 1460ed08c9 [FIX] mail: tracking of custom field
- Create a custom field
  Field Type: monetary
  Tracking: Always
- Install any module

A crash occurs in `_instanciate_attrs` since `attrs` is `None`.

In some special cases, the instanciation of the attrs of a field is
delayed at the very end of the setup. For example, in case of a Many2one
for which the comodel is not yet loaded.

Therefore the override of the method should take this case into account.

Closes #22922
opw-815185
2018-02-21 13:27:02 +01:00
Christophe Simonis eebc7b6e32 [MERGE] forward port branch 10.0 up to 1512618d3e 2018-02-21 12:42:46 +01:00
Christophe Matthieu 53bb0cee1f [FIX] hr_expense: add missing state field used in modifiers fields
The domain is add in the view from the python field description.

Issue:
In expense go in "to Approve" > "Expense Reports to Approve"
Create a new expense sheet by clicking create
Add an expense to the sheet
Click create in the bottom left

result: Uncaught Error: Unknown field state in domain
2018-02-21 12:29:28 +01:00
Romain Derie 2120e667b9 [FIX] website_sale: variants view, currency price and price diff
Before this commit:
1. When enabling 'List View of Variants' on a product page, it would not
   replace the variant normal view as it should since the code being replaced
   is included in the code replacing it.
2.The badge specifying the price difference between the variance and the
  product base price would be calculated by taking the price_extra of the
  variance attribute and converting it in the user currency which was not
  correct if a pricelist was set on the product variant because the price diff
  would then be (the variant price set on the pricelist) - (product base price)
  Note: this is about the 'List View of Variants' mode, not the normal mode
        which list variant attribute and not variant itself
3. The strikethrough amount was not in the user currency

Step to reproduce:
  - Enable variants & pricelists
  - Enable multi-currency and activate 'COP' as second currency (you may want
    to change the currency symbol on edit mode since it is also '$')
  - Go to iPad Retina Display product page in shop
  - Enable 'List View of Variants' in 'Customize'
  - Both Variants selection mode are visible (bug 1)
  - The third variant shows '+$ 50.40' which is the diff between the
    strikethrough prices (in fact the sum of the price_extra of the product
    variant attributes, +50,40 on the 32GO attribute in this case)
    It should show '+$ 40.32' since the price change from $600 to $640.32.
    This is bug n°2
  - Change Public Pricelist currency from USD to COP
  - Back on iPad page, change between the 3 product variants, you will see
    the $ price strikedthrough instead of the COP one:
    Strikedthrough: 750 (it should be 1 714 491,47)
    Price: 1 371 593,17
    This is bug 3
  - You can notice the bug n°2 being more visible since it shows
    '+$ 115 213,83' instead of '+ 92 171.07'
  - Remove the iPad Retina from Public Pricelist and add iPad Retina 32Go
    variant to it with a fix price of $1 000 000.
  - '32Gb, 2.4GHz, White' variant cost $1 000 000 but shows '+ 115 213.83'
    instead of '- 714 491.47' since the base price of Retina is
    '1 714 491.47'.
  - You can play with the pricelist price for this variant up and down, the
    diff price shown in the badge will always be 115 213.83 since it will
    always calculate it by summing all the variant's attribute price_extra
    and then converting it to the user currency.

This closes #14094, closes #22553
2018-02-21 12:18:56 +01:00
Jairo Llopis dd184b26ac [FIX] web_editor: Export classes and methods
Add various classes and methods to allow customization

Closes #23180
2018-02-21 11:50:57 +01:00
Christophe Simonis 1512618d3e [MERGE] forward port branch 9.0 up to e544ec8df7 2018-02-21 11:27:22 +01:00
Swapnesh Shah 17622fe25e [FIX] point_of_sale: Typo 2018-02-21 11:03:03 +01:00
Simon Lejeune 3c03376733 [FIX] stock: extra move, backorder and unit price
When creating an extra move, the price_unit field was not copied. It is
normal since the field is copy=False following rev[0].

But there was a side effect: let's say you order 1 product @ $10 and you
receive 5. The received quantity field on the purchase order line is
correctly set to 5 and the valuation inside the stock is correctly set
at $50, but on the picking there is one move line of 5 and a move a 4
and of 1, instead of one of 5. Note that in v10, the pack operation
would be split between the original move and the extra move, but in our
case the extra move is merged back in the original move, so we don't
need to split the move line. The split mechanism is there only when
working with moves without picking[1].

The issue here is that the moves are not merged because they do not have
the same price unit (5 and 0). We thus copy the unit price when creating
the extra move.

When creating a backorder, the price_unit field wasn't copied either.
It's not important when working with the classic flows (the link to
purchase_line_id is kept), but to be consistent we also copy it.

[0] https://github.com/odoo/odoo/commit/a4740861d3fdbecc8b1171b7d2072697e8a36258
[1] https://github.com/odoo/odoo/commit/561b3461a020021d911999cb41154f158b069a1d
2018-02-21 10:44:01 +01:00
Thibault Delavallée 446d4127d9 [FIX] mail: set view_id in mail/view only if we have one to specify
Currently if get_formview_id does not return a specific view id the
mail/view controller produces an url with view_id=False. Due to some
unknown reason it is not taken into account as False but as the
string False since some time. It generates a traceback and prevent
people from using the mail/view controller.

While finding why it seems to have changed we can avoid the issue by
setting the view_id only if set. It has no impact on the redirection
has the default for view is loaded as intended.
2018-02-21 10:24:43 +01:00
Florent de Labarre b55e844e1a [FIX] stock: check the state before put in pack
Makes consistent the Python logic and the view.

Closes #22534
opw-813477
2018-02-21 10:02:41 +01:00
Thibault Delavallée 5140e19092 [FIX] mail: correctly propagate parameters when re-calling message_post
A new notif_layout parameter has been introduced at 304e6cf90b. However it is
not correctly propagated to sub-calls when redirecting message_post
using context and sub-model.
2018-02-20 17:45:43 +01:00
Thibault Delavallée b4cf1a620c [FIX] mail: correctly give tracking values to notification template
Notification template has been converted into QWeb at commit 0f301bec25.
A variable renaming has not been correctly propagated, leading to
tracking values not being displayed in notification emails. This
commit fixes that.
2018-02-20 17:44:57 +01:00
Nicolas Martinelli e544ec8df7 [FIX] stock_account: method expect a record, not an id
Backport of 6cedc90f69
opw-817262
2018-02-20 17:07:24 +01:00
Martin Trigaux 6cfb775fff [FIX] payment_sips: use proper label
Why the abbreviation bro?
2018-02-20 16:56:13 +01:00
Martin Trigaux 59275673a4 [FIX] payment_stripe: correct typo 2018-02-20 16:42:02 +01:00
Martin Trigaux ed62588318 [FIX] web_editor: correct frenglish
Courtesy of e2f translators
2018-02-20 16:24:23 +01:00
Martin Trigaux a40044be4c [IMP] product: fix typo 2018-02-20 16:20:16 +01:00
Goffin Simon eb7602c4ea [FIX] sale: Confirmation date duplicated when duplicating SO
When duplicating a SO, the confirmation date is duplicated and the confirmation
date was older than the creation date.

opw:816866
2018-02-20 15:58:04 +01:00