Commit Graph

4348 Commits

Author SHA1 Message Date
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
Rushabh Mehta
1d2710d54d added 'report' permission 2013-01-10 17:11:48 +05:30
Anand Doshi
b7d0dcdd14 changed wn.downloadify to wn.tools.downloadify 2013-01-10 14:44:03 +05:30
Anand Doshi
ad13b4a716 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-10 14:38:08 +05:30
Rushabh Mehta
9dbb761f19 latest_upates 2013-01-10 12:37:28 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
249b0b4942 Merge branch 'master' into edge 2013-01-10 11:12:35 +05:30
Nabin Hait
9514d170c2 stock reco testcases 2013-01-10 10:40:37 +05:30
Rushabh Mehta
aecae587ce workflow updates: update_field not editable & bug fix 2013-01-09 19:03:20 +05:30
Rushabh Mehta
978d4e87c9 updated setup 2013-01-09 17:23:45 +05:30
Rushabh Mehta
be0b7df27e Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-09 16:41:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Nabin Hait
3e28f8f54b Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-09 15:23:43 +05:30
Nabin Hait
26d46556a4 first cut error fixes 2013-01-09 15:23:05 +05:30
Anand Doshi
b00ecc72c7 fixed latest updates page 2013-01-09 15:18:18 +05:30
Nabin Hait
55963a4164 added field description in employee 2013-01-09 14:50:01 +05:30
Nabin Hait
f8c6531c3d set as default button in fiscal year 2013-01-09 14:44:24 +05:30
Nabin Hait
0f61b476a2 toggle display of contact info based on customer 2013-01-09 12:50:43 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
435fd1426b Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-09 11:25:34 +05:30
Anand Doshi
f8e248d051 Merge branch 'edge' of github.com:webnotes/erpnext into edge
Conflicts:
	patches/january_2013/holiday_list_patch.py
2013-01-08 19:38:23 +05:30
Anand Doshi
6f88c6680e patch to fix existing holiday lists 2013-01-08 19:36:33 +05:30
Anand Doshi
a2945e8e4b patch to fix existing holiday lists 2013-01-08 19:28:51 +05:30
Nabin Hait
902e8609e5 stock reco and utility function of stocks 2013-01-08 18:29:24 +05:30
Anand Doshi
89230cbc4b fix in holiday list 2013-01-08 18:14:39 +05:30
Anand Doshi
cfd185e5ac fix in leave application holiday calculation 2013-01-08 17:44:31 +05:30
Anand Doshi
c2e3f347ea fix in stock entry.py -- dictionary size should not change when looping 2013-01-08 17:07:00 +05:30
Anand Doshi
e9418f3be1 fix in syntax when using erpnext.queries.item 2013-01-08 17:00:02 +05:30
Anand Doshi
6411b930d7 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:40 +05:30
Nabin Hait
4fb4659a03 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:04 +05:30