Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] [fix] default status in Purchase Receipt

Browse Source
This commit is contained in:
Rushabh Mehta 2015-05-18 14:36:57 +05:30
parent 770c258406
commit 7231bd76a2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/page/setup_wizard/install_fixtures.py
View File

@ -154,7 +154,7 @@ def install(country=None):
{'doctype': "Email Account", "email_id": "sales@example.com", "append_to": "Opportunity"}, {'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": "support@example.com", "append_to": "Issue"},
{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"}, {'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": _("Date of Joining")},
{"doctype": "Offer Term", "offer_term": _("Annual Salary")}, {"doctype": "Offer Term", "offer_term": _("Annual Salary")},
{"doctype": "Offer Term", "offer_term": _("Probationary Period")}, {"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": _("Leaves per Year")},
{"doctype": "Offer Term", "offer_term": _("Notice Period")}, {"doctype": "Offer Term", "offer_term": _("Notice Period")},
{"doctype": "Offer Term", "offer_term": _("Incentives")}, {"doctype": "Offer Term", "offer_term": _("Incentives")},
] ]
from erpnext.setup.page.setup_wizard.fixtures import industry_type from erpnext.setup.page.setup_wizard.fixtures import industry_type

3
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -631,6 +631,7 @@
"permlevel": 0 "permlevel": 0
}, },
{ {
"default": "Draft",
"fieldname": "status", "fieldname": "status",
"fieldtype": "Select", "fieldtype": "Select",
"in_filter": 1, "in_filter": 1,
@ -853,7 +854,7 @@
"icon": "icon-truck", "icon": "icon-truck",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-05-15 14:21:33.694753", "modified": "2015-05-18 05:06:04.723299",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -41,8 +41,8 @@ class PurchaseReceipt(BuyingController):
def validate(self): def validate(self):
super(PurchaseReceipt, self).validate() super(PurchaseReceipt, self).validate()
self.po_required()
self.set_status() self.set_status()
self.po_required()
self.validate_with_previous_doc() self.validate_with_previous_doc()
self.validate_rejected_warehouse() self.validate_rejected_warehouse()
self.validate_accepted_rejected_qty() self.validate_accepted_rejected_qty()