Commit Graph

773 Commits

Author SHA1 Message Date
Thibault Delavallée 9199587ec9 [CLEAN] crm: cleaned crm module before merging :
- removed unnecessary changes
- rewrote on_change_user and get_default_sectoin_id to have a correct default section
- removed duplicated code in sales_team module due to code moving not correctly cleaned
2014-05-12 13:41:49 +02:00
Prashant Panchal (OpenERP) 138ffedbf0 [MERGE]: Merged with addons 2014-05-09 18:47:56 +05:30
Prashant Panchal (OpenERP) b420dc37d3 [MERGE]merge with trunk 2014-05-08 19:14:33 +05:30
Thibault Delavallée 400b194d60 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140508123529-w91cb0e6ugzutqd1
2014-05-08 14:35:29 +02:00
Barad Mahendra 07ccf397a3 [Merge]with trunk
bzr revid: mba@tinyerp.com-20140507104533-jeorqz7rtx8m8i1c
2014-05-07 16:15:33 +05:30
Gery Debongnie 9f3abe3ea4 [FIX] code cleanup (addon crm)
improves the method to count opportunities/meetings/phonecalls in res_partner.py.  It was bugged in two different way: the phonecall_count field was counting the number of meetings and not of phone calls, and it was in the try statement, so it might give an incorrect value if an exception occurs in the computation of opportunity/meeting

Also, remove useless meeting_ids one2many field in crm_lead.py and improves the method meeting_count

bzr revid: ged@openerp.com-20140507100954-1aqnd93iu5wsixob
2014-05-07 12:09:54 +02:00
Ravi Gadhia a3e44373d0 Merge with trunk 2014-05-06 14:58:46 +05:30
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Ravi Gadhia 78204703b0 [IMP] split crm_case_section + create alias from lead 2014-05-02 14:27:50 +05:30
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Denis Ledoux 8da3bb66ca [FIX] crm: get_forwview_id, variable referenced before assignment
bzr revid: dle@openerp.com-20140430094601-4chke4890s55eb92
2014-04-30 11:46:01 +02:00
Randhir Mayatra rma-openerp 62cd1a6487 [MERGE] merge with latest trunk 2014-04-22 14:21:34 +05:30
Randhir Mayatra rma-openerp 27ee024847 [IMP] optimize code 2014-04-22 12:53:03 +05:30
Randhir Mayatra rma-openerp 9bb0e6f30e [IMP] improve demo data and menu items 2014-04-21 15:32:12 +05:30
Amit Vora 04c809e9f6 [MERGE] [IMP] crm: improved call / meeting buttons and behavior on lead and partner form view.
- improved behavior of schedule a meeting, for both opportunities and partner, with correct
attendees and options;
- removed wizard to schedule a cal, jumping to the list view with correct default values
is sufficient;
- scheduled calls is now accessible using a group, accessible through sales configuration;

bzr revid: tde@openerp.com-20140417145645-cpohfrfpqnskpok6
2014-04-17 16:56:45 +02:00
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
Denis Ledoux 75850c8f95 [ADD] *: replace overriden methods get_formview_action by get_formview_id
Methods to override to specify the view/action to launch for many2one links
get_formview_action use get_formview_id to find the view to open. Therefore, it is simplier to override get_formview_id to tell which view should be opened

