Commit Graph

105 Commits

Author SHA1 Message Date
Jeremy Kersten faba7cd5aa [IMP] Crm: Add tracking mixin to manage utm campaign and add this mixin to mass_mailing, crm_lead and sale_order 2014-07-08 17:33:00 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Thibault Delavallée ae89496bbc [MERGE] Sync with trunk 2014-05-14 17:21:54 +02:00
Thibault Delavallée 2b8739cf8b [IMP] website sales salesteam: refactored implementation
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
2014-05-12 17:52:10 +02:00
Thibault Delavallée 3406b6db39 [CLEAN] sale, sale_crm: cleaning before merging. Cleaned calculation
of default section id + removed duplicated code.
2014-05-12 14:56:01 +02:00
Randhir Mayatra rma-openerp 355a51a69d [MERGE] merge with latest trunk and resolve remain confclits 2014-04-14 14:17:14 +05:30
Ravish (Open ERP) 7699504d62 [Add new sale_team module] 2014-03-28 15:28:35 +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 Trainee) 168ca32323 [IMP] changes set Tag term instead of category
bzr revid: voraamitr@gmail.com-20140124052423-22qu8005g1nooort
2014-01-24 10:54:23 +05:30
Amit Vora (OpenERP Trainee) 4c287b29a9 [IMP] improve Homogenize the terms
bzr revid: voraamitr@gmail.com-20140123100058-lhcd5a95wkwi5jj0
2014-01-23 15:30:58 +05:30
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Denis Ledoux 7486095918 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9701 rev-id: dle@openerp.com-20131217124201-kha2717b4ka51aih
bzr revid: dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
2013-12-17 15:21:26 +01:00
Denis Ledoux df0a13ab4c [FIX]sale_crm: quotation/sale order default section_id based on res_users default_section_id
bzr revid: dle@openerp.com-20131217124201-kha2717b4ka51aih
2013-12-17 13:42:01 +01:00
Thibault Delavallée d181c63d07 [CLEAN] sale_crm: cleaning before merging
- sales report: the group by salesteam was wrongly placed in the view
- sale_crm: fixed computation for sparklines, now bar graph should display the same
result as the sales analysis
- added a forgottent cursor: pointer for a gauge
- moved the gauges in the dom
- sale_crm: report: removed extra content not necessary

bzr revid: tde@openerp.com-20131205144505-jfsd8lh91r1b13a1
2013-12-05 15:45:05 +01:00
Turkesh Patel (Open ERP) a68dbfe286 [RMV] remove all currecny related stuff as per the comments of fp sir.
bzr revid: tpa@tinyerp.com-20131126064238-odztahk0kofak3vh
2013-11-26 12:12:38 +05:30
Turkesh Patel (Open ERP) ecdb4abbd1 [IMP] improved code to show all amounts in sales teams currency instead on current users currency
bzr revid: tpa@tinyerp.com-20131029125128-9n4myfklstueqq0v
2013-10-29 18:21:28 +05:30
Turkesh Patel (Open ERP) 29214f0894 [IMP] improved code.
bzr revid: tpa@tinyerp.com-20131025094512-m0mx0a0s94h1ldjg
2013-10-25 15:15:12 +05:30
Turkesh Patel (Open ERP) f48db35788 [FIX] sale_crmconvert target and forcat fields to float from int
bzr revid: tpa@tinyerp.com-20131023113742-55szrqznr1imequi
2013-10-23 17:07:42 +05:30
Turkesh Patel (Open ERP) 4e0a8f9173 [IMP] removed unused create_uid field.
bzr revid: tpa@tinyerp.com-20131023064455-ge7pxrmz1qskh6jf
2013-10-23 12:14:55 +05:30
Turkesh Patel (Open ERP) 44eaa430cc [IMP] add direct currency_id field insted of related field.
bzr revid: tpa@tinyerp.com-20131023061053-3avp9mp31v7vl9o6
2013-10-23 11:40:53 +05:30
Turkesh Patel (Open ERP) f684f68173 [RMV] removed code to convert forcast and target amount in user currency.
bzr revid: tpa@tinyerp.com-20131023054254-gw4mjjighbbn1unm
2013-10-23 11:12:54 +05:30
Turkesh Patel (Open ERP) 0d840256c5 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131011061203-z13xuqw5fzznr6qc
2013-10-11 11:42:03 +05:30
Thibault Delavallée 187c9454d7 [FIX] sale_crm: fixed previous fix + forgot to complete domain on invoices, added an end date for invoice sparklines
bzr revid: tde@openerp.com-20131003095626-dckhvcvi935fdgzf
2013-10-03 11:56:26 +02:00
Thibault Delavallée f72927123e [FIX] crm, sale_crm, mass_mailin: fixed computation for sparkline widgets.
Added an end date in the read_group domain. Indeed having results outside the date range
made the result computation crash because of list limits. There is now a begin and end
date for groupby domain.

