Commit Graph
525 Commits
Author SHA1 Message Date
Christophe Simonis 05e0bf3f1b [MERGE] forward port of branch saas-11 up to e7190cb 2016-07-06 00:03:49 +02:00
Christophe Simonis e7190cbbbf [MERGE] forward port of branch saas-10 up to 74b51d3 2016-07-05 23:42:12 +02:00
Christophe Simonis 74b51d3d97 [MERGE] forward port of branch 9.0 up to 489ea42 2016-07-05 23:19:50 +02:00
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
Christophe Simonis 5a3a06f26f [MERGE] forward port of branch saas-11 up to d4d09df 2016-07-04 13:16:34 +02:00
Odoo Translation Bot e349692ede [I18N] Update translation terms from Transifex 2016-07-03 00:32:09 +02:00
Olivier Dony d4d09df143 [MERGE] Forward-port saas-10 up to f76f4cd0b6 2016-07-01 20:14:28 +02:00
Olivier Dony f76f4cd0b6 [MERGE] Forward-port 9.0 up to 7f2e748a22 2016-07-01 18:36:24 +02:00
Joren Van Onder 61d830c302 [IMP] website_quote: add option to save payment token
The form_save payment type is used by acquirers (currently only ogone)
to return a reusable payment token on successful payments. These can
then be used to charge the customer again.
2016-07-01 14:45:37 +02:00
Yannick Tivisse 692d41c686 [IMP] Classified each module in its category to display them correctly on odoo/apps
To be displayed correctly on odoo app (In a given category and not only in all or hidden)
the module category in the __openerp__.py file should be one of these:

    "Accounting",
    "Discuss",
    "Document Management",
    "eCommerce",
    "Human Resources",
    "Industries",
    "Localization",
    "Manufacturing",
    "Marketing",
    "Point of Sale",
    "Productivity",
    "Project",
    "Purchases",
    "Sales",
    "Warehouse",
    "Website",
    "Extra Tools",

'Accounting & Finance' will not work, as 'Project Management', ...
2016-06-30 13:27:46 +02:00
Christophe Simonis 93e6316029 [MERGE] forward port of branch saas-11 up to 7153077 2016-06-28 18:05:25 +02:00
Christophe Simonis 5166fbd21b [MERGE] forward port of branch saas-10 up to 6d51bce 2016-06-28 15:12:06 +02:00
Christophe Simonis 841aa4e208 [MERGE] forward port of branch 9.0 up to 3e15b86 2016-06-28 14:10:35 +02:00
Odoo Translation Bot 765b3fc6ac [I18N] Update translation terms from Transifex 2016-06-26 00:29:54 +02:00
Odoo Translation Bot d14efd562b [I18N] Update translation terms from Transifex 2016-06-22 21:14:56 +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
Joren Van Onder 8a761721d1 [IMP] payment: add options to automatically confirm SO's through website
Introduces two new options:
- confirm_so: to confirm the sale order on acquirer confirmation
- generate_and_pay_invoice: confirm_so + generation of invoice and
                            payment registration
2016-06-17 13:09:18 +02:00
Joren Van Onder 303e585371 [IMP] website_*: consolidate some duplicate payment logic
website_sale and website_quote both did their own
form_feedback. This causes issues because:

1. it would force upcoming features to have to be duplicated as well
2. there's a risk that improvements/bug fixes will only be applied to
one module, an example of this happening is
46c5f93b6c.
2016-06-17 13:09:18 +02:00
Christophe Simonis 10148c3c3a [MERGE] forward port of branch saas-9 up to 8ddf1b9 2016-06-17 12:24:47 +02:00
Christophe Simonis 8ddf1b909a [MERGE] forward port of branch 9.0 up to 8284c73 2016-06-17 11:32:09 +02:00
Christophe Simonis 8284c7389f [FIX] website_quote: avoid setting unknow field
The field `delay` on `sale.order.line` has been renamed into
`customer_delay` and is already set.

