Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3813_asset_transfer #1566

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#3813_asset_transfer #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb74f0
#3813_asset_transfer
Sep 10, 2019
9c4fa40
#3813_asset_transfer
Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pabi_asset_management/security/ir.model.access.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ 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
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_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
10 changes: 5 additions & 5 deletions pabi_asset_management/views/asset_transfer_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@
<header>
<button name="action_draft" states="draft2"
string="Set Source Assets" type="object"
groups="purchase.group_purchase_user"/>
groups="purchase.group_purchase_user,pabi_base.group_nstda_account_admin"/>
<button name="action_draft2" states="draft,ready"
string="Set Target Assets" type="object"
groups="purchase.group_purchase_user,account.group_account_user"/>
groups="purchase.group_purchase_user,account.group_account_user,pabi_base.group_nstda_account_admin"/>
<button name="action_ready" states="draft2"
string="Submit to Finance" type="object" class="oe_highlight"
groups="purchase.group_purchase_user"/>
groups="purchase.group_purchase_user,pabi_base.group_nstda_account_admin"/>
<button name="action_done" states="ready"
string="Transfer" type="object" class="oe_highlight"
groups="account.group_account_user"/> <!-- Only Accountant can Transfer -->
groups="account.group_account_user,pabi_base.group_nstda_account_admin"/> <!-- Only Accountant can Transfer -->
<button name="action_cancel" states="draft" string="Cancel" type="object"
groups="purchase.group_purchase_user"/>
groups="purchase.group_purchase_user,pabi_base.group_nstda_account_admin"/>
<field name="state" widget="statusbar" statusbar_visible="draft,draft2,ready,done"/>
</header>
<sheet>
Expand Down