From 9f51a483911cf98ff15e705bd04115fb2e72712b Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Mon, 12 Dec 2011 19:12:31 +0530 Subject: [PATCH 1/4] [IMP] improve project_mrp yml bzr revid: ara@tinyerp.com-20111212134231-nqjycxwnpj5i812f --- addons/project_mrp/__openerp__.py | 2 +- addons/project_mrp/project_mrp_demo.xml | 18 ++++ .../test/project_task_procurement.yml | 84 ++----------------- 3 files changed, 26 insertions(+), 78 deletions(-) create mode 100644 addons/project_mrp/project_mrp_demo.xml diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py index e5722b92da9..c36b3229a81 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/project_mrp/__openerp__.py @@ -54,7 +54,7 @@ task is completed. 'depends': ['project', 'procurement', 'sale', 'mrp_jit'], 'init_xml': [], 'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'], - 'demo_xml': [], + 'demo_xml': ['project_mrp_demo.xml'], 'test': ['test/project_task_procurement.yml'], 'installable': True, 'active': False, diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml new file mode 100644 index 00000000000..fe716351e66 --- /dev/null +++ b/addons/project_mrp/project_mrp_demo.xml @@ -0,0 +1,18 @@ + + + + + + + + + Partners Training + + + 1.0 + 5.0 + make_to_order + + + + \ No newline at end of file diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml index b2cc6a68363..bb6d8f95c45 100644 --- a/addons/project_mrp/test/project_task_procurement.yml +++ b/addons/project_mrp/test/project_task_procurement.yml @@ -1,83 +1,13 @@ -- | - In order to test project_mrp module with OpenERP I create a sale order - with product type 'service' so when procurement runs one task is created for - the project associated with my sale order. - - I create record for a service type product. + In order to test process to generate task automatic from procurement, I confirm sale order. - - !record {model: product.product, id: product_product_partnerstraining0, view: False}: - categ_id: product.product_category_7 - cost_method: standard - mes_type: fixed - name: Partners Training - procure_method: make_to_order - supply_method: produce - type: service - uom_id: product.uom_day - uom_po_id: product.uom_day - warranty: 0.0 -- | - I create a sale order for product Partners Training which has type 'Service', - and select the appropriate Analytic Account matching my project. -- - !record {model: sale.order, id: sale_order_so0}: - date_order: !eval time.strftime('%Y-%m-%d') - invoice_quantity: order - name: TESTSO006 - order_policy: manual - partner_id: base.res_partner_asus - partner_invoice_id: base.res_partner_address_tang - partner_order_id: base.res_partner_address_tang - partner_shipping_id: base.res_partner_address_tang - order_line: - - state: draft - delay: 7.0 - name: Partners Training - price_unit: 1.0 - product_id: product_product_partnerstraining0 - product_uom: product.uom_day - product_uom_qty: 5.0 - type: make_to_order - picking_policy: direct - pricelist_id: product.list0 - shop_id: sale.shop - user_id: base.user_demo - -- I select the Analytic Account for my project on the sale order -- - !python {model: sale.order}: | - acc_id = self.pool.get('project.project').browse(cr, uid, - ref('project.project_integrate_openerp')).analytic_account_id.id - self.write(cr, uid, ref('sale_order_so0'), {'project_id': acc_id}) -- - I confirm this sale order. -- - !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0} -- - I check the procurements. -- - !python {model: procurement.order}: | - orderline_obj = self.pool.get('sale.order.line') - line_ids = orderline_obj.search(cr, uid, [('order_id','=', ref('sale_order_so0'))]) - orders = orderline_obj.browse(cr, uid, line_ids) - proc_ids = map(lambda x: x.procurement_id.id, orders) - assert proc_ids, 'No Procurements!' -- - The scheduler runs. -- - !function {model: procurement.order, name: run_scheduler}: - - model: procurement.order - search: "[]" + !workflow {model: sale.order, action: order_confirm, ref: sale.order} - Now I check that one task is created for my sale order, in the desired project - !python {model: project.task}: | - order_obj = self.pool.get('sale.order') - order = order_obj.browse(cr, uid, ref('sale_order_so0')) - # planned_hours == 40 because default company project UOM is hours, and - # product was sold as 5.0 days. - task_id = self.search(cr, uid, [('name', '=', order.name+":Partners Training"), - ('project_id','=', ref('project.project_integrate_openerp')), - ('planned_hours','=', 40.0), - ('state','=','draft')]) - assert task_id, 'Expected Task not found!' \ No newline at end of file + task_id = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))]) + task_rec = self.browse(cr, uid, task_id[0]) + assert task_id, 'Expected Task not found!' + assert task_rec.planned_hours, 'Expected hour not found!' + assert task_rec.date_deadline, 'Expected task deadline not found!' \ No newline at end of file From 45cdafa988f89185cfec53a72599c9735f1eebd0 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Tue, 13 Dec 2011 10:29:09 +0530 Subject: [PATCH 2/4] [IMP]improve yml bzr revid: ara@tinyerp.com-20111213045909-0xlsp4a9lz3iav8o --- addons/project_mrp/project_mrp_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml index fe716351e66..a9240ccf1c5 100644 --- a/addons/project_mrp/project_mrp_demo.xml +++ b/addons/project_mrp/project_mrp_demo.xml @@ -7,7 +7,7 @@ Partners Training - + 1.0 5.0 From a4190e14632e1c2b5713ea6985bd342538b477de Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Tue, 13 Dec 2011 10:41:22 +0530 Subject: [PATCH 3/4] [IMP] improve demo data for project_mrp bzr revid: ara@tinyerp.com-20111213051122-mjnjoaq629e95tx1 --- addons/project_mrp/project_mrp_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml index a9240ccf1c5..6d283e10c60 100644 --- a/addons/project_mrp/project_mrp_demo.xml +++ b/addons/project_mrp/project_mrp_demo.xml @@ -8,7 +8,7 @@ Partners Training - + 1.0 5.0 make_to_order From 5d705055784588d049dad00b2782c9437de6688e Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Tue, 13 Dec 2011 11:51:24 +0530 Subject: [PATCH 4/4] [IMP] improve sale demo for sale order line bzr revid: ara@tinyerp.com-20111213062124-3117k1eynfcmaxkq --- addons/sale/sale_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 4fcce85c5b5..4f624c797fb 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -19,8 +19,8 @@ New server config + material - - + + 123 make_to_stock