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..80d7a4a47 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/models/purchase_request.py b/odex25_purchase/purchase_custom_stock/models/purchase_request.py index e0c80d0ec..0ee5b7202 100644 --- a/odex25_purchase/purchase_custom_stock/models/purchase_request.py +++ b/odex25_purchase/purchase_custom_stock/models/purchase_request.py @@ -42,11 +42,13 @@ class PurchaseRequest(models.Model): raise ValidationError(_("Can't Confirm Request With No Item!")) if not self.department_id: raise ValidationError(_("Please Select department for employee")) - service_products=self.line_ids.filtered(lambda line: line.product_id.type == "service") - if len(service_products) == len(self.line_ids): - self.write({'state': 'waiting'}) - else: + if any(self.line_ids.filtered(lambda line: line.product_id.type == "product")): self.write({'state': 'warehouse'}) + else: + for rec in self.line_ids: + rec.write({"qty_purchased":rec.qty}) + self.write({'state': 'waiting'}) + def create_requisition(self): @@ -84,8 +86,8 @@ class PurchaseRequest(models.Model): } def create_purchase_order2(self): - # if not self.partner_id : - # raise ValidationError("Please Insert ") + if not self.partner_id : + raise ValidationError(_("Please Insert a Vendor")) line_ids = [] for line in self.line_ids.filtered(lambda line: line.qty_purchased > 0): line_ids.append((0, 6, { 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..7e39b4471 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 f1e80b561..d916afae7 100644 --- a/odex25_purchase/purchase_requisition_custom/models/purchase_order.py +++ b/odex25_purchase/purchase_requisition_custom/models/purchase_order.py @@ -473,7 +473,7 @@ class PurchaseOrderCustom(models.Model): if self.requisition_id.id: self.requisition_id.state = 'done' if self.request_id: - self.request_id.write({'state': 'done'}) + self.request_id.write({'state': 'employee'}) return res 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