From 5b8be84377a9ee5b899d6c7928ce140f939d6d7b Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 28 Nov 2011 18:20:46 +0530 Subject: [PATCH 1/4] [IMP]account_asset: remove a unused a record and a set a demo data & improve a file, added a new yml file for wizard and add a yml demo data for account_asset bzr revid: mma@tinyerp.com-20111128125046-p8go329rsmcwya8d --- addons/account_asset/__openerp__.py | 4 +- addons/account_asset/account_asset_demo.xml | 2 +- addons/account_asset/account_asset_demo.yml | 17 ++++++ addons/account_asset/test/account_asset.yml | 53 +++++++------------ .../test/account_asset_wizard.yml | 32 +++++++++++ 5 files changed, 71 insertions(+), 37 deletions(-) create mode 100644 addons/account_asset/account_asset_demo.yml create mode 100644 addons/account_asset/test/account_asset_wizard.yml diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index f3d00b08893..14d109eb1b0 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -34,7 +34,9 @@ ], "demo_xml" : [ 'account_asset_demo.xml' ], - 'test': ['test/account_asset.yml', + 'test': ['account_asset_demo.yml', + 'test/account_asset.yml', + 'test/account_asset_wizard.yml', ], "update_xml" : [ "security/account_asset_security.xml", diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index 77185081848..0a21788795b 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -39,7 +39,7 @@ - open + draft CEO's Car diff --git a/addons/account_asset/account_asset_demo.yml b/addons/account_asset/account_asset_demo.yml new file mode 100644 index 00000000000..161aaaa9d8b --- /dev/null +++ b/addons/account_asset/account_asset_demo.yml @@ -0,0 +1,17 @@ +- + !record {model: account.asset.category, id: account_asset_category_01}: + name: Hardware - 3 Years + journal_id: account.expenses_journal + account_depreciation_id: account.xfa + method_number: 3 + account_asset_id: account.xfa + account_expense_depreciation_id: account.a_expense + +- + !record {model: account.asset.asset, id: account_asset_asset_01}: + name: CEO's Car + category_id: account_asset.account_asset_category_01 + purchase_value: 12000.0 + salvage_value: 2000.0 + method_number: 10 + \ No newline at end of file diff --git a/addons/account_asset/test/account_asset.yml b/addons/account_asset/test/account_asset.yml index b56aa028c61..df939922914 100644 --- a/addons/account_asset/test/account_asset.yml +++ b/addons/account_asset/test/account_asset.yml @@ -1,55 +1,38 @@ - - In order to test Account Asset I create Asset and confirm it and check it's Depriciation lines -- - I Create an Asset Category -- - !record {model: account.asset.category, id: account_asset_category_landbuildings0}: - account_asset_id: account.xfa - account_depreciation_id: account.xfa - account_expense_depreciation_id: account.a_expense - journal_id: account.expenses_journal - name: Land & Buildings -- - I Create an Account Asset -- - !record {model: account.asset.asset, id: account_asset_asset_Land0}: - category_id: account_asset_category_landbuildings0 - code: land - name: Land - partner_id: base.res_partner_14 - purchase_value: 5000.0 - state: draft + In order to test the process of Account Asset - - I check Initially that Account Asset is in the "Draft" state -- - !assert {model: account.asset.asset, id: account_asset_asset_Land0}: - - state == 'draft' -- - I Confirm Account Asset using Confirm Asset button + I perform a action to confirm Account Asset - !python {model: account.asset.asset}: | - self.validate(cr, uid, [ref("account_asset_asset_Land0")]) + self.validate(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")]) - - I check Asset is in running state after pressing Confirm button on asset + I check Asset is now 'open' - - !assert {model: account.asset.asset, id: account_asset_asset_Land0}: + !assert {model: account.asset.asset, id: account_asset.account_asset_asset_vehicles0}: - state == 'open' - - I Compute Account Asset using Compute button and check the number of depreciation lines created + I perform a action to compute Account Asset and check the number of depreciation lines created - !python {model: account.asset.asset}: | - self.compute_depreciation_board(cr, uid, [ref("account_asset_asset_Land0")]) + self.compute_depreciation_board(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")]) # pressing computation button can be remove if creation of depreciation lines while asset is created - value = self.browse(cr, uid, [ref("account_asset_asset_Land0")])[0] + value = self.browse(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")])[0] assert value.method_number == len(value.depreciation_line_ids) - - I Create Account Move using create move button on depreciation lines + I create account move for all depreciation lines - !python {model: account.asset.depreciation.line}: | - ids = self.search(cr, uid, [('asset_id','=',ref('account_asset_asset_Land0'))]) + ids = self.search(cr, uid, [('asset_id','=',ref('account_asset.account_asset_asset_vehicles0'))]) self.create_move(cr, uid, ids) + +- + I check the move line is created +- + !python {model: account.asset.asset}: | + asset = self.browse(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")])[0] + assert len(asset.depreciation_line_ids) == len(asset.account_move_line_ids) - I Check that After creating all the moves of depreciation lines the state is in "Close" state - - !assert {model: account.asset.asset, id: account_asset_asset_Land0}: + !assert {model: account.asset.asset, id: account_asset.account_asset_asset_vehicles0}: - state == 'close' diff --git a/addons/account_asset/test/account_asset_wizard.yml b/addons/account_asset/test/account_asset_wizard.yml new file mode 100644 index 00000000000..776b8b1428c --- /dev/null +++ b/addons/account_asset/test/account_asset_wizard.yml @@ -0,0 +1,32 @@ +- + In order to change the duration, I create a record of it +- + !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset.account_asset_asset_office0')}"}: + +- + I changed the method_number 10.0 +- + !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset.account_asset_asset_office0')}"}: + method_number: 10.0 +- + I perform a action to modify it +- + !python {model: asset.modify}: | + context = {"lang": 'en_US', "active_model":"account.asset.asset", "active_ids": [ref("account_asset.account_asset_asset_office0")], "tz": False, "active_id":ref('account_asset.account_asset_asset_office0')} + self.modify(cr, uid, [ref("asset_modify_number_0")], context=context) +- + I check the proper depreciation lines created +- + !assert {model: account.asset.asset, id: account_asset.account_asset_asset_office0}: + - method_number == len(depreciation_line_ids) -1 +- + In order to compute a asset on period ,I create a period of it +- + !record {model: asset.depreciation.confirmation.wizard, id: asset_compute_period_0}: + {} +- + I perform a action to compute it +- + !python {model: asset.depreciation.confirmation.wizard}: | + context = {"lang": 'en_US', "active_model":"ir.ui.menu", "active_ids": [ref("menu_asset_depreciation_confirmation_wizard")], "tz": False, "active_id":ref('menu_asset_depreciation_confirmation_wizard')} + self.asset_compute(cr, uid, [ref("asset_compute_period_0")], context=context) From 17045d2770c15319114754b49b5bb3712a9a333c Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 14 Dec 2011 15:39:46 +0530 Subject: [PATCH 2/4] [IMP] improved YML test case of account_asset module bzr revid: tpa@tinyerp.com-20111214100946-iia27i70n9ugdmgv --- addons/account_asset/__openerp__.py | 2 +- addons/account_asset/account_asset_demo.xml | 11 +++--- addons/account_asset/account_asset_demo.yml | 17 --------- addons/account_asset/test/account_asset.yml | 35 +++++++++---------- .../account_asset/test/account_asset_demo.yml | 9 +++++ .../test/account_asset_wizard.yml | 23 +++++------- 6 files changed, 41 insertions(+), 56 deletions(-) delete mode 100644 addons/account_asset/account_asset_demo.yml create mode 100644 addons/account_asset/test/account_asset_demo.yml diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index 9d4fc67d342..2dc80fc661a 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -34,7 +34,7 @@ ], "demo_xml" : [ 'account_asset_demo.xml' ], - 'test': ['account_asset_demo.yml', + 'test': ['test/account_asset_demo.yml', 'test/account_asset.yml', 'test/account_asset_wizard.yml', ], diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index 0a21788795b..fc27e3027de 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -1,7 +1,7 @@ - @@ -33,13 +33,12 @@ 3 - + --> - draft CEO's Car @@ -56,7 +55,7 @@ - + @@ -68,6 +67,6 @@ - + diff --git a/addons/account_asset/account_asset_demo.yml b/addons/account_asset/account_asset_demo.yml deleted file mode 100644 index 161aaaa9d8b..00000000000 --- a/addons/account_asset/account_asset_demo.yml +++ /dev/null @@ -1,17 +0,0 @@ -- - !record {model: account.asset.category, id: account_asset_category_01}: - name: Hardware - 3 Years - journal_id: account.expenses_journal - account_depreciation_id: account.xfa - method_number: 3 - account_asset_id: account.xfa - account_expense_depreciation_id: account.a_expense - -- - !record {model: account.asset.asset, id: account_asset_asset_01}: - name: CEO's Car - category_id: account_asset.account_asset_category_01 - purchase_value: 12000.0 - salvage_value: 2000.0 - method_number: 10 - \ No newline at end of file diff --git a/addons/account_asset/test/account_asset.yml b/addons/account_asset/test/account_asset.yml index df939922914..a3718e34345 100644 --- a/addons/account_asset/test/account_asset.yml +++ b/addons/account_asset/test/account_asset.yml @@ -1,38 +1,37 @@ - - In order to test the process of Account Asset + In order to test the process of Account Asset, - - I perform a action to confirm Account Asset + I perform a action to confirm Account Asset. - !python {model: account.asset.asset}: | - self.validate(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")]) + self.validate(cr, uid, [ref("account_asset_asset_vehicles0")]) - - I check Asset is now 'open' + I check Asset is now in Open state. - - !assert {model: account.asset.asset, id: account_asset.account_asset_asset_vehicles0}: + !assert {model: account.asset.asset, id: account_asset_asset_vehicles0, severity: error, string: Asset should be in Open state}: - state == 'open' - - I perform a action to compute Account Asset and check the number of depreciation lines created + I compute depreciation lines for asset of CEO's Car . - !python {model: account.asset.asset}: | - self.compute_depreciation_board(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")]) + self.compute_depreciation_board(cr, uid, [ref("account_asset_asset_vehicles0")]) # pressing computation button can be remove if creation of depreciation lines while asset is created - value = self.browse(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")])[0] - assert value.method_number == len(value.depreciation_line_ids) + value = self.browse(cr, uid, [ref("account_asset_asset_vehicles0")])[0] + assert value.method_number == len(value.depreciation_line_ids), 'Depreciation lines not created correctly' - - I create account move for all depreciation lines + I create account move for all depreciation lines. - !python {model: account.asset.depreciation.line}: | - ids = self.search(cr, uid, [('asset_id','=',ref('account_asset.account_asset_asset_vehicles0'))]) + ids = self.search(cr, uid, [('asset_id','=',ref('account_asset_asset_vehicles0'))]) self.create_move(cr, uid, ids) - - - I check the move line is created + I check the move line is created. - !python {model: account.asset.asset}: | - asset = self.browse(cr, uid, [ref("account_asset.account_asset_asset_vehicles0")])[0] - assert len(asset.depreciation_line_ids) == len(asset.account_move_line_ids) + asset = self.browse(cr, uid, [ref("account_asset_asset_vehicles0")])[0] + assert len(asset.depreciation_line_ids) == len(asset.account_move_line_ids), 'Move lines not created correctly' - - I Check that After creating all the moves of depreciation lines the state is in "Close" state + I Check that After creating all the moves of depreciation lines the state "Close". - - !assert {model: account.asset.asset, id: account_asset.account_asset_asset_vehicles0}: - - state == 'close' + !assert {model: account.asset.asset, id: account_asset_asset_vehicles0}: + - state == 'close' \ No newline at end of file diff --git a/addons/account_asset/test/account_asset_demo.yml b/addons/account_asset/test/account_asset_demo.yml new file mode 100644 index 00000000000..4e708746853 --- /dev/null +++ b/addons/account_asset/test/account_asset_demo.yml @@ -0,0 +1,9 @@ +- + !record {model: account.asset.category, id: account_asset_category_fixedassets0}: + account_asset_id: account.xfa +- + !record {model: account.asset.asset, id: account_asset_asset_vehicles0}: + category_id: account_asset_category_sale +- + !record {model: account.asset.asset, id: account_asset_asset_vehicles0}: + method_number: 10 \ No newline at end of file diff --git a/addons/account_asset/test/account_asset_wizard.yml b/addons/account_asset/test/account_asset_wizard.yml index 776b8b1428c..7fad4917750 100644 --- a/addons/account_asset/test/account_asset_wizard.yml +++ b/addons/account_asset/test/account_asset_wizard.yml @@ -1,32 +1,27 @@ - - In order to change the duration, I create a record of it + I create a record to change the duration of asset for calculating depreciation. - - !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset.account_asset_asset_office0')}"}: - -- - I changed the method_number 10.0 -- - !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset.account_asset_asset_office0')}"}: + !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset_asset_office0')}"}: method_number: 10.0 - - I perform a action to modify it + I change the duration. - !python {model: asset.modify}: | - context = {"lang": 'en_US', "active_model":"account.asset.asset", "active_ids": [ref("account_asset.account_asset_asset_office0")], "tz": False, "active_id":ref('account_asset.account_asset_asset_office0')} + context = {"active_id":ref('account_asset_asset_office0')} self.modify(cr, uid, [ref("asset_modify_number_0")], context=context) - - I check the proper depreciation lines created + I check the proper depreciation lines created. - !assert {model: account.asset.asset, id: account_asset.account_asset_asset_office0}: - method_number == len(depreciation_line_ids) -1 - - In order to compute a asset on period ,I create a period of it + I create a period to compute a asset on period. - !record {model: asset.depreciation.confirmation.wizard, id: asset_compute_period_0}: {} - - I perform a action to compute it + I compute a asset on period. - !python {model: asset.depreciation.confirmation.wizard}: | - context = {"lang": 'en_US', "active_model":"ir.ui.menu", "active_ids": [ref("menu_asset_depreciation_confirmation_wizard")], "tz": False, "active_id":ref('menu_asset_depreciation_confirmation_wizard')} - self.asset_compute(cr, uid, [ref("asset_compute_period_0")], context=context) + context = {"active_ids": [ref("menu_asset_depreciation_confirmation_wizard")], "active_id":ref('menu_asset_depreciation_confirmation_wizard')} + self.asset_compute(cr, uid, [ref("asset_compute_period_0")], context=context) \ No newline at end of file From fbcebff117bf2ae5e1aa7cee68673f652d27e019 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 15 Dec 2011 18:25:53 +0530 Subject: [PATCH 3/4] [IMP] account_asset: Reverted demo data changes. bzr revid: tpa@tinyerp.com-20111215125553-f6zy38gycz13ib1b --- addons/account_asset/account_asset_demo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index fc27e3027de..4a3078a9ba1 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -39,6 +39,7 @@ + open CEO's Car From ffcd04cdad26e90ec31ebb65055d06d607095045 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 19 Dec 2011 12:26:53 +0530 Subject: [PATCH 4/4] [REM] account_asset: Removed extra lines from demo file. bzr revid: uco@tinyerp.com-20111219065653-ut9r63j9kc3nbug3 --- addons/account_asset/account_asset_demo.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index 4a3078a9ba1..77185081848 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -1,7 +1,7 @@ - @@ -33,9 +33,9 @@ 3 - + --> @@ -56,7 +56,7 @@ - + @@ -68,6 +68,6 @@ - +