Commit Graph
77774 Commits
Author SHA1 Message Date
ajay javiya (OpenERP) a5bb8a5c49 [MERGE]: with main
bzr revid: aja@tinyerp.com-20131217061515-0ps865qvyiw5o4x5
2013-12-17 11:45:15 +05:30
ajay javiya (OpenERP) ad3f8c9079 [ADD]: access rights
bzr revid: aja@tinyerp.com-20131217055447-u43gglwzr2y5douh
2013-12-17 11:24:47 +05:30
Max Mumford 3aaa0c10fe [ADD] <main> tag around content for easy replacing, and CSS changes to maintain current UI
bzr revid: mmu@openerp.com-20131216160654-s75kx9xr2yutq5fg
2013-12-16 17:06:54 +01:00
Xavier Morel 98c4e6b3d4 [IMP] editability criteria for links and images
if a link or image is an editing host (has @contenteditable=true), its
body is editable *but* its attributes should not be considered
editable: if the attributes come from a t-att-*, @contenteditable will
be set on the node itself.

such elements should be ignored by the link & image dialog handling
thing, as editing their attributes has undesirable effects.

bzr revid: xmo@openerp.com-20131216134424-fdqs03i9pidbmaqt
2013-12-16 14:44:24 +01:00
ddm d15f3d2b8a [FIX] Main object for members (promote)
bzr revid: ddm@openerp.com-20131216134033-qnrvj06od8y2o868
2013-12-16 14:40:33 +01:00
ddm ff7da06cf9 [FIX] Main object for jobs (promote)
bzr revid: ddm@openerp.com-20131216133549-57343aix6it9ch5a
2013-12-16 14:35:49 +01:00
ajay javiya (OpenERP) cacba10893 [IMP][ADD]: template for sale.quote.template , to allow create a new template using cms
bzr revid: aja@tinyerp.com-20131216132346-4lw4t6whsqplfgwq
2013-12-16 18:53:46 +05:30
ddm 599b34d78d [FIX] Snafu
bzr revid: ddm@openerp.com-20131216112211-t8tvnamftce80qjd
2013-12-16 12:22:11 +01:00
Fabien Meghazi defdd6e565 [ADD] main_object for events
bzr revid: fme@openerp.com-20131216110234-iup1hiz57b68j8g7
2013-12-16 12:02:34 +01:00
ddm ff25c7a85a [FIX] Main object for events (promote)
bzr revid: ddm@openerp.com-20131216105403-0x6p1gg4ef0zjvid
2013-12-16 11:54:03 +01:00
ddm 285a596bf2 [FIX] Main object for customers (promote)
bzr revid: ddm@openerp.com-20131216102557-m9itxlw5jqjcdtlr
2013-12-16 11:25:57 +01:00
ddm 7cd60fb225 [FIX] Customers CMS bug
bzr revid: ddm@openerp.com-20131216095847-i4dqzk4ix26hh3cg
2013-12-16 10:58:47 +01:00
ddm 7763d6967e [FIX] Main object for partners (promote)
bzr revid: ddm@openerp.com-20131216092711-sv3n8ah969zm8nbs
2013-12-16 10:27:11 +01:00
Xavier Morel 87c3b6ac72 [FIX] disabling of field escaping
bzr revid: xmo@openerp.com-20131216092343-0e6t7nvse3r0p2zs
2013-12-16 10:23:43 +01:00
ddm 7ce0b5a69e [FIX] Main object for blog posts (promote)
bzr revid: ddm@openerp.com-20131216085636-y1h0h4ig9pbv9bcm
2013-12-16 09:56:36 +01:00
ajay javiya (OpenERP) 1e17cd0fc8 [IMP]: code
bzr revid: aja@tinyerp.com-20131216084935-frtb88w60l189id1
2013-12-16 14:19:35 +05:30
ddm 8f7db60fd6 [FIX] Tour should not start when testing
bzr revid: ddm@openerp.com-20131216075516-o70h4ydhgqj4i3kh
2013-12-16 08:55:16 +01:00
ajay javiya (OpenERP) 689606c2f6 [MERGE]: with main
bzr revid: aja@tinyerp.com-20131216053732-28d7ksu2tiyno6kf
2013-12-16 11:07:32 +05:30
ajay javiya (OpenERP) 68443085e1 [ADD]: object sale.quote.template and improve code
bzr revid: aja@tinyerp.com-20131216052451-rqz5tdqzqj4cv5ar
2013-12-16 10:54:51 +05:30
Fabien Pinckaers 38df46190a [IMP] Typo
bzr revid: fp@tinyerp.com-20131215080035-nbenf3bvfrmp1qv1
2013-12-15 09:00:35 +01:00
Fabien Pinckaers c62e8fc793 [IMP] Small improvements
bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
2013-12-14 20:21:05 +01:00
Fabien Pinckaers b5393c97e4 [IMP] slugify products/categories
bzr revid: fp@tinyerp.com-20131214115227-6g3w70pm6cotiqdk
2013-12-14 12:52:27 +01:00
Fabien Pinckaers cbc4b5e7ff [IMP] Product image improved layout
bzr revid: fp@tinyerp.com-20131214114625-uian4kh4gexpc6aa
2013-12-14 12:46:25 +01:00
Fabien Pinckaers d53d456c8c [IMP] revert bug
bzr revid: fp@tinyerp.com-20131213214438-ac4mmrurq90vn01r
2013-12-13 22:44:38 +01:00
Fabien Pinckaers bc749910f2 [IMP] Revert bad change in CSS, for height of footer
bzr revid: fp@tinyerp.com-20131213213759-fz3yjc79o09jmjw2
2013-12-13 22:37:59 +01:00
Fabien Pinckaers fd772ee527 [IMP] better css
bzr revid: fp@tinyerp.com-20131213213014-hz0x1tfxygrmev1o
2013-12-13 22:30:14 +01:00
Christophe Matthieu b32dd93365 [IMP] website_sale: layout for all theme and mobile view
bzr revid: chm@openerp.com-20131213161850-le6823cp9njx8iny
2013-12-13 17:18:50 +01:00
Christophe Matthieu aca3b51bf3 [IMP] website_sale: layout for all theme and mobile view
bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
2013-12-13 17:16:42 +01:00
Max Mumford 8d5b86759e [ADD] <main> tag around main content t-raw for easier content replacement
bzr revid: mmu@openerp.com-20131213124122-ciyin33zb1tw74lp
2013-12-13 13:41:22 +01:00
Thibault Delavallée fab63158a1 [CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method.
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
2013-12-13 12:06:29 +01:00
ddm 2c6eb6407f [IMP] Robustify automated tour execution
bzr revid: ddm@openerp.com-20131213102106-slphhqxhkwisgd0z
2013-12-13 11:21:06 +01:00
Xavier Morel f0a3a6136d [FIX] unfuck broken funcall
bzr revid: xmo@openerp.com-20131213100919-34mbfd2hc7bnga0v
2013-12-13 11:09:19 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Launchpad Translations on behalf of openerp 20dba40661 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213055207-syrqwzpvnts4z05q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131214054232-imi9a8u9v0ktnahm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216051546-5os7f9apxcrnrx05
bzr revid: launchpad_translations_on_behalf_of_openerp-20131217053233-yv0pe0b16pixnuk4
2013-12-17 05:32:33 +00:00
Xavier Morel 0fd50c4750 [REM] leftover logging
bzr revid: xmo@openerp.com-20131213093542-sdomq8skpwq5wrgv
2013-12-13 10:35:42 +01:00
Xavier Morel bf876739fe [REM] undo RTE button by fp demand, apparently unseen & unused by users
bzr revid: xmo@openerp.com-20131213092025-thlltl0xjxq0noyp
2013-12-13 10:20:25 +01:00
ajay javiya (OpenERP) 558e5fdf9b [MERGE] : with main
bzr revid: aja@tinyerp.com-20131213051723-onb54coa8f2930sj
2013-12-13 10:47:23 +05:30
ajay javiya (OpenERP) eda0c7f3e0 [IMP] : User will post on quotation without login, user is identify from the link that he get in his mail
bzr revid: aja@tinyerp.com-20131213050923-nwktcsnu3e62y3kg
2013-12-13 10:39:23 +05:30
Christophe Matthieu fbf71a27c5 [FIX] website_sale: checkout default partner is not the public user
bzr revid: chm@openerp.com-20131212122543-hcc53zjn6wlw5l80
2013-12-12 13:25:43 +01:00
Christophe Matthieu 6d6693c8a3 [FIX] website_event: add to cart
bzr revid: chm@openerp.com-20131212121734-zfz35ve6x2m99rar
2013-12-12 13:17:34 +01:00
Xavier Morel 00b012c01b [ADD] tentative tests for application of view inheritance stuff
bzr revid: xmo@openerp.com-20131212120600-timum4yzr84kl0mf
2013-12-12 13:06:00 +01:00
Christophe Matthieu c641d58610 [FIX] website_sale: address layout
bzr revid: chm@openerp.com-20131212120232-gsx1h0vk5t91wpcw
2013-12-12 13:02:32 +01:00
ajay javiya (OpenERP) 42a58bdfe4 [ADD] : create portal user of so customere
[IMP] : create a token when quotation is send to customer

bzr revid: aja@tinyerp.com-20131212115025-ljbwb7z1dscpfu5v
2013-12-12 17:20:25 +05:30
Christophe Matthieu 796b8bf362 [FIX] website_sale: layout; add push to top in grid
bzr revid: chm@openerp.com-20131212114731-9ivgwupic064o3x0
2013-12-12 12:47:31 +01:00
Christophe Matthieu 745a559c77 [IMP] website: Removing unnecessary spaces at beginning of line; website_sale: fix css
bzr revid: chm@openerp.com-20131212110740-4ofu3tebr3vgcrnd
2013-12-12 12:07:40 +01:00
Christophe Matthieu 730fdb904d [FIX] website_sale: css
bzr revid: chm@openerp.com-20131212110626-5kj461y6erg5ddhq
2013-12-12 12:06:26 +01:00
Christophe Matthieu ee370a837c [IMP] website: Removing unnecessary spaces at beginning of line
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
Christophe Matthieu 6655cd8ccd [IMP] website_sale: product placeholder image must be bigger
bzr revid: chm@openerp.com-20131212104724-0jmsepf8k5gtl18h
2013-12-12 11:47:24 +01:00
Thibault Delavallée 6b164eb7b3 [IMP] hr: minor usability improvements
- hr_holidays: renamed My Leaves filter by My Requests, more accurate
- hr_recruitment: string of name field is not Subject / Application Name, more accurate; this string is used in the search view also.

bzr revid: tde@openerp.com-20131212104612-2fbn9130emyvxg7s
2013-12-12 11:46:12 +01:00
ddm 76b5bef5fb [FIX] Tour should not start 'uninvited'
bzr revid: ddm@openerp.com-20131212102807-ra4uon05udtp5twu
2013-12-12 11:28:07 +01:00