Commit Graph
121855 Commits
Author SHA1 Message Date
RomainLibert f0589d3351 [MERGE] sale,pos_sale,website_sale: prepare for sale_enterprise
We want to add a dashboard view for sale in enterprise, for this we need
to make changes in the way views are defined on the actions (use
act_window.views) in sale.

We also need to modify the demo data in order to have beutiful display
in demo mode.

Task: #59409
Closes #25940
2018-08-03 11:18:20 +02:00
RomainLibert 7cf785ee3c [IMP] website_sale: change demo data sale_order create_date
In order to beautifully display data in the cohort view in enterprise,
we need to be able to define the create_date of sale_order
2018-08-03 11:18:19 +02:00
RomainLibert c77824c471 [IMP] sale,pos_sale: use act_window.views in
In order to be able to add some enterprise views to sale, we need to
define some act_window.views.

We also make some slight changes in the sale_report for use in
sale_enterprise
2018-08-03 11:02:46 +02:00
Odoo Translation Bot 935bac15df [I18N] Update translation terms from Transifex 2018-08-03 10:55:14 +02:00
Luis González b623695ee7 [FIX] website_sale_digital: portal files as digital products
Currently, when a digital product is purchased, the list of attachments
is incorrectly computed. Product template's portal files are retrieved
correctly, but all product variant's attachments are taken into account,
not only its portal files.

This commit causes the portal attachments to be computed correctly,
taking into account only portal files from both the product template and
product variant.

Closes #25609
2018-08-03 10:41:02 +02:00
Martin Trigaux 67295cdfab [REM] base: remove commented debugger
Introduced at 99f497b390
2018-08-03 10:27:52 +02:00
Fabien Pinckaers 5875b0ce2e [IMP]: mail layout CSS fix on button 2018-08-03 09:44:31 +02:00
Andreas Perhab b3bcfbde1b [FIX] sale_stock: fix msg argument in assertion
third positional argument is places not msg (which expects a number not a str)
https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertAlmostEqual

fixes errors like these:
 if round(abs(second-first), places) == 0:
 TypeError: 'str' object cannot be interpreted as an integer

and gives the intended message when assertion is errornous
2018-08-03 09:36:44 +02:00
Christophe Simonis 15d3ba496f [FIX] product: correct product view
The field `description` has been misplaced during foward-port of
46b8c07249
2018-08-02 18:19:52 +02:00
Richard Mathot 47654e98e0 [FIX] stock: make orderpoints run in a deterministic order
In Python 3.5, items() on a dictionary return keys in a randomized order.

location_data can thus be processed in different orders, leading to
different quantities in the MO's created by the procurement scheduler.

This fix makes the output of the scheduler deterministic.

(thanks to @odony for his help in troubleshooting this issue)

opw-1865711
2018-08-02 17:00:14 +02:00
jem-odoo 8d72fe6655 [MERGE] *_timesheet: selling services improvements
Impacted modules: account, hr_timesheet, sale and sale_timesheet

This merge commit contains many small changes in the way we
sell time in odoo.

* amount to invoice/invoiced amount: change the simple formula
used to really takes amount on invoice into account. This reintroduces
the 2 fields on sale.order.line model.

* some usability improvements: styling project overview, better
error and warning messages, ...

* invoicing timesheet: only timesheet linked to sale line with
'delivered qty' product will be linked to the invoiced (and considered
as invoiced) at invoice creation (instead of validation). Those
timesheets can not be modified then.

* Previous change implies to remove timesheet_revenue, which
became useless.

For more details, have a look at subcommit, as they explain
more precisely their feature and purpose.

Thanks to @bst-odoo for his support and functionnal coaching.

Task #1857652
2018-08-02 16:52:26 +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
jem-odoo 09974dcdfc [IMP] sale_timesheet: change demo data 2018-08-02 16:12:40 +02:00
jem-odoo e8bd6d67f1 [IMP] sale_timesheet: tooltip, style and extenadable in overview
This commit add the support of the tooltip for the last
table in plan project. It also provides a cosmetic change
and make the code more extendable as we will need this in
enterprise to add a column to include forecast in remaining
computation.

