pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,003 Commits 1 Branch 0 Tags
affeeeda2e445b5bddfa0818dc15485e4c19dc5d
Commit Graph
85003 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Launchpad Translations on behalf of openerp 2fa6706037 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
 2014-03-21 06:51:50 +00:00
Launchpad Translations on behalf of openerp 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
david.leach@logicsupply.com 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
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
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 b6bd0e8b8a [FIX] fix the print purchase button 
bzr revid: sle@openerp.com-20140320154226-tpx3d8a0xrmuxwrr
 2014-03-20 16:42:26 +01:00
Fabien Meghazi 0f9905b9f1 [IMP] better syntax for routing_map cache invalidation 
bzr revid: fme@openerp.com-20140320153651-4lkoekzhawny0p85
 2014-03-20 16:36:51 +01:00
Richard Mathot (OpenERP) 21b7829c70 [ADD] New stage for surveys 
bzr revid: rim@openerp.com-20140320153351-xgj5j164ixmwxaj6
 2014-03-20 16:33:51 +01:00
Thibault Delavallée 50ca5202a0 [REF] website_mail_group: refactored controllers and views 
- now using post arguments instead of hardcoded path items like mode;
- unfucked the date archives that was basically now working;
- keep user choices through the navigation (mode, dates);
- various small fixes in the views

bzr revid: tde@openerp.com-20140320151114-1mmk9x48i1lwc6qv
 2014-03-20 16:11:14 +01:00
Thibault Delavallée 6af6575efb [IMP] website_mail: added not stored function field 
on mail.message that is a short description of the message, either
the subject if present, of the beginning of the plain-text version
of the body. Used whenever messages 'subject' for all messages
is necessary.

bzr revid: tde@openerp.com-20140320151004-qq57s9r8qcpue0rs
 2014-03-20 16:10:04 +01:00
Thibault Delavallée 2bc87a67eb [IMP] mail_group: as they are now mailing list, avoid having automatic 
creation message, this is quite ugly.

bzr revid: tde@openerp.com-20140320150855-a0ich2zgzn320wj0
 2014-03-20 16:08:55 +01:00
Fabien Meghazi b8368d8182 [WIP] added virtual field. will probably change the name of this field 
bzr revid: fme@openerp.com-20140320150348-5tv7j2he26mhqpco
 2014-03-20 16:03:48 +01:00
Fabien Meghazi 5d107cfaa0 [IMP] static file injected in ir.attachment 
bzr revid: fme@openerp.com-20140320143346-nimxg7c61lm1253x
 2014-03-20 15:33:46 +01:00
Simon Lejeune d941bce076 [FIX] Adapted mrp bom structure (exit controller, added model) 
bzr revid: sle@openerp.com-20140320142520-3qapc7039q46eg9k
 2014-03-20 15:25:20 +01:00
Simon Lejeune 52522bf0f9 [FIX] get_pdf can be called on is own (no need to call get_html before on particular controller-report) and make the multiple ids work 
bzr revid: sle@openerp.com-20140320140609-7ozly6f55sgeow7k
 2014-03-20 15:06:09 +01:00
Frédéric van der Essen 5596413901 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140320134017-wi6qdofziia3q12l
 2014-03-20 14:40:17 +01:00
Simon Lejeune 221d2a6eeb [FIX] Reports not using the generic controller should not declare a controller anymore. They are now openerp models and are availabel either trough openerp model 'report' with get_html, get_pdf or through a controller. Adapted report_vat this way. 
bzr revid: sle@openerp.com-20140320133425-z04ewof8ktjanmn9
 2014-03-20 14:34:25 +01:00
Parth Gajjar (Open ERP) 0660bf99af [IMP] move js to head 
bzr revid: pga@tinyerp.com-20140320132800-mnnknhayjqnhbwns
 2014-03-20 18:58:00 +05:30
Christophe Simonis 03c31de4dd [FIX] web: when filtering out context, also strip *_view_ref keys 
bzr revid: chs@openerp.com-20140320131014-3v5qfjxq9unqu5fs
 2014-03-20 14:10:14 +01:00
Turkesh Patel (Open ERP) 141eecfa4c [ADD] added function to add karma to user. 
bzr revid: tpa@tinyerp.com-20140320130014-jehnk1x7n9jc1khj
 2014-03-20 18:30:14 +05:30
Parth Gajjar (Open ERP) ac8babe0e5 [IMP] minor changes 
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
 2014-03-20 17:37:58 +05:30
Chirag Dodiya (OpenERP) 9950cdde14 [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140320113507-d1mfk36e1ux6b7s0
 2014-03-20 17:05:07 +05:30
Frédéric van der Essen 53f02309ed [IMP] hw_escpos: print_xml_receipt() controller allows you to print an xml defined receipt 
bzr revid: fva@openerp.com-20140320112720-ldshe2764z3fyfvi
 2014-03-20 12:27:20 +01:00
Denis Ledoux 287aae3942 [FIX] stock: force form_view_ref to False in context of actions track_line and scrap_move to avoid context propagation of stock picking views 
bzr revid: dle@openerp.com-20140320110741-pg8se5c02p87yi1y
 2014-03-20 12:07:41 +01:00