Brahma K 27f9f5edb7 Merge branch 'master' of github.com:webnotes/erpnext ...

Conflicts:
	accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
	accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt
	accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt

2011-07-28 12:41:42 +05:30

..

doctype

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

2011-07-28 12:41:42 +05:30

DocType Label

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

DocType Mapper

all txt files updated due to module renaming/merging

2011-07-01 15:47:42 +05:30

GL Mapper

Sourced wnframework-modules from Google Code as erpnext

2011-06-08 14:37:15 +05:30

Module Def/Accounts

Added js,py and txt files related to Lease Agreement and its reports

2011-07-28 12:23:45 +05:30

page

restructured erpnext and deleted unwanted

2011-07-01 13:34:41 +05:30

Print Format

all txt files updated due to module renaming/merging

2011-07-01 15:47:42 +05:30

Role

all txt files updated due to module renaming/merging

2011-07-01 15:47:42 +05:30

search_criteria

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

2011-07-28 12:41:42 +05:30

TDS Rate Chart

Sourced wnframework-modules from Google Code as erpnext

2011-06-08 14:37:15 +05:30

utils

Lease Agreement

2011-07-26 19:04:13 +05:30

__init__.py

Sourced wnframework-modules from Google Code as erpnext

2011-06-08 14:37:15 +05:30