Commit Graph

4527 Commits

Author SHA1 Message Date
Rushabh Mehta
74f68fa27f Merge branch 'master' of github.com:webnotes/erpnext 2013-01-15 14:57:06 +05:30
Rushabh Mehta
04a054d695 Merge branch 'edge' 2013-01-15 14:55:14 +05:30
Rushabh Mehta
64eff9124e cleanup get_support_ticket 2013-01-15 14:38:29 +05:30
Rushabh Mehta
8a8c5ad74c cleanup get_support_ticket 2013-01-15 14:30:08 +05:30
Rushabh Mehta
c6bdbe6203 cleanup get_support_ticket 2013-01-15 14:26:45 +05:30
Rushabh Mehta
133d752ca4 cleanup get_support_ticket 2013-01-15 14:17:31 +05:30
Rushabh Mehta
3e4f340564 support fixes 2013-01-15 12:54:31 +05:30
Rushabh Mehta
8e10cea6d6 support fixes 2013-01-15 12:51:01 +05:30
Rushabh Mehta
971ccf9c0f support fixes 2013-01-15 12:46:17 +05:30
Rushabh Mehta
fd1536b50b cleaned up support email 2013-01-15 12:29:42 +05:30
Anand Doshi
5c03869472 fixed stock reco json to long text 2013-01-15 12:26:28 +05:30
Anand Doshi
62af43c9ff changed reconciliation json to long text 2013-01-15 12:25:02 +05:30
Anand Doshi
3817f2b9ba Merge branch 'master' of github.com:webnotes/erpnext 2013-01-15 12:00:44 +05:30
Anand Doshi
4fc5d92ac5 fixes in stock ledger report 2013-01-15 11:58:19 +05:30
Nabin Hait
d09d091db1 test case added for stock reco 2013-01-15 11:24:48 +05:30
Nabin Hait
e998ccd82a stock reco fises 2013-01-15 11:14:17 +05:30
Rushabh Mehta
ed34ab43e8 stock_ledger, removed un-necessary incoming_rate calculation 2013-01-15 10:42:39 +05:30
Rushabh Mehta
29b8093ec4 tinymce fixes 2013-01-14 18:47:01 +05:30
Rushabh Mehta
aae09ce82c updates to datetime.js 2013-01-14 18:17:58 +05:30
Rushabh Mehta
f0b7972102 consolidated permission checking and added patch 2013-01-14 17:02:13 +05:30
Rushabh Mehta
1cfde3ed41 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-14 16:11:30 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +05:30
Anand Doshi
9437f39c86 fixes in stock reco 2013-01-14 15:52:22 +05:30
Rushabh Mehta
be9ef4ac89 added code to update timestamps in Task, Customer Issue and Support Ticket 2013-01-14 15:48:00 +05:30
Anand Doshi
c313d662df -m 2013-01-14 15:46:17 +05:30
Anand Doshi
39a3c03b62 if not a valid csv file, ignore it in stock reconciliation patch 2013-01-14 15:26:51 +05:30
Anand Doshi
b1cf2119e9 fixes in reconciliation patch 2013-01-14 15:12:44 +05:30
Anand Doshi
54d6f18402 if local, then setup defaults 2013-01-14 15:06:53 +05:30
Anand Doshi
1649c60b0b fix in reconciliation patch 2013-01-14 14:58:55 +05:30
Anand Doshi
34ad33bfcb fix in reconciliation patch 2013-01-14 14:57:16 +05:30
Anand Doshi
4c3217b11c updated latest updates page 2013-01-14 14:54:12 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
2013-01-14 13:28:31 +05:30
Anand Doshi
e868db33ab Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-14 13:20:30 +05:30
Nabin Hait
914c6df478 testcase for stock reco 2013-01-14 13:15:42 +05:30
Anand Doshi
279e08e523 Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-14 11:17:54 +05:30
Anand Doshi
2ab31ab2d3 updated stock reconciliation patch 2013-01-14 11:17:34 +05:30
Rushabh Mehta
0c42dc4c22 updated is_custom='Yes' in standard reports 2013-01-14 10:49:29 +05:30
Rushabh Mehta
6995bb36e8 module apostrophe link issue 2013-01-14 10:27:18 +05:30
Rushabh Mehta
7d033d09dc set default report permission based on read 2013-01-13 14:34:38 +05:30
Nabin Hait
ac53b11969 stock reco fixes with testcases 2013-01-11 19:25:46 +05:30
Anand Doshi
4d79bfb225 added back Trend Analyzer report to home pages 2013-01-11 19:06:57 +05:30
Rushabh Mehta
ae1b0cee1b added help in doclistview to show match conditions 2013-01-11 16:13:41 +05:30
Rushabh Mehta
b116b3243d report permission merge 2013-01-11 15:05:03 +05:30
Rushabh Mehta
f3bb70155b Merge branch 'master' into edge 2013-01-11 15:01:45 +05:30
Anand Doshi
4dc7caadf2 use for update lock when updating stock entries 2013-01-11 11:44:49 +05:30
Rushabh Mehta
5e7ec20588 datepicker fixes 2013-01-11 11:15:27 +05:30
Rushabh Mehta
1233c4a800 financial statements: show only companies where permission is given 2013-01-11 11:00:20 +05:30
Rushabh Mehta
4f5b89934b stock uom replace bugfix 2013-01-11 10:50:54 +05:30
Anand Doshi
1b531866e0 fixes in stock reco, test case for serial no stock entry 2013-01-10 19:29:51 +05:30
Rushabh Mehta
b416166959 added 'report' permission 2013-01-10 17:14:09 +05:30