Commit Graph
56297 Commits
Author SHA1 Message Date
Amit Patel (OpenERP) f7b3d9b05f [MERGE]:procurement data for subtype
bzr revid: apa@tinyerp.com-20120903092805-28f4pk0heqjjinrw
2012-09-03 14:58:05 +05:30
Amit Patel (OpenERP) 267ce3705a [MERGE]:manufacturing data for subtype
bzr revid: apa@tinyerp.com-20120903085555-fus9m0wnob8r1bxy
2012-09-03 14:25:55 +05:30
Amit Patel (OpenERP) 1429f432f3 [MERGE]:merged account data for subtype
bzr revid: apa@tinyerp.com-20120903064341-t508t4w1si54iarw
2012-09-03 12:13:41 +05:30
Randhir Mayatra (OpenERP) aa216774ea [IMP] make changes into account data for the subtype
bzr revid: rma@tinyerp.com-20120903061713-xuhcfdqi4e7cp6qf
2012-09-03 11:47:13 +05:30
Foram Katharotiya (OpenERP) 97b7b8e550 [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120903052244-zsq8wnjalpiogtjq
2012-09-03 10:52:44 +05:30
Foram Katharotiya (OpenERP) b972b8fe26 [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120903051317-bq2zytg6xvp0o6mp
2012-09-03 10:43:17 +05:30
Amit Patel (OpenERP) 7e4225b3af [MERGE]:lp:~openerp-dev/openobject-addons/trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120831132232-kpwdzwu8yl1ye917
bzr revid: apa@tinyerp.com-20120903045932-u03grkwnd3ywcogv
2012-09-03 10:29:32 +05:30
Olivier Dony a97ac7649f [IMP] mail.mail: fix search view, as mail.mail != mail.message and meant for outgoing emails only now
bzr revid: odo@openerp.com-20120901011612-y1iab42s3g2gr8l0
2012-09-01 03:16:12 +02:00
Olivier Dony 9d16f324e9 [IMP] email.template: review/adapt form to 7.0-style + continue refactoring polishing
bzr revid: odo@openerp.com-20120901010907-703t6vx6n99tnyzq
2012-09-01 03:09:07 +02:00
Thibault Delavallée 761864c11c [FIX] [WIP] email_template: composition wizard: added render_message that get back the values generated by the template in mass_mail mode; email_template overrides the basic behavior of mail, to use the templating power (niak). Various fixes in the wizard, mostly in onchange_template_id. Some code cleaning. Updated the view, because onchange_template_id now take an extr argument (model). Added some tests used during this WIP. Will be updated next week.
bzr revid: tde@openerp.com-20120831171900-ii0ucshjnf8vjc3z
2012-08-31 19:19:00 +02:00
Thibault Delavallée 7eb5b82950 [FIX] email_template: generate_email now returns a standard-looking attachments in values (list of tuples).
bzr revid: tde@openerp.com-20120831171622-ibrrz5us0lunoi0q
2012-08-31 19:16:22 +02:00
Thibault Delavallée 0f3101cec5 [FIX] mail.compose.message: fixed send_mail about getting mass_mail values from template; fixed generated body that was adding a signature in reply mode; added the test that trigerred that bug.
bzr revid: tde@openerp.com-20120831171507-1prt4h46zsj77m23
2012-08-31 19:15:07 +02:00
Olivier Dony fb7491ed70 [FIX] email_template: fix template views + preview after latest model changes
bzr revid: odo@openerp.com-20120831163904-jh76tko9hwd2a06y
2012-08-31 18:39:04 +02:00
Olivier Dony 04c6823a99 [IMP] email_template: email.template does not inherit from mail.mail anymore, they had almost nothing left in common
+ minor lint cleanup

bzr revid: odo@openerp.com-20120831155805-bs8jmpt3eh52zwfb
2012-08-31 17:58:05 +02:00
Olivier Dony 24fab3ca7d [IMP] mail: refactor various places where we append content to HTML
bzr revid: odo@openerp.com-20120831155103-t13p33p7232g0128
2012-08-31 17:51:03 +02:00
Thibault Delavallée bdd972e3c9 [FIX] mail.message: message_read: fixed a call to a dict keyu not necessarily existing. Cleaned a bit the code, as well as the code of the related tests.
bzr revid: tde@openerp.com-20120831143707-ezcn17g5u39tcepq
2012-08-31 16:37:07 +02:00
Thibault Delavallée c973288701 [CLEAN] crm: convert_opportunity: removed dumb code about setting partner of messages when converting a lead into opportunity.
bzr revid: tde@openerp.com-20120831132803-wahvfkmg3typl90a
2012-08-31 15:28:03 +02:00
Foram Katharotiya (OpenERP) e44d125479 [IMP] Add data of subtype in mrp, mrp_repair & mrp_operations
bzr revid: fka@tinyerp.com-20120831131712-dz5b5isq797v5xfc
2012-08-31 18:47:12 +05:30
Thibault Delavallée a58d50225c [FIX] mail_message: fixed message_read. Issue was coming from 'expandable' messages, that are there for displaying the threads, but should not be processed.
bzr revid: tde@openerp.com-20120831131503-gvypj0z1jykjkpk9
2012-08-31 15:15:03 +02:00
Amit Patel (OpenERP) 649b424f68 [MERGE]:purchase subtype data
bzr revid: apa@tinyerp.com-20120831131108-63qom4rj8zi70e1x
2012-08-31 18:41:08 +05:30
Thibault Delavallée 0b67a85725 [FIX] mail.message, mail.compose.message: fixed attachments management, added tests.
bzr revid: tde@openerp.com-20120831125605-1oizomm2pv3b5rse
2012-08-31 14:56:05 +02:00
Foram Katharotiya (OpenERP) 84fd3b3a35 [IMP] change subtype close
bzr revid: fka@tinyerp.com-20120831124744-uup75dwshj5nmf2n
2012-08-31 18:17:44 +05:30
Randhir Mayatra (OpenERP) 596debf67e [IMP]make changes into account data for subtype
bzr revid: rma@tinyerp.com-20120831124722-2u9fcx10gnrcfsl5
2012-08-31 18:17:22 +05:30
Foram Katharotiya (OpenERP) e5b99dca25 [IMP] change close
bzr revid: fka@tinyerp.com-20120831124123-3fq363k7b5bcnuix
2012-08-31 18:11:23 +05:30
Amit Patel (OpenERP) fd4fea277a [MERGE]:trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120831124026-g5xf61xc64lphs7d
2012-08-31 18:10:26 +05:30
Amit Patel (OpenERP) 8cf6c80f8a [MERGE]:merged event data
bzr revid: apa@tinyerp.com-20120831122620-9dndyi9pzc7uh5vx
2012-08-31 17:56:20 +05:30
Thibault Delavallée 8f59e1d906 [IMP] mail_notification: removed select on columns, added creation of a combined index in init.
bzr revid: tde@openerp.com-20120831115202-q3fvj4tjoglaqw9c
2012-08-31 13:52:02 +02:00
Thibault Delavallée 9e6cce28b8 [FIX] mail: tests: fixed followers test, because using set() allows to override a test that was precisely about not having a same value more than once in follower_ids.
bzr revid: tde@openerp.com-20120831112721-56qfnh9vk1xkbke0
2012-08-31 13:27:21 +02:00
Amit Patel (OpenERP) 54affefe52 [MERGE]:idea data
bzr revid: apa@tinyerp.com-20120831112701-p9371y8j8u9ujuip
2012-08-31 16:57:01 +05:30
Thibault Delavallée 86dd3bdc57 [FIX] mail_message: fixed and simplified unread messages query. Added an index on the read column of mail_notification.
bzr revid: tde@openerp.com-20120831112353-egmeetrnecp2kflp
2012-08-31 13:23:53 +02:00
Foram Katharotiya (OpenERP) 5ec28dcd89 [IMP] improve code
bzr revid: fka@tinyerp.com-20120831111115-fqoapz8uroxsdddm
2012-08-31 16:41:15 +05:30
Foram Katharotiya (OpenERP) 6c56f95e86 [IMP] improve code
bzr revid: fka@tinyerp.com-20120831110443-55nxhelq1dfl073j
2012-08-31 16:34:43 +05:30
Randhir Mayatra (OpenERP) d32908a359 [IMP]make changes for the calcelled state into event
bzr revid: rma@tinyerp.com-20120831110000-cd022yy58aken0iw
2012-08-31 16:30:00 +05:30
Foram Katharotiya (OpenERP) 6c04925c0f [IMP] improve code
bzr revid: fka@tinyerp.com-20120831105855-crs13rnqi2uztgha
2012-08-31 16:28:55 +05:30
Amit Patel (OpenERP) 1100d6b1cc typo
bzr revid: apa@tinyerp.com-20120831105117-mjm99cs7ko8pmkfq
2012-08-31 16:21:17 +05:30
Amit Patel (OpenERP) 139ee97562 typo
bzr revid: apa@tinyerp.com-20120831104540-oixjx4jpknk5hlcc
2012-08-31 16:15:40 +05:30
Foram Katharotiya (OpenERP) 87658d9de8 [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120831104259-3gqgnikdczkmcgv2
2012-08-31 16:12:59 +05:30
Amit Patel (OpenERP) 31064b1855 fix data
bzr revid: apa@tinyerp.com-20120831104143-1ymb932kpng3bu3z
2012-08-31 16:11:43 +05:30
Foram Katharotiya (OpenERP) a6a3d4eda6 [IMP] set indentation in purchase_requisition.xml
bzr revid: fka@tinyerp.com-20120831104032-yfuugotohlgfvz75
2012-08-31 16:10:32 +05:30
Foram Katharotiya (OpenERP) 9bc3113890 [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120831103521-ydpkov2mvsg0um5g
2012-08-31 16:05:21 +05:30
Randhir Mayatra (OpenERP) 3d70ff5398 [MERGE]merge with parent branch
bzr revid: rma@tinyerp.com-20120831103452-me4umsgyfarosde0
2012-08-31 16:04:52 +05:30
Foram Katharotiya (OpenERP) 38476fa24c [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120831103243-cyk1ujall4akan8s
2012-08-31 16:02:43 +05:30
Randhir Mayatra (OpenERP) a284bf3e51 [MERGE]merge with parent branch
bzr revid: rma@tinyerp.com-20120831103206-4rk0yreikjgb0a51
2012-08-31 16:02:06 +05:30
Amit Patel (OpenERP) 8ef441badb [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120831102930-a53w7rvmibe3mqkm
2012-08-31 15:59:30 +05:30
Amit Patel (OpenERP) 23fec92030 [MERGE]:merged sale data for subtype
bzr revid: apa@tinyerp.com-20120831102306-bmru9z1rcfxwm3bc
2012-08-31 15:53:06 +05:30
Foram Katharotiya (OpenERP) e7dc36fedb [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120831102116-6ohk0uzvh8b57f2l
2012-08-31 15:51:16 +05:30
Foram Katharotiya (OpenERP) 69167eed31 [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120831101907-ksll2xf6wdjmprx1
2012-08-31 15:49:07 +05:30
Amit Patel (OpenERP) b2bccf9e58 [MERGE]
bzr revid: apa@tinyerp.com-20120831100951-hkdjqor37vuvuc18
2012-08-31 15:39:51 +05:30
Sanjay Gohel (Open ERP) 90e55a5337 [IMP]remove unused method and improve code
bzr revid: sgo@tinyerp.com-20120831100318-t2e2wv81trwfpc7u
2012-08-31 15:33:18 +05:30
Randhir Mayatra (OpenERP) 17ef40f428 [IMP]add the data into event for subtype
bzr revid: rma@tinyerp.com-20120831100012-mlzik593orznp9aj
2012-08-31 15:30:12 +05:30