From 77c716683eefcc07d56d9f30e4eecf66f90c4191 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 12:10:08 +0530 Subject: [PATCH 01/18] [ADD]: event: Added new register2invoice.yml for partner registration for event to invoice generated bzr revid: ron@tinyerp.com-20111114064008-zbxjp4210ff2nveo --- addons/event/__openerp__.py | 3 ++- .../event/test/process/register2invoice.yml | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 addons/event/test/process/register2invoice.yml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 1890ed7bf84..d65f3bbe221 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -54,7 +54,8 @@ Note that: 'res_partner_view.xml', ], 'demo_xml': ['event_demo.xml'], - 'test': ['test/test_event.yml'], + 'test': ['test/test_event.yml', + 'test/process/register2invoice.yml'], 'installable': True, 'active': False, 'certificate': '0083059161581', diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/register2invoice.yml new file mode 100644 index 00000000000..649179f9e99 --- /dev/null +++ b/addons/event/test/process/register2invoice.yml @@ -0,0 +1,23 @@ +- + I want to organize one conference event, First I registered partner for event + with 5 tickets, so I confirm this registration. +- + !python {model: event.registration}: | + self.check_confirm(cr, uid, [ref("reg_1_1")]) +- + I Check that Registration is confirm. +- + !assert {model: event.registration, id: reg_1_1}: + - state == 'open', "Registration should be open here." +- + After confirmation of partner, I create invoice base on costing of event. +- + !python {model: event.registration}: | + self.action_invoice_create(cr, uid, [ref("reg_1_1")]) +- + Now I Check for Invoice is created and Registration should be closed after invoice generated. +- + !python {model: event.registration}: | + record = self.browse(cr, uid, [ref("reg_1_1")])[0] + assert record.invoice_id, "Invoice should be generated" + assert record.state == "done", "Registration should be closed after invoice generated" \ No newline at end of file From 64a531e000d67b93634723df3a5fe432ae8fa577 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 12:37:48 +0530 Subject: [PATCH 02/18] [IMP]: event: Added more assert for generated invoiced in register2invoice.yml bzr revid: ron@tinyerp.com-20111114070748-wu67m8d9ddpiqdy8 --- addons/event/test/process/register2invoice.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/register2invoice.yml index 649179f9e99..80c8aed1b5f 100644 --- a/addons/event/test/process/register2invoice.yml +++ b/addons/event/test/process/register2invoice.yml @@ -20,4 +20,9 @@ !python {model: event.registration}: | record = self.browse(cr, uid, [ref("reg_1_1")])[0] assert record.invoice_id, "Invoice should be generated" + assert record.invoice_id.state == "draft", "Invoice state should be draft" + assert record.invoice_id.partner_id == record.partner_id, "Customer is not correspond with registration" + assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct" + assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct" + assert record.invoice_id.amount_total == record.price_subtotal, "Invoice origin is not correct" assert record.state == "done", "Registration should be closed after invoice generated" \ No newline at end of file From 46322eb7e1de8ace1667c24d6f2c3cb1a6a70c18 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 14:16:44 +0530 Subject: [PATCH 03/18] [IMP] event: Improved assert string bzr revid: ron@tinyerp.com-20111114084644-8jrahh2z4qc4b2rs --- .../test/{test_event.yml => process/event_confirm2done.yml} | 0 addons/event/test/process/register2invoice.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename addons/event/test/{test_event.yml => process/event_confirm2done.yml} (100%) diff --git a/addons/event/test/test_event.yml b/addons/event/test/process/event_confirm2done.yml similarity index 100% rename from addons/event/test/test_event.yml rename to addons/event/test/process/event_confirm2done.yml diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/register2invoice.yml index 80c8aed1b5f..96032e07007 100644 --- a/addons/event/test/process/register2invoice.yml +++ b/addons/event/test/process/register2invoice.yml @@ -24,5 +24,5 @@ assert record.invoice_id.partner_id == record.partner_id, "Customer is not correspond with registration" assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct" assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct" - assert record.invoice_id.amount_total == record.price_subtotal, "Invoice origin is not correct" + assert record.invoice_id.amount_total == record.price_subtotal, "Invoice amount is not correct" assert record.state == "done", "Registration should be closed after invoice generated" \ No newline at end of file From 7ef465010b11a99baa88c1c4e9416d5d4aab5adb Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 15:11:27 +0530 Subject: [PATCH 04/18] [IMP, MOVE, REN] event: 1) Moved event/test/test_event.yml to event/test/process/event_confirm2done.yml 2) Removed all demo data which is used in yml 3) Created process from events register, confirm to done 4) updated __openerp__.py bzr revid: ron@tinyerp.com-20111114094127-n3l4xwca8d1m2guc --- addons/event/__openerp__.py | 2 +- addons/event/event_demo.xml | 2 + .../event/test/process/event_confirm2done.yml | 188 ++---------------- 3 files changed, 22 insertions(+), 170 deletions(-) diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index d65f3bbe221..0d796481065 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -54,7 +54,7 @@ Note that: 'res_partner_view.xml', ], 'demo_xml': ['event_demo.xml'], - 'test': ['test/test_event.yml', + 'test': ['test/process/event_confirm2done.yml', 'test/process/register2invoice.yml'], 'installable': True, 'active': False, diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index 8e8764ca1a7..4f5a01b0c76 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -61,6 +61,8 @@ 68.00 + True + True 500 diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml index 5e35d79cab2..cbb3a946ca3 100644 --- a/addons/event/test/process/event_confirm2done.yml +++ b/addons/event/test/process/event_confirm2done.yml @@ -1,172 +1,22 @@ -- | - In order to test the "Event Organisation" in Association system. -- | - I want to organize one conference event on "OpenERP Business". -- | - I'm creating new product "Conference Ticket" to specify registration Cost of conference. -- - !record {model: product.product, id: product_product_ticketforconcert0}: - categ_id: product.cat1 - list_price: 68.0 - name: Conference Ticket -- | - I'm creating Event type "Conference". -- - !record {model: event.type, id: event_type_conference0}: - name: Conferences -- | - I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month. - - !record {model: event.event, id: event_event_conference0}: - date_begin: !eval time.strftime('%Y-%m-01') - date_end: !eval time.strftime('%Y-%m-10') - name: Conference on OpenERP Business. - product_id: 'product_product_ticketforconcert0' - type: 'event_type_conference0' - reply_to: 'info@customer.com' -- | - Check that the new conference event is "Draft" or not. -- - !assert {model: event.event, id: event_event_conference0}: - - state == 'draft', "Event should be in draft by default when first time created" -- | - Need Minimum 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations. -- | - So I set Minimum and Maximum Registrations limit. -- - !python {model: event.event}: | - self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10}) -- | - I'm doing to confirm that conference event. -- - !python {model: event.event}: | - self.button_confirm(cr, uid, [ref("event_event_conference0")]) -- | - But this conference event need minimum 10 Confirmed Registrations. so Check that Event is not "confirmed". -- - !assert {model: event.event, id: event_event_conference0}: - - state != 'confirm', "Event should not confirmed if minimum registrations does not reached" -- | - "Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets. -- | - I'm creating new partner "Mark Johnson" with his email "info@mycustomer.com". -- - !record {model: res.partner, id: res_partner_markjohnson0}: - address: - - city: Bruxelles - country_id: base.be - job_ids: - - contact_id: base_contact.res_partner_contact_jacot0 - function: CTO - name: base.res_partner_maxtor - sequence_partner: 0.0 - state: current - street: Rue des Palais 51, bte 33 - type: default - zip: '1000' - email: 'info@mycustomer.com' - name: Mark Johnson - -- | - I'm creating Registration for "Mark Johnson" on "Conference on OpenERP Business" with 10 tickets. -- - !record {model: event.registration, id: event_registration_registrationjacot0}: - contact_id: base_contact.res_partner_contact_jacot0 - event_id: event.event_event_conference0 - partner_id: event.res_partner_markjohnson0 - partner_invoice_id: event.res_partner_markjohnson0 - event_product: Conference Ticket - unit_price: 68.0 - nb_register: 10 -- | - I'm going to Open that Registration. -- - !python {model: event.registration}: | - self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")]) -- | - Check that Registration is in "Open" state or not. -- - !assert {model: event.registration, id: event_registration_registrationjacot0}: - - state == 'open', "Registration should be open here." - -- | - I'm again trying to confirm that conference event. -- - !python {model: event.event}: | - self.button_confirm(cr, uid, [ref("event_event_conference0")]) - -- | - Now Minimum requirement of Registration is fulfil. so Check that Event is "confirmed" or not. -- - !assert {model: event.event, id: event_event_conference0}: - - state == 'confirm', "Event should be confirmed here." - -- | - I'm creating invoice of Registration of "Mark Johnson" on "Conference on OpenERP Business". + 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.registration}: | - self.action_invoice_create(cr, uid, [ref("event_registration_registrationjacot0")]) - -- | - Check Invoice of Registration of "Mark Johnson" is created or not. -- - !assert {model: event.registration, id: event_registration_registrationjacot0}: - - invoice_id != False, "Invoice should be generated" - -- | - Check Registration of "Mark Johnson" is closed or not after invoice generated. -- - !assert {model: event.registration, id: event_registration_registrationjacot0}: - - state != 'done', "Registration should be closed after invoice generated" - -- | - Now "Mark Johnson" want to another registration on "Conference on OpenERP Business" with 120 tickets. -- | - I'm creating new registration for "Mark Johnson" with 100 tickets. -- - !record {model: event.registration, id: event_registration_registrationzen0}: - event_id: event.event_event_conference0 - partner_id: event.res_partner_markjohnson0 - partner_invoice_id: event.res_partner_markjohnson0 - event_product: Conference Ticket - unit_price: 68.0 - nb_register: 100 - -- | - I'm going to open "Mark Johnson" registration. -- - !python {model: event.registration}: | - self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")]) - -- | - But conference event does not allow more than 100 Registrations. so Check that registration is not in "open" state. -- - !assert {model: event.registration, id: event_registration_registrationzen0}: - - state == 'draft', "Registration should be in draft by default." -- | - Now I'm modifying number of tickets of "Mark Johnson"'s registration with 90 tickets. -- - !python {model: event.registration}: | - self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90}) -- | - I'm again try to open "Mark Johnson" registration. -- - !python {model: event.registration}: | - self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")]) - -- | - Check that registration "open" or not. -- - !assert {model: event.registration, id: event_registration_registrationzen0}: - - state == 'open', "Registration should be open here." -- | - I'm closing "Conference on OpenERP Business" Conference event -- !python {model: event.event}: | - self.button_done(cr, uid, [ref("event_event_conference0")]) -- | - Check that conference is in "close" state or not. -- - !assert {model: event.event, id: event_event_conference0}: - - state == 'done', "Registration should be Closed here." - + self.button_confirm(cr, uid, [ref("event_0")]) +- + 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}: + - state == 'confirm', "Event should be confirmed." +- + After completed event, I close this event. +- + !python {model: event.event}: | + self.button_done(cr, uid, [ref("event_0")]) +- + Check that conference is in "close" state. +- + !assert {model: event.event, id: event_0}: + - state == 'done', "Registration should be Closed." From a67e8be3fa9f7e513ea8770bb63b8e42088b42b0 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 15:37:21 +0530 Subject: [PATCH 05/18] [REN, IMP] event: Rename register2invoice.yml to partner_register2invoice.yml and improved assert string on event_confirm2done.yml bzr revid: ron@tinyerp.com-20111114100721-nu34kju9d1i0c4oo --- addons/event/__openerp__.py | 2 +- addons/event/test/process/event_confirm2done.yml | 2 +- .../{register2invoice.yml => partner_register2invoice.yml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename addons/event/test/process/{register2invoice.yml => partner_register2invoice.yml} (100%) diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 0d796481065..3681a582f2f 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -55,7 +55,7 @@ Note that: ], 'demo_xml': ['event_demo.xml'], 'test': ['test/process/event_confirm2done.yml', - 'test/process/register2invoice.yml'], + 'test/process/partner_register2invoice.yml'], 'installable': True, 'active': False, 'certificate': '0083059161581', diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml index cbb3a946ca3..4d5542896f7 100644 --- a/addons/event/test/process/event_confirm2done.yml +++ b/addons/event/test/process/event_confirm2done.yml @@ -19,4 +19,4 @@ Check that conference is in "close" state. - !assert {model: event.event, id: event_0}: - - state == 'done', "Registration should be Closed." + - state == 'done', "Event should be Closed." diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml similarity index 100% rename from addons/event/test/process/register2invoice.yml rename to addons/event/test/process/partner_register2invoice.yml From 5502ea7a9ceca7de6d5dfe697489b643903ea6b3 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 16:43:13 +0530 Subject: [PATCH 06/18] [ADD, IMP] event: 1) Added new yml event_draft2cancel.yml, 2) Updated demo data and gave min registration limit and event set to draft state instead of confirm state, 3) Created process from events register below limit but it should not be confirm then cancel event, 4) updated __openerp__.py bzr revid: ron@tinyerp.com-20111114111313-uhlq0o6vc4enklfn --- addons/event/__openerp__.py | 1 + addons/event/event_demo.xml | 2 +- .../event/test/process/event_draft2cancel.yml | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 addons/event/test/process/event_draft2cancel.yml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 3681a582f2f..aa7b3197b05 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -55,6 +55,7 @@ Note that: ], 'demo_xml': ['event_demo.xml'], 'test': ['test/process/event_confirm2done.yml', + 'test/process/event_draft2cancel.yml', 'test/process/partner_register2invoice.yml'], 'installable': True, 'active': False, diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index 4f5a01b0c76..8e1d37c52f6 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -76,9 +76,9 @@ 24.00 + 50 350 - Conference on ERP Buisness diff --git a/addons/event/test/process/event_draft2cancel.yml b/addons/event/test/process/event_draft2cancel.yml new file mode 100644 index 00000000000..48cb102f3e8 --- /dev/null +++ b/addons/event/test/process/event_draft2cancel.yml @@ -0,0 +1,22 @@ +- + 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")]) +- + 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}: + - state == 'confirm', "Event should be confirm." +- + So I cancel this Event +- + !python {model: event.event}: | + self.button_cancel(cr, uid, [ref("event_1")]) +- + I check event should be cancel. +- + !assert {model: event.event, id: event_1}: + - state == 'cancel', "Event should be cancel" From a83fcde385eff451f431aed88a2dc600bea60bb3 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 18:26:46 +0530 Subject: [PATCH 07/18] [ADD] event: 1) Added test/ui/onchange_events.yml 2) Added process to onchanges events, 3) Updated __openerp__.py bzr revid: ron@tinyerp.com-20111114125646-67hmq4w5cvrp1t7a --- addons/event/__openerp__.py | 3 ++- addons/event/test/ui/onchange_events.yml | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 addons/event/test/ui/onchange_events.yml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index aa7b3197b05..7533c90e601 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -56,7 +56,8 @@ Note that: 'demo_xml': ['event_demo.xml'], 'test': ['test/process/event_confirm2done.yml', 'test/process/event_draft2cancel.yml', - 'test/process/partner_register2invoice.yml'], + 'test/process/partner_register2invoice.yml', + 'test/ui/onchange_events.yml'], 'installable': True, 'active': False, 'certificate': '0083059161581', diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml new file mode 100644 index 00000000000..d6f58ed37db --- /dev/null +++ b/addons/event/test/ui/onchange_events.yml @@ -0,0 +1,10 @@ +- + I call onchange event to change costing of registration base on event. +- + !python {model: event.registration}: | + self.onchange_event(cr, uid, ref('reg_1_1'), ref("event_1"), []) +- + I call onchange event to change the partner of event registration. +- + !python {model: event.registration}: | + self.onchange_partner_id(cr, uid, ref('reg_1_1'), ref("base.res_partner_asus"), ref("event_1"), email=False) From 2452caff0830da176ca8b3443c6bc5e9266e9abc Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Nov 2011 18:35:46 +0530 Subject: [PATCH 08/18] [ADD] event: 1) Added onchange_product event in onchange_events.yml bzr revid: ron@tinyerp.com-20111114130546-jbcbi5li6xa3id2c --- addons/event/test/ui/onchange_events.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml index d6f58ed37db..ec8dbc78858 100644 --- a/addons/event/test/ui/onchange_events.yml +++ b/addons/event/test/ui/onchange_events.yml @@ -8,3 +8,8 @@ - !python {model: event.registration}: | self.onchange_partner_id(cr, uid, ref('reg_1_1'), ref("base.res_partner_asus"), ref("event_1"), email=False) +- + I call onchange event to change the product of event. +- + !python {model: event.event}: | + self.onchange_product(cr, uid, ref("event_1"), ref("event_product_0")) From 6bc804ac7330ce18a933745deb8a0138e2cca040 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 15 Nov 2011 12:07:19 +0530 Subject: [PATCH 09/18] [IMP] event: * Added Demo data for partner Registration for event * Added case Group of invoice for same partner bzr revid: ron@tinyerp.com-20111115063719-22r1hsqa9tsh111d --- addons/event/event_demo.xml | 11 +++++++++ .../test/process/partner_register2invoice.yml | 23 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index 8e1d37c52f6..9c9dba85730 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -128,5 +128,16 @@ + + + + + 5 + Ticket for Conference + 20 + + + + diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml index 96032e07007..3f8e0f0eb42 100644 --- a/addons/event/test/process/partner_register2invoice.yml +++ b/addons/event/test/process/partner_register2invoice.yml @@ -25,4 +25,25 @@ assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct" assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct" assert record.invoice_id.amount_total == record.price_subtotal, "Invoice amount is not correct" - assert record.state == "done", "Registration should be closed after invoice generated" \ No newline at end of file + assert record.state == "done", "Registration should be closed after invoice generated" +- + Now I check for same partner registration for two diffrent event and I create group invoices for same partner. +- + !python {model: event.make.invoice}: | + context.update({'active_model': 'event.make.invoice', 'active_ids': [ref("reg_0_1"), ref("reg_0_2")], 'active_id': ref("reg_0_1")}) + invoice = self.create(cr, uid, {'grouped': True}, context=context) + self.make_invoice(cr, uid, [invoice], context=context) +- + Now I Check for group Invoice is created with total amount of both registration + and Registration should be closed after invoice generated. +- + !python {model: event.registration}: | + reg_data_1 = self.browse(cr, uid, [ref("reg_0_1")])[0] + reg_data_2 = self.browse(cr, uid, [ref("reg_0_2")])[0] + assert reg_data_1.invoice_id, "Invoice should be generated" + assert reg_data_1.invoice_id.state == "draft", "Invoice state should be draft" + assert reg_data_1.invoice_id.partner_id == reg_data_1.partner_id, "Customer is not correspond with registration" + assert reg_data_1.invoice_id.type == 'out_invoice', "Invoice type is not correct" + assert reg_data_1.invoice_id.origin == reg_data_1.event_product, "Invoice origin is not correct" + assert reg_data_1.invoice_id.amount_total == (reg_data_1.price_subtotal + reg_data_2.price_subtotal), "Invoice total amount is not correct" + assert reg_data_1.state == "done", "Registration should be closed after invoice generated" From 63adefd9a39902f96b5e806dd969121809a2e88f Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 15 Nov 2011 12:29:13 +0530 Subject: [PATCH 10/18] [FIX] event: Traceback generated when converting partner to registration of event bzr revid: ron@tinyerp.com-20111115065913-03ikpexa6emwpiao --- addons/event/wizard/partner_event_registration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py index b8521e404e2..45d56ddc41c 100644 --- a/addons/event/wizard/partner_event_registration.py +++ b/addons/event/wizard/partner_event_registration.py @@ -34,8 +34,8 @@ class partner_event_registration(osv.osv_memory): 'event_id': fields.many2one('event.event', 'Event'), 'event_type': fields.many2one('event.type', 'Type', readonly=True), 'unit_price': fields.float('Registration Cost', digits_compute=dp.get_precision('Sale Price')), - 'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True), - 'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True), + 'start_date': fields.datetime('Start date', help="Beginning Date of Event", readonly=True), + 'end_date': fields.datetime('Closing date', help="Closing Date of Event", readonly=True), 'nb_register': fields.integer('Number of Registration'), } _defaults = { From ed2cd316f671480a19a5fe0573fbbcc146e05565 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 15 Nov 2011 14:05:53 +0530 Subject: [PATCH 11/18] [IMP] event: Added registration process from patner on partner_register2invoice.yml bzr revid: ron@tinyerp.com-20111115083553-v7xg40kj9l7ayrs5 --- .../test/process/partner_register2invoice.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml index 3f8e0f0eb42..d573d8c0f9a 100644 --- a/addons/event/test/process/partner_register2invoice.yml +++ b/addons/event/test/process/partner_register2invoice.yml @@ -1,6 +1,19 @@ - I want to organize one conference event, First I registered partner for event - with 5 tickets, so I confirm this registration. + with 5 tickets. +- + !python {model: partner.event.registration}: | + context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_ericdubois0")], 'active_id': ref("base.res_partner_ericdubois0")}) + register = self.create(cr, uid, {'event_id': ref('event_1'),'nb_register': 5}, context=context) + self.open_registration(cr, uid, [register], context=context) +- + Now I check for registration created base on partner. +- + !python {model: event.registration}: | + ids = self.search(cr, uid, [('partner_id','=',ref("base.res_partner_ericdubois0")), ('event_id', '=', ref('event_1'))]) + assert ids, "Registratin should be create here." +- + I confirm registration process. - !python {model: event.registration}: | self.check_confirm(cr, uid, [ref("reg_1_1")]) From 8661aa8a983de5ac77edb056916b76ba56fd4291 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 15 Nov 2011 14:48:56 +0530 Subject: [PATCH 12/18] [IMP] event: Added onchange_team and copy case in on onchange_event.yml and improved string at partner_register2invoice.yml bzr revid: ron@tinyerp.com-20111115091856-9ede5mpat4uz3gpr --- .../event/test/process/partner_register2invoice.yml | 2 +- addons/event/test/ui/onchange_events.yml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml index d573d8c0f9a..f8748afee2f 100644 --- a/addons/event/test/process/partner_register2invoice.yml +++ b/addons/event/test/process/partner_register2invoice.yml @@ -11,7 +11,7 @@ - !python {model: event.registration}: | ids = self.search(cr, uid, [('partner_id','=',ref("base.res_partner_ericdubois0")), ('event_id', '=', ref('event_1'))]) - assert ids, "Registratin should be create here." + assert ids, "Registration should be create here." - I confirm registration process. - diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml index ec8dbc78858..da80d2d81ba 100644 --- a/addons/event/test/ui/onchange_events.yml +++ b/addons/event/test/ui/onchange_events.yml @@ -13,3 +13,16 @@ - !python {model: event.event}: | self.onchange_product(cr, uid, ref("event_1"), ref("event_product_0")) +- + I call onchange event to change the team of event. +- + !python {model: event.event}: | + self.do_team_change(cr, uid, ref("event_1"), ref("crm.section_sales_department")) +- + Copy of event. +- + !python {model: event.event}: | + try: + self.copy(cr, uid, ref("event_2")) + except: + pass \ No newline at end of file From e0f0d7a5c00a464a5215b08f2d5b54d4892e2025 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 15 Nov 2011 15:11:03 +0530 Subject: [PATCH 13/18] [IMP] event: Added onchange_event for partner registration bzr revid: ron@tinyerp.com-20111115094103-gdykg94bms34qj0n --- addons/event/test/ui/onchange_events.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml index da80d2d81ba..750d8112351 100644 --- a/addons/event/test/ui/onchange_events.yml +++ b/addons/event/test/ui/onchange_events.yml @@ -18,6 +18,12 @@ - !python {model: event.event}: | self.do_team_change(cr, uid, ref("event_1"), ref("crm.section_sales_department")) +- + I call onchange event on partner registration. +- + !python {model: partner.event.registration}: | + context.update({'active_id': ref("base.res_partner_ericdubois0")}) + self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context) - Copy of event. - From e477f052e95d7612e81dd7b2b949def45ae4fdca Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 17 Nov 2011 11:57:56 +0530 Subject: [PATCH 14/18] [IMP, ADD] event: Add duplicate_event.yml and move code of duplicate of event from onchange_events.yml to duplicate yml bzr revid: ron@tinyerp.com-20111117062756-drk1hm8jtryq4xmb --- addons/event/__openerp__.py | 1 + addons/event/test/ui/duplicate_event.yml | 8 ++++++++ addons/event/test/ui/onchange_events.yml | 8 -------- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 addons/event/test/ui/duplicate_event.yml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 7533c90e601..485923257fe 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -57,6 +57,7 @@ Note that: 'test': ['test/process/event_confirm2done.yml', 'test/process/event_draft2cancel.yml', 'test/process/partner_register2invoice.yml', + 'test/ui/duplicate_event.yml', 'test/ui/onchange_events.yml'], 'installable': True, 'active': False, diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml new file mode 100644 index 00000000000..03be9a3d06d --- /dev/null +++ b/addons/event/test/ui/duplicate_event.yml @@ -0,0 +1,8 @@ +- + Copy of event. +- + !python {model: event.event}: | + try: + self.copy(cr, uid, ref("event_2")) + except: + pass \ No newline at end of file diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml index 750d8112351..90cc99f3abf 100644 --- a/addons/event/test/ui/onchange_events.yml +++ b/addons/event/test/ui/onchange_events.yml @@ -24,11 +24,3 @@ !python {model: partner.event.registration}: | context.update({'active_id': ref("base.res_partner_ericdubois0")}) self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context) -- - Copy of event. -- - !python {model: event.event}: | - try: - self.copy(cr, uid, ref("event_2")) - except: - pass \ No newline at end of file From 5d8c487a362534f1d08634e8b0fdf40e588dfd85 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 22 Nov 2011 16:11:26 +0530 Subject: [PATCH 15/18] [IMP, REN]: event: * renamed file event/test/ui/onchange_events.yml => event/test/ui/demo_data.yml, * Created record for onchange event bzr revid: ron@tinyerp.com-20111122104126-vyfp6bf7at9ap205 --- addons/event/__openerp__.py | 2 +- addons/event/test/ui/demo_data.yml | 20 ++++++++++++++++++ addons/event/test/ui/onchange_events.yml | 26 ------------------------ 3 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 addons/event/test/ui/demo_data.yml delete mode 100644 addons/event/test/ui/onchange_events.yml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 485923257fe..60d01d15007 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -58,7 +58,7 @@ Note that: 'test/process/event_draft2cancel.yml', 'test/process/partner_register2invoice.yml', 'test/ui/duplicate_event.yml', - 'test/ui/onchange_events.yml'], + 'test/ui/demo_data.yml'], 'installable': True, 'active': False, 'certificate': '0083059161581', diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml new file mode 100644 index 00000000000..66a3cbe8263 --- /dev/null +++ b/addons/event/test/ui/demo_data.yml @@ -0,0 +1,20 @@ +- + I create event registation record to call event onchange and partner onchange. +- + !record {model: event.registration, id: reg_0_1}: + event_id: event_0 + partner_id: base.res_partner_c2c + name: 'Ticket for Concert' +- + I create event record to call product onchange and team onchange. +- + !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. +- + !python {model: partner.event.registration}: | + context.update({'active_id': ref("base.res_partner_ericdubois0")}) + self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context) diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml deleted file mode 100644 index 90cc99f3abf..00000000000 --- a/addons/event/test/ui/onchange_events.yml +++ /dev/null @@ -1,26 +0,0 @@ -- - I call onchange event to change costing of registration base on event. -- - !python {model: event.registration}: | - self.onchange_event(cr, uid, ref('reg_1_1'), ref("event_1"), []) -- - I call onchange event to change the partner of event registration. -- - !python {model: event.registration}: | - self.onchange_partner_id(cr, uid, ref('reg_1_1'), ref("base.res_partner_asus"), ref("event_1"), email=False) -- - I call onchange event to change the product of event. -- - !python {model: event.event}: | - self.onchange_product(cr, uid, ref("event_1"), ref("event_product_0")) -- - I call onchange event to change the team of event. -- - !python {model: event.event}: | - self.do_team_change(cr, uid, ref("event_1"), ref("crm.section_sales_department")) -- - I call onchange event on partner registration. -- - !python {model: partner.event.registration}: | - context.update({'active_id': ref("base.res_partner_ericdubois0")}) - self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context) From dfbfaf6d1d4ba397e2261e90eed1f4aa84499fd1 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 28 Nov 2011 14:41:58 +0530 Subject: [PATCH 16/18] [IMP] event: Added copy of event registration in duplicate_event.yml bzr revid: ron@tinyerp.com-20111128091158-lm8j37ej39oz7xu0 --- addons/event/test/ui/duplicate_event.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml index 03be9a3d06d..c1287353c67 100644 --- a/addons/event/test/ui/duplicate_event.yml +++ b/addons/event/test/ui/duplicate_event.yml @@ -4,5 +4,13 @@ !python {model: event.event}: | try: self.copy(cr, uid, ref("event_2")) + except: + pass +- + Copy of event registarion. +- + !python {model: event.registration}: | + try: + self.copy(cr, uid, ref("reg_1_1")) except: pass \ No newline at end of file From 1a635e2216a294c7ab5b78c6fa6742a7c676fc2b Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 28 Nov 2011 15:10:28 +0530 Subject: [PATCH 17/18] [IMP] event: called onchange_contact_id() on event bzr revid: ron@tinyerp.com-20111128094028-6a96zd70xnb21b40 --- addons/event/test/ui/demo_data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml index 66a3cbe8263..2762e3b3cda 100644 --- a/addons/event/test/ui/demo_data.yml +++ b/addons/event/test/ui/demo_data.yml @@ -3,7 +3,7 @@ - !record {model: event.registration, id: reg_0_1}: event_id: event_0 - partner_id: base.res_partner_c2c + partner_id: base.res_partner_asus name: 'Ticket for Concert' - I create event record to call product onchange and team onchange. From 235d501eeff302cde8b7409d3bbb5f0749d0f8d1 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 28 Nov 2011 18:17:48 +0530 Subject: [PATCH 18/18] [IMP] event: Added case of button_reg_close and event confirm from wizard and improved data data to confirm stage instead of done stage bzr revid: ron@tinyerp.com-20111128124748-f1xge9tyh9dv30tn --- addons/event/event_demo.xml | 2 +- addons/event/test/ui/demo_data.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index 9c9dba85730..4f86f620e6f 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -94,7 +94,7 @@ Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers. - + diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml index 2762e3b3cda..2f48cf1a90b 100644 --- a/addons/event/test/ui/demo_data.yml +++ b/addons/event/test/ui/demo_data.yml @@ -18,3 +18,15 @@ !python {model: partner.event.registration}: | context.update({'active_id': ref("base.res_partner_ericdubois0")}) self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context) +- + I confirm event from wizard. +- + !python {model: event.confirm}: | + context.update({'event_ids': [ref("event_2")]}) + id = self.create(cr, uid , {}) + self.confirm(cr, uid, [id], context=context) +- + I call close registration process. +- + !python {model: event.registration}: | + self.button_reg_close(cr, uid, [ref("reg_0_2")])