Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2-yaml_crm_event-kbh into
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-yaml_crm_event-kbh/+merge/91987
Hello,
====crm and event=====
- I have improved yaml files for crm and event object.
Thank you,
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-yaml_crm_event-kbh/+merge/91987
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
=== modified file 'crm/crm_demo.xml'
--- crm/crm_demo.xml 2012-01-30 07:27:49 +0000
+++ crm/crm_demo.xml 2012-02-08 07:34:18 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
<record id="base.user_demo" model="res.users">
- <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
+ <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
</record>
<record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
<field name="name">Meetings</field>
@@ -14,5 +14,10 @@
<field name="code">Sales Marketing</field>
<field name="parent_id" ref="crm.section_sales_department"></field>
</record>
+ <record model="crm.segmentation" id="crm_segmentation0">
+ <field name="name">OpenERP partners</field>
+ <field name="exclusif">True</field>
+ <field name="categ_id" ref="base.res_partner_category_2"/>
+ </record>
</data>
</openerp>
=== modified file 'event/report/report_event_registration.py'
--- event/report/report_event_registration.py 2011-12-19 16:54:40 +0000
+++ event/report/report_event_registration.py 2012-02-08 07:34:18 +0000
@@ -79,14 +79,14 @@
SELECT
MIN(e.id) AS id,
e.id AS event_id,
- e.date_begin AS date,
+ e.create_date AS date,
e.user_id AS user_id,
e.section_id AS section_id,
e.company_id AS company_id,
e.product_id AS product_id,
e.main_speaker_id AS speaker_id,
- to_char(e.date_begin, 'YYYY') AS year,
- to_char(e.date_begin, 'MM') AS month,
+ to_char(e.create_date, 'YYYY') AS year,
+ to_char(e.create_date, 'MM') AS month,
count(e.id) AS nbevent,
t.id AS type,
CASE WHEN c.state IN ('draft') THEN c.nb_register ELSE 0 END AS draft_state,
@@ -102,13 +102,13 @@
event_type t ON (e.type=t.id)
WHERE c.active = 'true'
GROUP BY
- to_char(e.date_begin, 'YYYY'),
- to_char(e.date_begin, 'MM'),
+ to_char(e.create_date, 'YYYY'),
+ to_char(e.create_date, 'MM'),
c.state,
c.nb_register,
- t.id, e.id, e.date_begin, e.main_speaker_id,
+ t.id, e.id, e.create_date, e.main_speaker_id,
e.register_max, e.type, e.state, c.event_id, e.user_id,e.company_id,e.product_id,e.section_id,
- to_char(e.date_begin, 'YYYY-MM-DD'), c.id, c.price_subtotal )AS foo
+ to_char(e.create_date, 'YYYY-MM-DD'), c.id, c.price_subtotal )AS foo
GROUP BY
id,
event_id,
=== modified file 'event/test/process/event_confirm2done.yml'
--- event/test/process/event_confirm2done.yml 2011-12-19 16:54:40 +0000
+++ event/test/process/event_confirm2done.yml 2012-02-08 07:34:18 +0000
@@ -1,11 +1,11 @@
-
- I want to organize one conference event on "OpenERP Business", Customer subscribe/join
- into "Conference on OpenERP Business" with 6 tickets, first I confim this event.
+ I want to organize one conference event on "OpenERP Business", Customer subscribe/join
+ into "Conference on OpenERP Business" with 6 tickets, first I confim this event.
-
!python {model: event.event}: |
- self.button_confirm(cr, uid, [ref("event_0")])
+ self.event_confirm(cr, uid, [ref("event_0")])
-
- I Check that Event is "confirmed", and Its automatically sending mail to registered
+ I Check that Event is "confirmed", and Its automatically sending mail to registered
partner which joined to this event.
-
!assert {model: event.event, id: event_0}:
@@ -14,9 +14,9 @@
After completed event, I close this event.
-
!python {model: event.event}: |
- self.button_done(cr, uid, [ref("event_0")])
+ self.event_done(cr, uid, [ref("event_0")])
-
- Check that conference is in "close" state.
+ Check that conference is in "close" state.
-
!assert {model: event.event, id: event_0}:
- state == 'done', "Event should be Closed."
=== modified file 'event/test/process/event_draft2cancel.yml'
--- event/test/process/event_draft2cancel.yml 2011-11-14 11:13:13 +0000
+++ event/test/process/event_draft2cancel.yml 2012-02-08 07:34:18 +0000
@@ -1,11 +1,11 @@
-
- I want to organize event and its need Minimum 50 Registrations to confirm/start
- this Event, but Only 10 registration confirm for this event, I confirm this event.
+ I want to organize event and its need Minimum 50 Registrations to confirm/start
+ this Event, but Only 10 registration confirm for this event, I confirm this event.
-
!python {model: event.event}: |
- self.button_confirm(cr, uid, [ref("event_1")])
+ self.event_confirm(cr, uid, [ref("event_1")])
-
- Now I cheked for event and It should not be confirm because registrations for
+ Now I cheked for event and It should not be confirm because registrations for
this event is below limit.
-
!assert {model: event.event, id: event_1}:
@@ -14,7 +14,7 @@
So I cancel this Event
-
!python {model: event.event}: |
- self.button_cancel(cr, uid, [ref("event_1")])
+ self.event_cancel(cr, uid, [ref("event_1")])
-
I check event should be cancel.
-
=== modified file 'event/test/ui/demo_data.yml'
--- event/test/ui/demo_data.yml 2011-11-28 12:47:48 +0000
+++ event/test/ui/demo_data.yml 2012-02-08 07:34:18 +0000
@@ -10,10 +10,9 @@
-
!record {model: event.event, id: event_2}:
product_id: event_product_2
- section_id: crm.section_sales_department
name: 'Conference on ERP Buisness'
-
- I call onchange event from event registration wizard.
+ I call onchange event from event registration wizard.
-
!python {model: partner.event.registration}: |
context.update({'active_id': ref("base.res_partner_ericdubois0")})
=== modified file 'event/wizard/partner_event_registration.py'
--- event/wizard/partner_event_registration.py 2012-01-31 10:54:31 +0000
+++ event/wizard/partner_event_registration.py 2012-02-08 07:34:18 +0000
@@ -126,8 +126,8 @@
unit_price = product_obj._product_price(cr, uid, [event.product_id.id], False, False, {'pricelist': pricelist_id})[event.product_id.id]
res['value'] = {
- 'start_date': event.date_begin,
- 'end_date': event.date_end,
+ 'start_date': event.create_date,
+ 'end_date': event.date_deadline,
'unit_price': unit_price,
}
return res
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
