pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,913 Commits 1 Branch 0 Tags
f96b3cd9f97665ade831a198d1dfee252c25be09
Commit Graph
401 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 70a69bf9bc [FIX] website/im_livechat: use new api to get asset 
Issue: can't get asset content, self don't have env attribute, wrong attributes send.
 2016-07-05 18:44:58 +02:00
Christophe Matthieu f1e3ac88f8 [FIX] ir_qweb/website: must adapt AssetsBundle call to nex new syntax 
AssetsBundle receive the files list instead of to load the xml content itself (speed up because the file list is cached).
 2016-07-05 11:31:03 +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
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 2a3f37806f [FIX] im_livechat: use new api when calling cleaning methods 2016-06-28 19:01:53 +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
Aaron Bohy 97a8ff9909 [IMP] im_livechat: unpin old sessions in the autovacuum cron 2016-06-24 16:34:00 +02:00
Aaron Bohy 7d64bd5ed2 [IMP] im_livechat: add gc of empty sessions in the autovacuum cron 2016-06-24 16:34:00 +02:00
Odoo Translation Bot d14efd562b [I18N] Update translation terms from Transifex 2016-06-22 21:14:56 +02:00
Aaron Bohy db99c65f7b [IMP] im_livechat,mail: sort livechat channels in Discuss 
by date of last message in channel, desc.
 2016-06-22 10:10:46 +02:00
Odoo Translation Bot 108eee76c5 [I18N] Update translation terms from Transifex 2016-06-22 07:45:52 +02:00
Fabien Pinckaers f1ab3face1 [IMP] im_livechat: "website live chat" menu renamed to "Live Chat" 2016-06-17 10:39:15 -07: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
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
Odoo Translation Bot 596398a759 [I18N] Update translation terms from Transifex 2016-06-12 00:39:18 +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
Odoo Translation Bot d1fa3350bb [I18N] Update translation terms from Transifex 2016-06-05 00:30:55 +02:00
Christophe Simonis e54fb3eb22 [MERGE] forward port of branch saas-9 up to 30864b6 2016-06-03 12:33:58 +02:00
Christophe Simonis a36f6dbc29 [MERGE] forward port of branch 9.0 up to 928bc26 2016-06-02 15:12:47 +02:00
Odoo Translation Bot be91fa4c63 [I18N] Update translation terms from Transifex 2016-05-29 00:29:48 +02:00
Christophe Simonis 7046c2fbe6 [MERGE] forward port of branch saas-11 up to e4500d0 2016-05-26 16:58:37 +02:00
Christophe Simonis e4500d06fc [MERGE] forward port of branch saas-10 up to 57944db 2016-05-26 16:55:37 +02:00
Christophe Simonis 57944db19a [MERGE] forward port of branch saas-9 up to b7fce22 2016-05-26 16:48:33 +02:00
Christophe Simonis b7fce227cc [MERGE] forward port of branch 9.0 up to 9bd223f 2016-05-26 16:47:37 +02:00
Christophe Simonis 44fd6a55f3 [MERGE] forward port of branch saas-9 up to 413ba94 2016-05-26 14:10:55 +02:00
Martin Trigaux a93b6e8de0 Revert "[FIX] translate: don't translate DOCTYPE tag" 
This reverts commit 44e8b92beb.

The condition is wrong as a view starting with DOCTYPE as top element will be
excluded, including its child (the whole page them).

Re-add the translatable title that was excluded by the condition.
 2016-05-26 14:08:35 +02:00
Christophe Simonis 413ba9445c [MERGE] forward port of branch 9.0 up to 24eebbd 2016-05-26 14:06:36 +02:00
Martin Trigaux f92939e75c [I18N] im_livechat: export source terms 2016-05-26 13:34:11 +02:00
Christophe Matthieu 30eb4e31f6 [FIX] im_livechat: don't translate livechat javascript template 2016-05-26 07:51:03 +02:00
Christophe Matthieu a5b738b35f [FIX] im_livechat: don't translate livechat javascript template 2016-05-25 15:20:07 +02:00
Christophe Matthieu 25bf3e9f74 [FIX] im_livechat: don't translate livechat javascript template 2016-05-25 15:12:01 +02:00
Christophe Simonis a4b94012c2 [MERGE] forward port of branch saas-11 up to f43b206 2016-05-24 17:00:17 +02:00
Christophe Simonis f43b206970 [MERGE] forward port of branch saas-10 up to d35d8c3 2016-05-24 16:59:37 +02:00
Christophe Simonis d35d8c3fca [MERGE] forward port of branch saas-9 up to e5c2e6e 2016-05-24 16:40:53 +02:00
Christophe Simonis e5c2e6e001 [MERGE] forward port of branch 9.0 up to e69d9b8 2016-05-24 16:39:41 +02:00
Christophe Simonis 4f6d3b680a [MERGE] forward port of branch saas-11 up to bb442fd 2016-05-24 14:48:59 +02:00