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

[merge master

Browse Source 
]
This commit is contained in:
Rushabh Mehta
2013-04-18 10:37:16 +05:30
parent f61b680576 90c9ae713c
commit 651ce05fcc
38 changed files with 616 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:39",
"docstatus": 0,
"modified": "2013-03-07 07:03:23",
"modified": "2013-04-17 14:05:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,6 +58,7 @@
"options": "Company:company:default_currency"
},
{
"default": ":Company",
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",

5
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-07 11:42:55",
"creation": "2013-04-10 08:35:38",
"docstatus": 0,
"modified": "2013-03-29 13:44:37",
"modified": "2013-04-17 14:05:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -170,6 +170,7 @@
"width": "120px"
},
{
"default": ":Company",
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",

5
accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-08 15:36:47",
"creation": "2013-03-26 06:51:12",
"docstatus": 0,
"modified": "2013-03-22 16:45:28",
"modified": "2013-04-17 14:05:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,6 +58,7 @@
"reqd": 1
},
{
"default": ":Company",
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",

5
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-29 18:21:58",
"creation": "2013-04-10 08:35:44",
"docstatus": 0,
"modified": "2013-03-29 19:32:32",
"modified": "2013-04-17 14:05:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -219,6 +219,7 @@
"width": "120px"
},
{
"default": ":Company",
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",

3
accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:41",
"docstatus": 0,
"modified": "2013-03-07 07:03:31",
"modified": "2013-04-17 14:05:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -48,6 +48,7 @@
"search_index": 1
},
{
"default": ":Company",
"doctype": "DocField",
"fieldname": "cost_center_other_charges",
"fieldtype": "Link",

4
accounts/page/general_ledger/general_ledger.js
View File

@@ -307,10 +307,10 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
make_account_by_name: function() {
this.account_by_name = this.make_name_map(wn.report_dump.data["Account"]);
this.make_voucher_acconuts_map();
this.make_voucher_accounts_map();
},
make_voucher_acconuts_map: function() {
make_voucher_accounts_map: function() {
this.voucher_accounts = {};
var data = wn.report_dump.data["GL Entry"];
for(var i=0, j=data.length; i<j; i++) {