mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 07:54:46 +00:00
Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
Nabin Hait
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-19 10:23:33",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:26",
|
||||
"modified": "2013-01-29 16:27:57",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -207,7 +207,7 @@
|
||||
"label": "Credit Limit",
|
||||
"oldfieldname": "credit_limit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"permlevel": 0,
|
||||
"print_hide": 1
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:05",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:16",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -105,7 +105,7 @@
|
||||
"fieldname": "total_amount",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Total Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:05",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:16",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -79,7 +79,7 @@
|
||||
"label": "Debit",
|
||||
"oldfieldname": "debit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"label": "Credit",
|
||||
"oldfieldname": "credit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:05",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:02:32",
|
||||
"modified": "2013-01-29 16:28:16",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -44,7 +44,7 @@
|
||||
"label": "Budget Allocated",
|
||||
"oldfieldname": "budget_allocated",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency(cur_frm.doc.company_name)",
|
||||
"options": "Company:company_name:default_currency",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
@@ -54,7 +54,7 @@
|
||||
"label": "Actual",
|
||||
"oldfieldname": "actual",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency(cur_frm.doc.company_name)",
|
||||
"options": "Company:company_name:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-19 10:23:34",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:26",
|
||||
"modified": "2013-01-29 16:27:57",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -120,7 +120,7 @@
|
||||
"fieldname": "total_amount",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Total Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 0,
|
||||
"reqd": 1
|
||||
},
|
||||
@@ -152,7 +152,7 @@
|
||||
"fieldname": "total_invoiced_amount",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Total Invoiced Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 0,
|
||||
"read_only": 1
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:06",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:16",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -54,7 +54,7 @@
|
||||
"fieldname": "net_total",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Net Total",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1,
|
||||
"width": "120px"
|
||||
},
|
||||
@@ -63,7 +63,7 @@
|
||||
"fieldname": "grand_total",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Grand Total",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1,
|
||||
"width": "120px"
|
||||
}
|
||||
|
||||
@@ -51,6 +51,7 @@ class DocType:
|
||||
ac.doc.doctype = "Account"
|
||||
ac.doc.old_parent = ""
|
||||
ac.doc.freeze_account = "No"
|
||||
ac.ignore_permissions = 1
|
||||
ac.insert()
|
||||
|
||||
return ac.doc.name
|
||||
@@ -59,6 +60,7 @@ class DocType:
|
||||
cc = webnotes.model_wrapper(eval(arg))
|
||||
cc.doc.doctype = "Cost Center"
|
||||
cc.doc.old_parent = ""
|
||||
cc.ignore_permissions = 1
|
||||
cc.insert()
|
||||
|
||||
return cc.doc.name
|
||||
@@ -159,4 +161,4 @@ class DocType:
|
||||
""" % (args))
|
||||
|
||||
if not ret:
|
||||
msgprint("Payment Entry has been modified after you pulled it. Please pull it again.", raise_exception=1)
|
||||
msgprint("Payment Entry has been modified after you pulled it. Please pull it again.", raise_exception=1)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:06",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:17",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -98,7 +98,7 @@
|
||||
"label": "Debit Amt",
|
||||
"oldfieldname": "debit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()"
|
||||
"options": "Company:company:default_currency"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
@@ -107,7 +107,7 @@
|
||||
"label": "Credit Amt",
|
||||
"oldfieldname": "credit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()"
|
||||
"options": "Company:company:default_currency"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-19 10:23:34",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:27",
|
||||
"modified": "2013-01-29 18:19:58",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -62,6 +62,7 @@
|
||||
"fieldname": "voucher_type",
|
||||
"fieldtype": "Select",
|
||||
"in_filter": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Voucher Type",
|
||||
"oldfieldname": "voucher_type",
|
||||
"oldfieldtype": "Select",
|
||||
@@ -119,11 +120,12 @@
|
||||
"fieldname": "total_debit",
|
||||
"fieldtype": "Currency",
|
||||
"in_filter": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Total Debit",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_debit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -135,7 +137,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_credit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -151,7 +153,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "difference",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -222,6 +224,7 @@
|
||||
"doctype": "DocField",
|
||||
"fieldname": "remark",
|
||||
"fieldtype": "Small Text",
|
||||
"in_list_view": 1,
|
||||
"label": "Remark",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "remark",
|
||||
@@ -311,7 +314,7 @@
|
||||
"fieldname": "write_off_amount",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Write Off Amount <=",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
},
|
||||
@@ -346,6 +349,7 @@
|
||||
"fieldname": "total_amount",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"in_list_view": 0,
|
||||
"label": "Total Amount",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({
|
||||
init: function(d) {
|
||||
this._super(d);
|
||||
this.fields = this.fields.concat([
|
||||
'`tabJournal Voucher`.voucher_type',
|
||||
'`tabJournal Voucher`.remark',
|
||||
'`tabJournal Voucher`.total_debit',
|
||||
'`tabJournal Voucher`.company',
|
||||
"`tabJournal Voucher`.posting_date",
|
||||
]);
|
||||
this.stats = this.stats.concat(['voucher_type', 'company']);
|
||||
},
|
||||
prepare_data: function(data) {
|
||||
this._super(data);
|
||||
if(!data.remark) data.remark = '';
|
||||
if(data.remark.length> 30) {
|
||||
data.remark = '<span title="'+data.remark+'">' + data.remark.substr(0,30)
|
||||
+ '...</span>';
|
||||
}
|
||||
},
|
||||
columns: [
|
||||
{width: '3%', content: 'check'},
|
||||
{width: '5%', content: 'avatar'},
|
||||
{width: '3%', content: 'docstatus'},
|
||||
{width: '12%', content: 'name'},
|
||||
{width: '15%', content: 'voucher_type'},
|
||||
{width: '32%', content: 'remark+tags', css: {'color':'#222'}},
|
||||
{
|
||||
width: '18%',
|
||||
content: function(parent, data) {
|
||||
$(parent).html(format_currency(data.total_debit, erpnext.get_currency(data.company)));
|
||||
},
|
||||
css: {'text-align':'right'}
|
||||
},
|
||||
{width: '12%', content:'posting_date',
|
||||
css: {'text-align': 'right', 'color':'#777'},
|
||||
title: "Journal Voucher Date", type: "date"}
|
||||
],
|
||||
});
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:06",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:17",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -45,7 +45,7 @@
|
||||
"label": "Debit",
|
||||
"oldfieldname": "debit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()"
|
||||
"options": "Company:company:default_currency"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
@@ -54,7 +54,7 @@
|
||||
"label": "Credit",
|
||||
"oldfieldname": "credit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()"
|
||||
"options": "Company:company:default_currency"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-23 15:27:14",
|
||||
"creation": "2013-01-21 18:19:17",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:27",
|
||||
"modified": "2013-01-29 16:27:58",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -56,14 +56,6 @@
|
||||
"label": "Company",
|
||||
"options": "Company",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "account_type",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Account Type",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
@@ -100,7 +92,7 @@
|
||||
"fieldname": "total_amount",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Total Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -108,7 +100,7 @@
|
||||
"fieldname": "pending_amt_to_reconcile",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Outstanding Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:07",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:17",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -40,7 +40,7 @@
|
||||
"fieldname": "amt_due",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Unmatched Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -48,7 +48,7 @@
|
||||
"fieldname": "amt_to_be_reconciled",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Allocated Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"fieldname": "total_amt",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Total Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-21 18:19:17",
|
||||
"creation": "2013-01-29 17:54:09",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:25:09",
|
||||
"modified": "2013-01-29 18:25:24",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -89,6 +89,7 @@
|
||||
"fieldname": "supplier_name",
|
||||
"fieldtype": "Text",
|
||||
"hidden": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Name",
|
||||
"oldfieldname": "supplier_name",
|
||||
"oldfieldtype": "Data",
|
||||
@@ -357,7 +358,7 @@
|
||||
"label": "Total Tax",
|
||||
"oldfieldname": "total_tax",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -434,6 +435,7 @@
|
||||
"doctype": "DocField",
|
||||
"fieldname": "grand_total_import",
|
||||
"fieldtype": "Currency",
|
||||
"in_list_view": 1,
|
||||
"label": "Grand Total (Import)",
|
||||
"oldfieldname": "grand_total_import",
|
||||
"oldfieldtype": "Currency",
|
||||
@@ -460,7 +462,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_amount_to_pay",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -472,7 +474,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_advance",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -481,11 +483,12 @@
|
||||
"fieldname": "outstanding_amount",
|
||||
"fieldtype": "Currency",
|
||||
"in_filter": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Outstanding Amount",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "outstanding_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"search_index": 1
|
||||
@@ -506,7 +509,7 @@
|
||||
"label": "Net Total",
|
||||
"oldfieldname": "net_total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -517,7 +520,7 @@
|
||||
"label": "Taxes and Charges Added",
|
||||
"oldfieldname": "other_charges_added",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -528,7 +531,7 @@
|
||||
"label": "Taxes and Charges Deducted",
|
||||
"oldfieldname": "other_charges_deducted",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -539,7 +542,7 @@
|
||||
"label": "Grand Total",
|
||||
"oldfieldname": "grand_total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -560,7 +563,7 @@
|
||||
"fieldtype": "Currency",
|
||||
"label": "Write Off Amount",
|
||||
"no_copy": 1,
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
// render
|
||||
wn.doclistviews['Purchase Invoice'] = wn.views.ListView.extend({
|
||||
init: function(d) {
|
||||
this._super(d);
|
||||
this.fields = this.fields.concat([
|
||||
'`tabPurchase Invoice`.supplier_name',
|
||||
'`tabPurchase Invoice`.credit_to',
|
||||
'`tabPurchase Invoice`.currency',
|
||||
'IFNULL(`tabPurchase Invoice`.grand_total_import, 0) as grand_total_import',
|
||||
'IFNULL(`tabPurchase Invoice`.grand_total, 0) as grand_total',
|
||||
'IFNULL(`tabPurchase Invoice`.outstanding_amount, 0) as outstanding_amount',
|
||||
"`tabPurchase Invoice`.posting_date"
|
||||
]);
|
||||
this.stats = this.stats.concat(['company']);
|
||||
},
|
||||
|
||||
prepare_data: function(data) {
|
||||
this._super(data);
|
||||
data.paid = data.docstatus == 1 ?
|
||||
flt(((data.grand_total - data.outstanding_amount) / data.grand_total) * 100, 2) : 0;
|
||||
},
|
||||
|
||||
columns: [
|
||||
{width: '3%', content: 'check'},
|
||||
{width: '5%', content: 'avatar'},
|
||||
{width: '3%', content: 'docstatus'},
|
||||
{width: '15%', content: 'name'},
|
||||
{
|
||||
width: '34%',
|
||||
content: function(parent, data) {
|
||||
$(parent).html(data.supplier_name?data.supplier_name:data.credit_to)
|
||||
},
|
||||
css: {color: '#222'}
|
||||
},
|
||||
{
|
||||
width: '18%',
|
||||
content: function(parent, data) {
|
||||
$(parent).html(format_currency(data.grand_total_import, data.currency))
|
||||
},
|
||||
css: {'text-align':'right'}
|
||||
},
|
||||
{width: '10%', content: 'paid', type:'bar-graph', label:'Paid'},
|
||||
{width: '12%', content:'posting_date',
|
||||
css: {'text-align': 'right', 'color':'#777'},
|
||||
title: "Purchase Invoice Date", type: "date"},
|
||||
]
|
||||
});
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:08",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:17",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -55,7 +55,7 @@
|
||||
"label": "Advance Amount",
|
||||
"oldfieldname": "advance_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1,
|
||||
"width": "100px"
|
||||
},
|
||||
@@ -66,7 +66,7 @@
|
||||
"label": "Allocated Amount",
|
||||
"oldfieldname": "allocated_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"width": "100px"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-24 11:03:29",
|
||||
"creation": "2013-01-28 10:05:58",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-25 18:28:20",
|
||||
"modified": "2013-01-29 16:28:04",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -119,7 +119,7 @@
|
||||
"fieldname": "purchase_ref_rate",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Ref Rate*",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
@@ -129,7 +129,7 @@
|
||||
"label": "Rate*",
|
||||
"oldfieldname": "rate",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
@@ -140,7 +140,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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:08",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:17",
|
||||
"modified": "2013-01-29 16:27:50",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "wasim@webnotestech.com"
|
||||
},
|
||||
@@ -72,7 +72,7 @@
|
||||
"label": "Rate",
|
||||
"oldfieldname": "rate",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"reqd": 0
|
||||
},
|
||||
{
|
||||
@@ -82,7 +82,7 @@
|
||||
"label": "Amount",
|
||||
"oldfieldname": "tax_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"reqd": 0
|
||||
},
|
||||
{
|
||||
@@ -92,7 +92,7 @@
|
||||
"label": "Total",
|
||||
"oldfieldname": "total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -159,7 +159,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_tax_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
},
|
||||
@@ -173,7 +173,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-10 16:34:08",
|
||||
"creation": "2013-01-29 17:54:09",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:17",
|
||||
"modified": "2013-01-29 18:22:52",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -118,6 +118,7 @@
|
||||
"fieldname": "customer_name",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Name",
|
||||
"oldfieldname": "customer_name",
|
||||
"oldfieldtype": "Data",
|
||||
@@ -244,7 +245,7 @@
|
||||
"label": "Net Total*",
|
||||
"oldfieldname": "net_total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 0,
|
||||
"read_only": 1,
|
||||
"reqd": 1
|
||||
@@ -414,7 +415,7 @@
|
||||
"label": "Total Taxes and Charges",
|
||||
"oldfieldname": "other_charges_total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -450,7 +451,7 @@
|
||||
"label": "Grand Total",
|
||||
"oldfieldname": "grand_total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"reqd": 1,
|
||||
@@ -463,7 +464,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
|
||||
},
|
||||
@@ -485,7 +486,7 @@
|
||||
"label": "Total Advance",
|
||||
"oldfieldname": "total_advance",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -493,11 +494,12 @@
|
||||
"doctype": "DocField",
|
||||
"fieldname": "outstanding_amount",
|
||||
"fieldtype": "Currency",
|
||||
"in_list_view": 1,
|
||||
"label": "Outstanding Amount",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "outstanding_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -513,6 +515,7 @@
|
||||
"doctype": "DocField",
|
||||
"fieldname": "grand_total_export",
|
||||
"fieldtype": "Currency",
|
||||
"in_list_view": 1,
|
||||
"label": "Grand Total (Export)",
|
||||
"oldfieldname": "grand_total_export",
|
||||
"oldfieldtype": "Currency",
|
||||
@@ -549,7 +552,7 @@
|
||||
"label": "Gross Profit",
|
||||
"oldfieldname": "gross_profit",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -582,7 +585,7 @@
|
||||
"label": "Paid Amount",
|
||||
"oldfieldname": "paid_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
@@ -613,7 +616,7 @@
|
||||
"fieldname": "write_off_amount",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Write Off Amount",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
@@ -1027,7 +1030,7 @@
|
||||
"label": "Total Commission",
|
||||
"oldfieldname": "total_commission",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
// render
|
||||
wn.doclistviews['Sales Invoice'] = wn.views.ListView.extend({
|
||||
init: function(d) {
|
||||
this._super(d);
|
||||
this.fields = this.fields.concat([
|
||||
"`tabSales Invoice`.customer_name",
|
||||
"`tabSales Invoice`.debit_to",
|
||||
"ifnull(`tabSales Invoice`.outstanding_amount,0) as outstanding_amount",
|
||||
"ifnull(`tabSales Invoice`.grand_total,0) as grand_total",
|
||||
"`tabSales Invoice`.currency",
|
||||
"ifnull(`tabSales Invoice`.grand_total_export,0) as grand_total_export",
|
||||
"`tabSales Invoice`.posting_date",
|
||||
]);
|
||||
},
|
||||
prepare_data: function(data) {
|
||||
this._super(data);
|
||||
data.paid = (data.docstatus == 1) ?
|
||||
flt((data.grand_total - data.outstanding_amount) / data.grand_total * 100, 2) : 0;
|
||||
},
|
||||
columns: [
|
||||
{width: '3%', content: 'check'},
|
||||
{width: '5%', content: 'avatar'},
|
||||
{width: '3%', content: 'docstatus'},
|
||||
{width: '15%', content: 'name'},
|
||||
{
|
||||
width: '34%',
|
||||
content: function(parent, data) {
|
||||
$(parent).html(data.customer_name?data.customer_name:data.debit_to)
|
||||
},
|
||||
css: {color: '#222'}
|
||||
},
|
||||
{
|
||||
width: '18%',
|
||||
content: function(parent, data) {
|
||||
$(parent).html(format_currency(data.grand_total_export, data.currency))
|
||||
},
|
||||
css: {'text-align':'right'}
|
||||
},
|
||||
{width: '10%', content: 'paid', type:'bar-graph', label:'Paid'},
|
||||
{width: '12%', content:'posting_date',
|
||||
css: {'text-align': 'right', 'color':'#777'},
|
||||
title: "Sales Invoice Date", type: "date"}
|
||||
]
|
||||
});
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:09",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:18",
|
||||
"modified": "2013-01-29 16:27:51",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -55,7 +55,7 @@
|
||||
"label": "Advance amount",
|
||||
"oldfieldname": "advance_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1,
|
||||
"width": "120px"
|
||||
},
|
||||
@@ -66,7 +66,7 @@
|
||||
"label": "Allocated amount",
|
||||
"oldfieldname": "allocated_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"width": "120px"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:09",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-23 17:11:18",
|
||||
"modified": "2013-01-29 16:27:51",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -140,7 +140,7 @@
|
||||
"label": "Price List Rate*",
|
||||
"oldfieldname": "base_ref_rate",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
@@ -152,7 +152,7 @@
|
||||
"label": "Basic Rate*",
|
||||
"oldfieldname": "basic_rate",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"reqd": 1,
|
||||
"search_index": 0
|
||||
@@ -164,7 +164,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
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-24 11:03:30",
|
||||
"creation": "2013-01-24 15:56:19",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-24 14:15:49",
|
||||
"modified": "2013-01-29 16:28:04",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -82,7 +82,7 @@
|
||||
"label": "Amount",
|
||||
"oldfieldname": "tax_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"reqd": 0
|
||||
},
|
||||
{
|
||||
@@ -92,7 +92,7 @@
|
||||
"label": "Total",
|
||||
"oldfieldname": "total",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
@@ -136,7 +136,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_tax_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
},
|
||||
@@ -150,7 +150,7 @@
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "total_amount",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "eval:erpnext.get_currency()",
|
||||
"options": "Company:company:default_currency",
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
},
|
||||
|
||||
@@ -1,40 +1,36 @@
|
||||
[
|
||||
{
|
||||
"owner": "Administrator",
|
||||
"creation": "2013-01-27 16:30:52",
|
||||
"docstatus": 0,
|
||||
"creation": "2012-09-18 11:05:48",
|
||||
"modified": "2013-01-29 13:11:00",
|
||||
"modified_by": "Administrator",
|
||||
"modified": "2012-10-04 17:02:43"
|
||||
"owner": "Administrator"
|
||||
},
|
||||
{
|
||||
"name": "__common__",
|
||||
"title": "Financial Analytics",
|
||||
"module": "Accounts",
|
||||
"doctype": "Page",
|
||||
"module": "Accounts",
|
||||
"name": "__common__",
|
||||
"page_name": "financial-analytics",
|
||||
"standard": "Yes"
|
||||
"standard": "Yes",
|
||||
"title": "Financial Analytics"
|
||||
},
|
||||
{
|
||||
"doctype": "Page Role",
|
||||
"name": "__common__",
|
||||
"parent": "financial-analytics",
|
||||
"parentfield": "roles",
|
||||
"parenttype": "Page"
|
||||
},
|
||||
{
|
||||
"doctype": "Page",
|
||||
"name": "financial-analytics"
|
||||
},
|
||||
{
|
||||
"doctype": "Page Role",
|
||||
"parenttype": "Page",
|
||||
"parentfield": "roles"
|
||||
"role": "Analytics"
|
||||
},
|
||||
{
|
||||
"name": "financial-analytics",
|
||||
"doctype": "Page"
|
||||
},
|
||||
{
|
||||
"role": "Analytics",
|
||||
"doctype": "Page Role"
|
||||
},
|
||||
{
|
||||
"role": "Accounts Manager",
|
||||
"doctype": "Page Role"
|
||||
},
|
||||
{
|
||||
"role": "Accounts User",
|
||||
"doctype": "Page Role"
|
||||
"doctype": "Page Role",
|
||||
"role": "Accounts Manager"
|
||||
}
|
||||
]
|
||||
@@ -1,35 +1,31 @@
|
||||
[
|
||||
{
|
||||
"owner": "Administrator",
|
||||
"creation": "2013-01-27 16:30:52",
|
||||
"docstatus": 0,
|
||||
"creation": "2012-06-14 15:07:28",
|
||||
"modified": "2013-01-29 13:11:17",
|
||||
"modified_by": "Administrator",
|
||||
"modified": "2012-10-04 17:04:05"
|
||||
"owner": "Administrator"
|
||||
},
|
||||
{
|
||||
"name": "__common__",
|
||||
"module": "Accounts",
|
||||
"page_name": "Financial Statements",
|
||||
"doctype": "Page",
|
||||
"module": "Accounts",
|
||||
"name": "__common__",
|
||||
"page_name": "Financial Statements",
|
||||
"standard": "Yes"
|
||||
},
|
||||
{
|
||||
"doctype": "Page Role",
|
||||
"name": "__common__",
|
||||
"parent": "Financial Statements",
|
||||
"doctype": "Page Role",
|
||||
"parentfield": "roles",
|
||||
"parenttype": "Page",
|
||||
"parentfield": "roles"
|
||||
"role": "Accounts Manager"
|
||||
},
|
||||
{
|
||||
"name": "Financial Statements",
|
||||
"doctype": "Page"
|
||||
"doctype": "Page",
|
||||
"name": "Financial Statements"
|
||||
},
|
||||
{
|
||||
"role": "Accounts User",
|
||||
"doctype": "Page Role"
|
||||
},
|
||||
{
|
||||
"role": "Accounts Manager",
|
||||
"doctype": "Page Role"
|
||||
}
|
||||
]
|
||||
@@ -1,40 +1,36 @@
|
||||
[
|
||||
{
|
||||
"owner": "Administrator",
|
||||
"creation": "2013-01-27 16:30:52",
|
||||
"docstatus": 0,
|
||||
"creation": "2012-09-18 11:05:48",
|
||||
"modified": "2013-01-29 13:11:43",
|
||||
"modified_by": "Administrator",
|
||||
"modified": "2012-10-04 17:01:47"
|
||||
"owner": "Administrator"
|
||||
},
|
||||
{
|
||||
"name": "__common__",
|
||||
"title": "Trial Balance",
|
||||
"module": "Accounts",
|
||||
"doctype": "Page",
|
||||
"module": "Accounts",
|
||||
"name": "__common__",
|
||||
"page_name": "trial-balance",
|
||||
"standard": "Yes"
|
||||
"standard": "Yes",
|
||||
"title": "Trial Balance"
|
||||
},
|
||||
{
|
||||
"doctype": "Page Role",
|
||||
"name": "__common__",
|
||||
"parent": "trial-balance",
|
||||
"parentfield": "roles",
|
||||
"parenttype": "Page"
|
||||
},
|
||||
{
|
||||
"doctype": "Page",
|
||||
"name": "trial-balance"
|
||||
},
|
||||
{
|
||||
"doctype": "Page Role",
|
||||
"parenttype": "Page",
|
||||
"parentfield": "roles"
|
||||
"role": "Analytics"
|
||||
},
|
||||
{
|
||||
"name": "trial-balance",
|
||||
"doctype": "Page"
|
||||
},
|
||||
{
|
||||
"role": "Analytics",
|
||||
"doctype": "Page Role"
|
||||
},
|
||||
{
|
||||
"role": "Accounts Manager",
|
||||
"doctype": "Page Role"
|
||||
},
|
||||
{
|
||||
"role": "Accounts User",
|
||||
"doctype": "Page Role"
|
||||
"doctype": "Page Role",
|
||||
"role": "Accounts Manager"
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user