Commit Graph
131 Commits
Author SHA1 Message Date
Christophe Matthieu 032122484e [TYPO] qweb: use the same option attribute for t-esc t-raw and t-field
t-options instead of t-field-options
2016-07-05 18:44:58 +02:00
Christophe Matthieu 940e23a7dc [IMP] qweb: t-esc/t-raw use t-options instead of format method
t-field, t-esc and t-raw use the same widgets and options
2016-07-05 18:43:14 +02:00
Jeremy Kersten fc22b549b1 [FIX] website_quote: fix report Price
l is not defined, it is line.

Bug introduced with commit odoo/odoo@5f5f8d8.

But it was never detected before because there was
no value for b2b/b2C before commit odoo/odoo@e6184aeb37
so total/subtotal in report was never print.
2016-06-18 01:56:04 +02:00
Jeremy Kersten 5f5f8d8efe [IMP] sale: allow to show total of order line tax inc or based on unit price.
Allow to set in configuration mode b2b or b2c.
Change the column of order line in sale view and in reports depending of sale.

Fix price_reduce field (wrong if tax was included in price)
and merge with code discounted_price from website_sale.

Change header from reports "Price Tax Excluded' by 'Price' in report.
That is wrong, sometime the amount can haxe tax included in the price.
2016-06-17 15:06:04 +02:00
Nicolas Martinelli 55c06c09af [FIX] website_quote: do not use name_template
Crap... Forgot to save the last file modified in the previous commit.
2016-06-15 08:35:19 +02:00
Christophe Matthieu d9efca0908 [IMP] qweb: t-field-options is a python dict, safe_eval for compile template, not need to eval in field methods 2016-06-14 13:12:14 +02:00
Christophe Matthieu 710a7cee14 [FIX] website: t-att-*** display empty string attribute
Remove attribute only if the result is False or None
2016-06-14 09:46:26 +02:00
Christophe Matthieu 7ede9bcb2d [IMP] base ir.qweb: compile template (and use ast) to improve rendering speed
* The compiled templates are cached per user, lang, inherit context values
* ir.ui.fields: attributes method return an dict, and record_to_html return only the content value of the field
* all rendered text use build_text and all attributes use build_attribute
* t-esc-options is removed and replace by format_value method
* AssetsBundle receive the list files and remains
2016-06-14 09:46:25 +02:00
Ravi Patel 9416483465 [IMP] website_quote: Hide 'Unit Price' column from quote template line.
The unit price of the quote template lines is never be used anywhere

It is logical that pricelists determine the price of products and this
field is quite informative.
2016-06-14 09:17:40 +02:00
Yannick Tivisse 9e57185449 [IMP] base,sales_team: Move res_groups and menuitems to sales_team
Purpose:
Having the res_group defined in base and sales_team auto installed
with mail doens't make sense.

