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
Richard Mathot (OpenERP) dbd36f318c [FIX] Rem old merged code (SHOULD NOT BE MERGED INTO TRUNK) 
bzr revid: rim@openerp.com-20140326084646-0vutq1anyeju3w2y
 2014-03-26 09:46:46 +01:00
Richard Mathot (OpenERP) 6c0a7f1251 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140225092358-6i68zl4so7tn1for
bzr revid: rim@openerp.com-20140227093016-i87i2kh126280ab3
bzr revid: rim@openerp.com-20140303131411-5i0e5lk3h3mc8q2d
bzr revid: rim@openerp.com-20140304090203-rkdi7fh74woz8db4
bzr revid: rim@openerp.com-20140304155505-k2oiof5fvao1d19d
bzr revid: rim@openerp.com-20140315102635-526g0z3bq8zrn26b
bzr revid: rim@openerp.com-20140317075842-qojs31h28edyi778
bzr revid: rim@openerp.com-20140318075345-p6mbeo99a1eq4ixu
bzr revid: rim@openerp.com-20140319072134-dgr0psp0psu3rbhw
bzr revid: rim@openerp.com-20140321075445-qade01myf2189rwn
bzr revid: rim@openerp.com-20140325085102-p3tqknwr4usns3h1
bzr revid: rim@openerp.com-20140325152904-qiotk0fhecdxcald
bzr revid: rim@openerp.com-20140326073850-3q71kysucv15bkao
 2014-03-26 08:38:50 +01:00
ajay javiya (OpenERP) b5ffa0f83b [IMP]: code 
bzr revid: aja@tinyerp.com-20140326073057-d60x28qqizy2l3u9
 2014-03-26 13:00:57 +05:30
Launchpad Translations on behalf of openerp 87f5acb97b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140326071242-wi4c4p17bbhfp671
 2014-03-26 07:12:42 +00:00
Parth Gajjar (Open ERP) daed4c8c41 [IMP] send user's company_id for link if api key not set 
bzr revid: pga@tinyerp.com-20140326071057-fr76le4yr2yaiohq
 2014-03-26 12:40:57 +05:30
Turkesh Patel (Open ERP) b6db9be4f1 [MRG] lp:~openerp-dev/openobject-addons/trunk-website-forum-tpa-template_ans-ssh improved code to make notifications as unread. 
bzr revid: tpa@tinyerp.com-20140326065303-1eb4p8s1ni4n5t10
 2014-03-26 12:23:03 +05:30
Turkesh Patel (Open ERP) 5fe205d85a [IMP] improved typo 
bzr revid: tpa@tinyerp.com-20140326064913-3s4x6iahv86gquk8
 2014-03-26 12:19:13 +05:30
Sunil Sharma (OpenERP) 8e06abc7c5 [imp]:improve Mail notification read message for badge user 
bzr revid: sunilsharma.sharma07@gmail.com-20140326064244-1jkw4zuxkuz0kguf
 2014-03-26 12:12:44 +05:30
Turkesh Patel (Open ERP) 1a83ff8459 [IMP] do not store session_id in db update viewd post id in session and maintain it. 
bzr revid: tpa@tinyerp.com-20140326063042-1palqxiw10uvjlvf
 2014-03-26 12:00:42 +05:30
ajay javiya (OpenERP) 864892d6ce [MERGE] : with trunk 
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
 2014-03-26 11:18:41 +05:30
Dharmraj Jhala (OpenERP) 049acb32ae [MERGE] with parent branch 
bzr revid: dizzy.zala@gmail.com-20140326051938-35qgm6zlc3tpdvf7
 2014-03-26 10:49:38 +05:30
Dharmraj Jhala (OpenERP) 6242a749e0 [IMP] code improvement 
bzr revid: dizzy.zala@gmail.com-20140326051638-got79xh1azvz77ut
 2014-03-26 10:46:38 +05:30
Kersten Jeremy b2ea875f4c [FIX] IE9 - Move the placeholder in base_import from view to js, to use the mechanism of select2 and not the jquery.placeholder. Else, jq.placeholder override the select2 value, because the style option is in reality an input in dom. 
bzr revid: jke@openerp.com-20140325173205-n2q0dw1kynlkint7
 2014-03-25 18:32:05 +01:00
Kersten Jeremy 062ee7485c [FIX] IE9 - Catch error when we try to load a new stylesheet but that we have already reached the max number of sheet in IE9 : 31 
bzr revid: jke@openerp.com-20140325172147-6ymq1ixebawj4ce2
 2014-03-25 18:21:47 +01:00
