Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait
2013-03-07 11:42:47 +05:30
83 changed files with 460 additions and 336 deletions

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-10 16:34:26",
"creation": "2013-02-22 01:28:00",
"docstatus": 0,
"modified": "2013-01-29 16:27:56",
"modified": "2013-03-07 07:03:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -41,6 +41,7 @@
"oldfieldname": "item_code",
"oldfieldtype": "Link",
"options": "Item",
"print_width": "150px",
"reqd": 1,
"search_index": 1,
"width": "150px"
@@ -62,6 +63,7 @@
"oldfieldname": "item_name",
"oldfieldtype": "Data",
"print_hide": 1,
"print_width": "150px",
"reqd": 1,
"width": "150px"
},
@@ -72,6 +74,7 @@
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
"print_width": "300px",
"reqd": 1,
"width": "300px"
},
@@ -83,6 +86,7 @@
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
"print_width": "100px",
"reqd": 1,
"width": "100px"
},
@@ -94,6 +98,7 @@
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
"print_hide": 0,
"print_width": "50px",
"read_only": 1,
"reqd": 1,
"width": "50px"
@@ -109,6 +114,7 @@
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 1,
"print_width": "100px",
"reqd": 0,
"width": "100px"
},
@@ -121,6 +127,7 @@
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
"print_hide": 1,
"print_width": "100px",
"width": "100px"
},
{
@@ -132,6 +139,7 @@
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 0,
"print_width": "150px",
"reqd": 0,
"width": "150px"
},
@@ -144,6 +152,7 @@
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 0,
"print_width": "100px",
"read_only": 1,
"reqd": 0,
"width": "100px"
@@ -157,6 +166,7 @@
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_hide": 1,
"print_width": "100px",
"read_only": 1,
"width": "100px"
},
@@ -170,6 +180,7 @@
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_hide": 1,
"print_width": "150px",
"reqd": 0,
"width": "150px"
},
@@ -182,6 +193,7 @@
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_hide": 1,
"print_width": "100px",
"read_only": 1,
"reqd": 0,
"width": "100px"
@@ -195,6 +207,7 @@
"oldfieldtype": "Link",
"options": "Warehouse",
"print_hide": 1,
"print_width": "100px",
"width": "100px"
},
{
@@ -240,6 +253,7 @@
"oldfieldtype": "Link",
"options": "Brand",
"print_hide": 1,
"print_width": "150px",
"read_only": 1,
"width": "150px"
},
@@ -252,6 +266,7 @@
"oldfieldname": "actual_qty",
"oldfieldtype": "Currency",
"print_hide": 1,
"print_width": "150px",
"read_only": 1,
"width": "150px"
},
@@ -263,6 +278,7 @@
"no_copy": 1,
"options": "currency",
"print_hide": 1,
"print_width": "100px",
"read_only": 1,
"width": "100px"
},
@@ -275,6 +291,7 @@
"oldfieldname": "installed_qty",
"oldfieldtype": "Currency",
"print_hide": 1,
"print_width": "150px",
"read_only": 1,
"width": "150px"
},
@@ -299,6 +316,7 @@
"oldfieldname": "prevdoc_doctype",
"oldfieldtype": "Data",
"print_hide": 1,
"print_width": "150px",
"read_only": 1,
"search_index": 1,
"width": "150px"
@@ -314,6 +332,7 @@
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Data",
"print_hide": 1,
"print_width": "150px",
"read_only": 1,
"search_index": 1,
"width": "150px"
@@ -340,6 +359,7 @@
"oldfieldname": "prevdoc_detail_docname",
"oldfieldtype": "Data",
"print_hide": 1,
"print_width": "150px",
"read_only": 1,
"search_index": 0,
"width": "150px"

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-10 16:34:27",
"creation": "2013-02-22 01:28:00",
"docstatus": 0,
"modified": "2013-01-22 14:46:40",
"modified": "2013-03-07 07:03:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -74,6 +74,7 @@
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"print_width": "300px",
"read_only": 1,
"width": "300px"
},

View File

