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
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
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
jke-openerp
9a130e3157
[IMP] Add wizard and tuto for google synchro. add permission missing on calendar object
...
bzr revid: jke@openerp.com-20131211163849-z438c5d8m7w4qt3l
2013-12-11 17:38:49 +01:00
Christophe Simonis
9241d5f699
[FIX] when executing action received from a button call, set active_id and active_ids if there is one, remove existing if not; always set active_model
...
bzr revid: chs@openerp.com-20131211163609-i3s2mlncf5n91uda
2013-12-11 17:36:09 +01:00
Christophe Matthieu
083e88167e
[IMP] website: save (button) or discard (link), on left in modal
...
bzr revid: chm@openerp.com-20131211163305-5qwltn11k2ph179o
2013-12-11 17:33:05 +01:00
Gery Debongnie
7a672064c0
[FIX] improves the handling of headers titles when the db query returns false or undefined (addon web_graph)
...
bzr revid: ged@openerp.com-20131211162850-mgqs5csnw8wca974
2013-12-11 17:28:50 +01:00
Xavier Morel
ebc6ff5256
[REM] broken tests
...
weird tests (using broken views, but not just broken in the way the
test expects) were really testing for error on using a field which
does not exist, predicated on full rendering of the view during
validation.
This has been removed from the website branch as it's unfeasible and
nonsensical for model-less views (e.g. qweb), and thus the test blew
up with a completely different error (missing @string) or, once the
test was fixed, wouldn't blow up at all.
bzr revid: xmo@openerp.com-20131211162412-t31bxkpy2yzdnf0q
2013-12-11 17:24:12 +01:00
Christophe Matthieu
ef7eef6197
[IMP] website snippet: remove parent snippet when user delete the last child colmd snippet
...
bzr revid: chm@openerp.com-20131211162305-wxzvmwsb91e4prlb
2013-12-11 17:23:05 +01:00
Christophe Simonis
920ba45935
[FIX] filter the context keys only on the result action of the button
...
bzr revid: chs@openerp.com-20131211161810-hetgizet5mv3xkys
2013-12-11 17:18:10 +01:00
Christophe Matthieu
350bda93a6
[IMP] website_sale: empty comment
...
bzr revid: chm@openerp.com-20131211160749-a9f0u00mn4fjx7oe
2013-12-11 17:07:49 +01:00
Gery Debongnie
945719fb7d
[FIX] correctly computes the height and the width of the graph view (addon web_graph)
...
bzr revid: ged@openerp.com-20131211160011-fhv7ah63hlnyg7l0
2013-12-11 17:00:11 +01:00
Fabien Meghazi
b0c4ae43ac
[FIX] My humble participation to the great World War Z-index
...
bzr revid: fme@openerp.com-20131211153646-an990cc99t08f534
2013-12-11 16:36:46 +01:00
Christophe Matthieu
72c996333f
[IMP] website_mail: rename template
...
bzr revid: chm@openerp.com-20131211153543-4vjcd1h31ltf4dl0
2013-12-11 16:35:43 +01:00
Christophe Matthieu
17e132bb01
[FIX] website: order of script for editor and tours
...
bzr revid: chm@openerp.com-20131211153345-6hand0upjjqba85f
2013-12-11 16:33:45 +01:00
Christophe Matthieu
2733f9b287
[FIX] website: t-field widget monetary layout
...
bzr revid: chm@openerp.com-20131211152514-4s0fmnqri4l4ekkt
2013-12-11 16:25:14 +01:00
Christophe Matthieu
1acf6d904f
[FIX] website: editable in context
...
bzr revid: chm@openerp.com-20131211152511-5bw86drta0374x6y
2013-12-11 16:25:11 +01:00
Christophe Matthieu
2257e8d431
[IMP] website: change editable and use groups
...
bzr revid: chm@openerp.com-20131211145930-r0izxh9t0efjwhxh
2013-12-11 15:59:30 +01:00
Gery Debongnie
8da86807b6
[FIX] quick fix to make sure charts have a minimal height that is not too small (addon web_graph)
...
bzr revid: ged@openerp.com-20131211145056-nzpnir06xx3q0n9y
2013-12-11 15:50:56 +01:00
Christophe Matthieu
5217c8ebe8
[IMP] website: remove secure_layout. Inherit with groups for js editor
...
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
Fabien Meghazi
7fa61493db
[IMP] replace company name in header by a t-field
...
bzr revid: fme@openerp.com-20131211143515-d1kxwvokytjmf84j
2013-12-11 15:35:15 +01:00
Christophe Matthieu
d7062b80ec
[FIX] website snippet: change quote for selector for bug of jquery
...
bzr revid: chm@openerp.com-20131211142138-p3f38wuj1zoj8zmr
2013-12-11 15:21:38 +01:00
Gery Debongnie
b04f21ea12
[IMP] finally uses the full width and height to draw charts, instead of hardcoded numbers (in graph view) (addon web_graph)
...
bzr revid: ged@openerp.com-20131211140140-shlpos1jt3z8wj41
2013-12-11 15:01:40 +01:00
Denis Ledoux
7f00274384
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
...
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Denis Ledoux
89a9dbee75
[FIX] mrp: cost structure report, do not display twice main supplier
...
bzr revid: dle@openerp.com-20131211134120-fco4rlqjh258ba36
2013-12-11 14:41:20 +01:00
Martin Trigaux