diff --git a/odex25_accounting/exp_asset_base/__manifest__.py b/odex25_accounting/exp_asset_base/__manifest__.py index 2305248fe..1ac4aaee1 100644 --- a/odex25_accounting/exp_asset_base/__manifest__.py +++ b/odex25_accounting/exp_asset_base/__manifest__.py @@ -25,7 +25,6 @@ Add asset operations (Transfer, Sell/Dispose, Maitenenace, Assesment) 'installable': True, 'depends': [ 'odex25_account_asset', - # 'hr_expense_petty_cash', 'hr', 'barcodes', 'report_xlsx' ], 'data': [ diff --git a/odex25_accounting/initial_engagement_budget/models/purchase_request.py b/odex25_accounting/initial_engagement_budget/models/purchase_request.py index 97acca9df..6f2db3db4 100755 --- a/odex25_accounting/initial_engagement_budget/models/purchase_request.py +++ b/odex25_accounting/initial_engagement_budget/models/purchase_request.py @@ -10,9 +10,8 @@ class PurchaseRequest(models.Model): _inherit = 'purchase.request' state = fields.Selection( - selection=[('draft', 'Draft'), ('direct_manager', 'Direct Manager'), ('wait_for_send', 'Wait For Sent'), - ('initial', 'Initial Engagement'), - ('waiting', 'In Purchase'), ('done', 'Done'), ('cancel', 'Cancel'), ('refuse', 'Refuse')], + selection_add=[('wait_for_send', 'Wait For Sent'), + ('initial', 'Initial Engagement')], default="draft", tracking=True ) @@ -22,6 +21,9 @@ class PurchaseRequest(models.Model): initial_engagement_activate = fields.Boolean(compute='_check_initial_engagement_activate', store=True, default=False) + def action_skip_budget(self): + self.state = 'waiting' + @api.depends('name', 'date', 'department_id', 'state') def _check_initial_engagement_activate(self): for rec in self: diff --git a/odex25_accounting/initial_engagement_budget/views/purchase_request_view.xml b/odex25_accounting/initial_engagement_budget/views/purchase_request_view.xml index efcd5faad..f36c29aa3 100755 --- a/odex25_accounting/initial_engagement_budget/views/purchase_request_view.xml +++ b/odex25_accounting/initial_engagement_budget/views/purchase_request_view.xml @@ -9,9 +9,12 @@