Task #1857652
2018-08-02 16:12:40 +02:00
jem-odoo ecd5e60697 [IMP] sale_timesheet: hide 'invoice' button when no service to invoice
In plan project, when there is something to invoice on the SO
the "Create Invoice" button will be displayed, even if the
"to invoice" amount is zero. This can happen when the SO contains
an ordered service line (that does not create project/task). This
line will be in 'to invoice' status, but it is not taken into
account on the plan project since it does not interact with the
project (no created task, no timesheet, ...)
So, to avoid confusion, we hide the button on the project
overview.

Task #1857652
2018-08-02 16:12:40 +02:00
jem-odoo c54f095243 [IMP] hr_timesheet: warning when AA inactive to log timesheet
If the project does not allow timesheets, the 'timesheet' tab on task
should be hidden. If the project allows timesheet but its related
analytic account is inactive, the warning message will be displayed
to avoid user to record timesheets.

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo 9a691b1a1f [IMP] sale_timesheet: improve delete task message 2018-08-02 16:12:39 +02:00
jem-odoo 46b578784c [IMP] sale_timesheet: invoicing timesheets
This commit changes the way timesheet are invoiced.

An invoiced timesheet is a timesheet line linked to a invoiced
(timesheet_invoice_id set). This happens when the sale order line
linked to several timesheets is invoiced, but only for the line
based on 'delivered quantity' policy. Those timesheets will be linked
to the new created invoice.
Those timesheets can not be changed as they are considered as invoiced
to the customer: quantity, project, SO line, ... are freezed.
Those timesheets are now marked as invoiced at the invoice creation,
and not at the invoice validation, like before. This only concerned
Customer Invoice (and not Vendor Bills, Credit Note, ....).

For timesheets linked to a SO line based on 'ordered quantity', they can
be modified as their purpose is only to track the time spend on the SO
line, and it does not impact the amount or the quantities invoiced to
the customer.

The timesheet linked to milestone sale line can be modified too, they
are now linked to invoiced, as their is goal purely time tracking (as
the delivered quantity is manually change on SO line).

This commit also adapt the tests accordingly.

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo 9429a0683d [IMP] sale_timesheet: remove useless timesheet_revenue field
The timesheet revenue is a field introduces for 11.0, as a field
computed on the fly (not a computed one). Its goal was to estimate
the theorical (and effective) revenue (amuont of money received when
selling the timesheet), depending of the invoice policy, the quantity
really invoiced, ...
Its computation is quite complex, and is not working perfectly as it
is difficult to determine how much is already invoiced in case of
selling time in ordered quantity.
Also, this field is not used anymore in the project overview, removing
it will reduce code size and complexity. Soon, the amount to invoice and
invoiced coming from the SO lines replaced the timesheet revenue.

This commit removes the field, and its related tests.

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo cb7e6ce338 [IMP] sale_timesheet: timesheet_invoice_type computed field
As we plan to remove the timesheet_revenue field, we can
make 'timesheet_invoice_type' a computed field, to simplify
code and readability.
Before, this field was readonly, and set automatically on
timesheet creation.
To allow searching on it, we keep it stored.

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo a628d80d5e [IMP] sale_timesheet: sale line of subtask
Before this commit, a subtask was forced to have the same SO line
than its mother.
We now want to make it updatable: the default value will be the one
from its mother, but the user can change it manually and set it to
whatever he want (it still should be a service SO line, belonging to
the same customer than the task).

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo 17d0de306e [IMP] sale, sale_timesheet: use untaxed amount inv/to inv
Since the 2 fields 'untaxed_amount_to_invoice' and
'untaxed_amount_invoiced' are reintroced
we can now use them in sale report, and in profitability report when
selling time. They will
be used in the project overview, solving the wrong amount in that view.

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo a9658d5bf5 [IMP] sale: untaxed amount to invoice/invoiced on sale line
Similar fields were introduced at d2e33ba57c
but their computation were not totally exact, so someone removed them.
Also, for performance sake, they were replaced by a (too) simpler
calculation at 39d0613187d36f16c541734e80925e9d.
Turns out, those fields were usefull !