- Move the empty res_config class and the related view from
  base_setup to sales_team (base_setup only contains the 'General Settings'
  model and views
- Move the 'sale' related content from product to sale module (Access rights,
  menuitems,...)
- Set sales_team at autoinstall False. The module is installed when needed by
  crm or sale for example
- Set sales_team as a dependency of voip. (Access rights defined for configuration
  purpose)
- Set sales_team ad a dependency of subscription (Access rights issue too)

[FIX] account: move some ir.model.access to sale module
[FIX] payment: Move some ir.rule to website_sale
[FIX] stock: move some ir.model.access rule to sale_stock
[FIX] project: Move some ir.model.access rules to crm_project_issue
[FIX] mrp: Move some ir.model.access rules to sale_mrp
[FIX] calendar: move some ir.model.access rules to crm

Rename xmlids accordingly. Example: 'base.group_sale_manager' becomes
sales_team.group_sale_manager.

[ADD] sales_team: See own documents => See only his sales team
Moved the "User: Own Leads Only", "User: All Leads" and "Manager" groups from sale and crm
into sales_team module. Add the record rules so that user can see only his Own Sales Team
if "See Own Leads" is sales right and can see all sales teams if he is having sales rights
of "See All Leads" or manager.
2016-06-09 16:05:25 +02:00
Yannick Tivisse ccdb5cbfc0 Revert "[IMP] base,sales_team: Move res_groups and menuitems to sales_team"
This branch need more testing instead of doing 10 fixes. A lot of issues are occuring
when installing modules in different orders.

This reverts commit fa6e415cdb.
2016-06-06 17:26:30 +02:00
Yannick Tivisse fa6e415cdb [IMP] base,sales_team: Move res_groups and menuitems to sales_team
Purpose:
Having the res_group defined in base and sales_team auto installed
with mail doens't make sense.

- Move the empty res_config class and the related view from
  base_setup to sales_team (base_setup only contains the 'General Settings'
  model and views
- Move the 'sale' related content from product to sale module (Access rights,
  menuitems,...)
- Set sales_team at autoinstall False. The module is installed when needed by
  crm or sale for example
- Set sales_team as a dependency of voip. (Access rights defined for configuration
  purpose)
- Set sales_team ad a dependency of subscription (Access rights issue too)

Rename xmlids accordingly. Example: 'base.group_sale_manager' becomes
sales_team.group_sale_manager.
2016-06-06 15:46:52 +02:00
Vipul Bhatt 4dfbcecfdb [IMP] website_{portal,portal_sale,project_issue,quote} : add pager for customer documents
This commit adds controller to list documents of customer, with pager and archive
widget to sort documents. Impacted documents are : quotations, sale order,
invoices, and issues.

Portal breadcrumd is improved too : add the home icon, and keep the query
params when using archive widget.

Some editable zones were added to templates, allowing people to customize
their frontend portal.
2016-05-27 10:50:34 +02:00
sha-odoo f3a3cddf85 [IMP] sale: move project_id to Other Info in sale.order form view 2016-04-27 16:16:26 +02:00
Dhaval Panchal a04bda67e8 [IMP] sale: Pay option appears when the document is a confirmed SO. 2016-04-12 17:21:15 +02:00
Christophe Simonis 6c8141a1df [MERGE] forward port of branch saas-10 up to 2483327 2016-04-01 16:15:35 +02:00
David Monjoie f280bfe8a1 [IMP] website_quote: use new pagebreak mechanism 2016-03-25 11:34:26 +01:00
Julien Louette 293c1c06e6 [IMP] website_quote: adding layout categories to website quotations 2016-03-25 11:34:26 +01:00
Srushti Patel 91e8de0b05 [ADD] website_quote: Allow reordering of suggested products on quotations
This commit adds a sequence field on suggested products, allowing to arrange the order in which the suggested products will appear on the quotation
2016-03-25 10:26:17 +01:00
Christophe Simonis ddb0fb2739 [MERGE] forward port of branch saas-9 up to 59d3f63 2016-03-24 16:53:45 +01:00
Anand Kansagra 9c3cf2abb9 [IMP] sale, account: Rename 'Price' into 'Tax Excluded Price' on the sales orders/ quotations and account invoices reports. 2016-03-18 09:48:30 +01:00
Christophe Simonis 1c7f5a45e5 [MERGE] forward port of branch saas-7 up to d016457 2016-02-29 12:30:27 +01:00
Denis Ledoux c63be58eca [MERGE] forward port of branch saas-6 up to 8a098df 2016-02-23 15:33:08 +01:00
Damien Bouvy db5e6a124a [IMP] website_quote: mail template on a quote template for confirmation 2016-01-15 10:01:53 +01:00
Christophe Simonis 63c7488926 [MERGE] forward port of branch saas-8 up to 5f997bc 2016-01-12 16:12:32 +01:00
Christophe Simonis 5f997bc4ef [MERGE] forward port of branch saas-7 up to 7fa6f73 2016-01-12 16:11:28 +01:00
Denis Ledoux 1195eae010 [FIX] website_quote: correct company headers
When printing the online quote, using the "Print" button
in the online proposal in the front-end, the user
used to print the report is the SUPERUSER.

If `doc` or `o` is not set within the QWeb values,
the headers printed are the ones from the user company,
instead of the record company.

As this was the case in the `website_quote` report,
the company headers printed were not the sale order company
headers, but the SUPERUSER company headers.

opw-666306
2016-01-11 12:52:53 +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
Martin Trigaux e4bf03aeaf [MERGE] Forward port of branch saas-7 up to c298cf3 2015-12-21 11:37:53 +01:00
Nicolas Martinelli afa28f075a [FIX] website_quote: message if SO not confirmed
Commit 486cd3309 was not correctly forward ported. We also add a
specific message if the quotation is in state 'draft'.

Fixes #9226
2015-12-09 11:35:14 +01:00
Christophe Simonis f61cfaefc8 [MERGE] forward port of branch saas-7 up to 572cbfc 2015-11-25 16:43:19 +01:00
Christophe Simonis 56a442e205 [MERGE] forward port of branch saas-6 up to dade7e3 2015-11-25 13:26:02 +01:00
Yannick Tivisse 9f2b6e00ef [IMP] website: Add a class btn-multi-line to allow multi line labels on buttons
On website_quote, according to the translation, the label may become much larger than
the button width. By default the bootstrap btn class has the property 'white-space: nowrap'
Here the goal is to add a class which will be used for these kind of cases.
2015-11-20 16:41:37 +01:00
Fabien Pinckaers 72707806cc [IMP] Quotation template buttons 2015-11-20 01:25:43 +01:00
Goffin Simon e42e6d4b0d [FIX] website_quote: old api on_change_product_id
The old api on_change_product_id function in model 'sale.order.option'
doesn't receive the order_id to compute correctly the price unit for
suggested products. The new api _onchange_product_id function has exactly
the same logic as on_change_product_id and this function receives the order_id.
Then the new one can replace the old one. But to keep the compatibility with partners
who overwrite this old function, it is kept in the code.
This bug was introduced by 5047f4e, this commit defined the product_uom_change function
which called on_change_product_id. This commit was applied in saas-6.
The onchange calls in the views have be removed because all the new api onchange are called
even if they were still there.

opw:656494
2015-11-19 16:10:34 +01:00
Nicolas Martinelli de8f3f70fd [FIX] website_quote: support of 2 routes to accept quote
Complement of commit d9c2d03. We should still support the old route, in
case users do not update the template.
2015-10-28 14:33:07 +01:00
Denis Ledoux c8d6b36632 [MERGE] forward port of branch saas-6 up to a0c64bebe6 2015-10-28 12:01:30 +01:00
Nicolas Martinelli d9c2d03532 [FIX] website_quote: fix Sign & Confirm
Commit 7636b51 modifies the route from JSON to HTTP by mistake. Indeed,
the route /quote/accept is called from an ajax.jsonRpc request, not from
the `method="POST" t-attf-action="/quote/accept` which can be found in
website_quotation.xml.

The t-attf-action is actually only used to recover the order_id and the
token in website_quotation.js.

opw-652874
Closes #9227
Fixes #9226
2015-10-28 08:02:24 +01:00
Denis Ledoux a0c64bebe6 [MERGE] forward port of branch 8.0 up to 8209368 2015-10-14 12:28:22 +02:00
Damien Bouvy 486cd33091 [FIX] website_quote: prevent modifying the quote state if it's already been processed
Before this fix, it was possible to validate then cancel a quote (or the other way around) simply by using two tabs in your browser. From now on, we only validate/cancel a quote if it's the 'sent' state and advise the customer of the situation if he tries to abuse the process.
2015-10-12 10:43:46 +02:00
Christophe Simonis 7636b510a2 [ADD] *: CSRF protection in forms and routes
* make CSRF protection the default on all non-SAFE methods
  note: there currently is no way to call a CSRF-protected endpoint
  without a form-encoded entity-body as that's the only place we get the
  CSRF token from.
* simple CSRF token generation: just use the HMAC'd session id, no
  generating a new random token per session then HMAC it
* use constant-time equal function to avoid timing attacks
* assert that a database secret is configured before hashing/validating
  the CSRF token
* opt-out database manager from CSRF: The super-admin password serves
  the purpose of a CSRF token in the database manager screens.
  There is no request database to obtain the
  secret and generate a CSRF token.
2015-10-01 01:36:50 +02:00
Yannick Tivisse 844d5381bd [FIX] typo: Replace 'Expiry Date' by 'Expiration Date'
fp request
2015-09-30 16:42:18 +02:00
Fabien Pinckaers b568affe66 [IMP] Adding placeholders to all oe_title (thanks xgrep), usability guidelines 2015-09-11 08:51:57 +02:00
Fabien Pinckaers e1ceb8c657 [IMP] Next activities mechanism improved 2015-08-31 14:19:12 +02:00
Yannick Tivisse c4d638248c [IMP] sale,website_quote : improve menutip for quotations 2015-08-31 09:08:12 +02:00
qsm-odoo 85fd8d1da5 [IMP] website_quote: Remove useless label 2015-08-28 17:07:45 +02:00
Christophe Simonis edeceba7df [MERGE] forward port of branch saas-6 up to 7a768a4
Due to `sale` rewrite (94716a3f14),
the commit 503820acb6 has been partially
ignored (in sale.order.line) and will be rewritten later using new-api.
2015-08-28 15:07:16 +02:00
Denis Ledoux af07b2a075 [MERGE] forward port of branch 8.0 up to 42ecf5e 2015-08-26 14:05:17 +02:00
Denis Ledoux 3b02e3d63d [FIX] sale*: company tax filtering
f26b94f had as goal to filter the taxes of the product
according to the company when the sale.order
was created/edited as SUPERUSER_ID
(Who ignores the record rules).

Unfortunetaly, to filter the taxes,
it used the company of the customer,
while it's actually the company of the order which
should be used.

Indeed, for instance,
partners can be shared among all companies.

It was way less simple to access the company
of the sale.order, this parameter being
not available in the on_change method signature.

This is the easiest way to solve this issue
without breaking the API / retro-compatibility.

opw-647819
2015-08-25 14:52:20 +02:00
Yannick Tivisse ca8b417ded [IMP] Chnage the boolean require_payment to a selection field + radio button 2015-08-25 13:52:00 +02:00