devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue purchase confirm

This commit is contained in:
ronozoro 2024-11-05 23:53:37 -08:00
parent bfd8064370
commit 945aa82d4e
No known key found for this signature in database
GPG Key ID: 7C2BDED35C62C0F3
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odex25_purchase/governmental_purchase/models/purchase_order.py
View File

@ -31,7 +31,7 @@ class PurchaseOrderCustom(models.Model):
order.recommendation_order = True order.recommendation_order = True
def button_confirm(self): def button_confirm(self):
super(PurchaseOrderCustom, self).button_confirm() res = super(PurchaseOrderCustom, self).button_confirm()
for order in self: for order in self:
if order.state not in ['draft', 'sent', 'sign']: if order.state not in ['draft', 'sent', 'sign']:
continue continue
@ -43,4 +43,4 @@ class PurchaseOrderCustom(models.Model):
order.write({'state': 'to approve'}) order.write({'state': 'to approve'})
if order.partner_id not in order.message_partner_ids: if order.partner_id not in order.message_partner_ids:
order.message_subscribe([order.partner_id.id]) order.message_subscribe([order.partner_id.id])
return True return res

3
odex25_purchase/online_tendering/models/purchase_requsition.py
View File

@ -76,9 +76,8 @@ class POCustom(models.Model):
def button_confirm(self): def button_confirm(self):
res = None res = super(POCustom, self).button_confirm()
for rec in self: for rec in self:
res = super(POCustom,self).button_confirm()
if rec.application_id: if rec.application_id:
rec.application_id.state = 'contract' rec.application_id.state = 'contract'
return res return res

5
odex25_purchase/purchase_requisition_custom/models/purchase_order.py
View File

@ -535,10 +535,9 @@ class PurchaseOrderCustom(models.Model):
self.requisition_id.state = 'purchase_manager' self.requisition_id.state = 'purchase_manager'
def button_confirm(self): def button_confirm(self):
# res = super(PurchaseOrderCustom, self).button_confirm()
for order in self: for order in self:
if order.state not in ['draft']: if order.state not in ['draft']:
continue return super(PurchaseOrderCustom, self).button_confirm()
order._add_supplier_to_product() order._add_supplier_to_product()
# Deal with double validation process # Deal with double validation process
if order._approval_allowed(): if order._approval_allowed():
@ -563,7 +562,7 @@ class PurchaseOrderCustom(models.Model):
order.requisition_id.state = 'done' order.requisition_id.state = 'done'
if order.request_id: if order.request_id:
order.request_id.write({'state': 'done'}) order.request_id.write({'state': 'done'})
return True return res
def action_unsign(self): def action_unsign(self):
""" """