Commit Graph
81391 Commits
Author SHA1 Message Date
ajay javiya (OpenERP) 689606c2f6 [MERGE]: with main
bzr revid: aja@tinyerp.com-20131216053732-28d7ksu2tiyno6kf
2013-12-16 11:07:32 +05:30
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
2013-12-16 05:35:57 +00:00
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 f9e986ecea [IMP] allow frames in blogs (video, ...
bzr revid: fp@tinyerp.com-20131214211309-i2kk3cb60hnp1urz
2013-12-14 22:13:09 +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 65a5ce8a92 [IMP] HMTL5 main element
bzr revid: fp@tinyerp.com-20131213214157-8ow63hpaii6hdvxl
2013-12-13 22:41:57 +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
jke-openerp 04182723fa [FIX] Move old uniq constraint of google_id from crm_meeting to calendar.attendee
bzr revid: jke@openerp.com-20131213172500-nclgwxrldbf9nyxu
2013-12-13 18:25:00 +01:00
jke-openerp 0578ceabaa [Typo] Set the avatar of calendar event, before text to always have the picture at top 0px (float right on the first line)
bzr revid: jke@openerp.com-20131213163005-439v2vy300b362m1
2013-12-13 17:30:05 +01:00
jke-openerp c4dfc941e6 [IMP] Move google Id from event to attendee to allow to an event to be on several google calendars
bzr revid: jke@openerp.com-20131213162752-q6z3v7yplj3m8p7b
2013-12-13 17:27:52 +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
Christophe Simonis 9a456ac078 [FIX] ir.module.module: install_from_urls is restricted to administrators and only accept urls from apps server
[FIX] ir.module.module: download() method is now a no-op. This method was in fact already a no-op as the "url" field is never set explicitly in the code.

lp bug: https://launchpad.net/bugs/1260747 fixed

bzr revid: chs@openerp.com-20131213155212-9m1pnbpz97upyz3i
2013-12-13 16:52:12 +01:00
Foram Katharotiya (OpenERP) c95b53c6bd [IMP] improve domain
bzr revid: fka@tinyerp.com-20131213131550-9jqg5zj4hpjgxhrw
2013-12-13 18:45:50 +05:30
Foram Katharotiya (OpenERP) c498a4e8bc [MERGE] with 7.0
bzr revid: fka@tinyerp.com-20131213125109-jjq1svpf0oyjykq5
2013-12-13 18:21:09 +05:30
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
Xavier Morel 3b56c80ced [FIX] attempt to fix issues of Locale.parse(None) returning None
use Locale.default() instead of manually parsing the result of locale.getdefaultlocale()

bzr revid: xmo@openerp.com-20131213104030-0tejn7i13yex975v
2013-12-13 11:40:30 +01:00
jke-openerp 332b8df1fb [REF] Cleaning old code, remove commented code, ...
bzr revid: jke@openerp.com-20131213103517-ynzu2ti596dh3zm4
2013-12-13 11:35:17 +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
Xavier Morel 21700e5e28 [MERGE] from trunk
bzr revid: xmo@openerp.com-20131213093827-cew27ajx3mlu91h3
2013-12-13 10:38:27 +01: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
Xavier Morel 0546993327 [FIX] merge from trunk and fix handling of view inheritance
main problem, view inheritance model field would use model from the
root view (after following inherit_id links) rather than the base view
(the requested one) -> with divergent models, it was possible for the
requested view itself to never be returned.

bzr revid: xmo@openerp.com-20131212134422-uxg6h21w1jhth9ow
2013-12-12 14:44:22 +01:00
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
Martin Trigaux c301558bf9 [FIX] gamification: no, actually make record rule for every user, will handle portal later
bzr revid: mat@openerp.com-20131212115524-u25hz4xjj9l8gatb
2013-12-12 12:55:24 +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
Martin Trigaux c797a9071b [FIX] gamification: make record rule global and not for employees only
bzr revid: mat@openerp.com-20131212113639-lg2w2pm1mldbqe7a
2013-12-12 12:36:39 +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
jke-openerp 5c53b9ac00 [IMP] Add description on Google Calendar module
bzr revid: jke@openerp.com-20131212110550-kf8mgq605v7ddben
2013-12-12 12:05:50 +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
Gery Debongnie e0ee9a58c5 [IMP] removes the expand/fold menu, because the search view covers the same functionality (addon web_graph)
bzr revid: ged@openerp.com-20131212105533-uawad2hgqopfkygo
2013-12-12 11:55:33 +01:00
Thibault Delavallée 1a9f24c56d [FIX] l10n_us, l10n_ma: added missing accounts for product categories
bzr revid: tde@openerp.com-20131212105140-tmg6yzhkaxlu8v61
2013-12-12 11:51:40 +01:00
Martin Trigaux f02ed9b4cb [FIX] gamification_sale_crm: include lead converted to opportunity into lead count goal
bzr revid: mat@openerp.com-20131212105005-waw5n2wpe0gzwxqg
2013-12-12 11:50:05 +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