Commit Graph

701 Commits

Author SHA1 Message Date
Amit Vora d88835ed66 [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140328050000-xmax3xa0dp4ltxxv
2014-03-28 10:30:00 +05:30
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Denis Ledoux abf8e0d54f [ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam
bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
2014-03-20 18:51:29 +01:00
Denis Ledoux 8d52e36fd8 [FIX] crm: convert to opportunity (single lead) display losts
bzr revid: dle@openerp.com-20140319153956-iilonexkeng1fudl
2014-03-19 16:39:56 +01:00
Denis Ledoux e13ac3153f [FIX] crm: get duplicated leads use email_split from tools
bzr revid: dle@openerp.com-20140312164459-gi7ol7huxx3gcbxi
2014-03-12 17:44:59 +01:00
Denis Ledoux 387dc3c911 [FIX] crm: crm to opp, get duplidated leads does not take losts and deads. + search algorithm imp
bzr revid: dle@openerp.com-20140312155453-fj9ngb988advvn8s
2014-03-12 16:54:53 +01:00
Denis Ledoux 187545a06a [FIX] crm: lead to opp, do not force salesteam in mass convert
bzr revid: dle@openerp.com-20140312143102-0887zl1r4tc4yq6z
2014-03-12 15:31:02 +01:00
Amit Vora 55c3d2336a [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140312090734-1m11cnuavrgl92it
2014-03-12 14:37:34 +05:30
Denis Ledoux 6f12f4ba67 [FIX] crm: lead_to_opp wizard, use email address to find duplicated lead in single convert lead to opp
bzr revid: dle@openerp.com-20140306143621-z5mgcl2cm7kn6we0
2014-03-06 15:36:21 +01:00
Denis Ledoux 6a1e65b561 [FIX] crm: crm_to_lead tests, force assignation, to check round robin
bzr revid: dle@openerp.com-20140306092330-wuhfw36f3xpwdy4d
2014-03-06 10:23:30 +01:00
Denis Ledoux 83a4374363 [FIX] crm: lead_to_opp, do not force assignation in mass convert with deduplication (to prevent change the salesman of an existing opp), + fix get duplicated lead, now based on probability of stage instead of probability of the opp itself
bzr revid: dle@openerp.com-20140305164016-432vz5axo5l4wqko
2014-03-05 17:40:16 +01:00
Denis Ledoux 40b1ab36bb [FIX] crm: convert lead to opp wizard, on change salesman choose default salesteam if any
bzr revid: dle@openerp.com-20140304154442-o2zvun8ehv2ro6dl
2014-03-04 16:44:42 +01:00
ajay javiya (OpenERP) e0f8d3f80a [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140303064742-klvoa7t5l6wnzrg9
2014-03-03 12:17:42 +05:30
Christophe Simonis 0123c51997 [FIX] crm: lead to opportunity convertion: pass id instead of browse record object
bzr revid: chs@openerp.com-20140225102830-1za1ei2xlr1oc4nv
2014-02-25 11:28:30 +01:00
Christophe Matthieu 07adc071df [IMP] website_event: split module: remove depends with sale and move event's ticket form into a bridge: website_event_sale
bzr revid: chm@openerp.com-20140128113101-aon81actmpahyn58
2014-01-28 12:31:01 +01:00
Denis Ledoux 567be50d0a [FIX] crm: mass assign were not always deduplicating
bzr revid: dle@openerp.com-20140127103816-t9pga6sohbxaw5ux
2014-01-27 11:38:16 +01:00
Denis Ledoux c76e580da5 [ADD] crm: mass assign apply deduplication
bzr revid: dle@openerp.com-20140123180211-o1ebik36wegmi8mc
2014-01-23 19:02:11 +01:00
jke-openerp 46b0c7aa00 [REF] Rename model crm.meeting into calendar.event
Remove 2 unsused field from calendar.event model (dir,sequence)

bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
2014-01-15 10:38:05 +01:00
jke-openerp dd285d23af [TYPO] Rename base_calendar into calendar
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
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
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Denis Ledoux 8be0a5a8e1 [FIX]crm: several calls to _get_id for external id 'categ_phone2' which were not surrounded by try except ValueError
bzr revid: dle@openerp.com-20131114095721-v22dl5yc8bzhvevf
2013-11-14 10:57:21 +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 a9158e5993 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9487 rev-id: dle@openerp.com-20130930141202-ghnujem348kydd2m
bzr revid: dle@openerp.com-20130930150804-b4j080uy06t4n7f1
2013-09-30 17:08:04 +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
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
ajay javiya (OpenERP) a0ab757537 [REM] : remove wizard of schedule/log a call ,
[IMP] : Rename in Opportunity and in Partner form the 'Meeting' into 'Schedule a Meeting' ,

bzr revid: aja@tinyerp.com-20130822092259-it5a1e1v1ed9s60a
2013-08-22 14:52:59 +05:30
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
Denis Ledoux 69c314c51d [RENAME]RERENAME crm_channel => crm_partner_assign, for migration and translation issue
bzr revid: dle@openerp.com-20130620175326-0lgpbdxiusa65ss2
2013-06-20 19:53:26 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15: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
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Christophe Matthieu 454d3a0d4b [IMP] crm.case.section,salesteams: add groups multi_salesteams
bzr revid: chm@openerp.com-20130325165125-a5t5fdbnz9rqw1jp
2013-03-25 17:51:25 +01:00
Thibault Delavallée b551e04dcd [IMP] CRM: phonecall scheduling: opportunity description not in phonecall description anymore; move a field in form view to be more user friendly.
bzr revid: tde@openerp.com-20130307162851-jmic921ixzjop44g
2013-03-07 17:28:51 +01: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
Antonin Bourguignon 808850ec54 [IMP] _find_matching_partner() method
also minor doc imp

bzr revid: abo@openerp.com-20121206160553-upxra7pkab3vhi1g
2012-12-06 17:05:53 +01:00