nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nabin Hait
2013-01-30 12:49:44 +05:30
parent bf495c9a6d 9732250a83
commit 53595c6521
119 changed files with 664 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
buying/doctype/purchase_order/purchase_order.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-22 15:11:37",
"creation": "2013-01-29 17:54:10",
"docstatus": 0,
"modified": "2013-01-23 17:11:28",
"modified": "2013-01-29 18:16:48",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"parent": "Purchase Order",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
},
@@ -70,6 +71,7 @@
"fieldname": "supplier_name",
"fieldtype": "Data",
"hidden": 1,
"in_list_view": 1,
"label": "Name",
"read_only": 1
},
@@ -401,6 +403,7 @@
"doctype": "DocField",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Grand Total (Import)",
"no_copy": 0,
"oldfieldname": "grand_total_import",
@@ -435,7 +438,7 @@
"no_copy": 1,
"oldfieldname": "net_total",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"reqd": 0
@@ -448,7 +451,7 @@
"no_copy": 0,
"oldfieldname": "other_charges_added",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -460,7 +463,7 @@
"no_copy": 0,
"oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -472,7 +475,7 @@
"no_copy": 1,
"oldfieldname": "total_tax",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -484,7 +487,7 @@
"no_copy": 1,
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -495,7 +498,7 @@
"label": "Rounded Total",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -724,7 +727,8 @@
"description": "% of materials received against this Purchase Order",
"doctype": "DocField",
"fieldname": "per_received",
"fieldtype": "Float",
"fieldtype": "Percent",
"in_list_view": 1,
"label": "% Received",
"no_copy": 1,
"oldfieldname": "per_received",
@@ -737,7 +741,8 @@
"description": "% of materials billed against this Purchase Order.",
"doctype": "DocField",
"fieldname": "per_billed",
"fieldtype": "Float",
"fieldtype": "Percent",
"in_list_view": 1,
"label": "% Billed",
"no_copy": 1,
"oldfieldname": "per_billed",
@@ -814,7 +819,6 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Purchase User",
"submit": 1,
"write": 1
@@ -822,21 +826,13 @@
{
"doctype": "DocPerm",
"match": "supplier",
"permlevel": 0,
"role": "Supplier"
},
{
"doctype": "DocPerm",
"permlevel": 2,
"role": "All",
"write": 1
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Purchase Manager",
"submit": 1,
"write": 1
@@ -846,7 +842,6 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Material User",
"submit": 0,
"write": 0

38
buying/doctype/purchase_order/purchase_order_list.js
View File

@@ -1,38 +0,0 @@
// render
wn.doclistviews['Purchase Order'] = wn.views.ListView.extend({
init: function(d) {
this._super(d)
this.fields = this.fields.concat([
"`tabPurchase Order`.supplier_name",
"ifnull(`tabPurchase Order`.per_received,0) as per_received",
"ifnull(`tabPurchase Order`.per_billed,0) as per_billed",
"`tabPurchase Order`.currency",
"ifnull(`tabPurchase Order`.grand_total_import,0) as grand_total_import",
"`tabPurchase Order`.transaction_date",
]);
this.stats = this.stats.concat(['status', 'company']);
},
columns: [
{width: '3%', content: 'check'},
{width: '5%', content: 'avatar'},
{width: '3%', content: 'docstatus'},
{width: '15%', content: 'name'},
{width: '28%', content: 'supplier_name+tags', css: {color:'#222'}},
{
width: '18%',
content: function(parent, data) {
$(parent).html(format_currency(data.grand_total_import, data.currency))
},
css: {'text-align':'right'}
},
{width: '8%', content: 'per_received', type:'bar-graph', label:'Received'},
{width: '8%', content: 'per_billed', type:'bar-graph', label:'Billed'},
{width: '12%', content:'transaction_date',
css: {'text-align': 'right', 'color':'#777'},
title: "Purchase Order Date", type: "date"}
]
});

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

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-24 11:03:31",
"creation": "2013-01-28 10:05:59",
"docstatus": 0,
"modified": "2013-01-28 11:56:26",
"modified": "2013-01-29 16:28:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -152,7 +152,7 @@
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
"label": "Ref Rate*",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1
},
{
@@ -163,7 +163,7 @@
"label": "Rate*",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"print_width": "100px",
"reqd": 1,
@@ -177,7 +177,7 @@
"label": "Amount*",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"reqd": 1
@@ -344,7 +344,7 @@
"oldfieldtype": "Currency",
"print_hide": 1,
"print_width": "100px",
"read_only": 0,
"read_only": 1,
"width": "100px"
},
{

6
buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:10",
"docstatus": 0,
"modified": "2013-01-23 17:11:19",
"modified": "2013-01-29 16:27:51",
"modified_by": "Administrator",
"owner": "dhanalekshmi@webnotestech.com"
},
@@ -80,7 +80,7 @@
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()"
"options": "Company:company:default_currency"
},
{
"doctype": "DocField",
@@ -89,7 +89,7 @@
"label": "Amount",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"read_only": 1
},
{

6
buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:10",
"docstatus": 0,
"modified": "2013-01-23 17:11:19",
"modified": "2013-01-29 16:27:51",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -98,7 +98,7 @@
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()"
"options": "Company:company:default_currency"
},
{
"doctype": "DocField",
@@ -117,7 +117,7 @@
"label": "Amount",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"read_only": 1
},
{

8
buying/doctype/purchase_request/purchase_request.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-21 18:19:20",
"docstatus": 0,
"modified": "2013-01-23 16:59:33",
"modified": "2013-01-29 18:14:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -183,6 +183,7 @@
"doctype": "DocField",
"fieldname": "requested_by",
"fieldtype": "Data",
"in_list_view": 0,
"label": "Requested By",
"no_copy": 1,
"oldfieldname": "requested_by",
@@ -226,6 +227,7 @@
"fieldname": "status",
"fieldtype": "Select",
"in_filter": 1,
"in_list_view": 1,
"label": "Status",
"no_copy": 1,
"oldfieldname": "status",
@@ -242,7 +244,8 @@
"description": "% of materials ordered against this Purchase Requisition",
"doctype": "DocField",
"fieldname": "per_ordered",
"fieldtype": "Float",
"fieldtype": "Percent",
"in_list_view": 1,
"label": "% Ordered",
"no_copy": 1,
"oldfieldname": "per_ordered",
@@ -280,6 +283,7 @@
"doctype": "DocField",
"fieldname": "remark",
"fieldtype": "Small Text",
"in_list_view": 1,
"label": "Remarks",
"no_copy": 1,
"oldfieldname": "remark",

37
buying/doctype/purchase_request/purchase_request_list.js
View File

@@ -1,37 +0,0 @@
// render
wn.doclistviews['Purchase Request'] = wn.views.ListView.extend({
init: function(d) {
this._super(d)
this.fields = this.fields.concat([
"`tabPurchase Request`.status",
"IFNULL(`tabPurchase Request`.per_ordered, 0) as per_ordered",
"`tabPurchase Request`.remark",
"`tabPurchase Request`.transaction_date",
]);
this.stats = this.stats.concat(['status', 'company']);
},
prepare_data: function(data) {
this._super(data);
if(['Stopped', 'Cancelled'].indexOf(data.status)!=-1) {
data.label_type = 'important';
} else if(data.status == 'Submitted') {
data.label_type = 'success';
}
data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
},
columns: [
{width: '3%', content: 'check'},
{width: '5%', content:'avatar'},
{width: '3%', content:'docstatus'},
{width: '17%', content:'name'},
{width: '50%', content:'status_html+remark+tags', css: {'color': '#222'}},
{width: '10%', content: 'per_ordered', type:'bar-graph', label:'Ordered'},
{width: '12%', content:'transaction_date',
css: {'text-align': 'right', 'color':'#777'},
title: "Quotation Date", type: "date"}
]
});

4
buying/doctype/supplier/supplier.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:11",
"docstatus": 0,
"modified": "2013-01-22 16:55:25",
"modified": "2013-01-29 14:35:42",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -52,6 +52,7 @@
"doctype": "DocField",
"fieldname": "supplier_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Supplier Name",
"no_copy": 1,
"oldfieldname": "supplier_name",
@@ -62,6 +63,7 @@
"doctype": "DocField",
"fieldname": "supplier_type",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Supplier Type",
"oldfieldname": "supplier_type",
"oldfieldtype": "Link",

27
buying/doctype/supplier/supplier_list.js
View File

@@ -1,27 +0,0 @@
// render
wn.doclistviews['Supplier'] = wn.views.ListView.extend({
init: function(d) {
this._super(d)
this.fields = this.fields.concat([
"`tabSupplier`.supplier_type",
"`tabSupplier`.supplier_name",
]);
//this.stats = this.stats.concat(['company']);
},
prepare_data: function(data) {
this._super(data);
data.supplier_name = repl("<a href=\"#!Form/Supplier/%(name)s\">%(supplier_name)s</a>",
data);
},
columns: [
{width: '3%', content: 'check'},
{width: '5%', content:'avatar'},
{width: '50%', content:'supplier_name'},
{width: '10%', content:'tags'},
{width: '20%', content:'supplier_type', css: {'color': '#aaa'}},
{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
]
});

34
buying/doctype/supplier_quotation/supplier_quotation.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-21 18:19:20",
"creation": "2013-01-29 17:54:11",
"docstatus": 0,
"modified": "2013-01-23 17:11:28",
"modified": "2013-01-29 18:11:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"parent": "Supplier Quotation",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
},
@@ -70,6 +71,7 @@
"fieldname": "supplier_name",
"fieldtype": "Data",
"hidden": 1,
"in_list_view": 1,
"label": "Name",
"read_only": 1
},
@@ -356,6 +358,7 @@
"doctype": "DocField",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Grand Total (Import)",
"no_copy": 0,
"oldfieldname": "grand_total_import",
@@ -390,7 +393,7 @@
"no_copy": 1,
"oldfieldname": "net_total",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"reqd": 0
@@ -403,7 +406,7 @@
"no_copy": 0,
"oldfieldname": "other_charges_added",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -415,7 +418,7 @@
"no_copy": 0,
"oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -427,7 +430,7 @@
"no_copy": 1,
"oldfieldname": "total_tax",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -439,7 +442,7 @@
"no_copy": 1,
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -450,7 +453,7 @@
"label": "Rounded Total",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1
},
@@ -676,7 +679,6 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Manufacturing Manager",
"submit": 1,
"write": 1
@@ -686,7 +688,6 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Purchase Manager",
"submit": 1,
"write": 1
@@ -696,7 +697,6 @@
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Purchase User",
"submit": 0,
"write": 1
@@ -706,7 +706,6 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Material User",
"submit": 0,
"write": 0
@@ -716,19 +715,8 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"role": "Supplier",
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 2,
"role": "All",
"submit": 0,
"write": 1
}
]

