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
488 Commits
Author SHA1 Message Date
Christophe Simonis 54ebe31f51 [MERGE] forward port branch saas-11 up to 685e310 2016-10-11 18:33:18 +02:00
Christophe Simonis 685e3104ec [MERGE] forward port branch 9.0 up to 7bdb6f9 2016-10-11 18:23:27 +02:00
Nicolas Martinelli 2990060b7d [FIX] base_import, base_action_rule: fix traceback 
When importing an action rule, an error occurs:
- The import is committed when the user clicks on "Validate"
- The import fails with a traceback when the user clicks on "Import"

This is because commit 7d648542 introduces a `cr.commit()` in the
`_update_registry`, while nothing should be committed upon import
validation.

opw-683874
 2016-10-10 14:57:18 +02:00
Martin Trigaux d59d95107e [I18N] Update master translation terms from Transifex 2016-09-26 11:44:55 +02:00
Odoo Translation Bot 2a893606ae [I18N] Update translation terms from Transifex 2016-09-25 00:40:39 +02:00
Martin Trigaux 05d91ea4e9 [I18N] update saas-11 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-07 09:40:37 +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 e9bd2aad98 [I18N] Update translation terms from Transifex 2016-08-29 11:14:01 +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
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
Christophe Simonis 3a2147d95c [MERGE] forward port branch saas-10 up to bc1a0a3 2016-08-20 16:57:36 +02:00
Christophe Simonis bc1a0a32ca [MERGE] forward port branch 9.0 up to 58cbcba 2016-08-19 16:59:29 +02:00
Martin Trigaux 99215a02c6 [I18N] update saas-11 translations by merging 9.0 and master 
1. export saas-11 sources terms into .pot files
2. msgcat odoo-9 .po & odoo-master .po into saas-11 .po files
3. msgmerge saas-11 .po with saas-11 .pot files to keep relevant terms
 2016-08-19 13:54: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
Nicolas Martinelli 717ca3390f [FIX] base_import: error message 
During the import of a file, if the connection is closed (timeout,
server shutdown...), a traceback appears.

This is because `error.data.arguments` is not defined in this case.

opw-682104
 2016-08-17 11:43:17 +02:00
Odoo Translation Bot 842bf793f5 [I18N] Update translation terms from Transifex 2016-08-14 00:38:20 +02:00
Odoo Translation Bot 8a3a620404 [I18N] Update translation terms from Transifex 2016-08-07 00:38:49 +02:00
Christophe Simonis cfb0c0dead [MERGE] forward port branch saas-11 up to 7ae5121 2016-07-25 17:17:15 +02:00
Christophe Simonis 7ae5121877 [MERGE] forward port branch saas-10 up to fc0f023 2016-07-25 16:06: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
Odoo Translation Bot 691949c4b8 [I18N] Update translation terms from Transifex 2016-07-17 00:30:21 +02:00
Christophe Simonis 5858dda75f [MERGE] forward port branch saas-11 up to a62b8cf 2016-07-15 16:34:41 +02:00
Christophe Simonis 1fca5e01cb [MERGE] forward port branch saas-10 up to 156dee2 2016-07-14 18:17:30 +02:00
Christophe Simonis 156dee2aec [MERGE] forward port branch 9.0 up to fd9eb2e 2016-07-14 17:17:54 +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 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 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
Cedric Snauwaert 2f3b32c676 [FIX] base_import: fix error when trying to load a file and then clicking on cancel while file opener is opened 2016-07-01 16:57:27 +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
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 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
Olivier Dony 285deb9a14 [FIX] base_import: handle other cases of wrong CVS mime types 
Improves 8049d1e855 for other detected
cases, e.g. on Firefox + OSX.

opw-680347
 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