Commit Graph
103231 Commits
Author SHA1 Message Date
Christophe Simonis 5ba5172d99 [MERGE] forward port of branch saas-8 up to 8064379 2016-01-07 15:16:56 +01:00
Christophe Simonis 18fc5307c1 [REL] 9.saas~9 2016-01-07 15:16:27 +01:00
rmu-odoo e19c7ebde2 [IMP] product: added field category_id in search view 2016-01-07 15:09:17 +01:00
Jeremy Kersten 9e6528f77d [FIX] email_template: allow to format date in the right language
Format_tz allow to format a date, but if the format was '%B', it was always January regardless lang in context
Now, it possible to use babel, to get the date in the customer language.

So:
    format_tz(object.date_order, format='short', context={'use_babel':1, 'lang': 'fr_BE'})
        will return '5/01/16 22:20'

    format_tz(object.date_order, format='short', context={'use_babel':1, 'lang': 'en_US'})
        will return '1/5/16, 10:20 PM'

    format_tz(object.date_order, context={'use_babel':1, 'lang': 'en_US})
        will return 'Jan 5, 2016, 10:20:31 PM'

    format_tz(object.date_order, context={'use_babel':1, 'lang': 'fr_BE'})
        will return '5 janv. 2016 22:20:31'
2016-01-07 14:42:57 +01:00
Mitali Patel 3941e41b9f [IMP] product: removed create uom from product view 2016-01-07 14:08:54 +01:00
Christophe Simonis c9401d70f8 [FIX] point_of_sale: remove leftover print statement 2016-01-07 14:02:53 +01:00
Srushti Patel b91b3217a6 [IMP] account,payment: Need to improve typo in helptip message, change 'that' into 'This' 2016-01-07 14:00:12 +01:00
Denis Ledoux ff72139aff [FIX] website_sale, website_quote: pay now confirmation email
When configuring the payment acquirer with the confirmation
`at_pay_now`, meaning the sale order has to be
confirmed when clicking on the "Pay now" button, instead
of waiting for the payment confirmation,
the confirmation email wasn't not sent.

opw-665697
2016-01-07 13:52:07 +01:00
Denis Ledoux 2afa1942ca [MERGE] forward port of branch 8.0 up to 7473f4a 2016-01-07 13:40:01 +01:00
Lionel Sausin 66e6a7ce22 [FIX] report: translate report name
As the report are downloaded from a controller, the context of the
webclient is lost. We chose to use `context_get` to get back one
instead of serializing the context trough the url.
2016-01-07 13:39:07 +01:00
Denis Ledoux 7473f4a3c7 [FIX] payment_buckaroo: return url, payment validation
This revision is related to 6efc371291

The return URL parameter key has changed: The capital letters
are not the same than before.

Besides, send a dict in the `ADD_RETURNDATA` doesn't seem
to be supported by Buckaroo. We therefore no
longer uses a dict but a string to avoid problems.

opw-665697
2016-01-07 13:20:13 +01:00
Stephen Medina 8e1057316f [ADD] doc: mention how to include static files
Does not explicitly mention how static files are loaded. This will
confuse anyone who is using the documentation as a guide and not going
through the pet store example code. Feel free to edit however, as long
as it is mentioned somewhere.

fixes #9170
2016-01-07 12:29:25 +01:00
Yannick Tivisse 0f3621fd63 [REM] claim_from_delivery: Remove the module 2016-01-07 12:08:22 +01:00
Yannick Tivisse 8304949019 [REM] website_crm_claim: remove the module 2016-01-07 12:08:22 +01:00
Yannick Tivisse f88e4b2b52 [REM] crm_claim: Remove the module 2016-01-07 12:08:22 +01:00
rap-odoo cc247e9709 [IMP] base: Change the word 'paying' to 'paid' in the warning. 2016-01-07 12:00:12 +01:00
Jairo Llopis 7f230a540e Remove the right backdrop.
If anybody adds a new modal in the `then()` part of the promise, without
this code, all `.modal-backdrop` elements will be deleted, and further
dialogs will not be modal; with this, only the current modal's backdrop
will be deleted.
2016-01-07 11:40:39 +01:00
Gaurav Panchal 3eab623ac2 [IMP] stock : rename the string of procurements field in config settings 2016-01-07 11:25:27 +01:00
Nicolas Lempereur 3002a8dd09 [FIX] lunch: typo in xml_id from 8641681 2016-01-07 11:13:18 +01:00
Yannick Tivisse 8641681400 [IMP] Lunch: Archive products
Add a stat/toggle button on form view
Add a stat/toggle action on tree view
2016-01-07 10:53:32 +01:00
Denis Ledoux 0b9fbc67bb [FIX] purchase: prevent write on the related stock.location
`default_location_dest_id_usage` on `purchase.order` is
used only for an attrs domain on the field
`dest_address_id` in the purchase order form.

There is therefore no worries to set it as readonly,
it won't break the feature he has been added for.

Besides, this will prevent the useless write of the
same field value on the related `stock.location`
when saving the purchase order.

This is important to prevent the useless write
on `stock.location`, as users might have the rights
to create/edit purchase orders without having
the write access to the stock locations.

opw-660736
2016-01-07 10:29:49 +01:00
Christophe Matthieu 7fcce928f3 [FIX] web_editor: allow custom template for html_frame field 2016-01-07 09:52:56 +01:00
Mitali Patel fe4f8405f6 [IMP] payment: added missing payment methods from settings 2016-01-07 09:10:51 +01:00
rap-odoo e64fb37679 [FIX] product: "Products" filter now includes stockable products 2016-01-07 09:10:29 +01:00
Goffin Simon da03d97003 [IMP] account: test_product_id_change
Forward port of c4fb2c2 in new api
2016-01-06 23:18:54 +01:00
Yannick Tivisse d0e58a647d [FIX] website_quote: Take the template order line description if the
product is defined on the template

Also, implement 'back' button in quote template frontend edit mode
2016-01-06 16:58:19 +01:00
Joren Van Onder 17bb5fd374 [FIX] point_of_sale: fix forward port related issues
Fix 697739d, 682e660, da9275a and 697739d which where forward-ported in
8b4f052a38.
2016-01-06 16:55:59 +01:00
Mansi Trivedi ba2b37d3b9 [IMP] crm: CRM Lost Reason should be translatable. 2016-01-06 16:46:24 +01:00
Joren Van Onder 70e43b18e0 [FIX] point_of_sale: use tax_ids on the pos orderline, not the product
We have taxes on pos.order.line and we have taxes on the product of the
`pos.order.line`. There was no real consensus in the POS about which
taxes to use. As long as they're the same it doesn't cause issues, but
if someone where to change the taxes on a product which is used in an
open `pos.session` things will start going wrong.

When closing the pos.session amount_total of the `pos.order` in question
will not equal tax `account.move.lines` + product
`account.move.lines`. The reason for it is that we use the taxes on the
`pos.order.line` for the tax account.move.lines, whereas amount_total
used the taxes on product.

This fixes the problem by always using the tax set on
`pos.order.line`. This tax should be set only once through
`_order_line_fields` during orderline creation. After that it shouldn't
change. Therefore `pos.sessions` won't be affected by changes to taxes
of products anymore.

opw-660765
2016-01-06 16:45:28 +01:00
Christophe Simonis e502b3ea1f [MERGE] forward port of branch 9.0 up to 833fe49 2016-01-06 16:09:34 +01:00
Jeremy Kersten e9fc7353d2 [FIX] website_hr_recruitment: recruitment form customization
This commit is related to the PR #9515 and the continuation of 67b1be7f57
2016-01-06 15:43:26 +01:00
Nicolas Lempereur dccecaf11f [IMP] web_editor: use unicode number for FontAwesome controller
In some non-usual circumstances, using unicode in controllers can lead
to issue. For example on a terminal using C encoding (instead of the
mighty UTF-8) werkzeug might use sys.getfilesystemencoding to encode the
request URL which will fail with UTF-8 inside.

This commit change the URL character of the font awesome controller to
UTF-8, but keep the old way since every sent mail might still use it.

There is the overlap of character 0 to 9 which are overidden in this
commit by unicode code 0 to 9, but these were not used in font-awesome
anyway (or these are not even visible ASCII characters).

closes #9572
2016-01-06 15:31:03 +01:00
Yannick Tivisse e6c35bc4de [IMP] hr: renamed hr_department description to 'Department'
When creating a department, a default message appears in the chatter
that says "HR department created". It is misleading because the
department is not necessarily HR.
2016-01-06 15:15:53 +01:00
Anand Kansagra 83a35fa118 [IMP] sale: chaned default value of track_service
From 'Timesheet' to 'Manual' if service and 'Invoice Policy' is 'Reinvoice Costs'.
2016-01-06 14:58:00 +01:00
Anand Kansagra 4cc256182f [IMP] sale: changed 'cost' invoice_policy label
Label changed from 'Invoice based on time and material' to 'Reinvoice Costs'.
2016-01-06 14:57:14 +01:00
Anand Kansagra be88ef914a [IMP] sale: Move 'Invoice Policy' and 'Track Service' options into 'Sales' tab. 2016-01-06 14:56:51 +01:00
Anand Kansagra 71336afe10 [IMP] sale, purchase: Add tooltips in the product form view. 2016-01-06 14:56:48 +01:00
Cedric Snauwaert 833fe492d1 [FIX] account: add buttons on journal entries and journal item to see reconciled entries 2016-01-06 14:46:19 +01:00
Martin Trigaux bf6b106044 [FIX] doc: remove reference to website_less
No more module website_less needed to create a theme
Fixes #8182
2016-01-06 14:29:38 +01:00
Goffin Simon b935289acc [FIX] sale_analytic, sale_timesheet: _compute_analytic
The default domain set in _compute_analytic didn't allow to recompute
SO lines linked to several analytic lines because unit_amount is always
greater or equal to zero. The idea is to recompute the quantity delivred
on SO line linked to analytic lines with amount<=0 (which means that this
is a cost for the company, an expense or a refund).

opw:660812
2016-01-06 12:41:04 +01:00
Nicolas Lempereur 3450401afe [IMP] website{,_forum}: editor for forum or designer
With de5a00ac9 the editor would be loaded on the forum, but it would
then always be loaded on the website which might not be for the best.

With this change, the editor assets will be loaded on the website:

- if the viewer is part of the "base.group_website_designer" group,
- if we are on a forum page,

better solution for #9402
2016-01-06 11:52:50 +01:00
Goffin Simon 3756969517 [FIX] account: total_invoiced in res.partner
"total_invoiced" must only take customer invoices into account because
when you click on the button "invoiced" in the partner view form
you just see the customer invoices.

opw:665574
2016-01-06 11:46:31 +01:00
qsm-odoo 49b938a0f1 [FIX] web_kanban: useless breaking-layout o_kanban_mobile
Remove fixed width for kanban records in .o_kanban_mobile (in grouped
view the records overflowed their columns).

Note: this class seems useless and wrongly used by templates. This
should be removed in master (remove the class from templates and
include its less rules in all kanban records for specific classes).
2016-01-06 11:03:55 +01:00
Cedric Snauwaert a81d6121aa [IMP] hr_expense: improve expense report by grouping by employee-state-currency 2016-01-06 10:08:11 +01:00
Nicolas JEUDY eb8c674d63 [FIX] website_portal: bad xpath
"//div[@class='o_my_sidebar']" is not valid and fails when evaluated.
Could have been replaced by "//div[contains(string(@class),"o_my_sidebar")]" but
as needs a view modification, using an id is better for future inheritance.

Fixes #10279
2016-01-06 09:29:33 +01:00
Nicolas JEUDY ac444e90a8 [CLA] corporate signature for sudokeys 2016-01-06 09:29:33 +01:00
Nicolas Martinelli fcab79217a [FIX] purchase: link extra move to PO line
Commit ec949ad5 links the extra move to the Sale Order through the
procurement. To be consistent, we also have to link the extra move to
the Purchase Order.

The original issue is that any extra move is not taken into account in
the received quantity calculated.

opw-665398
2016-01-06 08:22:59 +01:00
Martin Trigaux 136c563bc6 [FIX] mass_mailing: duplicated regex 2016-01-06 08:20:48 +01:00
Martin Trigaux c7d281d846 [FIX] auth_signup,mass_mailing: export added terms
Forward port added a few terms, reexporting, removing bad ones
2016-01-06 08:20:48 +01:00
Martin Trigaux 5ca043b86c [FIX] mail, purchase: forwardport
Missing parts, I only blame rerere
2016-01-06 08:11:45 +01:00