Thibault Delavallée c5d8eac150 [IMP] [FIX] mass_mailing: email_to, for testing purposes, is back to 
a char field. Template is sent wihout being rendered.
Also improved name_get on contact (name <email>).

bzr revid: tde@openerp.com-20140325161813-ixxh8jdb6iliqtso
 2014-03-25 17:18:13 +01:00
Gery Debongnie 30e787511f [IMP] refactoring of readgroup method, to make it eager. Still incomplete, but it is mostly working (orm.py) 
bzr revid: ged@openerp.com-20140325161104-d0xgof4bcskh4ie6
 2014-03-25 17:11:04 +01:00
Fabien Meghazi 0fe55dddc1 [IMP] Added a mimetype field in ir.attachment 
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
 2014-03-25 17:04:13 +01:00
Thibault Delavallée a2c5e27901 [FIX] mass_mailing: do not perform the mass mailing when not having recipients. 
bzr revid: tde@openerp.com-20140325155127-luvpmen8lambhiou
 2014-03-25 16:51:27 +01:00
Richard Mathot (OpenERP) 4379867a01 [FIX] 
bzr revid: rim@openerp.com-20140325154935-2uqf0xfelb5e995i
 2014-03-25 16:49:35 +01:00
Christophe Simonis 5b2634bd6e [FIX] init logger earlier, right after config loading 
bzr revid: chs@openerp.com-20140325154627-cmodvx26jayj3k4a
 2014-03-25 16:46:27 +01:00
Richard Mathot (OpenERP) dafe2e2328 [REM] Duplicate menu in kanban view 
bzr revid: rim@openerp.com-20140325154526-n2x67rlnsktm0993
 2014-03-25 16:45:26 +01:00
Thibault Delavallée 89b41b3056 [FIX] mass_mailing: fixed demo data, warnings about non existent 
fields in demo data.

bzr revid: tde@openerp.com-20140325154246-6b97omyd4tjse7zo
 2014-03-25 16:42:46 +01:00
Thibault Delavallée 38541d8d2d [IMP] mass_mailing: cleaned and fixed mass mailing.send_all + added an onverride 
of the controller to be able to unsubscribe from leads.

bzr revid: tde@openerp.com-20140325154114-er4o489y3w3ng10f
 2014-03-25 16:41:14 +01:00
Thibault Delavallée d9ff66c3de [FIX] email_template minimal form view: add some required field in invisible 
in the view, to be able ot use default values when creating records

bzr revid: tde@openerp.com-20140325154031-vi773ggoz2q3qkxz
 2014-03-25 16:40:31 +01:00
Thibault Delavallée 2dc0372431 [FIX] email_template: protect against possible non existent value 
bzr revid: tde@openerp.com-20140325154006-fb5bu1khcvg6vdjb
 2014-03-25 16:40:06 +01:00
Fabien Meghazi f86967960d [MERGE] upstream 
bzr revid: fme@openerp.com-20140325153725-67hb463km4yvsnoe
 2014-03-25 16:37:25 +01:00
