6cbf19d815
[Merge] es_MX from Vauxoo
...
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
6f77ce98c7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
e3ffcd94d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019044609-vzsrc1a6nn17ahbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019055343-7s4rmkn8lpxvyt4n
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019060521-3smagczfoys4j5wl
2011-10-19 06:05:21 +00:00
048cfa7804
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111012044022-dt1ks2gwog40djxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20111012044412-fk2rlfsfnmhkvaq1
2011-10-12 04:44:12 +00:00
52b23d7040
[ADD] added es_MX.po translation files for each module
...
bzr revid: israel@openerp.com.ve-20111007201144-kap9ou7w8g92ai02
2011-10-07 16:11:44 -04:00
9b189d5a90
[ADD] added the es_VE.po translation files for each module
...
bzr revid: israel@openerp.com.ve-20111007193500-i7k8h9t28nhxioap
2011-10-07 15:35:00 -04:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
7c93366eab
[FIX] Update the categories of some modules
...
bzr revid: stw@openerp.com-20110930154646-9tr60seb389nw3yd
2011-09-30 17:46:46 +02:00
614334fd6a
[FIX] email_template: force fields.selection int backend
...
bzr revid: odo@openerp.com-20110927212311-sfg6eonra10yxveh
2011-09-27 23:23:11 +02:00
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
a925f16b66
[FIX] email_template: template toggle button in composition wizard now works
...
bzr revid: odo@openerp.com-20110915100626-kgm2pp2e1r3gpih5
2011-09-15 12:06:26 +02:00
d22c3043aa
[FIX] marketing_campaign: typos and cleanup
...
bzr revid: odo@openerp.com-20110912180025-scdjvcnquo07zcha
2011-09-12 20:00:25 +02:00
9d93a382a3
[IMP] email_template: use raw template for msg composition in mass_mail mode
...
bzr revid: odo@openerp.com-20110909201037-qz9m9mte6qh8flxd
2011-09-09 22:10:37 +02:00
57ce728cf5
[IMP] email_template: more robust model/record context passing
...
bzr revid: odo@openerp.com-20110909155427-7zy4x96jvg3lu09v
2011-09-09 17:54:27 +02:00
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
0a751bcae5
[IMP] email.template: typos and usability review
...
bzr revid: odo@openerp.com-20110908175541-h2qdchdwf60srksy
2011-09-08 19:55:41 +02:00
4281cbd0de
[IMP] email.template: typos and usability review
...
bzr revid: odo@openerp.com-20110908173752-j6z5kd1in80jk8re
2011-09-08 19:37:52 +02:00
321b513f04
[FIX] email.template: view typo
...
bzr revid: odo@openerp.com-20110907211759-ypex6nziuyz1icuz
2011-09-07 23:17:59 +02:00
c908a2f4d3
[FIX] email_template: unused import
...
bzr revid: odo@openerp.com-20110907172551-sgk2k2i7oh8hi5zh
2011-09-07 19:25:51 +02:00
1db8e54425
[IMP] all: unified context params for mail composition wizard
...
A single common `mail.compose.message.mode` key is now
used in the context, avoiding name collisions and being
more consistent.
bzr revid: odo@openerp.com-20110906093228-itbilwzpv4wl07j9
2011-09-06 11:32:28 +02:00
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
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
0b0aa95cfe
[IMP] email_template: another pass of cleanup (wip)
...
bzr revid: odo@openerp.com-20110825122725-mc1zx2f3ck9xr6g9
2011-08-25 14:27:25 +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
4fcb67bef1
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +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
ac9c0e55b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
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
4c6e88ba46
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110809045042-2gdi00rnxmh7s0ki
2011-08-09 04:50:42 +00: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
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
eedefe1ebc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110628044031-fyrldmppur3u2vso
2011-06-28 04:40:31 +00:00
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
e7bb8477dc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050137-14v8hzg4qgfwpf2m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110520043441-u9e1vje80f6he7xj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050229-ayodl6xmd20k7wd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20110522044744-l0biw9ydemk013yv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110523043818-uc1feowa93sym0df
2011-05-23 04:38:18 +00:00
a37a4404fb
[REF] consistent, grepable ir.values object naming.
...
bzr revid: vmt@openerp.com-20110516153331-vusrrgr3hvlcyei0
2011-05-16 17:33:31 +02:00
89ee28b7d1
email_template: code optimization, removed unused imports and useability fix
...
bzr revid: rha@tinyerp.com-20110511110423-ojb059dpf1m39ib5
2011-05-11 16:34:23 +05:30
5c0308f078
[FIX]
...
bzr revid: rha@tinyerp.com-20110510135048-f044stg7gaij0867
2011-05-10 19:20:48 +05:30
560915cb68
[MERGE] merged latest fixes from 6.0 up to r.4556
...
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk .
bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
4eb213855e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430060855-5u495d7r5747wf64
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501060400-go1qlvkfuyg5tk1c
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502060719-c9oa62lpvkf87sl3
2011-05-02 06:07:19 +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
8ac91b8336
[FIX] email_template: fix model in save_as_template()
...
bzr revid: rha@tinyerp.com-20110428085107-vv2l6ue1vzf2pdfk
2011-04-28 14:21:07 +05:30
d8c8c20a62
[MERGE] : merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: rha@tinyerp.com-20110428072503-nrset8wqcsgewwev
2011-04-28 12:55:03 +05:30
7464803d7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426060409-o8efsi8e0x8qdgpj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110427054644-lhqa0wkovwihv339
bzr revid: launchpad_translations_on_behalf_of_openerp-20110428054929-cx8ppeco060z80wm
2011-04-28 05:49:29 +00:00
d0db365ac5
[FIX] email_template: closing wizard on creating new template
...
bzr revid: rha@tinyerp.com-20110427103536-ppnufnu1ae8dbgt4
2011-04-27 16:05:36 +05:30
73209aee95
[MERGE] email_template: new button save as template in compose wizard
...
bzr revid: hmo@tinyerp.com-20110426125727-9l5ig560u2kyzrud
2011-04-26 18:27:27 +05:30
855b512e74
[FIX]
...
bzr revid: rha@tinyerp.com-20110426123824-l49480b3bkm0mr2k
2011-04-26 18:08:24 +05:30
f7883303b4
[FIX] email_template: added icon for button 'Save As Template' and change string and changes in search method domain for save_as_template()
...
bzr revid: rha@tinyerp.com-20110426122054-p4jcrk9zzt97dp8i
2011-04-26 17:50:54 +05:30
d63731b65f
[IMP]: email_template:
...
*able to save email as new template to reuse it
*evaluating expression type for mail same as email_template
bzr revid: rha@tinyerp.com-20110426115445-qpx91w218tyg4jde
2011-04-26 17:24:45 +05:30
Fabien Pinckaers
Launchpad Translations on behalf of openerp
Israel Fermin Montilla
Stephane Wirtel
Olivier Dony
Antony Lesuisse
Raphael Collet
Hardik Ansodariy (OpenERP)
Vo Minh Thu
Rifakat Haradwala (Open ERP)
Harry (OpenERP)