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

Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait
2013-07-03 11:48:10 +05:30
parent 71c3f95098 e6bf83e653
commit 72abfa6b4b
43 changed files with 664 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stock/doctype/serial_no/serial_no.txt
View File

@@ -2,13 +2,13 @@
{
"creation": "2013-05-16 10:59:15",
"docstatus": 0,
"modified": "2013-06-20 11:23:01",
"modified": "2013-07-02 12:07:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_attach": 1,
"allow_rename": 0,
"allow_rename": 1,
"autoname": "field:serial_no",
"description": "Distinct unit of an Item",
"doctype": "DocType",

3
stock/report/delivery_note_trends/delivery_note_trends.py
View File

@@ -21,8 +21,7 @@ from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Delivery Note"
conditions = get_columns(filters, trans)
conditions = get_columns(filters, "Delivery Note")
data = get_data(filters, conditions)
return conditions["columns"], data

8
stock/report/purchase_receipt_trends/purchase_receipt_trends.py
View File

@@ -21,11 +21,7 @@ from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Purchase Receipt"
conditions = get_columns(filters, trans)
data = get_data(filters, tab, conditions)
if not data :
webnotes.msgprint("Data not found for selected criterias")
conditions = get_columns(filters, "Purchase Receipt")
data = get_data(filters, conditions)
return conditions["columns"], data