Commit Graph

120 Commits

Author SHA1 Message Date
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
Thibault Delavallée d7af813044 [MERGE] [FIX] crm: fixed lead to opportunity wizard customer creation policy (opw 596231).
When choosing to link to an existing customer, then changing the action to create
a new customer or to avoid linking, the newly created opportunity was linked
to the previously chosen customer, due to the partner_id field not being
reset and used in the conversion process.

This field is not reset when changing the conversion action, leading to the action
being correctly taken into account.

lp bug: https://launchpad.net/bugs/1208436 fixed

bzr revid: tde@openerp.com-20131129101706-ccsn5u60sw8isroy
2013-11-29 11:17:06 +01:00
Denis Ledoux 53c1526197 [FIX]crm: crm_lead_to_opportunity wizard, the wizard was not choosing duplicated leads/opps which was having probability null in database
bzr revid: dle@openerp.com-20131030152628-tn12sxhbqbdqh3m4
2013-10-30 16:26:28 +01:00
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
Denis Ledoux 5be6edcec8 [FIX]crm: wizard lead to opportunities, match exact email, insensitive
bzr revid: dle@openerp.com-20130930141202-ghnujem348kydd2m
2013-09-30 16:12:02 +02:00
Ravi Gohil (OpenERP) f8d47a4a1d [FIX] crm: While processing the 'Convert to Opportunity' wizard in leads view, if the system found matching partner from the information provided in lead and suggested that partner in the wizard, and later if we decided not to link the opportunity to existing partner but to create a new one, it never create one, but will link to the priorly suggested partner: (Maintenance Case : 596231)
lp bug: https://launchpad.net/bugs/1208436 fixed

