Olivier Dony
1d3ff0e52f
[MERGE] sync with latest trunk
...
bzr revid: odo@openerp.com-20110927165219-ux50zxkszwpcfssd
2011-09-27 18:52:19 +02:00
Antony Lesuisse
26a58b22f2
[MERGE] config rework ir.action.todo stw
...
bzr revid: al@openerp.com-20110924142047-rdo7gwoluoydbfz4
2011-09-24 16:20:47 +02:00
Olivier Dony
51e1259dce
[MERGE] sync w/ latest trunk
...
bzr revid: odo@openerp.com-20110924020551-bv6rw8hj8p5din4n
2011-09-24 04:05:51 +02:00
Stephane Wirtel
556323758f
[FIX] Set the right categories and fix some bugs
...
bzr revid: stw@openerp.com-20110923133056-g4om6km431n83m07
2011-09-23 15:30:56 +02:00
2c2367e551
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110923043905-blb8usifowzv9nt0
2011-09-23 04:39:05 +00:00
Olivier Dony
d81837fac6
[MERGE] synch with latest trunk
...
bzr revid: odo@openerp.com-20110922162538-x7xucux66zma5bp8
2011-09-22 18:25:38 +02:00
Stephane Wirtel
2a59ce92e3
[MERGE] Email Framework - lp:~openerp-dev/openobject-addons/trunk-emails-unified
...
bzr revid: stw@openerp.com-20110913140016-zzfynrnjdaap0tfb
2011-09-13 16:00:16 +02:00
Olivier Dony
da59a314e6
[IMP] mail.thread: support stripping attachments
...
bzr revid: odo@openerp.com-20110908001651-ns4nw0ri18xp7twf
2011-09-08 02:16:51 +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
Olivier Dony
2f543db06e
[IMP] mail: cleanup/rename API + adapt dependencies (wip)
...
bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
2011-08-25 14:27:57 +02:00
Vo Minh Thu
c978be0052
[FIX] thunderbird: fields.char size kwarg is an integer.
...
bzr revid: vmt@openerp.com-20110824125949-9flddp034glld69u
2011-08-24 14:59:49 +02:00
Olivier Dony
b0bed63351
[IMP] mail.thread: renaming methods to avoid collisions with objects that use the mixin
...
bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
2011-08-23 19:58:09 +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
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
6aeed3c0d9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110805044024-q7ugk62igzbg3qjo
2011-08-05 04:40:24 +00:00
Xavier Morel
09cf4d40d0
[FIX] convert ir.actions.todo fields to match model definition changes
...
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done
bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
Xavier Morel
cc13113641
[REF] reformat xml files before applying automated search&replace on them
...
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Xavier Morel
5a41a68bc2
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
Raphael Collet
605c23b6c7
[MERGE] trunk-usability
...
bzr revid: rco@openerp.com-20110722150620-p957g1oye9k1nss1
2011-07-22 17:06:20 +02:00
Xavier Morel
a5fdb75ad6
[FIX] ir.actions.todo are now unskippable
...
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Raphael Collet
adafbc707a
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Quentin (OpenERP)
f03c4cdfb2
[MERGE] merged the addons branch of config rework project
...
bzr revid: qdp-launchpad@openerp.com-20110706223008-6qaf5mzb5zy5pa7r
2011-07-07 00:30:08 +02:00
Quentin (OpenERP)
664ba7bba3
[MERGE] merge with main addons branch
...
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
c947e50b50
[FIX] repack thunderbird plugin
...
bzr revid: tfr@openerp.com-20110616102518-yevhd2nyukupt53w
2011-06-16 12:25:18 +02:00
a8e1dee41c
[MERGE] thunderbird fix by tfr and atp lp:778466 lp:785611
...
bzr revid: tfr@openerp.com-20110616101852-19wwxp7bimwaonp5
2011-06-16 12:18:52 +02:00
Atul Patel (OpenERP)
8afb549a9d
[IMP]:Minor Improvement for mac os also
...
bzr revid: atp@tinyerp.com-20110616071534-5afaug9db0e1112g
2011-06-16 12:45:34 +05:30
Atul Patel (OpenERP)
fc2bea8034
[FIX]: Update .xpi and .jar as per source code
...
bzr revid: atp@tinyerp.com-20110616070605-yrxa2e06qd7mpuvp
2011-06-16 12:36:05 +05:30
Atul Patel (OpenERP)
1aaff7c466
[IMP]: More optimized solution
...
bzr revid: atp@tinyerp.com-20110616065849-7wn217nura6xzbmk
2011-06-16 12:28:49 +05:30
Atul Patel (OpenERP)
5fea7ec991
[FIX]: Use the mozilla API,Get Homedirectory and set path.
...
bzr revid: atp@tinyerp.com-20110616063302-qk2d0z6c84dzz20i
2011-06-16 12:03:02 +05:30
Atul Patel (OpenERP)
2572becd65
[FIX]
...
bzr revid: atp@tinyerp.com-20110615100755-k6i1isia9b891kb0
2011-06-15 15:37:55 +05:30
Atul Patel (OpenERP)
4e6a29b441
[MERGE]
...
bzr revid: atp@tinyerp.com-20110615095415-vjtz22qzvg680css
2011-06-15 15:24:15 +05:30
Atul Patel (OpenERP)
fd77c1ef12
[IMP]: Change also in source file
...
bzr revid: atp@tinyerp.com-20110615095003-dhf33a3b6jv414jb
2011-06-15 15:20:03 +05:30
Atul Patel (OpenERP)
7ef76f5666
[REMOVE]: Remove parse_eml() duplicate from tiny_xmlrpc.js file
...
bzr revid: atp@tinyerp.com-20110615050703-aigi3qonlzxf30dh
2011-06-15 10:37:03 +05:30
Atul Patel (OpenERP)
a36f550914
[FIX]: Changed Path and resolve security problem for thunderbird.
...
bzr revid: atp@tinyerp.com-20110614123121-orr806pupmyqb5zl
2011-06-14 18:01:21 +05:30
aag (OpenERP)
6c9fb7dd54
[IMP]thunderbird: Load Thunderbird Plug-In in Sales Management-5 categ
...
bzr revid: aag@tinyerp.co.in-20110603092557-iu8wjoqjxtuk1qh5
2011-06-03 14:55:57 +05:30
aag (OpenERP)
f4bda46914
[ADD]thunderbird: Load Thunderbird Plug-In add to sale -5 seq category
...
bzr revid: aag@tinyerp.co.in-20110602050633-z3uzxjlrx8yx61pi
2011-06-02 10:36:33 +05:30
aag (OpenERP)
ca73f09830
[ADD]thunderbird: Load Thunderbird Plug-In add to sale -5 seq category
...
bzr revid: aag@tinyerp.co.in-20110602050246-3e3cnezvmuaamtqv
2011-06-02 10:32:46 +05:30
26e28650a2
[FIX] push date in thunderbird
...
bzr revid: tfr@openerp.com-20110530100444-65963zryt7t7xzyo
2011-05-30 12:04:44 +02:00
Raphael Collet
7dcc7ce828
[IMP] remove unused modules
...
bzr revid: rco@openerp.com-20110523090656-qfuk3rquictzlprj
2011-05-23 11:06:56 +02:00
Raphael Collet
874ee8b49e
[MERGE] improve text in module thunderbird
...
bzr revid: rco@openerp.com-20110523080829-q5ojp7ubj3v0vt2t
2011-05-23 10:08:29 +02:00
Amit Bhavsar (Open ERP)
601a0799ca
[usability],improve text with thunderbird module
...
bzr revid: amb@tinyerp.com-20110520084037-44s4vus359ezxpqf
2011-05-20 14:10:37 +05:30
12f8701002
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110510043731-q2jphpxofpk96w5o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110511043751-nk6ku955bxwo1i7r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110512043510-7y1qenjz8zlpvolt
2011-05-12 04:35:10 +00:00
Rifakat Haradwala (Open ERP)
9be4b6771c
[FIX] thunderbird: parameters of the history() of partner.py
...
bzr revid: rha@tinyerp.com-20110504114322-ijfo973i8ru6bxzq
2011-05-04 17:13:22 +05:30
Olivier Dony
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
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
Rifakat Haradwala (Open ERP)
5c485691dc
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: rha@tinyerp.com-20110428073125-z67mcpuuzaa5plnq
2011-04-28 13:01:25 +05:30
Rucha (Open ERP)
1d5fa6ca4c
[IMP]: *: Reviewed config wizards of all modules and changed type + state in order to follow the behaviour described below:
...
* After a fresh installation of a DB if we dont select and application to install nothing will come
* If I select HR module first time, this module will be installed and all special wizards of this module should be appeared
* If I select HR module(its installed) again from application list, all special wizards of this module should be set as todo in order to display when clicking next
* For any other wizards we have to go to list of config wizards and run them manually (for web client these are supposed to be there in config panel)
bzr revid: rpa@tinyerp.com-20110427133518-52mawayc3rgoyx9h
2011-04-27 19:05:18 +05:30
Rifakat Haradwala (Open ERP)
44344056d3
[FIX] thunderbird: fixed import error
...
bzr revid: rha@tinyerp.com-20110427054648-axfgp2dnqm63bjqv
2011-04-27 11:16:48 +05:30
Harry (OpenERP)
cf032c0bf0
[MERGE] correction of backlog1
...
bzr revid: hmo@tinyerp.com-20110421095844-73673t3zs2clyeba
2011-04-21 15:28:44 +05:30
Olivier Dony