This revert commit d0d3ba921d.
2016-06-17 11:09:44 +02:00
Damien Bouvy c8a94fda19 [FIX] website_quote: test uses field that doesn't exist
Or at least doesn't exist anymore.

(Backport of 654237b43c)
2016-06-17 10:56:46 +02:00
Damien Bouvy 654237b43c [FIX] website_quote: test uses field that doesn't exist
Or at least doesn't exist anymore.
2016-06-17 08:33:07 +02:00
Aaron Bohy 6416c46d85 [REM] *: remove web_tip addon and its data in other addons 2016-06-16 14:59:40 +02:00
Christophe Simonis 9fe4cf5f72 [MERGE] forward port of branch saas-11 up to dda0d3d
# Conflicts:
#	addons/product_uos/i18n/lo.po
#	addons/sales_team/models/__init__.py
#	addons/website_payment/views/website_payment_templates.xml
#	addons/website_portal_sale/views/templates.xml
#	openerp/addons/base/ir/ir_qweb.py
2016-06-15 13:10:45 +02:00
Christophe Simonis dda0d3d62d [MERGE] forward port of branch saas-10 up to baf494c
# Conflicts:
#	addons/hr_timesheet/project_timesheet.py
#	addons/sale_layout/i18n/es_PE.po
#	addons/sale_layout/i18n/hu.po
#	addons/sale_layout/i18n/lo.po
#	addons/sale_layout/i18n/pl.po
#	addons/sale_service/i18n/es_MX.po
#	addons/sale_service/i18n/es_PE.po
#	addons/sale_service/i18n/lo.po
#	addons/stock/stock.py
#	addons/stock/stock_view.xml
#	addons/warning/i18n/es_PE.po
#	addons/warning/i18n/lo.po
#	addons/warning/i18n/ru.po
#	addons/web/i18n/cs.po
#	addons/web/i18n/ja.po
#	addons/web/i18n/lo.po
#	addons/web/i18n/th.po
2016-06-15 12:59:39 +02:00
Christophe Simonis baf494c67b [MERGE] forward port of branch saas-9 up to 1d81bb0
# Conflicts:
#	addons/account_extra_reports/i18n/ca.po
#	addons/account_extra_reports/i18n/fi.po
#	addons/account_extra_reports/i18n/pl.po
#	addons/account_extra_reports/i18n/te.po
#	addons/account_extra_reports/i18n/zh_CN.po
#	addons/account_full_reconcile/i18n/hu.po
#	addons/account_full_reconcile/i18n/pl.po
#	addons/crm/crm_lead_menu.xml
#	addons/crm_claim/i18n/es_PE.po
#	addons/crm_claim/i18n/hu.po
#	addons/crm_claim/i18n/ja.po
#	addons/crm_claim/i18n/pl.po
#	addons/delivery/views/delivery_view.xml
#	addons/product/product_view.xml
#	addons/project_timesheet/i18n/es_PE.po
#	addons/stock/stock_view.xml
2016-06-15 12:40:59 +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 Simonis f9072c789d [MERGE] forward port of branch 9.0 up to bfbe2d6
# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po
2016-06-14 19:27:16 +02:00
Christophe Simonis bfbe2d6e6d [MERGE] forward port of branch saas-6 up to df95b1f
The changes in `l10n_es` [1] have been ignored. They will be ported to
the new accouting later.