@@ -1,33 +1,33 @@
[
{
"owner": "Administrator",
"creation": "2013-02-22 01:28:00",
"docstatus": 0,
"creation": "2012-12-07 14:28:33",
"modified": "2013-03-07 07:03:21",
"modified_by": "Administrator",
"modified": "2012-12-07 14:28:33"
"owner": "Administrator"
},
{
"istable": 1,
"description": "Featured Item in Item Group",
"doctype": "DocType",
"istable": 1,
"module": "Stock",
"name": "__common__"
},
{
"parent": "Featured Item",
"doctype": "DocField",
"name": "__common__",
"label": "Item",
"parenttype": "DocType",
"options": "Item",
"fieldname": "item",
"fieldtype": "Link",
"permlevel": 0,
"parentfield": "fields"
"label": "Item",
"name": "__common__",
"options": "Item",
"parent": "Featured Item",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"name": "Featured Item",
"doctype": "DocType"
"doctype": "DocType",
"name": "Featured Item"
},
{
"doctype": "DocField"

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2012-03-27 14:36:33",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"modified": "2012-03-27 14:36:33",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,10 +14,7 @@
"istable": 1,
"module": "Stock",
"name": "__common__",
"read_only": 0,
"section_style": "Tray",
"show_in_menu": 0,
"version": 7
"read_only": 0
},
{
"doctype": "DocField",
@@ -42,6 +39,7 @@
"oldfieldname": "price_list_name",
"oldfieldtype": "Select",
"options": "Customer",
"print_width": "180px",
"width": "180px"
},
{
@@ -51,6 +49,7 @@
"label": "Ref Code",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
"print_width": "120px",
"width": "120px"
}
]

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-21 18:19:14",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"modified": "2013-01-23 16:57:49",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"owner": "Administrator"
},

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2012-03-27 14:36:33",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"modified": "2012-03-27 14:36:33",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,10 +11,7 @@
"doctype": "DocType",
"istable": 1,
"module": "Stock",
"name": "__common__",
"section_style": "Simple",
"show_in_menu": 0,
"version": 1
"name": "__common__"
},
{
"doctype": "DocField",
@@ -36,6 +33,7 @@
"in_filter": 0,
"label": "Parameter",
"oldfieldname": "specification",
"print_width": "200px",
"reqd": 1,
"search_index": 0,
"width": "200px"

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-02-18 12:48:07",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"modified": "2013-02-18 12:54:46",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"owner": "Administrator"
},

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2012-03-27 14:36:33",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"modified": "2012-03-27 14:36:33",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"istable": 1,
"module": "Stock",
"name": "__common__",
"section_style": "Simple",
"show_in_menu": 0,
"version": 3
"name": "__common__"
},
{
"doctype": "DocField",
@@ -39,6 +36,7 @@
"fieldname": "supplier_part_no",
"fieldtype": "Data",
"label": "Supplier Part Number",
"print_width": "200px",
"width": "200px"
}
]

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-10 16:34:27",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"modified": "2013-01-23 16:54:25",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"owner": "Administrator"
},

View File

@@ -1,42 +1,44 @@
[
{
"owner": "Administrator",
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
"creation": "2012-12-07 15:42:25",
"modified": "2013-03-07 07:03:22",
"modified_by": "Administrator",
"modified": "2012-12-17 15:29:37"
"owner": "Administrator"
},
{
"istable": 1,
"description": "Table for Item that will be shown in Web Site",
"doctype": "DocType",
"istable": 1,
"module": "Stock",
"name": "__common__"
},
{
"doctype": "DocField",
"name": "__common__",
"parent": "Item Website Specification",
"doctype": "DocField",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0,
"parentfield": "fields"
"permlevel": 0
},
{
"name": "Item Website Specification",
"doctype": "DocType"
"doctype": "DocType",
"name": "Item Website Specification"
},
{
"doctype": "DocField",
"label": "Label",
"width": "150px",
"fieldname": "label",
"fieldtype": "Data"
"fieldtype": "Data",
"label": "Label",
"print_width": "150px",
"width": "150px"
},
{
"doctype": "DocField",
"label": "Description",
"width": "300px",
"fieldname": "description",
"fieldtype": "Text"
"fieldtype": "Text",
"label": "Description",
"print_width": "300px",
"width": "300px"
}
]

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-10 16:34:27",
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
"modified": "2013-01-23 16:55:26",
"modified": "2013-03-07 07:03:23",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -42,6 +42,7 @@
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
"print_width": "300px",
"width": "300px"
},
{

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2012-03-27 14:36:34",
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
"modified": "2012-03-27 14:36:34",
"modified": "2013-03-07 07:03:23",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"istable": 1,
"module": "Stock",
"name": "__common__",
"section_style": "Simple",
"show_in_menu": 0,
"version": 5
"name": "__common__"
},
{
"doctype": "DocField",
@@ -35,6 +32,7 @@
"oldfieldname": "purchase_receipt_no",
"oldfieldtype": "Link",
"options": "Purchase Receipt",
"print_width": "220px",
"width": "220px"
},
{
@@ -44,6 +42,7 @@
"label": "Select PR",
"oldfieldname": "include_in_landed_cost",
"oldfieldtype": "Check",
"print_width": "120px",
"width": "120px"
}
]

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-02-20 13:25:31",
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
"modified": "2013-02-20 14:06:58",
"modified": "2013-03-07 07:03:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -35,6 +35,7 @@
"oldfieldname": "schedule_date",
"oldfieldtype": "Date",
"print_hide": 0,
"print_width": "100px",
"reqd": 1,
"width": "100px"
},
@@ -47,6 +48,7 @@
"oldfieldname": "item_code",
"oldfieldtype": "Link",
"options": "Item",
"print_width": "100px",
"reqd": 1,
"search_index": 1,
"width": "100px"
@@ -58,6 +60,7 @@
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"print_width": "250px",
"reqd": 1,
"width": "250px"
},
@@ -70,6 +73,7 @@
"oldfieldtype": "Link",
"options": "Warehouse",
"print_hide": 0,
"print_width": "100px",
"reqd": 0,
"width": "100px"
},
@@ -82,6 +86,7 @@
"no_copy": 0,
"oldfieldname": "qty",
"oldfieldtype": "Currency",
"print_width": "80px",
"reqd": 1,
"width": "80px"
},
@@ -94,6 +99,7 @@
"oldfieldname": "uom",
"oldfieldtype": "Link",
"options": "UOM",
"print_width": "70px",
"read_only": 1,
"reqd": 1,
"width": "70px"
@@ -117,6 +123,7 @@
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
"print_width": "100px",
"reqd": 1,
"search_index": 1,
"width": "100px"
@@ -145,6 +152,7 @@
"oldfieldtype": "Link",
"options": "Brand",
"print_hide": 1,
"print_width": "100px",
"read_only": 1,
"width": "100px"
},
@@ -157,6 +165,7 @@
"oldfieldname": "min_order_qty",
"oldfieldtype": "Currency",
"print_hide": 1,
"print_width": "70px",
"read_only": 1,
"reqd": 0,
"width": "70px"
@@ -170,6 +179,7 @@
"oldfieldname": "projected_qty",
"oldfieldtype": "Currency",
"print_hide": 1,
"print_width": "70px",
"read_only": 1,
"width": "70px"
},

