nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] frappe/erpnext#1510

Browse Source
This commit is contained in:
Neil Trini Lasrado
2014-08-19 10:41:34 +05:30
parent 5e893ef8fd
commit 9c3535307f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -117,7 +117,7 @@
"search_index": 1 "search_index": 1
}, },
{ {
"description": "If not applicable please enter: NA", "description": "",
"fieldname": "bill_no", "fieldname": "bill_no",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
@@ -758,7 +758,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-08-12 05:25:16.261614", "modified": "2014-08-19 10:36:33.177267",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

3
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -89,8 +89,7 @@ class PurchaseInvoice(BuyingController):
throw(_("Conversion rate cannot be 0 or 1")) throw(_("Conversion rate cannot be 0 or 1"))
def validate_bill_no(self): def validate_bill_no(self):
if self.bill_no and self.bill_no.lower().strip() \ if self.bill_no:
not in ['na', 'not applicable', 'none']:
b_no = frappe.db.sql("""select bill_no, name, ifnull(is_opening,'') from `tabPurchase Invoice` b_no = frappe.db.sql("""select bill_no, name, ifnull(is_opening,'') from `tabPurchase Invoice`
where bill_no = %s and credit_to = %s and docstatus = 1 and name != %s""", where bill_no = %s and credit_to = %s and docstatus = 1 and name != %s""",
(self.bill_no, self.credit_to, self.name)) (self.bill_no, self.credit_to, self.name))