Commit Graph

298 Commits

Author SHA1 Message Date
Xavier Morel 7c540bc4ee [FIX] exception rendering with pretty printed XML
had not been migrated to lxml
2014-07-14 13:44:37 +02:00
Christophe Simonis f654a7719b [MERGE] forward port of branch saas-5 up to 73d39a0 2014-07-10 22:49:53 +02:00
Jeremy Kersten 8eb97cc082 [IMP] website_sale: Add google analytics on checkout process 2014-07-09 17:45:40 +02:00
Christophe Matthieu e851c36a0f [FIX] website: error for rendering of the sitemap template. qweb can't render the xmlns attribute. 2014-07-09 16:03:54 +02:00
Olivier Dony 34bfa1b44f [MERGE] Forward-port saas-5 up to d9cda97 2014-07-05 01:45:45 +02:00
Olivier Dony d9cda97cf4 [MERGE] Forward-port saas-4 up to 5ceded9 2014-07-05 01:28:19 +02:00
Olivier Dony 5ceded9d69 [MERGE] Forward-port saas-3 up to 4fa30f5 2014-07-05 01:04:19 +02:00
Martin Trigaux a6bf8cd07b [FIX] website: avoid divisions by zero when no record to display 2014-07-02 16:25:24 +02:00
Simon Lejeune 20f4da67b3 Merge remote-tracking branch 'odoo/master' into master-report-translation-fix-sle 2014-06-27 18:17:15 +02:00
Christophe Simonis 1f57528bc6 [MERGE] forward port of branch saas-5 up to 8dfd5ea 2014-06-27 16:14:40 +02:00
Christophe Simonis 8dfd5eab01 [MERGE] forward port of branch saas-4 up to a4bc65c 2014-06-27 16:08:09 +02:00
Christophe Simonis a4bc65cdba [MERGE] forward port of branch saas-3 up to bdc4dd4 2014-06-27 16:06:37 +02:00
Olivier Dony 9c5ecd3bc4 [FIX] website: avoid hiding the signin info for users who are not employees nor portal users
This happens when you do a plain signup, you
end up as neither an employee nor a portal user,
but should still now when you are logged in.
2014-06-27 13:04:42 +02:00
Simon Lejeune fc8592adf2 [FIX] Report: translation fixed, use of 'primary clone' of web.layout and website.layout, minimal template is now a QWeb template 2014-06-27 12:00:49 +02:00
Simon Lejeune 195fa93168 [MERGE] backend front end integration
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Christophe Simonis 8cbaf52fd3 Revert "Saas 5 report translation fix sle" 2014-06-26 18:14:44 +02:00
Simon Lejeune b8cea9e60f [REV] revert unneeded changes in website layout 2014-06-26 17:04:16 +02:00
Christophe Matthieu 77a07670cf [IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view 2014-06-25 14:03:23 +02:00
xmo-odoo 3160eb74c4 Merge pull request #584 from xmo-odoo/master-qweb-groups-xmo
`@groups` attribute in qweb views
2014-06-18 09:37:02 +02:00
xmo-odoo c949509b5e Merge pull request #463 from xmo-odoo/qweb-foreach
Qweb foreach
2014-06-17 15:56:09 +02:00
Xavier Morel 79e10200d5 [IMP] prevent edition of page if groups which current user doesn't have
If the current view uses @groups attributes (possibly in called templates),
the corresponding elements are rendered to a void (empty string in qweb). If
said user can edit the page, does so and saves a view section in which there's
a @groups to which he has no access, the element[@groups] is completely
removed from the template once saved, losing it.

If QWeb encounters an @groups to which the current user has no right during
rendering, have it request a no-RTE page, so the user can not RTE-edit the
page (or drop snippets in it).
2014-06-17 12:01:52 +02:00
Richard Mathot ab3231d6c9 [REF] website: change URL to new Odoo website 2014-06-16 13:49:39 +02:00
Simon Lejeune 10a0edce11 [FIX] request unbound during test execution, add condition in website.layout and livechat 2014-06-11 22:56:55 +02:00
Simon Lejeune 9482bc8f19 [FIX] attempt to render website.layout during test execution 2014-06-11 19:17:56 +02:00
Christophe Simonis ccdae747a0 [MERGE] forward port of branch saas-5 up to a7c2125 2014-06-10 13:19:55 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Xavier Morel a9a83d00c9 [REM] python-qweb support for as-less foreach 2014-06-05 17:49:08 +02:00
Denis Ledoux 9bcda15b97 [FIX] website: prevent to split google analytics script 2014-06-04 16:15:16 +02:00
Richard Mathot 8dc0503aa5 [FIX] website*: make custom footer independant of main layout 2014-06-02 16:56:36 +02:00
Richard Mathot fe3775b96f [FIX] website: remove standard footer from the DOM instead of hiding it 2014-06-02 12:10:56 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Richard Mathot e137a7713b [FIX] website_sale: test did not load js properly and failed 2014-05-26 16:58:14 +02:00
Richard Mathot b0e263d00f [REF] website: shorter tag for charset 2014-05-26 08:51:38 +02:00
Richard Mathot 2012ee998d [FIX] website: remove illegal HTML attribute 2014-05-26 08:51:38 +02:00
Richard Mathot 8fb320e86f [FIX] website: remove illegal HTML attribute 2014-05-26 08:51:38 +02:00
Richard Mathot e28c810123 [FIX] website: convert non-standard HTML metatag to data attribute 2014-05-26 08:51:38 +02:00
Richard Mathot df94bddac8 [FIX] website: not well-formed HTML 2014-05-26 08:51:38 +02:00
--global 319f4cb270 [FIX] website: define languages variable outside of an 'if' as it is used below in the same template, leading to a crash due to the variable not always being defined. 2014-05-23 10:23:13 +02:00
Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme 2014-05-21 10:29:04 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Fabien Meghazi 863edbaaf2 Seperate assets_common from other bundles 2014-05-20 17:06:25 +02:00
Fabien Meghazi f90a37ea70 [IMP] sitemap caches it's output in ir.attachment 2014-05-16 15:31:26 +02:00
Fabien Meghazi 828b7aef2f [WIP] sitemap 2014-05-15 16:58:16 +02:00
Fabien Meghazi 2e0e242c82 [REV] Revert lazy sitemap 2014-05-14 17:11:16 +02:00
Fabien Meghazi a20ccfc7d4 [FIX] lazy sitemap with generators 2014-05-14 15:48:51 +02:00
Fabien Meghazi c3cfc4bc32 [MERGE] sitemap backport, merge trunk from 9438 til 9440
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
Fabien Meghazi 4118f9ed0a [IMP] openerpframework moved in common asset bundle 2014-05-13 10:18:31 +02:00
Fabien Meghazi 1d08697bc1 [FIX] Do not display language choice if multilang=False 2014-05-12 17:42:01 +02:00