Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,935 Commits 3 Branches 0 Tags 1 GiB
20a6f93612
Commit Graph

1013 Commits

Author SHA1 Message Date
Nabin Hait
da3110fc12 [merge] [minor] merged with master 2013-09-02 13:07:49 +05:30
Nabin Hait
0ddcc6f7cf [fix] [minor] set invoice due date based on credit days 2013-08-31 10:19:56 +05:30
Nabin Hait
5836c58a4b [docs] [minor] accounting for stock 2013-08-31 10:17:27 +05:30
Nabin Hait
94c90bdbf9 [fix] [minor] buying amount for sales bom item 2013-08-30 22:48:19 +05:30
Nabin Hait
da1e503f3d [fix] [minor] removed sample item field from item 2013-08-30 16:24:44 +05:30
Nabin Hait
bb77756069 [fix] [minor] auto accounting for stock transactions 2013-08-29 18:19:37 +05:30
Nabin Hait
d85d63bb81 [minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry 2013-08-28 19:24:52 +05:30
Nabin Hait
2e296fa46f [fix] [minor] Repost future gl entries and testcases 2013-08-28 18:53:11 +05:30
Anand Doshi
c753d31ba7 [fix] [minor] erpnext demo 2013-08-26 17:33:50 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Nabin Hait
27994c216a [perpetual accounting] gl entries based on stock_value difference in sl entries 2013-08-26 16:53:30 +05:30
Anand Doshi
6c0a1a9674 [fix] [minor] temporarily disabled pos view 2013-08-23 19:30:44 +05:30
Nabin Hait
aeba24ee81 [minor] make gl entry through bean and testcases 2013-08-23 15:17:36 +05:30
Rushabh Mehta
cb50dee98c [pos] [minor] added css file 2013-08-23 13:35:21 +05:30
Rushabh Mehta
16a62fa4be [pos] [cleanup] 2013-08-23 13:16:22 +05:30
Nabin Hait
a391606a8f [cleanup] [minor] budget code cleaned up with testcases 2013-08-23 10:46:41 +05:30
Nabin Hait
2b06aaa291 [cleanup] [minor] deprecated budget control and rewritten budget related code 2013-08-22 18:25:43 +05:30
Akhilesh Darjee
d6aa4bff7f [pos] pos view first commit 2013-08-22 17:26:43 +05:30
Nabin Hait
4212180804 Merge branch 'master' of github.com:webnotes/erpnext into perpetual 2013-08-22 15:23:11 +05:30
Rushabh Mehta
622c98d6f4 [demo] [minor] Added accounts, moved JV creation to server-side 2013-08-22 15:17:58 +05:30
Nabin Hait
f3075e19dc Merge branch 'master' of github.com:webnotes/erpnext into perpetual 2013-08-22 14:42:20 +05:30
Nabin Hait
b4418a4997 [minor] budget cleanup 2013-08-22 14:38:46 +05:30
Nabin Hait
77343391f5 [fix] [minor] changed validation message 2013-08-22 10:45:41 +05:30
Nabin Hait
11bd44e447 [minor] fixed conflict while merging with master 2013-08-21 17:51:46 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
4af17a88b0 [cleanup] [minor] period closing voucher inherited from accounts_controller with testcases 2013-08-21 17:45:47 +05:30
Nabin Hait
9653f60e89 [fix] [minor] insert cancelled sl entry for serialized inventory and at the end delete 2013-08-20 15:37:33 +05:30
Nabin Hait
05652874fc [merge] [minor] merged with master for serial_no updatess 2013-08-20 11:28:38 +05:30
Nabin Hait
76273ebfbc [merge] [minor] Fixed conflict while merging serial_no branch with master 2013-08-19 16:26:13 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Nabin Hait
176f3afd14 [fix] [minor] fixes in POS Invoice print format 2013-08-16 16:17:34 +05:30
Nabin Hait
3ccd07cc72 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:21:25 +05:30
Nabin Hait
21cf403b57 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:15:16 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +05:30
Anand Doshi
30324b857a [fix] [minor] set due date in sales invoice after mapping 2013-08-14 17:07:42 +05:30
Anand Doshi
379acbbd77 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 14:23:07 +05:30
Anand Doshi
9618cb8ef1 [fix] [minor] downsample data to 1000 points before plotting using flot.downsample plugin 2013-08-14 14:22:47 +05:30
Nabin Hait
29c8327a2f [fix] [minor] Analytics role added in Financial Statements report 2013-08-14 12:48:41 +05:30
Anand Doshi
dd2ec17962 [fix] [minor] pull credit days from customer, update credit days in account of customer 2013-08-13 13:57:53 +05:30
Anand Doshi
47e14a9de4 [fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings 2013-08-13 13:01:12 +05:30
Anand Doshi
c4dde9bd99 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 20:13:02 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
 2013-08-12 20:00:33 +05:30
Nabin Hait
358907d8a6 [fix] [minor] sales invoice: unhide fields if not hidden in database 2013-08-12 19:06:32 +05:30
Nabin Hait
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Nabin Hait
4af2dbf84d [perpetual accounting] [minor] patch for intial setup 2013-08-12 12:24:08 +05:30