Commit Graph

340 Commits

Author SHA1 Message Date
Anand Doshi
03fa78597d Merge branch 'master' into purchase_price_list 2013-01-17 10:58:41 +05:30
Rushabh Mehta
8d3fe553e5 added automatic lead creation for sales email id 2013-01-16 12:19:28 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Anand Doshi
756dca719b refactored purchase cycle's get item details and update item details functions and started with purchase price list 2013-01-15 18:39:21 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +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
54d6f18402 if local, then setup defaults 2013-01-14 15:06:53 +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
Nabin Hait
ac53b11969 stock reco fixes with testcases 2013-01-11 19:25:46 +05:30
Rushabh Mehta
5e7ec20588 datepicker fixes 2013-01-11 11:15:27 +05:30
Rushabh Mehta
4f5b89934b stock uom replace bugfix 2013-01-11 10:50:54 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Nabin Hait
3882db03e2 Trial Balance : with/without closing entry 2013-01-01 13:48:40 +05:30
Nabin Hait
30f5346184 stock level report 2012-12-28 15:39:55 +05:30
Anand Doshi
6ff2f6690f reduced width of brand in stock analytics report 2012-12-25 18:39:00 +05:30
Anand Doshi
4279dec000 fixed wn.require path for stock analytics and stock balance 2012-12-25 18:35:12 +05:30
Nabin Hait
ce159ab66b stock balance report and inclusion of filter on brand in all stock reports 2012-12-25 18:04:10 +05:30
Anand Doshi
e47ceae4b0 added option to add status in Support Ticket created through website 2012-12-24 19:50:15 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
70a3db78b7 fix in module addition in toolbar 2012-12-24 18:07:35 +05:30
Rushabh Mehta
ff153490fe desktop items fix 2012-12-22 07:42:04 +05:30
Rushabh Mehta
5ade7ca570 fixes to new desktop 2012-12-21 21:40:19 +05:30
Rushabh Mehta
d3c9fb6b3b changed desktop modules now using font-awesome instead of noun project fonts 2012-12-21 18:27:40 +05:30
Rushabh Mehta
380d7c6a53 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-21 15:01:08 +05:30
Rushabh Mehta
946e6d4a46 desktop icons now use font-awesome 2012-12-21 15:00:29 +05:30
Nabin Hait
dff6ed880b cleanup for stock entry - remove production order from locals 2012-12-21 14:42:00 +05:30
Nabin Hait
3765430c99 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-21 14:14:40 +05:30
Nabin Hait
079f5e0773 For Material Transfer against Production Order, fetch quantity pending to be transferred for each item. 2012-12-21 14:14:07 +05:30
Rushabh Mehta
d49ca03335 added '+' button to file selector and rounded corners 2012-12-21 12:31:45 +05:30
Anand Doshi
ab5cf08c14 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-20 12:42:53 +05:30
Anand Doshi
def65c671d show manufacturing small icon 2012-12-20 12:18:24 +05:30
Rushabh Mehta
be7fe472b6 import merge, remove Core 2012-12-20 11:01:09 +05:30
Rushabh Mehta
5569321d15 fixed z-index and renamed all-app.js to all-app.min.js 2012-12-20 10:37:37 +05:30
Nabin Hait
6435437e5b updates in manufacturing module 2012-12-19 19:33:41 +05:30
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Rushabh Mehta
647e0d1164 updates to product_page (search) and kb fix 2012-12-18 14:47:54 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Rushabh Mehta
fd6ad19fa0 refactored blog client-side code 2012-12-17 12:52:43 +05:30
Nabin Hait
9ea22b75bd Merge branch 'master' into production 2012-12-17 11:39:41 +05:30
Rushabh Mehta
60f47b3648 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 10:28:37 +05:30
Anand Doshi
5f17be8364 added payment link in expiry banner 2012-12-15 18:38:18 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Rushabh Mehta
65f336df59 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-14 16:40:06 +05:30
Rushabh Mehta
173a0fd4b7 refactored web / all-app now linked in app. no wnframework in website 2012-12-14 16:39:27 +05:30
Nabin Hait
3adaf607f0 bom cleanup 2012-12-14 14:25:51 +05:30
Nabin Hait
fce76cd5b2 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-14 13:21:52 +05:30
Anand Doshi
161cf87cc0 in mousetrap - do not save if cur_frm.save_disabled is set 2012-12-14 13:13:02 +05:30