33
buying/doctype/supplier_quotation/supplier_quotation_list.js
View File

@@ -1,33 +0,0 @@
// render
wn.doclistviews['Supplier Quotation'] = wn.views.ListView.extend({
init: function(d) {
this._super(d)
this.fields = this.fields.concat([
"`tabSupplier Quotation`.supplier_name",
"`tabSupplier Quotation`.currency",
"ifnull(`tabSupplier Quotation`.grand_total_import,0) as grand_total_import",
"`tabSupplier Quotation`.transaction_date",
]);
this.stats = this.stats.concat(['status', 'company']);
},
columns: [
{width: '3%', content: 'check'},
{width: '5%', content:'avatar'},
{width: '3%', content:'docstatus'},
{width: '15%', content:'name'},
{width: '44%', content:'supplier_name+tags', css: {color:'#222'}},
{
width: '18%',
content: function(parent, data) {
$(parent).html(format_currency(data.grand_total_import, data.currency))
},
css: {'text-align':'right'}
},
{width: '12%', content:'transaction_date',
css: {'text-align': 'right', 'color':'#777'},
title: "Supplier Quotation Date", type: "date"}
]
});

10
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-01-24 11:03:32",
"creation": "2013-01-28 10:06:00",
"docstatus": 0,
"modified": "2013-01-25 18:28:54",
"modified": "2013-01-29 16:28:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -138,7 +138,7 @@
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
"label": "Ref Rate*",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1
},
{
@@ -149,7 +149,7 @@
"label": "Rate*",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"print_width": "100px",
"reqd": 1,
@@ -163,7 +163,7 @@
"label": "Amount*",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "eval:erpnext.get_currency()",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"reqd": 1