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

228 Commits

Author SHA1 Message Date
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
67b8da652c Added Lease Agreement text files 2011-07-28 12:58:14 +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
Rushabh Mehta
5f3010735b updated email digest ui 2011-07-27 17:43:21 +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
Nabin Hait
d29916b7f5 file_list field hidden in bulk rename tool 2011-07-27 14:26:23 +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
0930762231 Added patch for Lease Agreement 2011-07-27 12:03:34 +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
Brahma K
8a76466d7c Lease Agreement 
Used by leasing and loan agents, who needs to followup their receipts against lease agreements
Contains leasing related reports with prefix "Lease"

Upload Account Transactions
Added a file to upload account transactions from csv file, which passes Journal Voucher and submits automatically
 2011-07-26 18:43:53 +05:30
Brahma K
7cd48f1d59 payable report in a single query 2011-07-21 17:57:32 +05:30
Brahma K
62a7b3cd4a loan file modification 2011-07-21 17:51:13 +05:30
nabinhait
1458af0691 Index patch released and doctype updated based on index 2011-07-20 10:31:19 +05:30
nabinhait
e6526369f3 Accounts Payable report improved: some query written outside the for-loop 
Supplier: supplier_status field has been deleted, not used by anyone except janak
index patch modified
 2011-07-19 18:09:26 +05:30
Brahma K
5e1d504483 Implemented the Auto JV posting upon Loan Installment posting 2011-07-15 19:35:24 +05:30
Brahma K
37fec6e219 Added Loan in Module Def 2011-07-15 11:20:04 +05:30
Rushabh Mehta
fd84f5ce90 added loan, loan_installment txts 2011-07-14 12:42:27 +05:30
Rushabh Mehta
62e77f536b added more features to loan 2011-07-14 12:41:39 +05:30
Rushabh Mehta
4fed41fb7a Merge branch 'master' of github.com:webnotes/erpnext into development 2011-07-14 10:59:20 +05:30
Rushabh Mehta
af596344ba merged conflict in gl_control.py 2011-07-13 14:37:17 +05:30
Rushabh Mehta
81aa8a0756 added loan and loan installment 2011-07-13 13:53:06 +05:30
Ravi Dey
6c174a6e35 company default currency fix 2011-07-11 16:40:49 +05:30
Nabin Hait
025d0620fe Merge branch 'master' of github.com:webnotes/erpnext 2011-07-10 13:50:00 +05:30
nabinhait
9f9b082f54 patch function written for illegal cancelled entry 2011-07-08 18:04:05 +05:30
Ravi Dey
b6e2488847 party_address fix 2011-07-08 15:33:18 +05:30
Ravi Dey
402ebab7df form_16a party address pull fix 2011-07-08 15:05:40 +05:30
Rushabh Mehta
a2ee615c94 added repost function gl_control 2011-07-06 16:15:59 +05:30
nabinhait
5deab24401 fixed conflict while merging with webnotes repo 2011-07-06 09:23:02 +05:30
nabinhait
1bd56b1c08 removed get_tips() from js file 2011-07-05 14:41:36 +05:30
nabinhait
4b2f35ed79 fixed issue in update_voucher_outstanding 2011-07-05 14:25:47 +05:30
nabinhait
c297df5b16 Removed Tips Common from each js file 2011-07-05 10:54:05 +05:30
nabinhait
a56fc00ea3 resoved conflict in patch, company and renaming tools 2011-07-01 16:32:03 +05:30
nabinhait
963f36b969 all txt files updated due to module renaming/merging 2011-07-01 15:47:42 +05:30
Ravi Dey
94a332a8ab Rename Tool updates 2011-07-01 13:50:34 +05:30
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30
Ravi Dey
c1c54c9400 invoice account head fix 2011-06-30 18:10:20 +05:30
Ravi Dey
19da0247c8 fix cost center 2011-06-29 18:28:05 +05:30
Ravi Dey
73e155cadc Fixed Company Deletion 2011-06-29 17:50:12 +05:30
Ravi Dey
7d7d68e563 Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 19:01:32 +05:30
Ravi Dey
5708da5a9f Default currency for company fixed 2011-06-28 19:01:02 +05:30
nabinhait
d4be1aeb66 Merge branch 'master' of git@github.com:webnotes/erpnext 2011-06-28 16:22:30 +05:30
nabinhait
78f5bf6498 fixed conflict 2011-06-28 16:21:58 +05:30
Ravi Dey
2380eabb32 Fixed Company Default Currency in Accounts Browser 2011-06-28 14:55:50 +05:30
Ravi Dey
c5998ce2da Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 14:48:55 +05:30
Ravi Dey
bb24e5ff06 Fixed Company Default Currency in Accounts Browser 2011-06-28 14:48:19 +05:30
nabinhait
53e6b81322 synced to upstream 2011-06-28 14:44:27 +05:30
Anand Doshi
a6a8d57914 Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 13:47:32 +05:30
Anand Doshi
b74eec8e93 Removed sales_register1 and sales_register2 folders as they are not required anymore 2011-06-28 13:42:08 +05:30
Rushabh Mehta
ab24d950bb added sample tests 2011-06-28 13:26:02 +05:30
Anand Doshi
3766a5598d Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 13:11:45 +05:30
Anand Doshi
f295f212b1 Changed query to make it more efficient 2011-06-27 16:30:29 +05:30
Anand Doshi
c0d6502c9f Changed query for faster output. 2011-06-27 13:57:15 +05:30
nabinhait
dda379e2c0 removed trial bal sql file 2011-06-27 12:53:35 +05:30
Ravi Dey
560ee3d18d removed address from tabaccounts 2011-06-23 13:03:24 +05:30
nabinhait
aeee6bae4a last update 2011-06-22 18:25:29 +05:30
nabinhait
a18bef59ae Revert "trial bal: added filter to select what to show(group/ledger/both) and optionto show/hide zero balance" 
This reverts commit 9bffdc95da.
 2011-06-22 14:29:25 +05:30
