Commit Graph
82144 Commits
Author SHA1 Message Date
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
Martin Trigaux a3a23bff53 [FIX] hr_gamification: hr officers can see any goals
bzr revid: mat@openerp.com-20131212103115-1i3tn2cez2iee8e3
2013-12-12 11:31:15 +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
Martin Trigaux 8a80688560 [FIX] gamification: move icon to description folder
bzr revid: mat@openerp.com-20131212102624-obfsh2nsclhpv4n9
2013-12-12 11:26:24 +01:00
Martin Trigaux 3d21d89c93 [FIX] gamification: change field name unit -> suffix
bzr revid: mat@openerp.com-20131212101444-v1y643ra8kl4eet0
2013-12-12 11:14:44 +01:00
Christophe Matthieu dfe3ca1172 [IMP] website_sale: Rename 'Incl Taxes' into Taxes
bzr revid: chm@openerp.com-20131212101442-k1abgkueua4t8iaa
2013-12-12 11:14:42 +01:00
Christophe Matthieu fa217bba33 [IMP] website_sale, website_event: layout
bzr revid: chm@openerp.com-20131212101258-tzzyyuz74ysmfn6s
2013-12-12 11:12:58 +01:00
ddm 5c36fdc60c [FIX] Fix publish in blog+event tutorials
bzr revid: ddm@openerp.com-20131212101134-vhppxic7pz45ox7l
2013-12-12 11:11:34 +01:00
ddm 0c699923e1 [FIX] Restore tutorial on blog install
bzr revid: ddm@openerp.com-20131212100316-ipy9vnrg4k05t0m2
2013-12-12 11:03:16 +01:00
ddm 64794a8c3b [FIX] Restore tutorial on module install
bzr revid: ddm@openerp.com-20131212095950-3675vfd0tjpzlsug
2013-12-12 10:59:50 +01:00
Gery Debongnie d27b9ab563 [MERGE] merge trunk
bzr revid: ged@openerp.com-20131212095350-hfn21bwp031nns1m
2013-12-12 10:53:50 +01:00
Gery Debongnie 43627cc63a [FIX] makes sure the web client loads the bootstrap.js file instead of using dropdown.js in web_graph (addon web)
bzr revid: ged@openerp.com-20131212094518-jlau88zb0bxjj966
2013-12-12 10:45:18 +01:00
ddm 8fe49cf3ca [IMP] Improve resume for automated tests
bzr revid: ddm@openerp.com-20131212094306-marvfv7zewlghiii
2013-12-12 10:43:06 +01:00
Martin Trigaux 0a0be4f86c [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131212093234-11xachvlsou862q4
2013-12-12 10:32:34 +01:00
Gery Debongnie edbc4d8927 [MERGE] latest trunk
bzr revid: ged@openerp.com-20131212085948-ntl7j40yl6815sye
2013-12-12 09:59:48 +01:00
Gery Debongnie f24f38ca88 [FIX] removes a debugger statement (addon web_graph)
bzr revid: ged@openerp.com-20131212083936-5s8xi6ays4xq9jul
2013-12-12 09:39:36 +01:00
Turkesh Patel (Open ERP) c5fae04622 [IMP] improved name of applicant in posted msg.
bzr revid: tpa@tinyerp.com-20131212062845-pu81cnpt8rozuz74
2013-12-12 11:58:45 +05:30
ajay javiya (OpenERP) 26c8697526 [ADD]: color on accept , decline and discuss buttons , demo products
bzr revid: aja@tinyerp.com-20131212051525-0s62wi45pxiwh5lq
2013-12-12 10:45:25 +05:30
Launchpad Translations on behalf of openerp 45e34f2f6b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
2013-12-12 05:15:25 +00:00
jke-openerp 38116a86d3 [Typo] Typo access security...
bzr revid: jke@openerp.com-20131211191857-uegy2x34lnf7mhaj
2013-12-11 20:18:57 +01:00
jke-openerp 5f4e3ea835 [TYPO] Typo, bad security rules
bzr revid: jke@openerp.com-20131211191831-r70gxot42ef2epf1
2013-12-11 20:18:31 +01:00
jke-openerp 889518d866 [IMP] Add permission on web_Calendar.contacts
bzr revid: jke@openerp.com-20131211185502-mmzi1nkdkdmsuuqj
2013-12-11 19:55:02 +01:00
jke-openerp 9870bef9f9 [Typo] Typo access security
bzr revid: jke@openerp.com-20131211185342-lhcb8kl8ekzc3bb5
2013-12-11 19:53:42 +01:00
ddm bdc04dcf44 [FIX] Blog tour
bzr revid: ddm@openerp.com-20131211182159-0yz02kdubxjgak3f
2013-12-11 19:21:59 +01:00
ddm 9e28c3f96c [FIX] Event tour
bzr revid: ddm@openerp.com-20131211182010-foz36z3jrvnkc67v
2013-12-11 19:20:10 +01:00
ddm e84d9a7f85 [FIX] Shop tour
bzr revid: ddm@openerp.com-20131211181410-rfy68dlqps8oldll
2013-12-11 19:14:10 +01:00
Denis Ledoux 291bc4a69d [FIX] hr_holidays: on change holiday type to employee tag, set employee to False.
Otherwise, the user who creates the allocation request by employee tag will benefit of the leaves he just entered, twice if he has the employee tag, once if has not the employee tag(and in this last case, he should not have this leave allocation, as he do not have the tag

bzr revid: dle@openerp.com-20131211180025-pg8kf13bt6d1vk9l
2013-12-11 19:00:25 +01:00
Denis Ledoux 942a10f2b3 [REVERT] rev 9007 dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
default_model and default_res_id were not present when doing this fix, because in the web client, we prevented the propagation of the context keys beginning with "_default" in some cases.
The fact is that, in this specific case, the keys "default_" should not have been removed. This has been fix in web client in 
rev 3892 revid:chs@openerp.com-20131211163609-i3s2mlncf5n91uda

Besides, active_model cannot be used here, as active_model is not 'sale.order' but the model of the wizard.

bzr revid: dle@openerp.com-20131211171429-6bxuh7o4ueiy9dd1
2013-12-11 18:14:29 +01:00
Martin Trigaux 385a54cb83 [MERGE] [FIX] fields: avoid traceback when rendering reference field if link is broken (name_get returns no result)
bzr revid: mat@openerp.com-20131211165521-dxcjq7e35q8i0xs9
2013-12-11 17:55:21 +01:00
Martin Trigaux 61db0a7755 [MERGE] [FIX] res_users: skip method _get_reified_groups if read returns no result (avoid traceback)
bzr revid: mat@openerp.com-20131211165047-7jq1got6aikjmdry
2013-12-11 17:50:47 +01:00