Rushabh Mehta
|
542da5e9ee
|
merged patch from stable
|
2011-08-02 13:31:59 +05:30 |
|
Rushabh Mehta
|
8d8dfc3e8d
|
fixed patches
|
2011-08-02 13:16:12 +05:30 |
|
Rushabh Mehta
|
a0e9467dc2
|
merged from origin
|
2011-08-02 13:06:30 +05:30 |
|
Rushabh Mehta
|
393e70b631
|
merged from stable
|
2011-08-02 13:05:09 +05:30 |
|
Anand Doshi
|
8029ca24b5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-02 13:02:46 +05:30 |
|
Nabin Hait
|
809530c4b9
|
Merge branch 'live'
|
2011-08-02 12:57:07 +05:30 |
|
Nabin Hait
|
510dad7aa7
|
fixed error in period closing voucher
|
2011-08-02 12:54:23 +05:30 |
|
Anand Doshi
|
38d1223538
|
Removed patch to modify account id in control panel. Will write script to update that
|
2011-07-29 13:13:46 +05:30 |
|
Anand Doshi
|
c1ef503d98
|
Patch to transfer db_name to account_id in control panel
|
2011-07-29 13:01:54 +05:30 |
|
Nabin Hait
|
f86ee7ed9a
|
Merge branch 'master' of github.com:nabinhait/erpnext
|
2011-07-28 16:25:47 +05:30 |
|
Nabin Hait
|
7c285712e1
|
fixed error in period closing voucher
|
2011-07-28 16:25:11 +05:30 |
|
Nabin Hait
|
b824cdbbfd
|
update modified date of JV through bank reco
|
2011-07-28 16:17:32 +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 |
|
Nabin Hait
|
8ae9895733
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-28 15:33:53 +05:30 |
|
Nabin Hait
|
f541b746d1
|
fixed conflict while merging master and live
|
2011-07-28 15:33:42 +05:30 |
|
Nabin Hait
|
5c04580453
|
Merge pull request #24 from tobrahma/master
Journal Voucher .txt file added and remove a massage while generating schedule in Lease Agreement
|
2011-07-28 03:02:19 -07:00 |
|
Brahma K
|
5ca0153b51
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-28 15:29:30 +05:30 |
|
Brahma K
|
4e5fcf03fc
|
Journal Voucher .txt file added
|
2011-07-28 15:29:12 +05:30 |
|
Nabin Hait
|
36506a20fa
|
merged some update from live
|
2011-07-28 15:18:05 +05:30 |
|
Nabin Hait
|
25ffe5b9a4
|
modules renamed in customer_address and feed patch
|
2011-07-28 13:49:03 +05:30 |
|
Nabin Hait
|
86f3028fc1
|
added __init__.py file in old patches dir
|
2011-07-28 13:13:52 +05:30 |
|
Nabin Hait
|
7ce060ae22
|
Merge pull request #23 from tobrahma/master
Added ignored text files related Lease agreement
|
2011-07-28 00:30:13 -07:00 |
|
Brahma K
|
67b8da652c
|
Added Lease Agreement text files
|
2011-07-28 12:58:14 +05:30 |
|
Nabin Hait
|
d1a17c8592
|
Merge pull request #22 from tobrahma/master
Converted Lease Agreement Reports in Standard and created corrosponding js,py and sql files
|
2011-07-28 00:12:56 -07:00 |
|
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
|
31a407dc87
|
fixed module name in previous patch and proper path somewhere
|
2011-07-28 11:47:45 +05:30 |
|
Rushabh Mehta
|
8852c066ce
|
updated email digest ui
|
2011-07-27 17:46:16 +05:30 |
|
Rushabh Mehta
|
5f3010735b
|
updated email digest ui
|
2011-07-27 17:43:21 +05:30 |
|
Rushabh Mehta
|
90495e0d1f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-27 17:42:07 +05:30 |
|
Nabin Hait
|
c650616509
|
Merge pull request #21 from nabinhait/master
check gl entry b4 delete/trash and conversion of group/ledger
|
2011-07-27 03:18:27 -07:00 |
|
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 |
|
Rushabh Mehta
|
1ead1fcef1
|
added email_digest UI
|
2011-07-27 15:41:11 +05:30 |
|
Rushabh Mehta
|
e4d3b19b24
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-27 15:40:17 +05:30 |
|
Nabin Hait
|
d29916b7f5
|
file_list field hidden in bulk rename tool
|
2011-07-27 14:26:23 +05:30 |
|
Nabin Hait
|
07385ac812
|
Bulk rename tool included in setup module
|
2011-07-27 14:12:14 +05:30 |
|
Nabin Hait
|
ce55dcc2c2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-27 13:13:19 +05:30 |
|
Nabin Hait
|
3a5a9e3748
|
Merge pull request #20 from tobrahma/master
Lease Agreement Permissions update for Accounts Manager
|
2011-07-27 00:42:41 -07:00 |
|
Nabin Hait
|
a74f12a982
|
salary slip restored
|
2011-07-27 13:11:39 +05:30 |
|
Brahma K
|
3085b10224
|
Upload Account Transactions .txt added
|
2011-07-27 13:08:11 +05:30 |
|
Brahma K
|
bf625718ac
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-27 13:04:37 +05:30 |
|
Brahma K
|
3b1ebe0b24
|
Patch to give permission to Accounts Manager to Lease Agreement
|
2011-07-27 13:04:11 +05:30 |
|
Nabin Hait
|
3443e49583
|
Merge pull request #19 from tobrahma/master
Added ignored text files related Lease agreement
|
2011-07-27 00:16:44 -07:00 |
|
Brahma K
|
a71160ebcc
|
Added .txt in gitignore and added text files
|
2011-07-27 12:43:48 +05:30 |
|
Nabin Hait
|
e33831252d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-07-27 12:39:33 +05:30 |
|
Nabin Hait
|
c95e6f6788
|
txt file removed from .gitignore
|
2011-07-27 12:38:45 +05:30 |
|
Nabin Hait
|
85c86c90d2
|
Merge pull request #17 from tobrahma/master
Added patches to Lease Agreement
|
2011-07-26 23:43:58 -07:00 |
|
Brahma K
|
bcdade51e3
|
Added Accounts Module Def
|
2011-07-27 12:11:09 +05:30 |
|