Richard Mathot (OpenERP) 6e25b1fc3f [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
 2014-03-25 16:29:35 +01:00
Richard Mathot (OpenERP) 9b3bc55398 [FIX] Bug when duplicating surveys. OpenERP won't anymore duplicate user input lines 
bzr revid: rim@openerp.com-20140325152736-ctug9axql2ub0cnn
 2014-03-25 16:27:36 +01:00
Thibault Delavallée 6577b935eb [IMP] mass_mailing: improved inherited form view of email template 
bzr revid: tde@openerp.com-20140325142640-a0vf1l84keoc35jl
 2014-03-25 15:26:40 +01:00
Thibault Delavallée 3c79803ce0 [FIX] mass_mailing: fixed email_template preview model 
that inherit from email_template; however with the inheritance mechanism of openerp
it is not updated when email_template itself is updated, therefore having to force
an update with a dummy inheritance.

bzr revid: tde@openerp.com-20140325142621-fbxa2gmeo52zf4qw
 2014-03-25 15:26:21 +01:00
Thibault Delavallée 283ce860fc [REM] mail: removed dead code in mail.js 
bzr revid: tde@openerp.com-20140325142535-rptr14zfxf8ctx27
 2014-03-25 15:25:35 +01:00
Thibault Delavallée 8c270f9b87 [FIX] email_template: fixed iteration on a dict 
bzr revid: tde@openerp.com-20140325142519-z3j1saqry9j23e0p
 2014-03-25 15:25:19 +01:00
Thibault Delavallée d70538402b [REM] mail: removed dead code in mail_message 
bzr revid: tde@openerp.com-20140325142507-9vgzcyfno750ungz
 2014-03-25 15:25:07 +01:00
Parth Gajjar (Open ERP) 744b4bb2b6 [IMP] opened dialog if api key not set, final total in dropdown, improved requests in base_gengo 
bzr revid: pga@tinyerp.com-20140325141308-5h2rtlbm2ctytbt1
 2014-03-25 19:43:08 +05:30
chm@openerp.com 0d4d9af5f4 [FIX] website: fix and activate frontend test 
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
 2014-03-25 15:03:28 +01:00
Thibault Delavallée 97d49659d0 [IMP] email_template: added an option to automatically generate 
recipients instead of using template-based values. This should be the default way of using
templates actually, to avoid confusion with mako, ill-defined templates, ...

email_template code has been updated to handle recipient_ids when creating an email, depending
on its generated template values or default recipients.

mail_compose_message has also been updated, delegating the calculation of recipient when
having a template to the template itself, using some context keys to force the use
of partners instead of email_to and email_cc.

Also updated email_template form view to be a bit less confusing.

bzr revid: tde@openerp.com-20140325140324-bljvybigk3zv5ugm
 2014-03-25 15:03:24 +01:00
chm@openerp.com 1eb0e13c4b [IMP] post install for test running; fix phantomjs and run test 
bzr revid: chm@openerp.com-20140325140119-jnkisyz6k3s6a34w
 2014-03-25 15:01:19 +01:00
Fabien Meghazi 329c19f94e [FIX] Fix url slug check bug in multilang=True 
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
 2014-03-25 15:00:26 +01:00
Thibault Delavallée 73bebb6563 [IMP] mail: default recipients management 
- mail.compose.message: in render_message_batch, compute defaults recipients
for the composer (method called for mass mailing only). This way values are
available for inheriting models.

bzr revid: tde@openerp.com-20140325135347-9v7u4uokffy7ud43
 2014-03-25 14:53:47 +01:00
Richard Mathot (OpenERP) 1bd20e2b9d [FIX] Menus 
[REM] Calendar view for surveys

bzr revid: rim@openerp.com-20140325134604-xk8sv3kxhcxtve5d
 2014-03-25 14:46:04 +01:00
Vidhin Mehta (OpenERP) a6039496f6 [IMP]Add comments. 
bzr revid: vme@tinyerp.com-20140325132319-w0f9xfokn7yicjkv
 2014-03-25 18:53:19 +05:30
ajay javiya (OpenERP) 52e527c518 [IMP]: code 
bzr revid: aja@tinyerp.com-20140325132042-sr9mcr4jv51wp0vw
 2014-03-25 18:50:42 +05:30
Vidhin Mehta (OpenERP) 763b1475a9 [IMP]Minor improvements. 
bzr revid: vme@tinyerp.com-20140325131433-qf26x8kueone81tj
 2014-03-25 18:44:33 +05:30
Dharmraj Jhala (OpenERP) d06810ba9d [MERGE] with parent branch 
bzr revid: dizzy.zala@gmail.com-20140325131150-xaoi9qpuufqp44en
 2014-03-25 18:41:50 +05:30
Dharmraj Jhala (OpenERP) 20a3cd97ba [IMP] improved code so that template calls minimum function 
bzr revid: dizzy.zala@gmail.com-20140325130848-w96dwzhu6kktw428
 2014-03-25 18:38:48 +05:30
Vidhin Mehta (OpenERP) f2c567a666 [IMP]typo changing commits. 
bzr revid: vme@tinyerp.com-20140325125343-prtk6wus50t93uih
 2014-03-25 18:23:43 +05:30
Vidhin Mehta (OpenERP) 0881710694 [IMP]Refactore. 
bzr revid: vme@tinyerp.com-20140325122327-9lqr308hz01q25p7
 2014-03-25 17:53:27 +05:30
ajay javiya (OpenERP) f76a734e90 [MERGE] : with trunk 
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
 2014-03-25 17:11:09 +05:30
Turkesh Patel (Open ERP) 4a69655cb2 [ADD] added code to calculate total views per page. 
bzr revid: tpa@tinyerp.com-20140325113409-7k7e2tak952cbyt5
 2014-03-25 17:04:09 +05:30
Denis Ledoux e61d12bfa7 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd 
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
 2014-03-25 12:29:09 +01:00