From 6e861d59b135da33f89fb8612923ef4f1d33a4e9 Mon Sep 17 00:00:00 2001 From: Saksit Muangsamai Date: Wed, 18 Sep 2019 11:15:17 +0700 Subject: [PATCH 1/3] #3813_asset_transfer2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Module : pabi_asset_management FI: เพิ่มสิทธิ์ Asset Transfer ให้ทีมบัญชี GL บางคน ให้สามารถ Create ได้ Redmine : https://mobileapp.nstda.or.th/redmine/issues/3813 --- pabi_asset_management/security/ir.model.access.csv | 4 +++- .../views/asset_transfer_view.xml | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pabi_asset_management/security/ir.model.access.csv b/pabi_asset_management/security/ir.model.access.csv index 6de56eed4..0e1b1294b 100755 --- a/pabi_asset_management/security/ir.model.access.csv +++ b/pabi_asset_management/security/ir.model.access.csv @@ -40,4 +40,6 @@ access_account_asset_request_line_management_asset_user,access_account_asset_req access_account_asset_management_asset_user,access_account_asset_management_asset_user,account_asset_management.model_account_asset,pabi_asset_management.group_assets_report,1,1,0,0 access_account_asset_profile_management_asset_user,access_account_asset_profile_management_asset_user,account_asset_management.model_account_asset_profile,pabi_asset_management.group_assets_report,1,1,0,0 access_account_asset_removal_lines_purchase_user,access_account_asset_removal_lines_purchase_user,model_account_asset_removal_lines,purchase.group_purchase_user,1,0,0,0 -access_account_asset_removal_lines_account_user,access_account_asset_removal_lines_account_user,model_account_asset_removal_lines,account.group_account_user,1,1,1,1 \ No newline at end of file +access_account_asset_removal_lines_account_user,access_account_asset_removal_lines_account_user,model_account_asset_removal_lines,account.group_account_user,1,1,1,1 +access_account_asset_transfer_account_admin,access_account_asset_transfer_account_admin,model_account_asset_transfer,pabi_base.group_nstda_account_admin,1,1,1,0 +access_account_asset_transfer_target_account_admin,access_account_asset_transfer_target_account_admin,model_account_asset_transfer_target,pabi_base.group_nstda_account_admin,1,1,1,0 \ No newline at end of file diff --git a/pabi_asset_management/views/asset_transfer_view.xml b/pabi_asset_management/views/asset_transfer_view.xml index 7ba180d13..99ddcd9e3 100755 --- a/pabi_asset_management/views/asset_transfer_view.xml +++ b/pabi_asset_management/views/asset_transfer_view.xml @@ -57,18 +57,18 @@
@@ -143,7 +143,7 @@
- +
@@ -197,7 +197,7 @@ + groups="purchase.group_purchase_user,account.group_account_user,pabi_base.group_nstda_account_admin"/> From e9e90b55fdd6ea7e36bd02233503427e5a75c8d5 Mon Sep 17 00:00:00 2001 From: Saksit Muangsamai Date: Wed, 18 Sep 2019 14:46:46 +0700 Subject: [PATCH 2/3] #3813_asset_transfer2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Module : pabi_asset_management FI: เพิ่มสิทธิ์ Asset Transfer ให้ทีมบัญชี GL บางคน ให้สามารถ Create ได้ FI: Asset void/Remove Asset ให้ pop หน้าจอ ให้ update วันที่ กะ gl Redmine : https://mobileapp.nstda.or.th/redmine/issues/3813 Redmine : https://mobileapp.nstda.or.th/redmine/issues/3752 --- .../wizard/account_asset_reverse.py | 25 +++++++++++++++++++ .../wizard/account_asset_reverse_view.xml | 3 +++ 2 files changed, 28 insertions(+) diff --git a/pabi_asset_management/wizard/account_asset_reverse.py b/pabi_asset_management/wizard/account_asset_reverse.py index 92102da7e..686d5bc41 100644 --- a/pabi_asset_management/wizard/account_asset_reverse.py +++ b/pabi_asset_management/wizard/account_asset_reverse.py @@ -22,6 +22,27 @@ class AccountAssetReverse(models.TransientModel): string='Notes', size=1000, ) + void_date_remove = fields.Date( + string='Asset Removal Date', + default=fields.Date.today, + required=True, + copy=False, + ) + void_account_residual_value_id = fields.Many2one( + comodel_name='account.account', + string='Residual Value Account', + domain=[('type', '=', 'other')], + required=True, + default=lambda self: self.env['account.account'].search([('code','=','1214010002')]) + ) + void_posting_regime = fields.Selection( + [('residual_value', _('Residual Value')), + ('gain_loss_on_sale', _('Gain/Loss on Sale')),], + string='Removal Entry Policy', + required=True, + default='residual_value', + #default=lambda self: self._get_posting_regime(), + ) @api.multi def reverse(self): @@ -64,6 +85,10 @@ def reverse(self): AccountMove._reconcile_voided_entry([move.id, rev_move.id]) rev_move.button_validate() # Set asset removed + res = asset.open_entries() + move_id = self.env['account.move'].search(res['domain']) + for move in move_id: + move.date = self.void_date_remove asset.write({'status': self.target_status.id, 'state': 'removed'}) asset.message_post(body=_('-- Void/Removed --\n%s') % self.note) diff --git a/pabi_asset_management/wizard/account_asset_reverse_view.xml b/pabi_asset_management/wizard/account_asset_reverse_view.xml index 86572a3a0..26beb7d44 100644 --- a/pabi_asset_management/wizard/account_asset_reverse_view.xml +++ b/pabi_asset_management/wizard/account_asset_reverse_view.xml @@ -24,7 +24,10 @@

