Sanjay Gohel (Open ERP)
92b707c116
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20120904093250-fwawd23g26064wnl
2012-09-04 15:02:50 +05:30
Sanjay Gohel (Open ERP)
93f5c6b6a9
[IMP]add unit test for message subtype
...
bzr revid: sgo@tinyerp.com-20120904093111-hj291blbbkg39cey
2012-09-04 15:01:11 +05:30
Amit Patel (OpenERP)
d19d95fb18
[MERGE]:merged stock data
...
bzr revid: apa@tinyerp.com-20120904092314-z0q0xjmv0apxg1lb
2012-09-04 14:53:14 +05:30
Foram Katharotiya (OpenERP)
c93a029833
[MERGE] Merge with parent branch
...
bzr revid: fka@tinyerp.com-20120904053939-jcmtmg9asc0rh4fz
2012-09-04 11:09:39 +05:30
Foram Katharotiya (OpenERP)
49722c77c0
[IMP] add received & delivered subtype in stock
...
bzr revid: fka@tinyerp.com-20120903123405-7rmte2src1xtdghp
2012-09-03 18:04:05 +05:30
Amit Patel (OpenERP)
13659d0590
[MERGE]:trunk-mail-cleaning-fp
...
bzr revid: apa@tinyerp.com-20120903100634-qxrkrpnpon10s44i
2012-09-03 15:36:34 +05:30
Thibault Delavallée
1be5a4d452
[FIX] hr_holidays: fixed wrong condition due to bad merge of trunk.
...
bzr revid: tde@openerp.com-20120903095526-su8jionaltao0x2k
2012-09-03 11:55:26 +02:00
Amit Patel (OpenERP)
f7b3d9b05f
[MERGE]:procurement data for subtype
...
bzr revid: apa@tinyerp.com-20120903092805-28f4pk0heqjjinrw
2012-09-03 14:58:05 +05:30
Thibault Delavallée
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Foram Katharotiya (OpenERP)
23007e8aeb
[IMP] Add picking_in & picking_out object in stock
...
bzr revid: fka@tinyerp.com-20120903085728-vx5hbkug5527nolo
2012-09-03 14:27:28 +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
Foram Katharotiya (OpenERP)
8efd186276
[MERGE] Merge with parent branch
...
bzr revid: fka@tinyerp.com-20120903051925-r01yx7u7nvono353
bzr revid: fka@tinyerp.com-20120903070434-on2thgronzgnk5am
2012-09-03 12:34:34 +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
e3f1c26e6a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
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
Fabien Pinckaers
310aab1a57
[IMP] usability partner logo as avatar class
...
bzr revid: fp@openerp.com-20120902191726-7zacp4mctooxao51
2012-09-02 21:17:26 +02:00
Antony Lesuisse
1699e4dc97
[IMP] determine openerp_addons_namespace dynamically
...
bzr revid: al@openerp.com-20120902170556-vkt2a936am4vrmmc
2012-09-02 19:05:56 +02:00
Fabien Pinckaers
d7a2ea78dc
[IMP] CSS
...
bzr revid: fp@openerp.com-20120902133023-dgdicbx0xnlht2l5
2012-09-02 15:30:23 +02:00
Fabien Pinckaers
972306d015
[IMP] CSS
...
bzr revid: fp@openerp.com-20120902125805-jeivl4whuzzubv7l
2012-09-02 14:58:05 +02:00
Stephane Wirtel
703ba01954
[ADD] Add a script to install all the modules in a trunk database with the tests
...
bzr revid: stw@openerp.com-20120901141719-zsc2ow2u93kovri7
2012-09-01 16:17:19 +02:00
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
Olivier Dony
77e92aeaad
[FIX] FieldTextHtml: allow using widget=html on regular char/text fields
...
This is required when we want to easily preview arbitrary
HTML content, such as the body of the email templates
used in marketing_campaign modules
bzr revid: odo@openerp.com-20120901003712-m1h9s5tlbn2kyvnn
2012-09-01 02:37:12 +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
Xavier Morel
8ba3942676
[FIX] make first day of week in date pickers coherent with locale and calendar view
...
bzr revid: xmo@openerp.com-20120831145355-7itr8svth1vtv3m3
2012-08-31 16:53:55 +02:00
Quentin (OpenERP)
fc8855fa74
[MERGE] merged branch with leave request improvements
...
bzr revid: qdp-launchpad@openerp.com-20120831144244-40apxljf6juyv3nv
2012-08-31 16:42:44 +02:00
Xavier Morel
21a645fb6d
[ADD] basic accesskey support to form views, courtesy of Holger Brunn
...
bzr revid: xmo@openerp.com-20120831143729-abzn22vjsqnxk4uv
2012-08-31 16:37:29 +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
Stephane Wirtel
31025afe28
[FIX] base: Remove the default value for the image
...
bzr revid: stw@openerp.com-20120831141415-gqsvhh08fum874gn
2012-08-31 16:14:15 +02:00
Stephane Wirtel
8d08d5a1b9
[MERGE] base: fix the read method with the ids argument
...
bzr revid: stw@openerp.com-20120831140152-9birj6mslf5g0in4
2012-08-31 16:01:52 +02:00
Stephane Wirtel
b3988436cb
[REF] Replace the user id 1 by openerp.SUPERUSER_ID
...
bzr revid: stw@openerp.com-20120831135309-o4plzf5wp0kyuzgf
2012-08-31 15:53:09 +02:00
Stephane Wirtel
1eac0fbe52
[REF] Replace the user id 1 by openerp.SUPERUSER_ID
...
bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
2012-08-31 15:51:36 +02:00
Minh Tran
ad051ebf45
fix old avatar code
...
bzr revid: mit@openerp.com-20120831134941-w0xui7l1pj3ulv71
2012-08-31 15:49:41 +02:00
Minh Tran
a93ae39aa8
fix merge crap
...
bzr revid: mit@openerp.com-20120831133213-gn46ph3umef08u9r
2012-08-31 15:32:13 +02:00
Minh Tran
a57ee611c4
fix merge crap
...
bzr revid: mit@openerp.com-20120831133133-5u2jvawyn6xkth91
2012-08-31 15:31:33 +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
Minh Tran
ffee21269b
Random generation of avatar
...
bzr revid: mit@openerp.com-20120831131317-js8ov35l9tqbjzt0
2012-08-31 15:13:17 +02:00
Minh Tran
c0d5a80682
Random generation of default avatar
...
bzr revid: mit@openerp.com-20120831131216-c5j02m8q7kwnn5pv
2012-08-31 15:12:16 +02:00
Minh Tran
8239412dd5
merge from trunk
...
bzr revid: mit@openerp.com-20120831131118-6i2vljv4pdqb7iqo
2012-08-31 15:11:18 +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
Sanjay Gohel (Open ERP)