bzr revid: tde@openerp.com-20131003082736-tw50xk2vmhpjh1e5
2013-10-03 10:27:36 +02:00
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux 274cf1e293 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Denis Ledoux ff3a6ddde6 [FIX]sale_crm: add context to categ_ids for sale order object. Its dummy to set 'crm.lead' for object_name in context while the current object is a 'sale.order', but its less dummy to copy crm.lead tags to sale.order tags while using the convert to quotation wizard
bzr revid: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
2013-09-23 18:24:28 +02:00
Turkesh Patel (Open ERP) 17b89198ab [FIX] round amount insted of converting in to int.
bzr revid: tpa@tinyerp.com-20130906111655-f6na9nvtot6t7wdd
2013-09-06 16:46:55 +05:30
Turkesh Patel (Open ERP) e7764209b7 [FIX] improved code for invoice sparkline bar
bzr revid: tpa@tinyerp.com-20130905071404-dlgdeovxarfa9pg6
2013-09-05 12:44:04 +05:30
Turkesh Patel (Open ERP) ee9b75603f [IMP] insted of replacing int field with function and add new int fied add new function field only, use fnct_inv insted of overwriting write method.
bzr revid: tpa@tinyerp.com-20130821111113-5n022roofguvea0f
2013-08-21 16:41:13 +05:30
Turkesh Patel (Open ERP) f21aa3c371 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130821054505-l3e9h86gsqa60jp9
2013-08-21 11:15:05 +05:30
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Turkesh Patel (Open ERP) a3508b45d7 [IMP] improved code to show invoice bar value
bzr revid: tpa@tinyerp.com-20130816132754-tgnd3xoi9v3o5711
2013-08-16 18:57:54 +05:30
Sunil Sharma (OpenERP Trainee) 418c77da30 [IMP]:User_Currency:
bzr revid: sunilsharma.sharma07@gmail.com-20130813063315-i45q7dykm6sp3a94
2013-08-13 12:03:15 +05:30
Turkesh Patel (Open ERP) 7f6daa12f9 [IMP] Improved report of lead/apportunity analysis to show in user currency and improved code to show target and forcast amount in current user currency.
bzr revid: tpa@tinyerp.com-20130805113549-9vmwd2v0zsjwlcms
2013-08-05 17:05:49 +05:30
Denis Ledoux a99b5786d1 [MERGE] Forward-port of 7.0 bugfixes up to rev. 9337 (dle@openerp.com-20130731153129-8hmqrgsg3e9d533f)
bzr revid: mat@openerp.com-20130726073123-6buqe3rg321gj5rw
bzr revid: odo@openerp.com-20130730110536-a74ea14pwb2y03ay
bzr revid: dle@openerp.com-20130801123703-frjhpeqwocsjo7ge
2013-08-01 14:37:03 +02:00
Martin Trigaux 3037b94205 [FIX] sale_crm: allow modifying the default sale's team on user preferences
bzr revid: mat@openerp.com-20130729075824-jcxwd1va8yav4rjh
2013-07-29 09:58:24 +02:00
Thibault Delavallée a3c677b337 [CLEAN] sale, sale_crm: reverted some changes, cleaning before merging.
bzr revid: tde@openerp.com-20130604123026-f0xks6ky1rkw3ser
2013-06-04 14:30:26 +02:00
Thibault Delavallée 09e0cd8dc6 [CLEAN] crm, sale_crm: cleaned code for new fields. Fixed some bugs in calculation and monthly repartition. Updated form views. Improved use of sparkline widget, now having tootips.
bzr revid: tde@openerp.com-20130531153100-q1cmpx0kjb02cbtu
2013-05-31 17:31:00 +02:00
Christophe Matthieu 4e7b20dfb6 [IMP] salesteams: duration only by month
bzr revid: chm@openerp.com-20130527093036-bn4kjnre9vhxf76k
2013-05-27 11:30:36 +02:00
Christophe Matthieu 15c9537eb1 [IMP] salesteams: use read_group to simplify
bzr revid: chm@openerp.com-20130524135255-myzntlue5e87j6vk
2013-05-24 15:52:55 +02:00
Christophe Matthieu 096962342a [MERGE] from trunk
bzr revid: chm@openerp.com-20130522145042-3ril2zvogqs55ako
bzr revid: chm@openerp.com-20130524100533-fc0c7l47hb8j4xib
2013-05-24 12:05:33 +02:00
Christophe Matthieu 35cd85b0ba [FIX] sale: overwrite _make_invoice and get section_id in sale_crm module
bzr revid: chm@openerp.com-20130522104858-zlhe453zu9r41lqx
2013-05-22 12:48:58 +02:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Cedric Snauwaert 655e36bc50 [FIX]sale_crm: when validating a SO with a sale team associated, information was not in associated invoice.
bzr revid: csn@openerp.com-20130516151255-azu6a3x6les0tzu6
2013-05-16 17:12:55 +02:00
Christophe Matthieu 137859f01e [FIX] sale_crm: fix JustGage widget
bzr revid: chm@openerp.com-20130506081354-ulx7c02wo4uxq2h7
2013-05-06 10:13:54 +02:00
Christophe Matthieu a26c8d76b9 [MERGE] from trunk
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta
2013-05-03 16:00:29 +02:00
Christophe Matthieu 3cf1b01d1c [IMP] salesteams: comment and tooltip
bzr revid: chm@openerp.com-20130425130111-pq94g5v9o5rwyzts
2013-04-25 15:01:11 +02:00
Christophe Matthieu 57fdf11635 [IMP] salesteams: add demo data
bzr revid: chm@openerp.com-20130419103600-71j6munkzygnffe4
2013-04-19 12:36:00 +02:00
Christophe Matthieu d388383adb [IMP] salesteams: gauge label color, action context
bzr revid: chm@openerp.com-20130418103015-si1vjq1scivoqxfu
2013-04-18 12:30:15 +02:00