bzr revid: rgo@tinyerp.com-20130807094630-efk7yo1ia27vpq5i
2013-08-07 15:16:30 +05:30
Thibault Delavallée 163d88ea32 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130719100119-ohpzxw4r1fxta93k
2013-07-19 12:01:19 +02:00
Christophe Simonis 24ea151a37 merge upstream
bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044
2013-07-17 16:29:47 +02:00
Thibault Delavallée 0e9fd3d5d5 [IMP] crm: removed state field. Refactored code according to the new guidelines.
bzr revid: tde@openerp.com-20130716151003-c2df3nzgo1by0hyi
2013-07-16 17:10:03 +02:00
Christophe Matthieu 9d9e3d2ef8 [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
ggh-openerp 3b73e2b2a4 [IMP]Removed space before Exclamation marks [!]
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
dle@openerp.com 9d2cf73253 [FIX]crm: lead/opp convert/opp wizard: Add salesperson and salesteam in wizard form
bzr revid: dle@openerp.com-20130417161703-z3id6hb20c9pceho
2013-04-17 18:17:03 +02:00
dle@openerp.com 0333d5954f [FIX]Convert to opportunity do not shown lead/opp with state done, remove invisible of user_id in views
bzr revid: dle@openerp.com-20130208104713-8tg3n6yui3wgsd2o
2013-02-08 11:47:13 +01:00
dle@openerp.com 83dd5d14b0 [FIX]Remove useless print, useless partner_id redifining, invisible context for section_id
bzr revid: dle@openerp.com-20130205100940-fc272ogg3v58j3hj
2013-02-05 11:09:40 +01:00
dle@openerp.com 191ff031c9 [FIX]Merge lead/opportunities
bzr revid: dle@openerp.com-20130205095028-vomxadw2sy3lck9x
2013-02-05 10:50:28 +01:00
dle@openerp.com 1b9503923c [FIX]Merge Lead/Opp on convert to opportunity
bzr revid: dle@openerp.com-20130204175106-q2r6xmox16co4n35
2013-02-04 18:51:06 +01:00
hacker on test server 91954d029f [FIX] crm leads merge views and action = merge not well placed
bzr revid: hacker_on_test_server-20130201161850-m9xnp901la968ogo
2013-02-01 17:18:50 +01:00
hacker on test server ef30f3a6a8 [FIX]Convert to opportunities
bzr revid: hacker_on_test_server-20130201141811-s3byg8g19mya0fuk
2013-02-01 15:18:11 +01:00
Antony Lesuisse 822d1b3d13 crm merge fix
bzr revid: al@openerp.com-20130201104728-35rh2flvyjq8pxkn
2013-02-01 11:47:28 +01:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Antonin Bourguignon a9f67c3729 [IMP] indentation
bzr revid: abo@openerp.com-20121130165958-eg00un2qhipubcwr
2012-11-30 17:59:58 +01:00
Antonin Bourguignon e6bfe6583e [IMP] rename lead2partner (again) into crm.partner.binding; also rephrase the documentation
bzr revid: abo@openerp.com-20121113172235-j6ngsolg0wbu84yg
2012-11-13 18:22:35 +01:00
Antonin Bourguignon 3b2b5f31b9 [WIP] rename 'lead2partner' into 'generate.partner' for more clarity
bzr revid: abo@openerp.com-20121112133033-urh3emybeabfvdxm
2012-11-12 14:30:33 +01:00
Antonin Bourguignon ffbb5bacbd [WIP] remove dead code from previous 2partner wizards, and start refactirubg some parts of the code
bzr revid: abo@openerp.com-20121112121743-ilsr59d6juacodj2
2012-11-12 13:17:43 +01:00
Antonin Bourguignon cccbbdfbb2 [IMP] indentation
bzr revid: abo@openerp.com-20121112101514-5da79d21g009t8o1
2012-11-12 11:15:14 +01:00
Antonin Bourguignon 48bf8e72da [IMP] minor imp of code style
bzr revid: abo@openerp.com-20121107161142-c5iqr501mxbghy82
2012-11-07 17:11:42 +01:00
Antonin Bourguignon efd48ffbef [WIP] fix the duplicate partner creation when converting a lead to opportunity
lp bug: https://launchpad.net/bugs/1065751 fixed

bzr revid: abo@openerp.com-20121106175142-eoozcwd8xz5412mk
2012-11-06 18:51:42 +01:00
Antonin Bourguignon 392d0ff664 [IMP] code style, comments
bzr revid: abo@openerp.com-20120926154232-yzg3rlpknaqqpzza
2012-09-26 17:42:32 +02:00
ajay javiya (OpenERP) 776d4aa12f [FIX]:Fix convert Lead to opportunity
bzr revid: aja@tinyerp.com-20120924070849-1cvvztpwe6lrsn1f
2012-09-24 12:38:49 +05:30
ajay javiya (OpenERP) 121cfa9223 [IMP]:Improve Notification when merge opportunities
bzr revid: aja@tinyerp.com-20120921095547-xgxntbd3niwo0hak
2012-09-21 15:25:47 +05:30
Fabien Pinckaers 4efd1a346c [IMP] usability improvements
bzr revid: fp@tinyerp.com-20120912175527-lru5i9rltp1qnnrg
2012-09-12 19:55:27 +02:00
Olivier Dony 971756e016 [FIX] crm: correct mass conversion wizard defaults, fixes crm tests
bzr revid: odo@openerp.com-20120824161320-mdfqibfe53v2op79
2012-08-24 18:13:20 +02:00
Olivier Dony cd67c50e29 [MERGE] crm: cherry-pick of mass conversion improvements from 6.1
This corresponds to rev.6762 from 6.1, which includes a lot
of fixes related to mass conversions, and is completely
related to the kind of fixes currently done for crm during
the mail refactoring.
This should not break crm more than it is already in this branch.

bzr revid: odo@openerp.com-20120823200629-1m1eym62l7aabzgl
2012-08-23 22:06:29 +02:00
Antonin Bourguignon d928b07ace [IMP] rephrase some error and warning messages in caldav and crm
remove exclamation marks at the end of messages
remove first person usage ('I' and 'We')
remove unjustified capital letters

bzr revid: abo@openerp.com-20120806170732-nr7hhhgww1br2hem
2012-08-06 19:07:32 +02:00
Pinakin Nayi (OpenERP) ea721d65af [IMP]crm-warning-msg
bzr revid: pna@tinyerp.com-20120712055038-06rgow7j1sgae6v6
2012-07-12 11:20:38 +05:30
Jigar Amin - OpenERP e88e09aff5 [IMP/FIX] res_partner_addres model clean up for crm, lead, phonecall, meeting
bzr revid: jam@tinyerp.com-20120305110346-6vn4he5imzlu53iv
2012-03-05 16:33:46 +05:30
Harry (OpenERP) 24cbb648a5 [IMP] crm: add new action action_crm_lead2opportunity_partner
bzr revid: hmo@tinyerp.com-20111026162901-2gkhsyjk6646utyt
2011-10-26 21:59:01 +05:30
Harry (OpenERP) 36061f54a3 [IMP+FIX] crm: clean test case, correct issues, added demo data of section for Sales Marketing Team, rename lead_form.yml with onchange_events.yml
bzr revid: hmo@tinyerp.com-20111025073957-e6m4fr70g6e29k0s
2011-10-25 13:09:57 +05:30
Harry (OpenERP) 340c9c5576 [IMP] crm: clean test cases, APIs of crm.lead, crm.phonecall
bzr revid: hmo@tinyerp.com-20111024133010-ve55lvg2cie206l9
2011-10-24 19:00:10 +05:30
Harry (OpenERP) c6a71b8dbb [IMP] crm: clear apis
bzr revid: hmo@tinyerp.com-20111021070111-tzgqm0jo3gor9jvm
2011-10-21 12:31:11 +05:30
Olivier Dony 674f3d794e [FIX] crm: fix wizards for proper inheritance
bzr revid: odo@openerp.com-20110927172015-qoeaund7u2knrct5
2011-09-27 19:20:15 +02:00
Antony Lesuisse 71443ad49f [MERGE] trunk
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02: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
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
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
Rifakat Haradwala (Open ERP) 3f694e2e6d [FIX]: crm: changes regarding
*Merge opportunities wizard
*Convert opportunities wizard, fix for cr and uid parameter passing

bzr revid: rha@tinyerp.com-20110505115242-dsp2161zun8r2wmd
2011-05-05 17:22:42 +05:30
Harry (OpenERP) 5be7bbd5c3 [MERGE] merged with trunk development branch
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Harry (OpenERP) 1a404f0c96 [IMP] crm: send_mail_to_salesman method , call schedule_with_attach instead of direct send email
bzr revid: hmo@tinyerp.com-20110421080908-c3oc32kkwdygb2e4
2011-04-21 13:39:08 +05:30
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