pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,483 Commits 1 Branch 0 Tags
ba4454ccfb9fc2de2dca0f7cd753ddb453b5f2fe
Commit Graph
85483 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif 
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
 2014-03-25 12:24:13 +01:00
Fabien Meghazi 222b068e6d [FIX] saas-3 fix for url lang switching with model converters 
bzr revid: fme@openerp.com-20140325111257-co5a63i723rd8cv1
 2014-03-25 12:12:57 +01:00
ajay javiya (OpenERP) bac460d5bd [IMP] : ask name and email to anonymus user 
-> write name as author instead of anonymus in inline discussion
[ADD] :add 'publish/unpublish' feature on inline comments
[FIX] : nline discuss does not work on smaller devices

bzr revid: aja@tinyerp.com-20140325110428-sxvcsq2wdkptr3m3
 2014-03-25 16:34:28 +05:30
Martin Trigaux c6f19b6d0d [MERGE] [FIX] base_calendar: do not add offset symbol to end_date when computing rrule 
Fix issue when recurrent event (repeat until specified date) with reminder, would fail comparing naive and offset-aware datetimes

lp bug: https://launchpad.net/bugs/1191399 fixed

bzr revid: mat@openerp.com-20140325105848-m886oa9ys0fhb0ju
 2014-03-25 11:58:48 +01:00
Denis Ledoux 6d60e0ee29 [FIX] project: on project template duplication, keep original tasks stages 
bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
 2014-03-25 11:49:21 +01:00
Martin Trigaux 91c3673949 [MERGE] [FIX] purchase_requisition: when getting the price based on the pricelist for a supplier, pass the missing supplier id (useful for pricelist based on supplier price) (opw 601890) 
bzr revid: mat@openerp.com-20140325104613-t79wxl4y38ll82h0
 2014-03-25 11:46:13 +01:00
Olivier Dony 38c255627e [MERGE] l10n_fr: remove obsolete French taxes, following 2014 rate update, courtesy of Alexis de Lattre (Akretion) 
bzr revid: odo@openerp.com-20140325104323-xtxthbopkhk350r4
 2014-03-25 11:43:23 +01:00
Thibault Delavallée 9c80b99e5e [FIX] email_template: sending an email using the 
send_mail method of a template is not related to openchatter anymore;
therefore recipients should not be called 'followers of XX', but use
their real name instead. This is already done, but the tests were not
updated.

bzr revid: tde@openerp.com-20140325103955-oc7ob98b1jql7tlz
 2014-03-25 11:39:55 +01:00
Fabien Meghazi 8435da41bc [MERGE] upstream 
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
 2014-03-25 11:39:28 +01:00
Vidhin Mehta (OpenERP) 458991e011 [IMP]make global methods. 
bzr revid: vme@tinyerp.com-20140325103253-co0m99smbvtq7pxc
 2014-03-25 16:02:53 +05:30
Denis Ledoux 8310cd1920 [FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id 
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices

bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
 2014-03-25 11:32:26 +01:00
Fabien Meghazi 27f38edb25 [FIX] dirty saas-3 fix for url lang switching with model converters 
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
 2014-03-25 11:07:22 +01:00
Richard Mathot (OpenERP) a8117436ab [FIX] Typos and bullshit introduced in r10622 
bzr revid: rim@openerp.com-20140325093023-07nvjr5543liobm9
 2014-03-25 10:30:23 +01:00
Thibault Delavallée b01ecbec97 [FIX] mass_mailing: email_template: finally found how to specify 
a form view id in an action; do not use view_id that seems to be used for
that, but changes the view order (always form by default)... bleurg.

bzr revid: tde@openerp.com-20140325093007-g3hy9m8kcac9x1xs
 2014-03-25 10:30:07 +01:00
chm@openerp.com 82989d95f7 [FIX] phantomjs: hide error if document.body does not exists 
bzr revid: chm@openerp.com-20140325092547-ilnbqdj4rhdo0q3r
 2014-03-25 10:25:47 +01:00
Turkesh Patel (Open ERP) a9d192da24 [IMP] improved code to show some items based on user. 
bzr revid: tpa@tinyerp.com-20140325091240-ie606wjojnfakgno
 2014-03-25 14:42:40 +05:30
Thibault Delavallée 83151d515c [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140325090223-ubimv7051snep8rp
 2014-03-25 10:02:23 +01:00
Thibault Delavallée 7185a68775 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
 2014-03-25 10:02:09 +01:00
Richard Mathot (OpenERP) 631532072d [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
 2014-03-25 09:54:51 +01:00
Richard Mathot (OpenERP) 2c9b2f1b18 [IMP] Kanban view improvements 10-first-clicks 
bzr revid: rim@openerp.com-20140325085155-c2ik8r09re5yyna5
 2014-03-25 09:51:55 +01:00
chm@openerp.com 105c26e623 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140324082422-38x5kcnh830200wl
bzr revid: chm@openerp.com-20140325084953-s3sl2f1un7z08wxy
 2014-03-25 09:49:53 +01:00