pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,851 Commits 1 Branch 0 Tags
229fab5fa080a1602cd93a2d8cf3e4bd20587aed
Commit Graph
200 Commits
Author SHA1 Message Date
Martin Trigaux d59d95107e [I18N] Update master translation terms from Transifex 2016-09-26 11:44:55 +02:00
Christophe Simonis 7a02b90e17 [MERGE] forward port branch saas-11 up to dc4d6b6 2016-09-09 15:43:06 +02:00
Christophe Simonis dc4d6b6a7a [MERGE] forward port branch saas-10 up to e1bd405 2016-09-09 15:14:39 +02:00
Christophe Simonis e1bd405d8c [MERGE] forward port branch 9.0 up to af87c57 2016-09-09 11:49:48 +02:00
Christophe Simonis af87c57e51 [MERGE] forward port branch saas-6 up to f98665f 2016-09-09 11:26:15 +02:00
Martin Trigaux 6e61ea2256 [I18N] update saas-12 translations by merging 9.0 and master 
Without fuzzy-matching that is too flexible and error prone.
Was matching on wrong source and got translation without '%s'
 2016-09-06 10:03:09 +02:00
Odoo Translation Bot 9f0d3800cc [I18N] Update translation terms from Transifex 2016-09-04 00:36:28 +02:00
Martin Trigaux 9bbdec5dc9 [FIX] update saas-10 translations by merging 9.0 and master 
using the --uses-first parameter on msgmerge this time
 2016-08-29 15:35:58 +02:00
Martin Trigaux f0c8224175 [FIX] update saas-11 translations by merging 9.0 and master 
using the --uses-first parameter on msgmerge this time
 2016-08-26 15:19:04 +02:00
Joren Van Onder cae2c74985 [FIX] website_{payment,portal_sale}: move code depending on sale 
From website_payment to website_portal_sale.
 2016-08-24 11:19:15 +02:00
Martin Trigaux 133da17faa [I18N] update saas-12 translations by merging 9.0 and master 
1. export saas-12 sources terms into .pot files
2. msgcat odoo-9 .po & odoo-master .po into saas-12 .po files
3. msgmerge saas-12 .po with saas-12 .pot files to keep relevant terms
 2016-08-22 14:16:52 +02:00
Odoo Translation Bot 43aee6db75 [I18N] Update translation terms from Transifex 2016-08-21 00:40:51 +02:00
Christophe Simonis 9ad5f26b3f [MERGE] forward port branch saas-11 up to 3a2147d 2016-08-20 17:18:31 +02:00
Martin Trigaux 2331bbf4b0 [I18N] update saas-10 translations by merging 9.0 and master 
1. export saas-10 sources terms into .pot files
2. msgcat odoo-9 .po & odoo-master .po into saas-10 .po files
3. msgmerge saas-10 .po with saas-10 .pot files to keep relevant terms
 2016-08-18 16:47:23 +02:00
