From 7231bd76a21f348ca8229d675a02a86f43d25d02 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 May 2015 14:36:57 +0530 Subject: [PATCH] [minor] [fix] default status in Purchase Receipt --- erpnext/setup/page/setup_wizard/install_fixtures.py | 4 ++-- erpnext/stock/doctype/purchase_receipt/purchase_receipt.json | 3 ++- erpnext/stock/doctype/purchase_receipt/purchase_receipt.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/page/setup_wizard/install_fixtures.py b/erpnext/setup/page/setup_wizard/install_fixtures.py index f6de099938..629c06f6db 100644 --- a/erpnext/setup/page/setup_wizard/install_fixtures.py +++ b/erpnext/setup/page/setup_wizard/install_fixtures.py @@ -154,7 +154,7 @@ def install(country=None): {'doctype': "Email Account", "email_id": "sales@example.com", "append_to": "Opportunity"}, {'doctype': "Email Account", "email_id": "support@example.com", "append_to": "Issue"}, {'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"}, - + {"doctype": "Offer Term", "offer_term": _("Date of Joining")}, {"doctype": "Offer Term", "offer_term": _("Annual Salary")}, {"doctype": "Offer Term", "offer_term": _("Probationary Period")}, @@ -167,7 +167,7 @@ def install(country=None): {"doctype": "Offer Term", "offer_term": _("Leaves per Year")}, {"doctype": "Offer Term", "offer_term": _("Notice Period")}, {"doctype": "Offer Term", "offer_term": _("Incentives")}, - + ] from erpnext.setup.page.setup_wizard.fixtures import industry_type diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 8925cddc59..f2232930f7 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -631,6 +631,7 @@ "permlevel": 0 }, { + "default": "Draft", "fieldname": "status", "fieldtype": "Select", "in_filter": 1, @@ -853,7 +854,7 @@ "icon": "icon-truck", "idx": 1, "is_submittable": 1, - "modified": "2015-05-15 14:21:33.694753", + "modified": "2015-05-18 05:06:04.723299", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 44fc0cc34a..e56cd1e907 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -41,8 +41,8 @@ class PurchaseReceipt(BuyingController): def validate(self): super(PurchaseReceipt, self).validate() - self.po_required() self.set_status() + self.po_required() self.validate_with_previous_doc() self.validate_rejected_warehouse() self.validate_accepted_rejected_qty()