Olivier Dony
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Xavier Morel
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Olivier Dony
d5d2099658
[IMP] mail*: rename mail.compose.wizard extension, for consistency
...
bzr revid: odo@openerp.com-20110909131045-mzuspzazkv34ns3q
2011-09-09 15:10:45 +02:00
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
ae7b1699cb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
Olivier Dony
4fcb67bef1
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
Olivier Dony
8f9f45ea94
[IMP] all: next pass of review/renaming for new mail API
...
bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
2011-08-22 19:16:59 +02:00
063e28a83d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
b93ee681aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110819043543-y0ffrzj9o2vtuktx
2011-08-19 04:35:43 +00:00
ac9c0e55b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
2a5e3c0712
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110817044135-4q05u1i6k8x337j9
2011-08-17 04:41:35 +00:00
cdbd7dd7d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110816043437-2ik9gp5alwecpla8
2011-08-16 04:34:37 +00:00
Xavier Morel
3278222800
[FIX] project_scrum: filters in field in override to project search view
...
bzr revid: xmo@openerp.com-20110812080051-ozhrap5afiqunt1f
2011-08-12 10:00:51 +02:00
Olivier Dony
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Raphael Collet
0b4d547900
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110805142118-0z8k0f897xfu2zll
2011-08-05 16:21:18 +02:00
be1a659658
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110803043726-ofn4l3px2ooldl00
bzr revid: launchpad_translations_on_behalf_of_openerp-20110804043456-fnef8uwgur5od0en
2011-08-04 04:34:56 +00:00
RavishchanraMurari (Open ERP)
caa3c07094
email.addresss_id_repalce_by_user_email
...
bzr revid: rmu@tinyerp.com-20110728061156-swmn5jz78zb3w4vd
2011-07-28 11:41:56 +05:30
Raphael Collet
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP)
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Olivier Dony
06fb14130a
[IMP] removed method=True params from all fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!
bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
effe36ee48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110618045712-0yql5n0y3b2cdjn5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110619043730-488lieaxfqynd5ji
bzr revid: launchpad_translations_on_behalf_of_openerp-20110620043317-29hyt535kvzpilvb
2011-06-20 04:33:17 +00:00
Jigar Amin
b217fdbb73
[FIX] wrong tooltip
...
bzr revid: jam@tinyerp.com-20110606063446-101wsd4dqunvy0vd
2011-06-06 12:04:46 +05:30
efe639a92e
[BUG/FIX] project_scrum : Email From issue as per bug lp#791895 and email body format improved
...
bzr revid: jam@tinyerp.com-20110606062151-dg9aeec6l7mp7w7c
2011-06-06 11:51:51 +05:30
552afb10c5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603044017-yoke5zwvpebyo93o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604045342-rkt8o6e65uyj8kjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605043539-vvllkcbozllrdlg7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606043718-0i2770ro7c0oho9t
2011-06-06 04:37:18 +00:00
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Harry (OpenERP)
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Harry (OpenERP)
0577796333
[MERGE] merged addons trunk development branch after resolving conflicts
...
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Rifakat Haradwala (Open ERP)
44bcca9f2f
[IMP] email.compose.message: useability improvements
...
bzr revid: rha@tinyerp.com-20110419115850-8vsbd9yv3vhedgss
2011-04-19 17:28:50 +05:30
Harry (OpenERP)
bc708c8b96
[REVIEW] remove passing email_model and email_res_id into context
...
bzr revid: hmo@tinyerp.com-20110412091820-t9wjrzetr814soeg
2011-04-12 14:48:20 +05:30
Rifakat Haradwala (Open ERP)
f53ee6053a
[IMP] email.message.common: implemented active_id and active_model in default_get() and fix reference of fields subject and body
...
bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9
2011-04-07 18:20:24 +05:30
RME (OpenERP)
d1128469db
[FIX] project_scrum : when click on postpone button than also button appears in cancel or done state
...
bzr revid: rme@tinyerp.com-20110407104920-mgv3rfi1aruoipxf
2011-04-07 16:19:20 +05:30
838512af0b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
Rifakat Haradwala (Open ERP)
47a85e9f8f
[IMP] mail: rename module email to mail because of parsing error
...
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
Rifakat Haradwala (Open ERP)
9a9c100595
[Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: rha@tinyerp.com-20110330092614-sgnniorxit17zvxn
2011-03-30 14:56:14 +05:30
Harry (OpenERP)
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
Thibault Francois
40fd149a4a
[MERGE] fix lp:727698
...
bzr revid: tfr@openerp.com-20110323093043-frbz6vvwua335s2e
2011-03-23 10:30:43 +01:00
Rifakat Haradwala (Open ERP)
2fe7c51e36
[REM] email.smtp_server: removed email.smtp_server and did changes in email module
...
bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
2011-03-21 19:01:56 +05:30
niv-openerp
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
c18e506cf5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110318050000-clr4x2jge8ptg7q6
2011-03-18 05:00:00 +00:00
Quentin (OpenERP)
8295f3125f
[MERGE] lp:684741
...
bzr revid: qdp-launchpad@openerp.com-20110317173316-1nwca68kko2dlu1c
2011-03-17 18:33:16 +01:00
niv-openerp
edbb2d7168
[MERGE] Improvements to manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
Rucha (Open ERP)
117d3f75a0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
rch-openerp
33c691e7cc
[ADD]: Images of project_scrum and project_timesheet modules.
...
bzr revid: rch@tinyerp.com-20110316132222-wzmfcn3cj1uwa6zq
2011-03-16 18:52:22 +05:30
8470bd7fb6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110316044753-r21w112simc911w5
2011-03-16 04:47:53 +00:00
RME (OpenERP)
33978d90a8
[FIX] project_scrum : burn down chart print only from it's form view with button & removed previous development
...
lp bug: https://launchpad.net/bugs/727698 fixed
bzr revid: rme@tinyerp.com-20110315094358-86s5sup5xoz98gsb
2011-03-15 15:13:58 +05:30
Rucha (Open ERP)
62b3abd6c0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110314102742-xsankh8h4q562lv8
2011-03-14 15:57:42 +05:30
Olivier Dony