b9302052c8
[MERGE] Upstream
...
bzr revid: stw@openerp.com-20111005145931-piwiavbep6sr8nx3
2011-10-05 16:59:31 +02:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
69b916b144
[MERGE] fetchmail local mta option by stw
...
bzr revid: al@openerp.com-20111004222640-ako0cjw414c5lz72
2011-10-05 00:26:40 +02:00
2810a6ce4a
[MERGE] Upstream
...
bzr revid: stw@openerp.com-20111003132244-7yum8h21osi9zfcu
2011-10-03 15:22:44 +02:00
012164a0ab
[MERGE]
...
bzr revid: stw@openerp.com-20111003120940-e0i7cgvcxvnxxgf1
2011-10-03 14:09:40 +02:00
ff61502272
[IMP] some view should not have group_by...
...
bzr revid: fp@tinyerp.com-20111001211529-0g2jccon81tbjrry
2011-10-01 23:15:29 +02:00
e70a409af1
[IMP] useability views
...
bzr revid: fp@tinyerp.com-20111001200247-tqyw0w8zomrq0jil
2011-10-01 22:02:47 +02:00
49ab1f660c
[IMP] fetchmail useability
...
bzr revid: fp@tinyerp.com-20111001192612-bgyiugp815evia5r
2011-10-01 21:26:12 +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
7afbca3af9
[IMP] fetchmail: Introduce the fetchmail_model keyword in the context to specify the default value for the object field of the fetchmail.server object
...
bzr revid: stw@openerp.com-20110922130827-ny2i17lng1x1ua59
2011-09-22 15:08:27 +02:00
d57135eaef
[IMP] fetchmail: Add a new type for the incoming server and generate a zip file with the script of the mailgateway and the right configuration
...
bzr revid: stw@openerp.com-20110916140252-movu1cxjubt0bc44
2011-09-16 16:02:52 +02:00
6289ce38f9
[FIX] fetchmail.server: care for non-ascii connection error message
...
bzr revid: odo@openerp.com-20110914120753-tt1x0kr8b1noj84j
2011-09-14 14:07:53 +02:00
92e1432757
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110914044104-ups83zg1ztym9h60
2011-09-14 04:41:04 +00:00
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
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
d0edaf5df7
[FIX] fetchmail: finish renaming in access rights
...
bzr revid: odo@openerp.com-20110909201212-1a4ig1ecidtcgwnn
2011-09-09 22:12:12 +02:00
32a892cbbb
[IMP] fetchmail: cleanup - improve names
...
bzr revid: odo@openerp.com-20110908141941-vsd21wfb13z5tywa
2011-09-08 16:19:41 +02:00
d81f1cd942
[IMP] fetchmail: review+cleanup
...
bzr revid: odo@openerp.com-20110908010700-n7fk9hzwb60v80cq
2011-09-08 03:07:00 +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
e7d06fc3d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110826043322-8smkycmnlsiirg0b
2011-08-26 04:33:22 +00: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
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
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
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
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
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
5a41a68bc2
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
d844fd133b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110720043721-c35fwfpelcbp1jbk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110721043532-p7f537lm5otnbht8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110722044222-ntao98t3fw2ldjgb
2011-07-22 04:42:22 +00:00
a5fdb75ad6
[FIX] ir.actions.todo are now unskippable
...
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
9c9516d21c
[MERGE] merged with main addons trunk
...
bzr revid: qdp-launchpad@openerp.com-20110706145644-merwy0setzzb8c9w
2011-07-06 16:56:44 +02:00
664ba7bba3
[MERGE] merge with main addons branch
...
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
6df880e9a4
[IMP]: fetchmail: improve the log message
...
bzr revid: sbh@tinyerp.com-20110617082738-i0umdo9cptek6l4j
2011-06-17 13:57:38 +05:30
ca2598f997
[IMP]: fetchmail: improve the log message
...
bzr revid: sbh@tinyerp.com-20110617063914-lue87brktmevt9a8
2011-06-17 12:09:14 +05:30
77cd54d73a
[IMP]crm: Setup Your Mail server in Sales Management-5 categ
...
bzr revid: aag@tinyerp.co.in-20110603092148-6p999s2zawgi3tmz
2011-06-03 14:51:48 +05:30
b161026c62
[ADD]fetchmail: Setup Your Mail server add to sale -6 seq category
...
bzr revid: aag@tinyerp.co.in-20110602051556-uodzfh6kytfbjy50
2011-06-02 10:45:56 +05:30
9219ef0823
[IMP]fetchmail : In the form view of Setup your email server : add icon on button
...
bzr revid: aag@tinyerp.co.in-20110519060101-eksvmy4907mz8bx6
2011-05-19 11:31:01 +05:30
84ab33f772
[IMP]Fetchmail:add tooltip on user - change label of model to object to create
...
bzr revid: aag@tinyerp.co.in-20110509051327-wl60urxkcce3l7yw
2011-05-09 10:43:27 +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
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
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
b6428f5b9d
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110415092039-94d5dn2qiq388m7b
bzr revid: rpa@tinyerp.com-20110426064148-nqu2870kk5y59fym
bzr revid: rpa@tinyerp.com-20110427044613-zx55jv7o3t209meb
2011-04-27 10:16:13 +05:30
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
e3b787689f
[IMP]: Improve ir.actions.todo replace restart=type
...
bzr revid: ksa@tinyerp.co.in-20110411131719-b5x6i11xvq8gdqjc
2011-04-11 18:47:19 +05:30
326fc1420b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411054240-glbtpl72fmw06spz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110409061637-9s5h5adu95tabmbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20110410060107-yhr6iuxpvirpqo8l
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411054315-0ka0kjfhsys3iuf4
2011-04-11 05:43:15 +00:00
c05b34c409
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408044528-x2b0tjohjf1dqbic
bzr revid: launchpad_translations_on_behalf_of_openerp-20110409050011-j1zonbxqthg6cnbv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110410044959-wu9z8ma8je0netjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411045409-41dld74ls1lcxfwl
2011-04-11 04:54:09 +00:00
Stephane Wirtel
Antony Lesuisse
Fabien Pinckaers
Olivier Dony
Launchpad Translations on behalf of openerp
Xavier Morel
Quentin (OpenERP)
Bhumika (OpenERP)
aag (OpenERP)
Rucha (Open ERP)
Harry (OpenERP)
ksa (Open ERP)