+ + + From 8c8a42dda8de8f03f037a8725ad0c126ff2bcfd8 Mon Sep 17 00:00:00 2001 From: Saksit Muangsamai Date: Mon, 23 Sep 2019 10:56:22 +0700 Subject: [PATCH 3/3] #3813_asset_transfer2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Module : pabi_asset_management FI: เพิ่มสิทธิ์ Asset Transfer ให้ทีมบัญชี GL บางคน ให้สามารถ Create ได้ FI: Asset void/Remove Asset ให้ pop หน้าจอ ให้ update วันที่ กะ gl เพิ่ม Asset Removal Date and Note Redmine : https://mobileapp.nstda.or.th/redmine/issues/3813 Redmine : https://mobileapp.nstda.or.th/redmine/issues/3752 --- pabi_asset_management/wizard/account_asset_reverse.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pabi_asset_management/wizard/account_asset_reverse.py b/pabi_asset_management/wizard/account_asset_reverse.py index 686d5bc41..979266fc0 100644 --- a/pabi_asset_management/wizard/account_asset_reverse.py +++ b/pabi_asset_management/wizard/account_asset_reverse.py @@ -75,7 +75,7 @@ def reverse(self): (asset.code, )) # Reverse entry move_dict = move.copy_data({})[0] - move_dict['ref'] = _(u'ยกเลิกเลขครุภัณฑ์: %s') % asset.display_name + move_dict['ref'] = _(u'%s / %s') % (asset.code,self.note) move_dict['journal_id'] = 417 #change Asset Journal => Asset Journal (No-Budget) for line in move_dict.get('line_id', []): line[2]['asset_profile_id'] = False @@ -89,6 +89,8 @@ def reverse(self): move_id = self.env['account.move'].search(res['domain']) for move in move_id: move.date = self.void_date_remove + asset.date_remove = self.void_date_remove + asset.note = self.note asset.write({'status': self.target_status.id, 'state': 'removed'}) asset.message_post(body=_('-- Void/Removed --\n%s') % self.note)