diff --git a/odex25_purchase/purchase_custom_stock/__pycache__/__init__.cpython-38.pyc b/odex25_purchase/purchase_custom_stock/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 000000000..1746b344d
Binary files /dev/null and b/odex25_purchase/purchase_custom_stock/__pycache__/__init__.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_custom_stock/models/__pycache__/__init__.cpython-38.pyc b/odex25_purchase/purchase_custom_stock/models/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 000000000..d38e71076
Binary files /dev/null and b/odex25_purchase/purchase_custom_stock/models/__pycache__/__init__.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_custom_stock/models/__pycache__/purchase_request.cpython-38.pyc b/odex25_purchase/purchase_custom_stock/models/__pycache__/purchase_request.cpython-38.pyc
new file mode 100644
index 000000000..91f7f8578
Binary files /dev/null and b/odex25_purchase/purchase_custom_stock/models/__pycache__/purchase_request.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_custom_stock/wizards/__pycache__/__init__.cpython-38.pyc b/odex25_purchase/purchase_custom_stock/wizards/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 000000000..738e6f44e
Binary files /dev/null and b/odex25_purchase/purchase_custom_stock/wizards/__pycache__/__init__.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_custom_stock/wizards/__pycache__/picking_purchase_request.cpython-38.pyc b/odex25_purchase/purchase_custom_stock/wizards/__pycache__/picking_purchase_request.cpython-38.pyc
new file mode 100644
index 000000000..85f30cee2
Binary files /dev/null and b/odex25_purchase/purchase_custom_stock/wizards/__pycache__/picking_purchase_request.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/__pycache__/__init__.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 000000000..6381c7516
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/__pycache__/__init__.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/__init__.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 000000000..e9850ebfa
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/__init__.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/account_invoice.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/account_invoice.cpython-38.pyc
new file mode 100644
index 000000000..fcef6955a
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/account_invoice.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/account_payment.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/account_payment.cpython-38.pyc
new file mode 100644
index 000000000..b388d3a16
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/account_payment.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/budget_confirmation.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/budget_confirmation.cpython-38.pyc
new file mode 100644
index 000000000..ea9a15837
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/budget_confirmation.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/mail_compose_message.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/mail_compose_message.cpython-38.pyc
new file mode 100644
index 000000000..7da0fe7b3
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/mail_compose_message.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_order.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_order.cpython-38.pyc
new file mode 100644
index 000000000..071258153
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_order.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_request.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_request.cpython-38.pyc
new file mode 100644
index 000000000..312e3f002
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_request.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_requisition_custom.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_requisition_custom.cpython-38.pyc
new file mode 100644
index 000000000..01b496ea4
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/purchase_requisition_custom.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/res_partner.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/res_partner.cpython-38.pyc
new file mode 100644
index 000000000..8747fc0e5
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/res_partner.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/__pycache__/res_settings.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/models/__pycache__/res_settings.cpython-38.pyc
new file mode 100644
index 000000000..e0089f881
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/models/__pycache__/res_settings.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/models/purchase_order.py b/odex25_purchase/purchase_requisition_custom/models/purchase_order.py
index d916afae7..6b21ea409 100644
--- a/odex25_purchase/purchase_requisition_custom/models/purchase_order.py
+++ b/odex25_purchase/purchase_requisition_custom/models/purchase_order.py
@@ -327,7 +327,7 @@ class PurchaseOrderCustom(models.Model):
     def action_skip_budget(self):
         """ Skip purchase budget"""
         for po_id in self:
-            if po_id.state == 'wait_for_send':
+            if po_id.state == 'wait_for_send' or po_id.request_id:
                 # Deal with double validation process
                 valid_amount = self.env.user.company_id.currency_id.compute(
                     po_id.company_id.po_double_validation_amount, po_id.currency_id)
diff --git a/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml b/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
index 6646b6276..97cf6afca 100644
--- a/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
+++ b/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
@@ -139,7 +139,7 @@
 
                     <button string='PO To Contract' name="open_convert_po_contract" type="object"
                             class="oe_highlight" groups="purchase.group_purchase_manager"
-                            attrs="{'invisible':[('state','in',('draft','wait','wait_for_send','sent','to approve','sign','waiting','purchase','cancel'))]}"/>
+                            attrs="{'invisible':[('state','in',('draft','wait','wait_for_send','sent','to approve','sign','waiting','done','purchase','cancel'))]}"/>
                 </xpath>
 
                 <xpath expr="//field[@name='date_order']" position="after">
@@ -151,7 +151,7 @@
                     <attribute name="groups">purchase.group_purchase_manager</attribute>
                     <attribute name="states">""</attribute>
                     <attribute name="attrs">
-                        {'invisible':[('state','in',('wait','wait_for_send','sign','sent','to approve','waiting','purchase','cancel'))]}
+                        {'invisible':[('state','in',('wait','wait_for_send','sign','sent','to approve','done','waiting','purchase','cancel'))]}
                     </attribute>
                 </xpath>
                 <xpath expr="/form/header/button[@id='bid_confirm']" position="attributes">
diff --git a/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/__init__.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 000000000..62350084b
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/__init__.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/cancel_purchase_request.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/cancel_purchase_request.cpython-38.pyc
new file mode 100644
index 000000000..4aa6b1cfc
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/cancel_purchase_request.cpython-38.pyc differ
diff --git a/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/convert_to_contract.cpython-38.pyc b/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/convert_to_contract.cpython-38.pyc
new file mode 100644
index 000000000..9c153eb95
Binary files /dev/null and b/odex25_purchase/purchase_requisition_custom/wizards/__pycache__/convert_to_contract.cpython-38.pyc differ