Commit Graph
263 Commits
Author SHA1 Message Date
Olivier Dony cadc193ea6 [FIX] crm: wrong action name, missed in last merge conflict
bzr revid: odo@openerp.com-20110913172922-l5w9k64rydc8lf02
2011-09-13 19:29:22 +02:00
Antony Lesuisse ea2e8b64c4 [MERGE] trunk-kanban-ysa (manually because of uncommit in trunk)
bzr revid: al@openerp.com-20110913162907-4gvjesa21nvf8v95
2011-09-13 18:29:07 +02:00
Olivier Dony d2c07d6c55 [FIX] crm: incorrect view re-introduced by bad trunk merge
bzr revid: odo@openerp.com-20110913110048-idsavanmlj93i92o
2011-09-13 13:00:48 +02:00
Olivier Dony 983a7d2fd2 [MERGE] latest trunk
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Fabien Meghazi f712daf710 [ADD] Add kanban view for crm.lead - Opportunities
bzr revid: fme@openerp.com-20110906130429-9jbtgdodm3an8jdu
2011-09-06 15:04:29 +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 e9d94b824e [IMP]: crm,mail: minor fixes after review
bzr revid: odo@openerp.com-20110906080014-6texz097jepfrwsp
2011-09-06 10:00:14 +02:00
Antony Lesuisse 51d8e1bb16 [FIX] more crm opportunity to reference new mail wizards
bzr revid: al@openerp.com-20110827215902-z0pxd2sd7zv7k5y1
2011-08-27 23:59:02 +02:00
Antony Lesuisse fbaaf7ef43 [FIX] crm opportunity to reference new mail wizards
bzr revid: al@openerp.com-20110827214904-icwgdueu9f91ninz
2011-08-27 23:49:04 +02:00
Antony Lesuisse 71443ad49f [MERGE] trunk
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
Antony Lesuisse 42b36f710e [MERGE] remove stage type ksa, and MASSIVE crm_lead cleanup
bzr revid: al@openerp.com-20110825041037-0jerocl9x8psve2c
2011-08-25 06:10:37 +02:00
Olivier Dony 4fcb67bef1 [MERGE] latest trunk
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
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
fp 32624d2857 [IMP] Misc useability improvement
bzr revid: fp@fp-laptop-20110818193044-dwv8je39jv65dbta
2011-08-18 21:30:44 +02:00
ksa (Open ERP) c77f9fd715 [IMP]: remove stage type for crm claim
bzr revid: ksa@tinyerp.co.in-20110817083350-hjwj331jt6hxz80r
2011-08-17 14:03:50 +05:30
ksa (Open ERP) b99b42a51d [IMP]: remove stage type in lead and opportunity report
bzr revid: ksa@tinyerp.co.in-20110817054625-xh1v2s9bdkoxaqd4
2011-08-17 11:16:25 +05:30
ksa (Open ERP) 170ee9bf72 [IMP]: remove stage type in lead and opportunity
bzr revid: ksa@tinyerp.co.in-20110816133353-kfgzeotfuwoe0jle
2011-08-16 19:03:53 +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
Raphael Collet 87f239fb33 [MERGE] remove extended filters
bzr revid: rco@openerp.com-20110804102635-2ixo1tmogsulj83u
2011-08-04 12:26:35 +02:00
Tejas (OpenERP) 171e30f7db [Usability]removed extended filter from the crm_lead_view
bzr revid: tta@openerp.com-20110726114045-8dnf5sq43v21flku
2011-07-26 17:10:45 +05:30
Raphael Collet 4116fa8512 [IMP] modify some filter buttons to include pending documents
bzr revid: rco@openerp.com-20110725100554-wq5yyxx7rxmmdyu3
2011-07-25 12:05:54 +02:00
Amit Bhavsar (Open ERP) 76511fd3cf [usability],improve tooltip on search button
bzr revid: amb@tinyerp.com-20110725091454-mmcau026pyzze68f
2011-07-25 14:44:54 +05:30
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
Amit Bhavsar (Open ERP) 772719e00f [usability],tooptip on search button
bzr revid: amb@tinyerp.com-20110722100000-736i3hxq1rlxq5oq
2011-07-22 15:30:00 +05:30
Amit Bhavsar (Open ERP) 5bc8c72cf5 [usability],tooltip on search button
bzr revid: amb@tinyerp.com-20110720100454-ko6iub7h021u25ry
2011-07-20 15:34:54 +05:30
Tejas (OpenERP) 3db1ea86df usability : crm extended seachview changes
bzr revid: tta@openerp.com-20110720094624-bs2h1wh7u4ak3x8p
2011-07-20 15:16:24 +05:30
Fabien Pinckaers f6eae71bd4 [IMP] Useability, shorten button Send Email
bzr revid: fp@tinyerp.com-20110705065336-17rm8j5hl5ra5m05
2011-07-05 08:53:36 +02:00
tfr@openerp.com 2b5a65155e [MERGE] with trunk
bzr revid: tfr@openerp.com-20110616153244-82785aneylz1h3tu
2011-06-16 17:32:44 +02:00
Fabien Pinckaers d436944eae [FIX] Misc useability issues
bzr revid: fp@tinyerp.com-20110525092253-odme1r9saxgce2dg
2011-05-25 11:22:53 +02: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
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
uco 82c6329478 [FIX] usability improvement
bzr revid: tfr@openerp.com-20110411151230-y6skgssffwqix887
2011-04-11 17:12:30 +02:00
Thibault Francois 1a45ff614d [MERGE] crm improvement
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02: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) 24883b8c57 [IMP] crm,project_issue: did related changes
bzr revid: rha@tinyerp.com-20110325041227-ljpbuaf8gu03ak89
2011-03-25 09:42:27 +05:30
Thibault Francois 329d6814eb [IMP] apply patch from crm imp + history + subject
bzr revid: tfr@openerp.com-20110323162206-3k2xwpvral9lb66o
2011-03-23 17:22:06 +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
Yogesh (OpenERP) e1afe5828a [IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
Thibault Francois 9fb3e10ee7 [MERGE] bug fix 722723
bzr revid: tfr@openerp.com-20110304125334-ht2v8t21lwq7q7md
2011-03-04 13:53:34 +01:00
Thibault Francois 2b7ba42ea9 [FIX] opt-in, opt-out in opportunities and typo
bzr revid: tfr@openerp.com-20110304102750-ujj2tmml1lur3zef
2011-03-04 11:27:50 +01:00
Yogesh (OpenERP) 230b03e26f [IMP] improce email.compose wizard code. and change active_id to email_res_id.
bzr revid: ysa@tinyerp.com-20110301095057-sb8tsgovwpt852yj
2011-03-01 15:20:57 +05:30
Harry (OpenERP) 85e8c93460 [MERGE] merged with trunk-addons-development
bzr revid: hmo@tinyerp.com-20110225074706-pjzvvfqe1200zwji
2011-02-25 13:17:06 +05:30
Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
2011-02-24 16:03:09 +01:00
Harry (OpenERP) bbbbf1359a [MERGE] merged with trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110224131516-zooy75ufkl0783kr
2011-02-24 18:45:16 +05:30
Harry (OpenERP) 81b186195a [MERGE]
bzr revid: hmo@tinyerp.com-20110224120319-743iwwk6vs6kd9z8
2011-02-24 17:33:19 +05:30
Yogesh (OpenERP) d44239edd2 [REM] remove unused value in context. like mail=new remove in context related to email.compose.message wizard.
bzr revid: ysa@tinyerp.com-20110224115801-wc1ka9ntxtvnwm4y
2011-02-24 17:28:01 +05:30
Harry (OpenERP) 2137084ff4 [MERGE]
bzr revid: hmo@tinyerp.com-20110224105709-cfck7d0iyclfijws
2011-02-24 16:27:09 +05:30
Yogesh (OpenERP) ece864e532 [IMP] email.compose.message :- add the email_model=model name pass in context in xml file and change the active_model to email_model in default_get method. Global list define of email_model in crm and module are install then add the model name in this list.
bzr revid: ysa@tinyerp.com-20110224101305-iagvga1j6o6h4k0k
2011-02-24 15:43:05 +05:30
Harry (OpenERP) 05d250b121 [MERGE]
bzr revid: hmo@tinyerp.com-20110224092200-wqls7m3mj1znale5
2011-02-24 14:52:00 +05:30
stw@openerp.com a966a3a593 [FIX] partner and adress creation (by stw) + add send email button
bzr revid: tfr@openerp.com-20110222162403-1y8jaec31mp05d50
2011-02-22 17:24:03 +01:00