diff --git a/MKS_Tradex_Backend_2/models/purchase_requisition.py b/MKS_Tradex_Backend_2/models/purchase_requisition.py index baadb98..256cd5a 100755 --- a/MKS_Tradex_Backend_2/models/purchase_requisition.py +++ b/MKS_Tradex_Backend_2/models/purchase_requisition.py @@ -6,7 +6,7 @@ from odoo import api, fields, models, SUPERUSER_ID, _ PURCHASE_REQUISITION_STATES = [ ('draft', 'New'), - ('approval', 'Pending PC Validation'), + ('approval', 'Submitted To PC'), ('validate_by_pc','Validated By PC'), ('manager_approval','Submitted To MGT'), ('approved','Approved By MGT'), @@ -19,12 +19,22 @@ PURCHASE_REQUISITION_STATES = [ class purchase_requisition(models.Model): _inherit = "purchase.requisition" + + def _check_store_keeper(self): + has_vle_group = self.env.user.has_group( + 'csc_administrator.group_vle_level') + self.state_blanket_order = self.state state = fields.Selection(PURCHASE_REQUISITION_STATES, 'Status', tracking=True, required=True, copy=False, default='draft') state_blanket_order = fields.Selection(PURCHASE_REQUISITION_STATES, compute='_set_state') + # store_keeper_visibility = fields.Boolean("Visibility",default='_check_store_keeper') + + # @api.depends('state') + # def _check_store_keeper(self): + # self.state_blanket_order = self.state @api.depends('state') def _set_state(self): diff --git a/MKS_Tradex_Backend_2/models/sale_order.py b/MKS_Tradex_Backend_2/models/sale_order.py index e57701e..16171de 100755 --- a/MKS_Tradex_Backend_2/models/sale_order.py +++ b/MKS_Tradex_Backend_2/models/sale_order.py @@ -15,9 +15,9 @@ class sale_order(models.Model): ('approved', 'Approved By MGT'), ('logistics_approval', 'Validated By LC'), ('logistics_approved', 'validated By LC'), - ('credit_approval', 'Submitted By CC'), + ('credit_approval', 'Submitted To CC'), ('sent', 'Quotation Sent'), - ('sale', 'Sales Order'), + ('sale', 'Validated By CC'), ('done', 'Locked'), ('reject','Rejected By MGT'), ('cancel', 'Cancelled'), diff --git a/MKS_Tradex_Backend_2/views/sale_order_view.xml b/MKS_Tradex_Backend_2/views/sale_order_view.xml index 780ed5d..29230ad 100755 --- a/MKS_Tradex_Backend_2/views/sale_order_view.xml +++ b/MKS_Tradex_Backend_2/views/sale_order_view.xml @@ -30,13 +30,11 @@