Commit Graph
686 Commits
Author SHA1 Message Date
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
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
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 1df211b693 [IMP] rename methods in crm_lead and crm_phonecall:
in these classes, the method convert_partner() is now named handle_partner_assignation()
also the method in crm_phonecall has received the same refactoring than the one in crm_lead
documentation has been improved
these two method are a pure code duplication and would deserve a refactoring

bzr revid: abo@openerp.com-20121205192146-rogbsln3atcm1lvt
2012-12-05 20:21:46 +01:00
Antonin Bourguignon fdfb872c68 [IMP] code style
bzr revid: abo@openerp.com-20121205184617-ohe292g8zp2x83jq
2012-12-05 19:46:17 +01:00
Antonin Bourguignon 825472c6a7 [IMP] remove the make_partner() method which wasn't in use anywhere anymore
bzr revid: abo@openerp.com-20121205171815-ztd21cjrfi0cy1vr
2012-12-05 18:18:15 +01:00
Antonin Bourguignon 1dba8eb0c3 [FIX] typo in docstring
bzr revid: abo@openerp.com-20121204153544-ungdrl3sf88h3ej0
2012-12-04 16:35:44 +01:00
Antonin Bourguignon 4f1e657da7 [IMP] we actually can merge more than two opps together
bzr revid: abo@openerp.com-20121203164026-jd722eo3h2vqwfkq
2012-12-03 17:40:26 +01:00
Antonin Bourguignon a9f67c3729 [IMP] indentation
bzr revid: abo@openerp.com-20121130165958-eg00un2qhipubcwr
2012-11-30 17:59:58 +01:00
Antonin Bourguignon 4e64f8e96f [WIP] redirect to the right view (opp or lead)
improve documentation and code style

bzr revid: abo@openerp.com-20121120181333-ho2zu27q1qs2hoe5
2012-11-20 19:13:33 +01:00
Antonin Bourguignon 3dba2e5586 [IMP] remove a write() that sincerely seems useless
improve some var names

bzr revid: abo@openerp.com-20121119181224-c206f0xzuxw2hes0
2012-11-19 19:12:24 +01:00
Antonin Bourguignon 9591811eb4 [IMP] use a many2many_tags widget instead of an array for the salesmen field in the massive conversion wizard
bzr revid: abo@openerp.com-20121115171958-wdnkhjqfp18qdfi6
2012-11-15 18:19:58 +01:00
Antonin Bourguignon fda57cd226 [IMP] remove whitespaces
bzr revid: abo@openerp.com-20121115171457-al3d1r0qz0fv2s0c
2012-11-15 18:14:57 +01:00
Antonin Bourguignon 6974be3d6d [IMP] remove dead code from crm_partner_to_opportunity and crm_phonecall_to_opportunity
fp and al judged that phonecall2opp wizard was just a 'one more click' step
instead of the wizard, a phonecall will directly be converted into an opp when clicking on the 'Convert to opp' button (todo)
tests have been adapted, but some tests are still missing like 'merge lead with opp' or 'merge leads together' (todo)
documentation has been improved

bzr revid: abo@openerp.com-20121114184134-m37k9mwsq2hclgii
2012-11-14 19:41:34 +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 357a407738 [IMP] take both partner_name AND contact_name into account while looking for a matching partner
slightly improve code style

bzr revid: abo@openerp.com-20121112142158-5kgxn23ji5ubuura
2012-11-12 15:21:58 +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