nabinhait
60ee199e74 Revert "fixed indentation error" 
This reverts commit 3c48be9e60.
 2011-06-22 14:28:13 +05:30
nabinhait
9bffdc95da trial bal: added filter to select what to show(group/ledger/both) and optionto show/hide zero balance 2011-06-22 12:48:51 +05:30
nabinhait
3c48be9e60 fixed indentation error 2011-06-22 12:46:10 +05:30
nabinhait
5559ed9269 subject changed in payable voucher 2011-06-21 17:04:22 +05:30
nabinhait
31a73f2a26 fixed error in update_outstanding through fiscal year 2011-06-21 16:58:01 +05:30
nabinhait
6150e65f71 reload itemwise sales/purchase register: added new columns 2011-06-20 16:34:48 +05:30
nabinhait
95da6f6ad2 deleted server side code from itemwise pur register. Reason: itemwise tax rate was not considering, hence showing wrong result 2011-06-20 13:26:23 +05:30
nabinhait
69cf1a3a62 deleted server side code from itemwise pur register. Reason: itemwise tax rate was not considering, hence showing wrong result 2011-06-20 13:22:41 +05:30
nabinhait
fbf9a5853c deleted server side code from itemwise sales register report 2011-06-20 13:18:55 +05:30
nabinhait
a1c0148472 moved js and py file from itemwise_sales_register1 to itemwise_sales_register 2011-06-20 12:13:14 +05:30
nabinhait
804e6636e7 removed duplicate itemwise sales register 2011-06-20 12:05:30 +05:30
nabinhait
5299d1d293 removed scrapped fn get_pan_tan() from onload of tds payment 2011-06-15 16:15:27 +05:30
nabinhait
d537d1a078 fixed fetching of challan id in form 16A 2011-06-15 15:49:44 +05:30
nabinhait
75e67cfcdb in_words fld added in form 16a 2011-06-15 13:13:27 +05:30
nabinhait
e0250fbab6 Merge branch 'master' of git@github.com:webnotes/erpnext 2011-06-14 15:05:20 +05:30
Pratik Vyas
c1e6e4c752 Sourced wnframework-modules from Google Code as erpnext 2011-06-08 14:37:15 +05:30