Commit Graph

4169 Commits

Author SHA1 Message Date
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
559c16fabb production cleanup patch 2012-12-11 15:18:51 +05:30
Nabin Hait
52a70832d6 Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:15:04 +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
69b3730a18 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-11 14:36:19 +05:30
Nabin Hait
cddbe6dd80 validation while created through company saving and root deleted 2012-12-11 14:35:45 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
3519d7de01 fixed production cleanup patch 2012-12-10 19:37:49 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Nabin Hait
cb7dc4aa7e Merge branch 'master' into production 2012-12-10 19:03:58 +05:30
Nabin Hait
1ea0944586 rename production to manufacturing 2012-12-10 19:02:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Rushabh Mehta
c50f088a22 website updates changes 2012-12-10 18:25:30 +05:30
Rushabh Mehta
275c04c1f7 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-10 18:24:34 +05:30
Nabin Hait
11931d21eb Merge branch 'master' of github.com:webnotes/erpnext 2012-12-10 18:14:09 +05:30
Nabin Hait
822022082d removed BOM Control and Production Control 2012-12-10 18:13:34 +05:30
Nabin Hait
6db5fffd6d BOM replace tool 2012-12-10 18:12:23 +05:30
Nabin Hait
5999944a5c bom cleanup: update cost and flat bom by traversing full tree 2012-12-10 18:11:42 +05:30
Anand Doshi
29c187118f Merge branch 'master' of github.com:webnotes/erpnext 2012-12-10 18:08:16 +05:30
Anand Doshi
50a19b578c fix in fiscal year validation 2012-12-10 18:06:14 +05:30
Anand Doshi
c9d9bf3a58 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-10 15:16:28 +05:30
Anand Doshi
a02a14f442 employee query in expense claim 2012-12-10 15:15:52 +05:30
Rushabh Mehta
1c8ab8ad7a c 2012-12-10 14:56:45 +05:30
Rushabh Mehta
6aa52622b2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-10 09:18:24 +01:00
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30
Rushabh Mehta
29be18947e p 2012-12-10 11:15:59 +05:30
Rushabh Mehta
8532e35b57 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-08 08:37:35 +01:00
Anand Doshi
0952dcdda3 fixed error message in purchase common in update_refdoc_qty 2012-12-08 13:03:57 +05:30
Rushabh Mehta
76ce330cb5 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-08 07:19:04 +01:00
Anand Doshi
85e785fa0d fix in naming series 2012-12-08 11:47:36 +05:30
Rushabh Mehta
9c95dfeca3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 15:29:55 +01:00
Anand Doshi
f437899a5b fix in blog link 2012-12-07 19:59:25 +05:30
Rushabh Mehta
880e26d9c2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 15:23:41 +01:00
Anand Doshi
baf4f648a5 fixed comments - import issue 2012-12-07 19:53:18 +05:30
Anand Doshi
d62845641d fix in assign to notifications 2012-12-07 19:28:27 +05:30
Rushabh Mehta
4ddbacc460 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 14:40:42 +01:00
Anand Doshi
b6a0f780f0 fix in assign notifications 2012-12-07 19:10:16 +05:30
Rushabh Mehta
f98c4d0875 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 14:19:04 +01:00
Anand Doshi
ae0ca1c0a0 changed fiscal year back to link in Leave Application DocType 2012-12-07 18:48:17 +05:30
Rushabh Mehta
ec557ee053 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 11:49:01 +01:00
Rushabh Mehta
c821f2b3ff leave application type fix 2012-12-07 16:17:59 +05:30
Rushabh Mehta
6b118571db Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 15:48:01 +05:30
Rushabh Mehta
0db74a7ebd cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification 2012-12-07 15:47:32 +05:30
Rushabh Mehta
91e760ade1 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 10:51:55 +01:00
Anand Doshi
197d1b4e55 show expiry date in setup home page 2012-12-07 15:21:34 +05:30
Rushabh Mehta
ec46d02ac0 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 10:14:35 +01:00
Nabin Hait
9b924ce695 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 14:43:40 +05:30
Nabin Hait
2ce027fc9f floating point issue in percentage delivered/billed 2012-12-07 14:43:06 +05:30