[1] See 730890f369 and e3e5cfe82c
2016-06-14 19:22:21 +02:00
Christophe Simonis df95b1fc9d [MERGE] forward port of branch 8.0 up to baa4cc0
# Conflicts:
#	addons/account/i18n/bs.po
#	addons/account_analytic_default/i18n/lo.po
#	addons/account_analytic_plans/i18n/lo.po
#	addons/account_bank_statement_extensions/i18n/zh_CN.po
#	addons/account_cancel/i18n/ca.po
#	addons/account_check_writing/i18n/zh_CN.po
#	addons/account_payment/i18n/bs.po
#	addons/account_test/i18n/zh_CN.po
#	addons/analytic/i18n/te.po
#	addons/auth_ldap/i18n/pl.po
#	addons/auth_oauth/i18n/bs.po
#	addons/auth_oauth/i18n/pl.po
#	addons/base_geolocalize/i18n/uk.po
#	addons/base_import/i18n/pl.po
#	addons/base_import_module/i18n/pl.po
#	addons/base_setup/i18n/bs.po
#	addons/claim_from_delivery/i18n/zh_CN.po
#	addons/crm_claim/i18n/zh_CN.po
#	addons/crm_helpdesk/i18n/zh_CN.po
#	addons/crm_partner_assign/i18n/pl.po
#	addons/crm_profiling/i18n/zh_CN.po
#	addons/crm_project_issue/i18n/ca.po
#	addons/email_template/i18n/ca.po
#	addons/email_template/i18n/zh_CN.po
#	addons/event/i18n/da.po
#	addons/event_sale/i18n/da.po
#	addons/google_calendar/i18n/bs.po
#	addons/google_drive/i18n/bs.po
#	addons/hr/i18n/cs.po
#	addons/hr_expense/i18n/sv.po
#	addons/hr_holidays/i18n/pl.po
#	addons/hr_payroll_account/i18n/zh_CN.po
#	addons/hr_recruitment/i18n/ja.po
#	addons/hr_timesheet/i18n/tlh.po
#	addons/hr_timesheet_sheet/i18n/fr.po
#	addons/im_chat/i18n/bs.po
#	addons/im_chat/i18n/da.po
#	addons/im_livechat/i18n/bs.po
#	addons/l10n_be/i18n/pl.po
#	addons/l10n_be_intrastat/i18n/es_DO.po
#	addons/l10n_be_intrastat/i18n/lo.po
#	addons/l10n_be_invoice_bba/i18n/ca.po
#	addons/l10n_be_invoice_bba/i18n/lo.po
#	addons/l10n_eu_service/i18n/mk.po
#	addons/l10n_in_hr_payroll/i18n/zh_CN.po
#	addons/l10n_multilang/i18n/zh_CN.po
#	addons/l10n_th/i18n/zh_CN.po
#	addons/lunch/i18n/bs.po
#	addons/lunch/i18n/pl.po
#	addons/lunch/i18n/sv.po
#	addons/lunch/i18n/th.po
#	addons/marketing/i18n/te.po
#	addons/marketing_campaign/i18n/zh_CN.po
#	addons/marketing_campaign_crm_demo/i18n/pl.po
#	addons/membership/i18n/zh_CN.po
#	addons/mrp_byproduct/i18n/ab.po
#	addons/mrp_repair/i18n/pl.po
#	addons/mrp_repair/i18n/sv.po
#	addons/note/i18n/zh_CN.po
#	addons/pad/i18n/pl.po
#	addons/payment_buckaroo/i18n/pl.po
#	addons/payment_ogone/i18n/pl.po
#	addons/point_of_sale/i18n/bs.po
#	addons/pos_discount/i18n/bs.po
#	addons/pos_restaurant/i18n/bs.po
#	addons/procurement/i18n/ja.po
#	addons/procurement/i18n/sv.po
#	addons/product/i18n/bs.po
#	addons/product_expiry/i18n/hr.po
#	addons/product_expiry/i18n/sv.po
#	addons/product_extended/i18n/sv.po
#	addons/project/i18n/ja.po
#	addons/project_issue/i18n/ja.po
#	addons/project_issue/i18n/zh_CN.po
#	addons/project_issue_sheet/i18n/zh_CN.po
#	addons/purchase/i18n/bs.po
#	addons/purchase/i18n/ja.po
#	addons/purchase/i18n/nb.po
#	addons/purchase/i18n/sv.po
#	addons/report/i18n/fr.po
#	addons/report/i18n/pt_BR.po
#	addons/report_intrastat/i18n/sv.po
#	addons/sale/i18n/bs.po
#	addons/sale/i18n/ja.po
#	addons/sale_crm/i18n/fa.po
#	addons/sale_layout/i18n/zh_CN.po
#	addons/sale_service/i18n/lo.po
#	addons/sales_team/i18n/zh_CN.po
#	addons/stock_account/i18n/ja.po
#	addons/stock_account/i18n/sv.po
#	addons/stock_picking_wave/i18n/lo.po
#	addons/subscription/i18n/zh_CN.po
#	addons/survey/i18n/mk.po
#	addons/survey/i18n/pt_BR.po
#	addons/warning/i18n/lo.po
#	addons/web/i18n/lo.po
#	addons/website_blog/i18n/bs.po
#	addons/website_blog/i18n/ja.po
#	addons/website_crm_partner_assign/i18n/pl.po
#	addons/website_crm_partner_assign/i18n/zh_CN.po
#	addons/website_event/i18n/da.po
#	addons/website_event/i18n/zh_CN.po
#	addons/website_event_sale/i18n/da.po
#	addons/website_event_track/i18n/da.po
#	addons/website_event_track/i18n/ja.po
#	addons/website_event_track/i18n/zh_CN.po
#	addons/website_forum_doc/i18n/zh_CN.po
#	addons/website_hr_recruitment/i18n/da.po
#	addons/website_hr_recruitment/i18n/ja.po
#	addons/website_mail/i18n/fr.po
#	addons/website_mail/i18n/ja.po
#	addons/website_mail_group/i18n/zh_CN.po
#	addons/website_quote/i18n/bs.po
#	addons/website_sale/controllers/main.py
#	addons/website_sale/i18n/bs.po
#	addons/website_sale/i18n/fa.po
#	addons/website_sale_delivery/i18n/zh_CN.po
#	addons/website_sale_options/i18n/lo.po
#	openerp/addons/base/i18n/bs.po
#	openerp/addons/base/i18n/ka.po
2016-06-14 18:53:27 +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
Odoo Translation Bot 3215a81bab [I18N] Update translation terms from Transifex 2016-06-12 03:06:37 +02:00
Odoo Translation Bot 596398a759 [I18N] Update translation terms from Transifex 2016-06-12 00:39:18 +02:00
Christophe Simonis e35b57d6f5 [MERGE] forward port of branch 8.0 up to 26b3501
# Conflicts:
#	addons/procurement/procurement.py
2016-06-10 12:23:34 +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
Goffin Simon d0d3ba921d [FIX] website_quote: delay in SO line
When creating an SO line with a quotation template, the customer
lead time must be set.

