Olivier Dony
ee4df1e397
[MERGE] Forward-port saas-4 up to 8b15482
2014-08-01 13:06:49 +02:00
Olivier Dony
8b15482e00
[MERGE] Forward-port saas-3 up to e79a367
2014-08-01 12:54:30 +02:00
Denis Ledoux
2d17c18c7d
[FIX] crm: base_partner_merge, search with lowercase for name,email
...
and without spaces for vat
2014-07-31 19:38:00 +02:00
Denis Ledoux
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
Denis Ledoux
5739aebfb1
[MERGE] forward port of branch saas-3 up to 474eae9a43
2014-07-23 12:14:14 +02:00
Martin Trigaux
1f878f152a
[MERGE] forward port of branch 7.0 up to 680f955
2014-07-22 13:39:15 +02:00
Jérome Maes
738270557f
[FIX] crm : propagate the lead_id when scheldule other phone calls
2014-07-18 13:02:07 +02:00
Thibault Delavallée
f0ef8ac446
[FIX] web_kanban_sparkline, sales_team, stock: use char function field to transmit sparkline data; the data is now correctly dumped into json, and parsed in the widget.
2014-07-04 14:42:38 +02:00
Thibault Delavallée
257631e331
[FIX] sales_team, crm: fixed sales_team form view: alias data was not displayed due to wrongly done inheritance + fixed a typo hidden in the view
2014-06-03 08:55:00 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Martin Trigaux
6718e9d03a
[FIX] crm: do not overwrite the value of no_force_assignation if already set in the context
2014-05-20 13:10:56 +02:00
Thibault Delavallée
ae89496bbc
[MERGE] Sync with trunk
2014-05-14 17:21:54 +02:00
Thibault Delavallée
a5311e6900
[MOV] crm: moved css / js related to salesteam to sales_team module; sale_crm: moved data and demo data into
...
sale and sales_team module.
2014-05-14 14:30:26 +02:00
Martin Trigaux
c50d82ddea
[FIX] crm: make days to close and days to open simple calendar delta
...
When computing the duration to close or to open a lead, do not use some kind of complex computation with working days. It does not make sense to use the number of intervals with the number of days. The computation was incorrect and very slow.
Replaced by simple calendar delta.
2014-05-13 16:09:26 +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
1101c618a5
[FIX] sales_team: fixed kanban view inheritance
2014-05-12 15:58:47 +02:00
Thibault Delavallée
3af0824fa5
[FIX] crm: typo
2014-05-12 15:58:39 +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
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
Thibault Delavallée
443c830bfc
[RENAME] sale_team renamed to sales_team. Update module name, file name and reference to the module.
2014-05-12 10:37:47 +02:00
Denis Ledoux
e70fc38f2f
[FIX] crm: The get_formview_id method does not expect a model arg anymore
...
bzr revid: dle@openerp.com-20140512075919-ewldirr5ejd5py13
2014-05-12 09:59:19 +02:00
Prashant Panchal (OpenERP)
138ffedbf0
[MERGE]: Merged with addons
2014-05-09 18:47:56 +05:30
Prashant Panchal (OpenERP)
ca2bee0865
[IMP]add groups 'base.group_multi_salesteams'
2014-05-09 16:16:07 +05:30
Prashant Panchal (OpenERP)
6c0389279a
[IMP]add groups 'base.group_multi_salesteams' on sales team dependent module
2014-05-09 13:13:13 +05:30
Mantavya Gajjar
0e08ceddb1
[FIX]: review sale_team to add groups on section_id field
2014-05-09 13:08:26 +05:30
Thibault Delavallée
ea1e0e3275
[CLEAN] crm, hr_recruitmnet, project: cleaned priority / kanban state in kanban views
...
bzr revid: tde@openerp.com-20140508152536-s3my5onl33z3kxxx
2014-05-08 17:25:36 +02:00
Thibault Delavallée
ae69285593
[CLEAN] crm: fixed opp kanban view update
...
bzr revid: tde@openerp.com-20140508143128-tazp6gx0ka9glio1
2014-05-08 16:31:28 +02:00
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
Christophe Simonis
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
Christophe Simonis
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +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
Gery Debongnie
88cef3a8eb
[FIX] code cleanup (addon crm)
...
remove unused fields meeting_count and meeting_ids
bzr revid: ged@openerp.com-20140507094553-fwj05122ncr3uic1
2014-05-07 11:45:53 +02:00
Prashant Panchal (OpenERP)
3bdba0b499
[MERGE]merge with trunk
2014-05-07 15:15:07 +05:30
Launchpad Translations on behalf of openerp
93bab6ba7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140507062712-t81pc41duzjfrwa6
2014-05-07 06:27:12 +00:00
Ravi Gadhia
a3e44373d0
Merge with trunk
2014-05-06 14:58:46 +05:30
Kersten Jeremy
868f54780e
[MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not...
...
bzr revid: jke@openerp.com-20140505162422-k332rm7j21af5ore
2014-05-05 18:24:22 +02:00
Kersten Jeremy
6d00292064
[REF] Replace temp name by real name
...
bzr revid: jke@openerp.com-20140505154246-8vahdzf60oiksm62
2014-05-05 17:42:46 +02:00
Denis Ledoux
ce88158381
[FIX] crm: typo, interrests to interest
...
bzr revid: dle@openerp.com-20140502145823-vtkqkd7njqf31682
2014-05-02 16:58:23 +02:00
Gery Debongnie
a8e1fbcbd3
[FIX] correct a small typo in previous merge (addon crm)
...
bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
2014-05-02 15:22:58 +02:00
Gery Debongnie
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Ravi Gadhia
adf1480f71
[IMP] add alias name
2014-05-02 18:18:40 +05:30
Kersten Jeremy
ed6bc9f198
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct
2014-05-02 14:31:49 +02:00
Denis Ledoux
03b03d0476
[FIX] crm: in order the mark as lost action to work, the dead stage has to be folded
...
bzr revid: dle@openerp.com-20140502101525-bzyjpz7jbr1njobl
2014-05-02 12:15:25 +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
Ravi Gadhia
74f60e6212
[REM] crm.case.section.inherit use crm.case.section for get aliase_id
2014-05-01 14:15:42 +05:30
Ravi Gadhia
3bfdd859e2
Merge with trunk
2014-05-01 13:12:03 +05:30
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