Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,418 Commits 3 Branches 0 Tags 1 GiB
2482bf32c0
Commit Graph

95 Commits

Author SHA1 Message Date
Anand Doshi
2482bf32c0 fix in recurring invoice error email 2012-10-15 12:32:58 +05:30
Anand Doshi
9035aa825d fix in bank reconciliation 2012-10-12 14:51:06 +05:30
Nabin Hait
35d01ed3a4 fixes in bank reconciliation 2012-10-11 17:14:46 +05:30
Anand Doshi
cc798f4e0d fixed syntax error in journal voucher 2012-10-11 12:43:28 +05:30
Nabin Hait
66660f489e Merge branch 'master' of github.com:webnotes/erpnext 2012-10-10 15:38:58 +05:30
Nabin Hait
27b1c30735 fix cancelled gl entries :patch 2012-10-10 15:34:38 +05:30
Anand Doshi
1aace542c9 removed import error bypass and added missing py files for each doctype 2012-10-10 14:26:23 +05:30
Anand Doshi
d69b32e856 fix in get_balance_on for a date which does not fall within any fiscal year 2012-10-10 11:44:21 +05:30
Nabin Hait
cca0b4aab7 error fixed in financial analytics and financial statement 2012-10-05 18:33:22 +05:30
Nabin Hait
8579262f61 hide master_name if not master_type 2012-10-05 14:34:09 +05:30
Nabin Hait
91e9e5c47b fields disables in account doctype 2012-10-05 14:18:38 +05:30
Nabin Hait
5417f5666c deprecated dashboard 2012-10-05 12:11:23 +05:30
Nabin Hait
97971c43e0 bank reco fixes 2012-10-03 17:47:10 +05:30
Nabin Hait
5e66ce121b fix wrong vouchers due to Valuation charges 2012-10-03 16:58:24 +05:30
Nabin Hait
92dd87f0fe debit-credit tolerance increased to .005 2012-10-03 13:33:13 +05:30
Nabin Hait
9462ce9aef Taxes and charges category issue fixed 2012-10-03 11:54:06 +05:30
Rushabh Mehta
2ccabb26c2 jv print format & core module appframe fix 2012-10-02 16:49:41 +05:30
Rushabh Mehta
4b1894aa85 jv merge fix 2012-10-02 16:27:23 +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
3245a15cb7 added future imports 2012-10-01 11:35:49 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Rushabh Mehta
7c454b3039 dont save duplicate files 2012-09-25 18:20:36 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Brahma K
29d5549bde Features Setting 
1. Features Setting DocType
2. Startup.js will be added with a function which binds with refresh of doc
3. Startup.js contains the Features dictionary
 2011-08-25 16:20:16 +05:30
Nabin Hait
7caae4d71a removed eval 2011-08-23 15:57:06 +05:30
Nabin Hait
503164ae15 Merge pull request #48 from nabinhait/master 
removed eval: hot fix
 2011-08-22 02:54:24 -07:00
Nabin Hait
ff4bf867bf removed eval in pull_details fn 2011-08-22 15:23:24 +05:30
Nabin Hait
d075a6c53d Removed cstr in return for get_server_fields() 2011-08-17 10:50:57 +05:30
Nabin Hait
192db6a7cd str removed for get_server_fields return 2011-08-17 10:28:46 +05:30
Brahma K
8703734087 Development is merged into Master 2011-08-16 14:33:32 +05:30
Brahma K
b77bfdb990 BOM Related changes (1.Unset as Default BOM, 2.Flat BOM Repair 3.delete_doc issue) 2011-08-16 12:10:51 +05:30
Rushabh Mehta
89717292b7 fixed get_server_values to make them utf-8 friendly 2011-08-12 10:55:43 +05:30
Nabin Hait
f82b1cc4bd old_parent field in account is linked to Account now, it will fix account renaming bug 2011-08-05 13:23:14 +05:30
Nabin Hait
7c285712e1 fixed error in period closing voucher 2011-07-28 16:25:11 +05:30
Nabin Hait
f88f2f4d13 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-28 16:01:55 +05:30
Nabin Hait
3df2859299 update modified date of JV through bank reconciliation 2011-07-28 16:01:16 +05:30
Nabin Hait
43a3a619b3 clearance date will be copy while amending journal voucher 2011-07-28 15:38:23 +05:30
Brahma K
4e5fcf03fc Journal Voucher .txt file added 2011-07-28 15:29:12 +05:30
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
Brahma K
f1353e231d Added js,py and txt files related to Lease Agreement and its reports 2011-07-28 12:23:45 +05:30
Nabin Hait
7081d5e300 Check if any gl entry exists instead of current balance while delete/cancel or conveted from ledger to group or vice versa 
Excluded trashed account from Balance sheet and P&L statement
Added is_cancelled check in mis control
 2011-07-27 15:43:37 +05:30
Brahma K
3b1ebe0b24 Patch to give permission to Accounts Manager to Lease Agreement 2011-07-27 13:04:11 +05:30
Brahma K
a71160ebcc Added .txt in gitignore and added text files 2011-07-27 12:43:48 +05:30
Brahma K
790a78785b fixed conflict 2011-07-27 10:54:11 +05:30
Brahma K
d7db2ea20f Lease Agreement 
Used by leasing and loan agents (i.e. Automobile leasing etc) for receipt follow up and reporting

Account Transactions Upload
	Uploads transactions from a csv files, creates Journal Vouchers and submits
 2011-07-26 19:04:13 +05:30