bzr revid: dle@openerp.com-20140416143755-07slguqn6zadqsg5
2014-04-16 16:37:55 +02:00
Thibault Delavallée 4336c64a7c [IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.

bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2
2014-04-16 10:28:51 +02:00
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Barad Mahendra 12b0dfa9b5 [Merge]with trunk
bzr revid: mba@tinyerp.com-20140415093047-1ctqspzbofv1pt3d
2014-04-15 15:00:47 +05:30
Gery Debongnie d8b2eab2d0 [FIX] correctly names a variable 'meeting_ids' instead of 'opportunity_ids' (addon crm)
bzr revid: ged@openerp.com-20140414100652-gwv5cwht6wl12ah9
2014-04-14 12:06:52 +02:00
Randhir Mayatra rma-openerp 355a51a69d [MERGE] merge with latest trunk and resolve remain confclits 2014-04-14 14:17:14 +05:30
Richard Mathot (OpenERP) 5d177a9b10 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
2014-04-11 16:28:17 +02:00
Randhir Mayatra rma-openerp 6da28202f3 [MERGE] merge with latest trunk 2014-04-11 12:36:24 +05:30
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Barad Mahendra 0522e80ea5 [Merge]with trunk
bzr revid: mba@tinyerp.com-20140408123641-0qyrg1fmgguezmro
2014-04-08 18:06:41 +05:30
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Christophe Simonis db6fb31870 [MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
Olivier Dony 1cdf8ac3f2 [FIX] crm.lead: missing index on stage_id/type/state
bzr revid: odo@openerp.com-20140402122023-detokob7c6a06rux
2014-04-02 14:20:23 +02:00
Ravish (Open ERP) 44d3f263cc [IMP] update on code 2014-04-01 18:34:23 +05:30
Barad Mahendra 923db7a8cd [Merge]with trunk
bzr revid: mba@tinyerp.com-20140331091822-i0f05rcwm3qvxpsd
2014-03-31 14:48:22 +05:30
Ravish (Open ERP) 7699504d62 [Add new sale_team module] 2014-03-28 15:28:35 +05:30
Amit Vora d892a5b38e [IMP] improve code
bzr revid: avo@tinyerp.com-20140328063012-mxvgudl5b3219j2i
2014-03-28 12:00:12 +05:30
Randhir Mayatra rma-openerp 0f40b3bc8f [IMP] convert button into stat button for project_issue and stock_claim
bzr revid: rma@tinyerp.com-20140324050921-qxn3n4getus3il6c
2014-03-24 10:39:21 +05:30
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Barad Mahendra 1cfa94706b [Merge]with trunk
bzr revid: mba@tinyerp.com-20140318084344-cuwdqdtphsk6xd7j
2014-03-18 14:13:44 +05:30
Amit Vora 2a50034bfc [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q
2014-03-13 18:18:45 +05:30
Kersten Jeremy 6a01718aef [FIX] Remove test from saas-3 - Tech Saas & AL agreement
bzr revid: dle@openerp.com-20140311164559-1vi0mw3qm8n0vobn
bzr revid: dle@openerp.com-20140312111450-smumao0hm1vzifgn
bzr revid: dle@openerp.com-20140312121555-uum96hj8f2y1rvna
bzr revid: jke@openerp.com-20140312125757-e2kgxuwz0jko77ve
2014-03-12 13:57:57 +01:00
Martin Trigaux 5041f63b35 [FIX] crm: write a value to date_closed field as well if change directly the stage instead of using buttons (which will probably be removed later)
bzr revid: mat@openerp.com-20140311150446-0atbc6esymjyv69e
2014-03-11 16:04:46 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Denis Ledoux 74af3ac0fe [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Martin Trigaux 8db1b77757 [FIX] crm: write a value to date_closed when mark an opportunity as won or lost.
This value is required to compute 'Days to Close' field

bzr revid: mat@openerp.com-20140307111835-o7nd7dmkn5y8zg2a
2014-03-07 12:18:35 +01:00
Mahendra Barad (OpenERP) da5f8b26df [Merge]with trunk
bzr revid: mba@tinyerp.com-20140228131855-obhatiecnzv1bgqu
2014-02-28 18:48:55 +05:30
Amit Vora (OpenERP) 2a73281281 [IMP] improve code according to PEP8
bzr revid: voraamitr@gmail.com-20140226133222-9poyk5squ291iyyf
2014-02-26 19:02:22 +05:30
Amit Vora (OpenERP) 61702ad635 [MERGE] merge with main branch
bzr revid: voraamitr@gmail.com-20140226124327-lo0zdy3fztjvdtwk
2014-02-26 18:13:27 +05:30
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Denis Ledoux ae0e712cb9 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9134 revid:dle@openerp.com-20140217124230-ov201kfep88f5tn7
bzr revid: dle@openerp.com-20140217124520-5pbcbaa08gewv7oo
2014-02-17 13:45:20 +01:00
Denis Ledoux 0ef17beed0 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9846 revid:dle@openerp.com-20140217124044-o8sgz1esfqeha01f
bzr revid: dle@openerp.com-20140214100922-m6rf7c6x85nv67sl
bzr revid: dle@openerp.com-20140214114713-oab4kbearvv7g3nh
bzr revid: dle@openerp.com-20140214131810-9abebxpfeoga1crn
bzr revid: dle@openerp.com-20140217124230-ov201kfep88f5tn7
2014-02-17 13:42:30 +01:00