Simon Lejeune
5ac5805da0
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140321122202-cegi29h86p0bf54r
2014-03-21 13:22:02 +01:00
Simon Lejeune
1128743932
[FIX] Added the decorator website on the get_file route, correctly pass the context on the mrp bom structure and allow to install report module without pypdf installed
...
bzr revid: sle@openerp.com-20140321122103-mzp465s8hxckq4ai
2014-03-21 13:21:03 +01:00
Dharmraj Jhala (OpenERP)
c96f080e72
[IMP] improved code
...
bzr revid: dizzy.zala@gmail.com-20140321120550-8p0l6lh5iv45mvf7
2014-03-21 17:35:50 +05:30
Simon Lejeune
6b5986e34d
[FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
...
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
d8f27686e5
[IMP] website tour: fix test tour
...
bzr revid: chm@openerp.com-20140321115724-iwu17fkzdzaksmrs
2014-03-21 12:57:24 +01:00
429324999c
[IMP] website tour: remove tag script and css to lib bootstrap
...
bzr revid: chm@openerp.com-20140321112344-mwh2p8pp02j9sdq0
2014-03-21 12:23:44 +01:00
254b3a29fa
[IMP] website tour: auto set backdrop if no selector element
...
bzr revid: chm@openerp.com-20140321111815-t0312xxl7l83w9rx
2014-03-21 12:18:15 +01:00
Simon Lejeune
e06cefb4be
[FIX] Correctly separate website variable between report and website_report layouts
...
bzr revid: sle@openerp.com-20140321111742-rzkykk00z6fbum8d
2014-03-21 12:17:42 +01:00
58b6aeb01d
[IMP] website tour: remove bootstrap Tour lib
...
bzr revid: chm@openerp.com-20140321110750-ew8rj3nv2jcort1x
2014-03-21 12:07:50 +01:00
Simon Lejeune
57e6e8fd28
[FIX] Multiples fixes: correct context passing, changed osv.Model to osv.AbstractModel to avoid creating tables in database when the model use for the reports contains only method
...
bzr revid: sle@openerp.com-20140321105806-0bwo992995la91fe
2014-03-21 11:58:06 +01:00
Dharmraj Jhala (OpenERP)
e925756b7f
[IMP] improved typo
...
bzr revid: dizzy.zala@gmail.com-20140321100509-1htk580zquuov71m
2014-03-21 15:35:09 +05:30
Turkesh Patel (Open ERP)
7738af32e2
[FIX] improved code to add karma on vote
...
bzr revid: tpa@tinyerp.com-20140321094019-hbekr1rntbpdvvc5
2014-03-21 15:10:19 +05:30
Turkesh Patel (Open ERP)
283af4b6e5
[MRG] merged branch with improvements for assigning badges on running challange,improved some badge data.
...
bzr revid: tpa@tinyerp.com-20140321091924-mc3acnpx66oar555
2014-03-21 14:49:24 +05:30
Richard Mathot (OpenERP)
5f07ed7870
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140321075507-tzj93ev3cs5x4nby
2014-03-21 08:55:07 +01:00
Xavier Morel
a56dc53bea
[REM] 4-spaces indent for web view pretty-print-before-save routine
...
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.
Just keep lxml's standard 2-spaces indent.
LXML is unable to pretty print the layout anyway.
bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54:19 +01:00
Denis Ledoux
30853afd18
[FIX] website: prevent animations in edit mode
...
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
Denis Ledoux
9fa1b047ba
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9158 revid:dle@openerp.com-20140321140450-8ulnhr76qybiadks
...
bzr revid: dle@openerp.com-20140321140751-cf85vp7m2p7pa4uf
2014-03-21 15:07:51 +01:00
Kersten Jeremy
356e4f595a
[FIX] Redirect user to /web/login and not /web. The redirect is now compatible with the rev web:3983 (needto be retrocompatible), but the good practice should be to always redirect to login. It is to login controller to redirect if user is alreayd logged.
...
bzr revid: jke@openerp.com-20140321115524-j3vk6lovuphnaods
2014-03-21 12:55:24 +01:00
Kersten Jeremy
1d4b43eb38
[FIX] Redirect user from /web if a get redirect is found.
...
If you redirect an user not logged, into /web?redirect=xxx, he was correctly redirect to /web/login?redirect=/web?redirect=xxx. But when user come back on /web?redirect=xxx, he was not redirected to xxx.
The question should be to have only one behavior when we redirect people, as well /web?redirect as well /web/login?redirect. But because we use both in actual code, we need to accept both for retro-compatibility.
bzr revid: jke@openerp.com-20140321115018-x4e3l3d1v0tp0dyo
2014-03-21 12:50:18 +01:00
Richard Mathot (OpenERP)
7a77412cca
[IMP] Update demo data: add stages
...
bzr revid: rim@openerp.com-20140321075345-a9wfarz2etaijy4p
2014-03-21 08:53:45 +01:00
Dharmraj Jhala (OpenERP)
8bb5bfa241
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140320063836-xzno2dwuaxt1y033
bzr revid: dizzy.zala@gmail.com-20140321073301-hvfqqnch7jfktinb
2014-03-21 13:03:01 +05:30
Dharmraj Jhala (OpenERP)
f7621ff8be
[MERGE] with latest trunk server
...
bzr revid: pga@tinyerp.com-20140228054414-z2x4vufay1gbbpao
bzr revid: dizzy.zala@gmail.com-20140318065312-uq43i2aiha1kn3d0
bzr revid: dizzy.zala@gmail.com-20140319090323-0srxjge14cw8y4wv
bzr revid: dizzy.zala@gmail.com-20140320064008-fj9merih0wtz6tz6
bzr revid: dizzy.zala@gmail.com-20140321073141-f54b3lqel1l9lgq2
2014-03-21 13:01:41 +05:30
Parth Gajjar (Open ERP)
bc0a7cbc0c
[IMP] added sync option in base_gengo wizard,do not show option in website_gengo
...
bzr revid: pga@tinyerp.com-20140321071438-kip2lkzlzvm0et7n
2014-03-21 12:44:38 +05:30
Turkesh Patel (Open ERP)
7a82d51f84
[IMP] instead of showing no of badges show karma in user detail
...
bzr revid: tpa@tinyerp.com-20140321065332-ic28um9qtvdxx82f
2014-03-21 12:23:32 +05:30
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
7b0b8a0790
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061913-o2fp3m104dzeb2ky
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065115-srp2g1l3twjabmcq
2014-03-21 06:51:15 +00:00
Vidhin Mehta (OpenERP)
2d3656fd35
[IMP]show timezone option, select bydefault and change timezone value according to selection.
...
bzr revid: vme@tinyerp.com-20140321064541-zvrnx1b9azgrjkh7
2014-03-21 12:15:41 +05:30
Turkesh Patel (Open ERP)
967c424833
[MRG] merge with lp:openobejct-addons
...
bzr revid: tpa@tinyerp.com-20140321064210-uuccvuj2dwelabms
2014-03-21 12:12:10 +05:30
Turkesh Patel (Open ERP)
e0ec4271f3
[IMP] don't allow user to post on hos own post.
...
bzr revid: tpa@tinyerp.com-20140321063855-ok26jsyyhza7x3ff
2014-03-21 12:08:55 +05:30
ajay javiya (OpenERP)
7e4d71f6fa
[FIX] : only blog post titles and content can be tweet , not footer content
...
bzr revid: aja@tinyerp.com-20140321055428-7chzxnw6csntjs0q
2014-03-21 11:24:28 +05:30
d73baf5d1d
[FIX] stock: while cancelling purcahse order created from procurement it availables the related internal stock move which should not and also not triggering the workflow method
...
bzr revid: ado@tinyerp.com-20140321055412-30i0ifkj8wnzmaer
2014-03-21 11:24:12 +05:30
Sunil Sharma (OpenERP)
1185f7b8b5
[imp]:improve gamification challenge line category forum and add clss gamification challenge assign reward user
...
bzr revid: sunilsharma.sharma07@gmail.com-20140321054642-bjbgm4e92tur9f83
2014-03-21 11:16:42 +05:30
Chirag Dodiya (OpenERP)
fa30038c2c
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140321050817-31v8k14za5w60pjh
2014-03-21 10:38:17 +05:30
Denis Ledoux
54d8cd1e86
[FIX] crm: round robin tests on salesman assignation set force assignation true
...
bzr revid: dle@openerp.com-20140320183814-163zwgilty4l2jv7
2014-03-20 19:38:14 +01:00
Denis Ledoux
0e4cfe0add
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9157 revid:dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
...
bzr revid: chs@openerp.com-20140320134212-9nbuc7uqla4uiyf7
bzr revid: dle@openerp.com-20140320112958-slajf0ho0jtl7u60
bzr revid: dle@openerp.com-20140320161349-olyte7xt35nfj3dg
bzr revid: dle@openerp.com-20140320181737-68q9xh9jhfjynjip
2014-03-20 19:17:37 +01:00
Josse Colpaert
cb4b0a0c06
[IMP] Documentation start second pass
...
bzr revid: jco@openerp.com-20140320180857-in0fqm0stsfwns4a
2014-03-20 19:08:57 +01:00
Quentin (OpenERP)
c8648d9ed6
[FIX] stock: a couple of fixes of styntax error introduced in previous revision + some refactoring
...
bzr revid: qdp-launchpad@openerp.com-20140320180310-3tehn9d9z94qco43
2014-03-20 19:03:10 +01:00
Kersten Jeremy
9bf6f0310e
[FIX] Move default value in the _defaults of model and not in default_get.
...
Don't override the location_id if the super get_default don't retrun a value.
Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id
bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq
2014-03-20 19:02:40 +01:00
Denis Ledoux
abf8e0d54f
[ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam
...
bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
2014-03-20 18:51:29 +01:00
Thibault Delavallée
7e7260664d
[IMP] mass_mailing: delete option added in kanban view of mass mailings
...
bzr revid: tde@openerp.com-20140320175102-tw5htuv0warh743l
2014-03-20 18:51:02 +01:00
Thibault Delavallée
e42a69b10a
[FIX] [IMP] mass_mailing: campaign form view: button to duplicate
...
a mailing is now effectively implemented.
bzr revid: tde@openerp.com-20140320175004-3vlhdw6pnfdsx5hn
2014-03-20 18:50:04 +01:00
Denis Ledoux
be81326ee3
[FIX] survey: report not stored on filesystem
...
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
2014-03-20 18:48:35 +01:00
Thibault Delavallée
2f0b59be37
[IMP] list_view: allow displaying string-based buttons in list view
...
and not only img-based buttons.
bzr revid: tde@openerp.com-20140320173907-5b02atnispbznqmj
2014-03-20 18:39:07 +01:00
Frédéric van der Essen
b206261dd5
[IMP] hw_escpos: re-enabled image printing in xml receipts
...
bzr revid: fva@openerp.com-20140320170955-ekgya8pcv2wljhl8
2014-03-20 18:09:55 +01:00
Simon Lejeune
246ec6854b
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140320170806-3mfsm4nmhiq1ujk7
2014-03-20 18:08:06 +01:00
Thibault Delavallée
d2679a75bb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140320170520-3amtifgp7e659vuv
2014-03-20 18:05:20 +01:00
Thibault Delavallée
ae92bbf2e2
[IMP] mass_mailing: various usability improvements
...
- See recipients on mailing form view: now opens the recipients in a popup,
- Added a minimal form view for the contact list, used in the actions to create
after choosing filter / domain / recipients, to avoid confusing the user,
- Various small fixes in kanban view of campaign,
- contact_list_ids m2m is now no_create, because there is a button to do it
properly
- changing model now reset the template
bzr revid: tde@openerp.com-20140320170455-6vvudpin2bsp8ida
2014-03-20 18:04:55 +01:00
Simon Lejeune
ad50d5fcfe
[FIX] Multiple improvements in report including giving formatlang a cursor and a uid via a lambda method, cleaning of some comments and restoring the page numbering
...
bzr revid: sle@openerp.com-20140320165841-21clvch4ujak1y3m
2014-03-20 17:58:41 +01:00
Frédéric van der Essen
a4afb910e9
[IMP] hw_escpos / point_of_sale: print receipt with an xml template
...
bzr revid: fva@openerp.com-20140320164530-odpeuf1igh7wkrms
2014-03-20 17:45:30 +01:00
Denis Ledoux
84eeb79875
[FIX] point_of_sale: add multi-companies rules on pos.config
...
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
Simon Lejeune