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
Odoo Translation Bot
108eee76c5
[I18N] Update translation terms from Transifex
2016-06-22 07:45:52 +02:00
Raphael Collet
8da9116f5d
[REM] models: remove deprecated method BaseModel.import_data()
2016-06-16 16:50:46 +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
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 730890f369e3e5cfe82c
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
Olivier Dony
285deb9a14
[FIX] base_import: handle other cases of wrong CVS mime types
...
Improves 8049d1e855
2016-06-14 12:35:59 +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
Nicolas Martinelli
8049d1e855
[FIX] base_import: file type on Windows
...
When a user imports a CSV file on Windows, the "CSV Format Options…"
field does not appear. This is an issue since it might be necessary to
tune these options depending on the file, e.g. change the encoding.
For some unknown reason, on Windows, the file type is empty whatever the
browser used. Therefore, we fall back on the extension of the file.
opw-680347
2016-06-09 15:09:22 +02:00
Christophe Simonis
ac5023060c
[MERGE] forward port of branch saas-10 up to 2f948c7
2016-06-08 12:19:23 +02:00
Martin Trigaux
f307e36e66
[FIX] base_import: disable tracking during validation
...
Force the value tracking_disable to be make sure that the validation (which is
supposed to have no impact), will not send any email.
Fixes #3173
2016-06-08 11:37:03 +02:00
Christophe Simonis
3ed483caa1
[MERGE] forward port of branch 9.0 up to fa4a371
2016-06-07 19:21:18 +02:00
Christophe Simonis
ca2dad4c44
[MERGE] forward port of branch 8.0 up to b9a006c
2016-06-06 15:41:50 +02:00
Odoo Translation Bot
eb48b94cea
[I18N] Update translation terms from Transifex
2016-06-05 03:01:35 +02:00
Odoo Translation Bot
d1fa3350bb
[I18N] Update translation terms from Transifex
2016-06-05 00:30:55 +02:00
Christophe Simonis
30864b6d00
[MERGE] forward port of branch 9.0 up to 5419485
2016-06-03 11:29:49 +02:00
Xudong Yang
f558c049d0
[FIX] base_import: t-if does not work with t-jquery
...
Not evaluated, move the condition to the button
Closes #12230
2016-06-02 17:56:23 +02:00
Christophe Simonis
a36f6dbc29
[MERGE] forward port of branch 9.0 up to 928bc26
2016-06-02 15:12:47 +02:00
Christophe Simonis
589751ca28
[MERGE] forward port of branch 8.0 up to bde083a
2016-06-02 12:58:48 +02:00
Odoo Translation Bot
cb70a8ff98
[I18N] Update translation terms from Transifex
2016-05-29 02:58:42 +02:00
Odoo Translation Bot
be91fa4c63
[I18N] Update translation terms from Transifex
2016-05-29 00:29:48 +02:00
David Monjoie
64aea2b515
[FIX] base_import: currency symbol can be placed at the right of the value
...
The previous code went outside of the list bounds because the modulo
operator has a higher priority than the addition one.
2016-05-25 13:53:33 +02:00
Christophe Simonis
e641d740d7
[MERGE] forward port of branch saas-10 up to fac4cc7
2016-05-24 14:08:42 +02:00
Christophe Simonis
f8e6bb73b3
[MERGE] forward port of branch 9.0 up to 4c07faf
2016-05-24 12:33:23 +02:00
Christophe Simonis
0de30f4013
[MERGE] forward port of branch 8.0 up to 0af32f3
2016-05-23 15:08:35 +02:00
Odoo Translation Bot
95c9036aef
[I18N] Update translation terms from Transifex
2016-05-22 02:57:09 +02:00
Odoo Translation Bot
ebc0206ab5
[I18N] Update translation terms from Transifex
2016-05-22 00:28:27 +02:00
Christophe Simonis
e38ddcfeae
[MERGE] forward port of branch saas-10 up to b26fd22
2016-05-17 14:39:05 +02:00
Christophe Simonis
6d6a90f385
[MERGE] forward port of branch 9.0 up to 128d58f
2016-05-17 14:04:26 +02:00
Odoo Translation Bot
610d462740
[I18N] Update translation terms from Transifex
2016-05-15 00:29:02 +02:00
Christophe Simonis
91c9284951
[MERGE] forward port of branch saas-10 up to 5aa0bae
2016-05-13 16:33:51 +02:00
Christophe Simonis
7f2a9e77b6
[MERGE] forward port of branch 9.0 up to dcab356
2016-05-13 14:08:51 +02:00
Christophe Simonis
2f374c4cba
[MERGE] forward port of branch 8.0 up to 3a32021
2016-05-12 12:38:02 +02:00
Odoo Translation Bot
859fe655d2
[I18N] Update translation terms from Transifex
2016-05-08 02:57:57 +02:00
Odoo Translation Bot
9cdc40e3ed
[I18N] Update translation terms from Transifex
2016-05-08 00:28:57 +02:00
Christophe Simonis
0fbc92e0c4
[MERGE] forward port of branch saas-10 up to 1e86774
2016-05-04 17:09:51 +02:00
Christophe Simonis
431ef552b3
[MERGE] forward port of branch 9.0 up to 822966d
2016-05-02 14:44:20 +02:00
Christophe Simonis
396facfaf0
[MERGE] forward port of branch 8.0 up to 8651d08
2016-05-02 11:04:21 +02:00
Odoo Translation Bot
8651d0815d
[I18N] Update translation terms from Transifex
2016-05-01 02:57:51 +02:00
Odoo Translation Bot
da82207478
[I18N] Update translation terms from Transifex
2016-05-01 00:29:59 +02:00
Christophe Simonis
2dcbdd0778
[MERGE] forward port of branch saas-10 up to bb8f0f1
2016-04-25 15:48:31 +02:00
Christophe Simonis
4d337f72ed
[MERGE] forward port of branch 9.0 up to ac7beb3
2016-04-25 13:33:01 +02:00
Christophe Simonis
ba34df1ead
[MERGE] forward port of branch 8.0 up to 0410d11
2016-04-25 11:56:52 +02:00
Christophe Simonis