Commit Graph

45 Commits

Author SHA1 Message Date
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Rushabh Mehta
3ab6c5fca9 appraisal, don't validate points for self-appraisal 2013-01-19 10:54:03 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Nabin Hait
35b6d94c06 automatic purchase request from production planning tool 2013-01-17 12:31:09 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Nabin Hait
d11e9d6619 removed time_to_ampm and time_to_hhmm function 2013-01-16 16:51:58 +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
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
Anand Doshi
435fd1426b Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-09 11:25:34 +05:30
Anand Doshi
e9418f3be1 fix in syntax when using erpnext.queries.item 2013-01-08 17:00:02 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +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
Anand Doshi
f9a3c8fcdc added status validation 2012-12-28 19:42:49 +05:30
Nabin Hait
e606e7850a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:51:55 +05:30
Rushabh Mehta
4337802cdb integrated workflow, disable Submit, Cancel if workflow is defined 2012-12-28 16:07:55 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Anand Doshi
815f2f32c8 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 19:51:57 +05:30
Anand Doshi
3382aee301 fixes in child perms related to production planning tool 2012-12-24 19:40:03 +05:30
Nabin Hait
ed92841868 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:47:57 +05:30
Nabin Hait
68431e9cb3 restored 'use multi level bom' in production order 2012-12-24 18:47:18 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Nabin Hait
625713e2eb fixed message in stock entry 2012-12-21 15:21:39 +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
Anand Doshi
401f954cc7 hide naming series in production order 2012-12-20 16:15:24 +05:30
Nabin Hait
2880a55a01 production order naming series patch 2012-12-20 16:00:27 +05:30
Anand Doshi
6c92a56cae changed description in production order, syntax fix in stock entry.py 2012-12-20 13:57:43 +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
Nabin Hait
1a6a94b760 stock entry cleanup 2012-12-18 18:42:02 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Nabin Hait
f3faead478 disable save button 2012-12-14 14:36:17 +05:30
Nabin Hait
3adaf607f0 bom cleanup 2012-12-14 14:25:51 +05:30
Nabin Hait
351f790ae6 bom code cleanup 2012-12-13 13:13:19 +05:30
Nabin Hait
7e20d938d4 bom code cleanup 2012-12-13 11:47:41 +05:30
Nabin Hait
4301dadaab bom code cleanup 2012-12-13 11:10:17 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Nabin Hait
c52edd1e59 production cleanup 2012-12-11 18:38:58 +05:30
Anand Doshi
038d7aae9b Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:22:40 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Nabin Hait
bfcc16af17 rebuilt exploded bom items patch 2012-12-11 15:14:30 +05:30
Anand Doshi
c551964d5d Merge branch 'master' into production
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
2012-12-11 14:59:19 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30