Odoo Translation Bot 842bf793f5 [I18N] Update translation terms from Transifex 2016-08-14 00:38:20 +02:00
Christophe Simonis 53015e11a9 [MERGE] forward port branch saas-11 up to eb83ab2 2016-08-03 16:16:30 +02:00
Christophe Simonis c956075f5f [MERGE] forward port branch 9.0 up to cadb481 2016-08-03 15:07:24 +02:00
Christophe Simonis 20db912f77 [MERGE] forward port branch 8.0 up to 1213de3 2016-08-03 14:09:30 +02:00
Odoo Translation Bot 337049baa8 [I18N] Update translation terms from Transifex 2016-07-31 03:07:08 +02:00
Odoo Translation Bot b7eb3c6bd0 [I18N] Update translation terms from Transifex 2016-07-31 00:38:56 +02:00
Christophe Simonis cfb0c0dead [MERGE] forward port branch saas-11 up to 7ae5121 2016-07-25 17:17:15 +02:00
Christophe Simonis fc0f023053 [MERGE] forward port branch 9.0 up to 1089dcf 2016-07-25 15:07:47 +02:00
Odoo Translation Bot 6dcaffa3e0 [I18N] Update translation terms from Transifex 2016-07-24 00:30:28 +02:00
Christophe Simonis 5858dda75f [MERGE] forward port branch saas-11 up to a62b8cf 2016-07-15 16:34:41 +02:00
Christophe Simonis 156dee2aec [MERGE] forward port branch 9.0 up to fd9eb2e 2016-07-14 17:17:54 +02:00
Christophe Simonis a039fc509b [MERGE] forward port of branch 8.0 up to 9650249 2016-07-13 17:26:44 +02:00
Odoo Translation Bot ef83f798d5 [I18N] Update translation terms from Transifex 2016-07-10 03:01:32 +02:00
Odoo Translation Bot 5a73ff2f1f [I18N] Update translation terms from Transifex 2016-07-10 00:30:32 +02:00
Christophe Simonis 05e0bf3f1b [MERGE] forward port of branch saas-11 up to e7190cb 2016-07-06 00:03:49 +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 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
Odoo Translation Bot e349692ede [I18N] Update translation terms from Transifex 2016-07-03 00:32:09 +02:00
Christophe Simonis 30edf6fa8f [FIX] website_payment: use renamed fields/variables 2016-06-28 18:59: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 841aa4e208 [MERGE] forward port of branch 9.0 up to 3e15b86 2016-06-28 14:10:35 +02:00
Martin Trigaux cbbc90fc2e [FIX] website_payment: access parent payment method 
On the other routes (e.g. /my/, /my/contract/) payment information on the parent
contact are displayed but can not be access in the my payment route.
You get in a unconsistant situation where you can access the contract of the
company and its payment information but can not use this payment information.

opw-681491, opw-681502
 2016-06-28 12:16:41 +02:00
Odoo Translation Bot d14efd562b [I18N] Update translation terms from Transifex 2016-06-22 21:14:56 +02:00
Christophe Simonis b87a93a091 [MERGE] forward port of branch 8.0 up to 5b1beec 2016-06-20 13:34:46 +02:00
Odoo Translation Bot cd369396d9 [I18N] Update translation terms from Transifex 2016-06-19 02:59:13 +02:00
Joren Van Onder e3730cf1f2 [IMP] payment*,website: rename payment.method -> payment.token 
payment.method was not a good name because it was too easy to confuse
with account.payment.method.
 2016-06-17 13:09:18 +02:00
Joren Van Onder 65b1220008 [IMP] website_payment: when invoicing always ignore invoice policy 
Sale orders created through the website that have to be automatically
invoiced should ignore the delivery invoicing policy.

Otherwise you can end up with either an invoice not being generated at
all. This means the user has to manually generate and add the payment to
it. Even worse is if only some purchased products have invoice policy
delivery. In this case a partial invoice would be generated to which the
payment would be added, leading to a mismatch between invoice total and
payment amount.
 2016-06-17 13:09:18 +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 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 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
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 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
Damien Bouvy 87717509c0 [FIX] website_payment: fetch default provider + render issue 
* Fixes a bug that prevented the system to fetch the default provider
because the default_get call was wrong (wrong model + missing
company_id kwarg)
* Displays the amount as a monetary widget (to do that, the amount
must be sent as a float in the controller)
* Display the acquirer 'pre_msg' field to display eventual fees
 2016-06-14 08:53:41 +02:00
Odoo Translation Bot 596398a759 [I18N] Update translation terms from Transifex 2016-06-12 00:39:18 +02:00
Yannick Tivisse ab833656bc [FIX] crm,website_payment: group_configuration doesn't exist anymore 
The goal of commits
https://github.com/odoo/odoo/commit/56a06b73f25ba31ff8c33b04e3af33eb8722f7d3
https://github.com/odoo/odoo/commit/f4006d22ef29ebeb04ce2dfea6670cca4e1cb98e

were to allow admistration users others than 'Administrators' to
create ir.values. As the lowest group 'group_configuration' doesn't
exist anymore since saas-10, we use sudo if the user has the new
lowest access right, which is erp_manager

See https://github.com/odoo/odoo/commit/fdb3ad7082a572d71182b9460b274b94c6bd7560
 2016-06-09 10:01:32 +02:00