Commit Graph

274 Commits

Author SHA1 Message Date
Stephane Wirtel 3dc8168974 [FIX] Set the categories
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
Stephane Wirtel 1ba826a4ea [REF] Rename the categories
bzr revid: stw@openerp.com-20110928141258-9hfn5rfhboar2e5z
2011-09-28 16:12:58 +02:00
Fabien Pinckaers c3a79fbc36 merge
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
Fabien Pinckaers 68cc4c3948 merge
bzr revid: fp@tinyerp.com-20110924090227-z4m2ymb6b1n5oxvz
2011-09-24 11:02:27 +02:00
Antony Lesuisse ccc56996dd [MERGE] trunk-search_views or instead of and in groups
bzr revid: al@openerp.com-20110923172247-pj5ii3pxisiyco6k
2011-09-23 19:22:47 +02:00
DBR (OpenERP) a198350e58 [IMP]remove repeated code
bzr revid: dbr@tinyerp.com-20110923063949-4c6oymzdaick8pav
2011-09-23 12:09:49 +05:30
DBR (OpenERP) cd78f6ac16 Improve the statments
bzr revid: dbr@tinyerp.com-20110922114325-pdaf41uih8gcgrmz
2011-09-22 17:13:25 +05:30
Rucha (Open ERP) 0e861ae34a [MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
DBR (OpenERP) 6d7fe80f9a [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20110921104455-yg1j8lu1yfoufeel
2011-09-21 16:14:55 +05:30
DBR (OpenERP) 289ad6ec3f [IMP]Improve Domains
bzr revid: dbr@tinyerp.com-20110921071544-quyoatb7d1ba5fh3
2011-09-21 12:45:44 +05:30
DBR (OpenERP) 15df3b8cf2 [IMP]Improve the help
bzr revid: dbr@tinyerp.com-20110921054146-o0dhl9b1olp2hnk4
2011-09-21 11:11:46 +05:30
Mayur Maheshwari (OpenERP) 1be371c851 [IMP]account_voucher,crm_claim,crm_fundraising,marketing_campaign,stock,purchase_requisition:removed a quote from statusbar_colour as per suggestion
bzr revid: mma@tinyerp.com-20110921051720-ag458lyz42o64bhb
2011-09-21 10:47:20 +05:30
DBR (OpenERP) 1a7dd4f724 [IMP]sales_crm : Improve the icons
bzr revid: dbr@tinyerp.com-20110919084750-d3rjbeeyrqmz742c
2011-09-19 14:17:50 +05:30
DBR (OpenERP) 88acb39c5f [IMP]sales_crm : Improve the search view
bzr revid: dbr@tinyerp.com-20110919070909-em15z9u8epr93jh5
2011-09-19 12:39:09 +05:30
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Mayur Maheshwari (OpenERP) 3846b99e01 [IMP]stock:statusbar Improvement is Done as per suggestion
bzr revid: mma@tinyerp.com-20110915133052-di9iknwgnromr4s4
2011-09-15 19:00:52 +05:30
Mayur Maheshwari (OpenERP) 364f9aefa9 [IMP]stock,purchase_requisition,crm:statusbar Improvement is Done
bzr revid: mma@tinyerp.com-20110914131111-3o0jykg61r5eq98c
2011-09-14 18:41:11 +05:30
DBR (OpenERP) e8c112c837 [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20110914051815-eufzxqhse757el5w
2011-09-14 10:48:15 +05:30
Olivier Dony f0d937e96d [FIX] mail*: add missing `email_from` field for list views that need it for attrs
bzr revid: odo@openerp.com-20110909141844-b9vnj0p0tin534uu
2011-09-09 16:18:44 +02:00
DBR (OpenERP) 8e93d5a59c [IMP]crm_* : Remove extra space
bzr revid: dbr@tinyerp.com-20110908102935-r3x7a03psb3j3bo0
2011-09-08 15:59:35 +05:30
Olivier Dony 194c8dba31 [FIX] mail*: mail.message list should be readonly
bzr revid: odo@openerp.com-20110907211736-73fnu73xnca14gn9
2011-09-07 23:17:36 +02:00
Olivier Dony 5bfc6ff3fe [IMP] crm.fundraising: implement message_new to properly initialize values when new message arrives
bzr revid: odo@openerp.com-20110907162710-toc4du4vh1w34142
2011-09-07 18:27:10 +02:00
Olivier Dony 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
Olivier Dony f42126df0e [MERGE] latest trunk
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
Launchpad Translations on behalf of openerp 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 4f5fa4f0d8 [MERGE] trunk
bzr revid: al@openerp.com-20110828025452-vkkj23005ct60wpb
2011-08-28 04:54:52 +02:00
Antony Lesuisse e83ea8f54c [IMP] res.partner.canal into crm.case.channel
bzr revid: al@openerp.com-20110827233130-end57de3i484r0kb
2011-08-28 01:31:30 +02:00
Antony Lesuisse 71443ad49f [MERGE] trunk
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +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
ksa (Open ERP) 572e9227a5 [REM]:Remove menu for claim and fundraising
bzr revid: ksa@tinyerp.co.in-20110819101302-vxu1ixwljzj34wcw
2011-08-19 15:43:02 +05:30
ksa (Open ERP) 13481a83ff [REM]:filter buttons in stage search view
bzr revid: ksa@tinyerp.co.in-20110819095503-52osr4ippl95bx2a
2011-08-19 15:25:03 +05:30
ksa (Open ERP) 73742c80a3 [IMP]: remove stage type for crm fundraising
bzr revid: ksa@tinyerp.co.in-20110817085404-uaezg715cn4e5310
2011-08-17 14:24:04 +05:30
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
Olivier Dony 3e6b0297d0 [IMP] crm*: update crm modules to new mail module (wip)
bzr revid: odo@openerp.com-20110722182337-5irz3g2qva0cf45e
2011-07-22 20:23:37 +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
Launchpad Translations on behalf of openerp 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) 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
Launchpad Translations on behalf of openerp 25da1b63a3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110416045916-5ck4ifulww06owks
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417043634-x8jqcrbbylxdj06l
2011-04-17 04:36:34 +00:00
Launchpad Translations on behalf of openerp ad0ececa4e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110412043500-p2dr3313fnqonqsm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413044003-7pujurdq9cldrqkm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110415050633-iw3b088ogvp5c34f
2011-04-15 05:06:33 +00:00
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) dbf82a8fb4 [FIX] rename name, descrition field to subject and body to remaining modules
bzr revid: rha@tinyerp.com-20110408072853-bhoeuqdfgoqx3tyb
2011-04-08 12:58:53 +05:30
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp d8ca559b5d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
Launchpad Translations on behalf of openerp c5ca5a565f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110326050046-dq45skrem9w4mvec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110327045332-0qk3wj2yahi6f7ty
bzr revid: launchpad_translations_on_behalf_of_openerp-20110328043636-fm3ded2ur36t8x6q
2011-03-28 04:36:36 +00:00
niv-openerp 55a226ef3a [MERGE] Resynchronized with trunk.
bzr revid: nicolas.vanhoren@openerp.com-20110325102413-7xjgusazsow7nwaf
2011-03-25 11:24:13 +01:00
vro 28bb0168f2 [IMP]: Detailed descriptions added.
bzr revid: vro@tinyerp.com-20110322132141-nlms978ymg4mom1g
2011-03-22 18:51:41 +05:30
Launchpad Translations on behalf of openerp 7b645682ae Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110319052026-6lkkmi7ipgbszki3
2011-03-19 05:20:26 +00:00