Neither of those 2 implementations were 100% correct, so this commit
reintroduced thoses 2 fields on sale.order.line object:

1/ untaxed_amount_invoiced: will contain the amount (money without
taxes) invoiced
from the sale line, taking refund linked to the same SO line into
account. The formula is
   SUM(inv_line.price_subtotal) - SUM(ref_line.price_subtotal)
where
   `inv_line` is a customer invoice line linked to the SO line
   `ref_line` is a customer credit note (refund) line linked to the SO
line

2/ untaxed_amount_to_invoice: will contain the amount (taxes excluded)
of the money to invoice from this sale line. The formula is
   SOL.total - SOL.untaxed_amount_invoiced

Those numbers are interesting in reporting, and to manage the billing
part for salespersons.

Task #1857652
2018-08-02 16:12:39 +02:00
jem-odoo 255e66695a [FIX] account: unexisting fields
When making a refund, a list of field is read during the
process. This field list comes from the
method, which return some field that does not exist anymore.
Reading non-existing fields creates warning in logs
2018-08-02 16:12:39 +02:00
Odoo Translation Bot 8aed99b0bd [I18N] Update translation terms from Transifex 2018-08-02 14:39:54 +02:00
Thibault Delavallée 00b75c3a49 [REF] point of sale: revert wrong configuration change
This commit reverts a configuration update recently done. Tax display
configuration was moved from pos config to general company settings.
This was a mistake and should not stay as it is. Even if saas 11.4 could
be considered as stable this change is necessary and does not impact
anybody as this branch is not released.

Partially revert e434690fe3 .
2018-08-02 14:33:40 +02:00
Martin Trigaux 6b2dcd064d [I18N] export saas-11.4 source terms
For odoo-master transifex project
2018-08-02 13:32:24 +02:00
Martin Trigaux 8c07fd3c5a [FIX] barcodes: remove untranslated content
Since 6a3324a7 and 0c489cf1fa, a translation can not contain a \n
Previous text was not correct rst anyway.

Reexport base translations to include all missing modules
2018-08-02 11:49:32 +02:00
RomainLibert 01f6a0257d [FIX] web: use fieldName instead of field in _sanitizeValue
In _sanitizeValue we can receive field as a string of the form
fieldName:grouping, if we search for this directly in the fields of the
model we won't find anything.

Hence we should use the fieldName part of it.
2018-08-02 11:41:42 +02:00
Odoo Translation Bot a465802b98 [I18N] Update translation terms from Transifex 2018-08-02 10:18:12 +02:00
Martin Trigaux cb4281fe75 [FIX] *: typos or missing words 2018-08-02 10:11:07 +02:00
Nimesh Jethva 2cbdf1b4ad [FIX] web: BS4, restore bold font for main titles of settings 2018-08-02 09:55:20 +02:00
qsm-odoo ba586a6216 [FIX] website: BS4, restore dropdown menus in website navbar
As soon as a website menu contained a sub-menu, the whole website layout
was broken as we put <li/> elements inside a <div/> element (this
occured by mistake with BS4 migration).
2018-08-02 09:55:20 +02:00
qsm-odoo 08117383d0 [FIX] web_editor: activate image tab by default in media dialog 2018-08-02 09:55:20 +02:00
qsm-odoo 2587483f41 [FIX] web: restore the "+" menu in backend
Dropdown menus which collapsed in the "+" menu were not receiving
the proper styling anymore.

Thanks to @nla-odoo
2018-08-02 09:55:20 +02:00
qsm-odoo 8ba0bbb092 [FIX] base_import: BS4, visible error text on import fail
In BS3, the combination "text-danger" and "bg-danger" worked as the red
color for texts was not the same as the red color for backgrounds. With
BS4, they are the same so it does not make sense.