View File

@@ -0,0 +1,8 @@
# For license information, please see license.txt
from __future__ import unicode_literals
import webnotes
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-10 16:34:28",
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
"modified": "2013-01-22 14:47:04",
"modified": "2013-03-07 07:03:26",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"fieldtype": "Link",
"label": "Item Code",
"options": "Item",
"print_width": "100px",
"reqd": 1,
"width": "100px"
},
@@ -39,6 +40,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"label": "Item Name",
"print_width": "200px",
"read_only": 1,
"width": "200px"
},
@@ -47,6 +49,7 @@
"fieldname": "qty",
"fieldtype": "Float",
"label": "Quantity",
"print_width": "100px",
"reqd": 1,
"width": "100px"
},
@@ -55,6 +58,7 @@
"fieldname": "stock_uom",
"fieldtype": "Data",
"label": "UOM",
"print_width": "100px",
"read_only": 1,
"width": "100px"
},
@@ -63,6 +67,7 @@
"fieldname": "net_weight",
"fieldtype": "Float",
"label": "Net Weight",
"print_width": "100px",
"read_only": 1,
"width": "100px"
},
@@ -72,6 +77,7 @@
"fieldtype": "Link",
"label": "Weight UOM",
"options": "UOM",
"print_width": "100px",
"read_only": 1,
"width": "100px"
},

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-02-07 08:28:23",
"creation": "2013-02-22 01:28:03",
"docstatus": 0,
"modified": "2013-02-11 08:13:11",
"modified": "2013-03-07 07:03:28",
"modified_by": "Administrator",
"owner": "Administrator"
},

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-10 16:34:29",
"creation": "2013-02-22 01:28:03",
"docstatus": 0,
"modified": "2013-01-23 16:56:21",
"modified": "2013-03-07 07:03:30",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,6 +50,7 @@
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"print_width": "300px",
"width": "300px"
},
{

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-29 19:25:45",
"creation": "2013-02-22 01:28:04",
"docstatus": 0,
"modified": "2013-02-20 16:46:26",
"modified": "2013-03-07 07:03:32",
"modified_by": "Administrator",
"owner": "Administrator"
},

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2012-03-27 14:36:40",
"creation": "2013-02-22 01:28:04",
"docstatus": 0,
"modified": "2012-03-27 14:36:40",
"modified": "2013-03-07 07:03:34",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,10 +11,7 @@
"doctype": "DocType",
"istable": 1,
"module": "Stock",
"name": "__common__",
"section_style": "Tray",
"show_in_menu": 0,
"version": 1
"name": "__common__"
},
{
"doctype": "DocField",

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-02-04 11:33:57",
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
"modified": "2013-02-04 11:36:16",
"modified": "2013-03-07 07:03:34",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,6 +24,7 @@
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0,
"print_width": "200px",
"width": "200px"
},
{