Commit Graph

30 Commits

Author SHA1 Message Date
Rushabh Mehta
36af6a02ad [grid reports] now show by wn.route_options 2013-07-01 14:35:57 +05:30
Anand Doshi
70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/december_2012/deprecate_tds.py
	patches/june_2012/reports_list_permission.py
	selling/doctype/sales_bom/locale/_messages_doc.json
	selling/doctype/sales_bom/locale/ar-doc.json
	selling/doctype/sales_bom/locale/de-doc.json
	selling/doctype/sales_bom/locale/es-doc.json
	selling/doctype/sales_bom/locale/fr-doc.json
	selling/doctype/sales_bom/locale/hi-doc.json
	selling/doctype/sales_bom/locale/hr-doc.json
	selling/doctype/sales_bom/locale/nl-doc.json
	selling/doctype/sales_bom/locale/pt-BR-doc.json
	selling/doctype/sales_bom/locale/pt-doc.json
	selling/doctype/sales_bom/locale/sr-doc.json
	selling/doctype/sales_bom/locale/ta-doc.json
	selling/doctype/sales_bom/locale/th-doc.json
	selling/doctype/sales_bom_item/locale/_messages_doc.json
	selling/doctype/sales_bom_item/locale/ar-doc.json
	selling/doctype/sales_bom_item/locale/de-doc.json
	selling/doctype/sales_bom_item/locale/es-doc.json
	selling/doctype/sales_bom_item/locale/fr-doc.json
	selling/doctype/sales_bom_item/locale/hi-doc.json
	selling/doctype/sales_bom_item/locale/hr-doc.json
	selling/doctype/sales_bom_item/locale/nl-doc.json
	selling/doctype/sales_bom_item/locale/pt-BR-doc.json
	selling/doctype/sales_bom_item/locale/pt-doc.json
	selling/doctype/sales_bom_item/locale/sr-doc.json
	selling/doctype/sales_bom_item/locale/ta-doc.json
	selling/doctype/sales_bom_item/locale/th-doc.json
2013-06-26 14:07:29 +05:30
Nabin Hait
cca41a172c [fix][report] general ledger 2013-06-25 14:14:32 +05:30
Nabin Hait
909e8b120f [fix][report] general ledger 2013-06-25 14:08:18 +05:30
Nabin Hait
3e8eca35a2 [report][fix] stock balance 2013-06-24 17:18:24 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30
Nabin Hait
8b96ba1da6 [general ledger] group by voucher 2013-06-24 13:54:16 +05:30
Nabin Hait
f78d16cca1 [general ledger] group by voucher option 2013-06-21 15:13:49 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Nabin Hait
99883420e7 [general ledger][fixes] for against_account value 2013-04-29 12:17:05 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Anand Doshi
b094ae7f23 [general ledger] [fix] renamed function 2013-04-12 20:19:10 +05:30
Nabin Hait
54cab9cded [fixes] fixes in general ledger grid report 2013-04-10 16:04:18 +05:30
Anand Doshi
b96fef9802 remove cancelled entries from grid report when fetching data based on modified 2013-03-07 15:35:36 +05:30
Nabin Hait
e8b7ac1469 opening and closing balance fix in general ledger 2013-01-02 15:11:29 +05:30
Nabin Hait
2f1d1a05b8 general ledger report group by ledgers 2013-01-01 19:52:52 +05:30
Anand Doshi
6f6fadd360 group gl entries by ledger 2013-01-01 18:32:49 +05:30
Rushabh Mehta
6f65de15ae appframe fixes 2012-12-22 13:50:35 +05:30
Anand Doshi
ca868e42ae added module icons in grid reports 2012-11-26 18:47:54 +05:30
Anand Doshi
8cab3f5f1c Removed Chosen and implemented Link field - autocomplete in grid report 2012-11-23 13:38:39 +05:30
Anand Doshi
ba6aafedad commented out chosen code -- unable to adjust the margin/position correctly 2012-11-22 17:38:48 +05:30
Anand Doshi
293e0124cd convert select to chosen, if specified in filters 2012-11-22 16:53:04 +05:30
Anand Doshi
d7f1bcbde6 changes to make select field compatible to chosen 2012-11-22 16:34:09 +05:30
Rushabh Mehta
9d0569a690 general_ledger: show against account, set title, and show is_opening as opening 2012-11-13 11:42:42 +05:30
Rushabh Mehta
c5a8d427f1 link fix in general ledger 2012-11-12 15:45:08 +05:30
Rushabh Mehta
fe7b444903 reportview, grid_report part of build and separate default dates 2012-11-12 15:39:47 +05:30
Rushabh Mehta
e7ccc317de dynamic loading for reports 2012-10-04 09:57:01 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
2012-10-02 14:35:20 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-09-26 12:24:28 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30