Fortunately, we introduced a mixin customization which automatically
selects the correct color according to the background. So removing the
"text-danger" part is enough to make sure the text will be visible over
"bg-danger" background.
2018-08-02 09:55:20 +02:00
qsm-odoo 90d22851b2 [FIX] web: BS4, review selected dropdown item style (II)
Completes commit https://github.com/odoo/odoo/commit/e10a4303c21332f10d89b0c19661cc11ca0dc7a6
2018-08-02 09:55:20 +02:00
qsm-odoo b1107cba38 [FIX] website_sale: BS4, review some checkout layouts 2018-08-02 09:55:20 +02:00
Kishan Gajjar e391ebff98 [FIX] web_editor: BS4, restore crop dialog UI 2018-08-02 09:55:20 +02:00
qsm-odoo ad12802228 [FIX] website_sale_comparison, *: restore broken scss asset
* website_slides

The app was still using an old BS3 variables that happened to be created
by the website_slides app (that is why the bug was not noticable
on runbot).
2018-08-02 09:55:20 +02:00
qsm-odoo d9b9c4e8e1 [FIX] *: BS4, restore some popover design
Completes commit https://github.com/odoo/odoo/commit/2d5595fcbad73ed0ce03f048fdd870d9659bcd5e
2018-08-02 09:55:20 +02:00
qsm-odoo c120eb3a29 [FIX] hr_org_chart: BS4, restore most of the hr_org_chart feature
With BS4, the popover and the chart design were broken. This is now
restored but could still use a bit of redesigning.
2018-08-02 09:55:20 +02:00
qsm-odoo f63a36e184 [FIX] mail: BS4, restore followers dropdown style 2018-08-02 09:55:20 +02:00
qsm-odoo 8b1d17fe0e [FIX] base: also add vendor prefixes with debug=assets
As explained here: https://github.com/odoo/odoo/commit/770aec399c4e6e29cfc5854318cbda19a605315d#diff-3d7991d8bc534e0372f0bd9b4f9165a7R424,
we have to post-process the generated css to add some vendor prefixes.

Doing that there was however only adding those in non-debug=assets
files.
2018-08-02 09:55:20 +02:00
qsm-odoo a070c2e877 [FIX] base: BS4, restore <select/> style
In enterprise version, the select elements have a custom style. For it
to work, the "appearance" CSS property must be understood... which is
not the case in most browser without vendor prefixes.

As discussed in https://github.com/odoo/odoo/commit/770aec399c4e6e29cfc5854318cbda19a605315d,
vendor prefixes are added by post-processing the scss generation.
2018-08-02 09:55:20 +02:00
Lucas Perais (lpe) dda2f0f861 [FIX] mass_mailing_event: keep default domain
Before this commit, when cliking on "mass mail attendees" on a event form
the default domain on the attendees for determining the mass mailing recipient
was lost in an onchange

After this commit, we retrieve the right domain

OPW 1869308
closes #26081
2018-08-02 09:35:29 +02:00
Adrien Dieudonne d91ec258e6 Revert "[IMP] web: use burger menu for tablet in vertical mode"
This reverts commit 4e5f826ce5
for two reasons:

1) A lot of people are working with splitted desktop screen and
will see the view switcher/search as on mobile: it's not efficient.
Only the burger menu should have been visible for the tablets,
not the other mobile features.

2) When you switch between vertical mode and H mode, we don't want
to change the mobile mode because widgets aren't reinstantiated and
some features don't work.
For example, the burger menu is broken if you switch from H mode to
V mode.

Task-1869468
2018-08-02 08:14:10 +02:00
Christophe Simonis 7d529c6ae9 [FIX] purchase_stock: adapt fix 3869cdf7d8 to new models 2018-08-01 19:06:17 +02:00
Christophe Simonis 8f093ea6f9 [FIX] hr_holidays: remove useless invisible label 2018-08-01 18:33:34 +02:00
Christophe Simonis 4797627259 [MERGE] forward port branch saas-11.4 up to 8d9366197e 2018-08-01 18:02:29 +02:00