nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes][merge conflict]

Browse Source
This commit is contained in:
Nabin Hait
2013-06-05 12:53:53 +05:30
parent cec0a0efd8 0feebc1a67
commit c6548b64c2
14 changed files with 397 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
buying/doctype/purchase_common/purchase_common.py
View File

@@ -202,10 +202,11 @@ class DocType(BuyingController):
msgprint("Please check Item %s is not present in %s %s ." % (d.item_code, d.prevdoc_doctype, d.prevdoc_docname))
raise Exception
# Check if Warehouse has been modified.
if not cstr(data[0]['warehouse']) == cstr(d.warehouse):
msgprint("Please check warehouse %s of Item %s which is not present in %s %s ." % (d.warehouse, d.item_code, d.prevdoc_doctype, d.prevdoc_docname))
raise Exception
if cstr(data[0]['warehouse']) and \
not cstr(data[0]['warehouse']) == cstr(d.warehouse):
msgprint("""Please check warehouse %s of Item %s
which is not present in %s %s""" % (d.warehouse, d.item_code,
d.prevdoc_doctype, d.prevdoc_docname), raise_exception=1)
# Check if UOM has been modified.
if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Material Request':
@@ -436,4 +437,4 @@ class DocType(BuyingController):
for d in getlist(obj.doclist, obj.fname):
if d.prevdoc_doctype and d.prevdoc_docname:
dt = sql("select transaction_date from `tab%s` where name = '%s'" % (d.prevdoc_doctype, d.prevdoc_docname))
d.prevdoc_date = dt and dt[0][0].strftime('%Y-%m-%d') or ''
d.prevdoc_date = dt and dt[0][0].strftime('%Y-%m-%d') or ''

13
buying/doctype/purchase_order_item/purchase_order_item.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:06",
"docstatus": 0,
"modified": "2013-05-28 12:13:21",
"modified": "2013-05-31 14:26:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -377,15 +377,12 @@
"read_only": 1
},
{
"default": "0.00",
"doctype": "DocField",
"fieldname": "billed_qty",
"fieldtype": "Float",
"hidden": 0,
"label": "Billed Quantity",
"fieldname": "billed_amt",
"fieldtype": "Currency",
"label": "Billed Amt",
"no_copy": 1,
"oldfieldname": "billed_qty",
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 1,
"read_only": 1
},