opw:678039
2016-06-08 14:17:40 +02:00
Christophe Simonis 7306e888a6 [MERGE] forward port of branch saas-11 up to ac50230 2016-06-08 12:28:16 +02:00
Christophe Simonis ac5023060c [MERGE] forward port of branch saas-10 up to 2f948c7 2016-06-08 12:19:23 +02:00
Christophe Simonis 2f948c76aa [MERGE] forward port of branch saas-9 up to 3ed483c 2016-06-07 19:45:02 +02:00
Christophe Simonis 3ed483caa1 [MERGE] forward port of branch 9.0 up to fa4a371 2016-06-07 19:21:18 +02:00
Olivier Dony af47009815 [FIX] website_{quote,sale}: payment tx handling consistency
Both website_sale and website_quote have logic to independently
confirm sales orders when a successful payment transaction is
processed.
Rev 46c5f93b6c introduced an extra
check and logging for transactions with mismatching amounts in
website_sale, but the same change was not done in website_quote.

Consequently, when both modules were installed, the tx mismatch
check was bypassed by website_quote, and a spurious logging message
was emitted by website_sale if the website_quote logic had executed
first.

This patch makes tx handling consistent in both modules, and avoids
the misleading log message when both modules are installed.
2016-06-07 16:29:52 +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
Christophe Simonis ca2dad4c44 [MERGE] forward port of branch 8.0 up to b9a006c 2016-06-06 15:41:50 +02:00