Commit Graph

324 Commits

Author SHA1 Message Date
Rushabh Mehta
0c42dc4c22 updated is_custom='Yes' in standard reports 2013-01-14 10:49:29 +05:30
Nabin Hait
ac53b11969 stock reco fixes with testcases 2013-01-11 19:25:46 +05:30
Anand Doshi
4dc7caadf2 use for update lock when updating stock entries 2013-01-11 11:44:49 +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
Anand Doshi
ad13b4a716 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-10 14:38:08 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Nabin Hait
9514d170c2 stock reco testcases 2013-01-10 10:40:37 +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
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
Nabin Hait
902e8609e5 stock reco and utility function of stocks 2013-01-08 18:29:24 +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
Nabin Hait
418d580a8b fifo part of stock reconciliation 2013-01-07 19:35:20 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +05:30
Rushabh Mehta
996c30a575 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-07 17:43:52 +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
ea09dbcfbb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-07 15:00:08 +05:30
Nabin Hait
8bacc3443e added columns and moved serial no related reports to stock module 2013-01-07 14:59:07 +05:30
Anand Doshi
e80b9c6ee9 closing = opening + diff for stock balance report 2013-01-07 13:28:40 +05:30
Anand Doshi
1d55c72d8b added .py~ to gitignore 2013-01-07 12:54:10 +05:30
Anand Doshi
68d1023624 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-04 13:17:03 +05:30
Anand Doshi
62299260dc shifted UOM field to after qty field in purchase cycle 2013-01-04 13:16:34 +05:30
Nabin Hait
0b65700ef8 serial No Status report 2013-01-04 12:06:54 +05:30
Anand Doshi
cec918f9ce fix in stock level report 2013-01-02 16:00:25 +05:30
Anand Doshi
946442d7a5 added new item-wise pricelist report and deprecated search criteria of Stock module 2013-01-02 13:51:29 +05:30
Nabin Hait
6072a682bc added description in stock level and balance report 2012-12-31 17:16:23 +05:30
Anand Doshi
025d741ecf fix in stock balance report 2012-12-31 12:43:36 +05:30
Anand Doshi
751af41a94 temporarily removed status validation for serial no 2012-12-30 16:43:04 +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
Nabin Hait
6850b4c572 added footnote to stock level report explaining the various columns 2012-12-28 16:44:52 +05:30
Nabin Hait
30f5346184 stock level report 2012-12-28 15:39:55 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Anand Doshi
391b6b7a0f fixes validation in item master 2012-12-28 15:30:21 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Anand Doshi
b420e88955 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 15:36:30 +05:30
Anand Doshi
b62c4edf02 added is_item_table_empty validation in submit event of purchase common 2012-12-27 15:35:58 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Anand Doshi
b2c3e81e55 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:35:39 +05:30
Anand Doshi
4279dec000 fixed wn.require path for stock analytics and stock balance 2012-12-25 18:35:12 +05:30
Rushabh Mehta
4ce83836b3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:23:37 +05:30
Rushabh Mehta
7edf899706 added wesite slideshow and attributions on website 2012-12-25 18:18:17 +05:30
Nabin Hait
bfe864e11a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:17:16 +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
Rushabh Mehta
f50c012808 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 15:09:58 +05:30
Rushabh Mehta
7837d80716 fixes to website, item (added table for cross listing), modules_setup and form_header 2012-12-25 15:09:14 +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
b9314da054 validate is stock item in stock entry 2012-12-24 18:38:32 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Rushabh Mehta
6f65de15ae appframe fixes 2012-12-22 13:50:35 +05:30
Anand Doshi
c3e485b705 fixed remove from locals 2012-12-21 16:02:36 +05:30
Nabin Hait
dff6ed880b cleanup for stock entry - remove production order from locals 2012-12-21 14:42:00 +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
be8af5b7ed Merge branch 'master' of github.com:webnotes/erpnext 2012-12-20 18:34:09 +05:30
Anand Doshi
d566a10f55 validate warehouses for manufacture/repack only if bom is used 2012-12-20 18:33:04 +05:30
Rushabh Mehta
88a4c44cfa Merge branch 'master' of github.com:webnotes/erpnext 2012-12-20 17:12:59 +05:30
Rushabh Mehta
fc19f25c88 updates to item, item_group and website 2012-12-20 17:11:51 +05:30
Nabin Hait
b5d23ee554 hide display of from/to warehouse based on purpose 2012-12-20 15:33:59 +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
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
Nabin Hait
5c2bb9d9ed sales order linked with project 2012-12-18 10:44:01 +05:30
Nabin Hait
7c59c68434 stock entry cleanp 2012-12-18 10:28:36 +05:30
Rushabh Mehta
a93ba77918 added item specification, bugfix for form grid 2012-12-17 16:02:04 +05:30
Rushabh Mehta
0e9e848cfc added item specification, bugfix for form grid 2012-12-17 16:00:34 +05:30
Anand Doshi
834adfab60 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 14:13:59 +05:30
Anand Doshi
1b8918a192 do not copy uom details in item 2012-12-17 14:12:47 +05:30
Rushabh Mehta
6fa388c3d4 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 12:53:20 +05:30
Anand Doshi
09f799bc98 show message on removing attachment used in description html 2012-12-17 12:12:01 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +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
13d2e74886 bom cleanup 2012-12-14 14:29:12 +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
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Rushabh Mehta
a59aa68eac added new reports 2012-12-14 10:27:10 +05:30
Rushabh Mehta
e848e9c4c3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 13:14:22 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
d8e5dcc6f8 accepted qty = received qty, if not accepted qty 2012-12-12 16:52:23 +05:30
Rushabh Mehta
4b8f90c5b4 permission, user_default fix 2012-12-12 16:28:21 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Nabin Hait
c52edd1e59 production cleanup 2012-12-11 18:38:58 +05:30
Rushabh Mehta
38b6af97e5 updates to attachment 2012-12-11 16:19:14 +05:30
Rushabh Mehta
24a69613e0 update file urls 2012-12-11 15:58:19 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +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
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Nabin Hait
5999944a5c bom cleanup: update cost and flat bom by traversing full tree 2012-12-10 18:11:42 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +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
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
Rushabh Mehta
571377a313 added html to tinymce + moved website/web_cache.py > website/utils.py 2012-12-07 11:00:26 +05:30
Anand Doshi
a367bfe059 fixes after website refactor 2012-12-06 18:26:09 +05:30
Anand Doshi
0e0b2317e1 fixes in item after change in website 2012-12-06 18:18:58 +05:30
Rushabh Mehta
df0b00a981 refactored website 2012-12-06 16:15:38 +05:30
Anand Doshi
8e6ab709f5 fix in delivery note unhide of adj_rate and ref_rate 2012-12-06 11:55:41 +05:30
Anand Doshi
2249d9d858 fixes in packing slip - packed qty validation 2012-12-05 19:57:27 +05:30
Anand Doshi
0a32ed3219 allow changing the uom conversion factor in purchase cycle 2012-12-05 16:50:49 +05:30
Anand Doshi
d3b82cf9de fixes in tax controller and test purchase receipt 2012-12-04 11:49:37 +05:30
Nabin Hait
ff438b8cee rejected serial no 2012-12-03 18:35:17 +05:30
Nabin Hait
1d15c704af rejected serial no fixes 2012-12-03 18:14:16 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30
Nabin Hait
4c70cd974a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-03 15:58:37 +05:30
Nabin Hait
dd4c679899 stock entry incoming rate fixes and batch no get_query 2012-12-03 15:57:50 +05:30
Rushabh Mehta
7dd13a45f6 chart of account fixes, added delete, rename 2012-12-03 14:11:24 +05:30
Rushabh Mehta
833f070991 added allow_rename and also fix in autonotification 2012-12-03 11:33:08 +05:30
Rushabh Mehta
08a437bad7 removed schedule date mandatory from purchase receipt 2012-12-03 10:21:52 +05:30
Anand Doshi
9760aebdf9 ported test data and test purchase receipt from aii 2012-11-30 19:46:11 +05:30
Anand Doshi
9021ef75d1 minor fixes 2012-11-30 19:45:51 +05:30
Anand Doshi
d8b85073cd removed old tests.py 2012-11-30 19:45:39 +05:30
Anand Doshi
ea61d8cf99 replaced set 2012-11-30 17:18:45 +05:30
Anand Doshi
535fbb1b00 replaced get_value 2012-11-30 17:16:03 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Nabin Hait
3e0612db83 fixed conflict 2012-11-30 15:02:20 +05:30
Nabin Hait
faf251a53e Production cleanup with linking with sales order 2012-11-30 14:36:01 +05:30
Rushabh Mehta
35c017a78f cleanup of notification control: now in boot 2012-11-30 10:57:28 +05:30
Anand Doshi
88d522aa51 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 17:14:23 +05:30
Anand Doshi
01bf10b8b6 changed default to Monthly in new grid reports 2012-11-28 17:12:18 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Anand Doshi
ca868e42ae added module icons in grid reports 2012-11-26 18:47:54 +05:30
Rushabh Mehta
de91a21946 commonified naming_series 2012-11-26 11:58:22 +05:30
Rushabh Mehta
7d665818b5 moved delivered_items_to_be_billed from stock to accounts 2012-11-23 17:56:30 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
83350bc946 supplier can now be searched using name 2012-11-22 17:39:19 +05:30
Anand Doshi
93a35cab19 added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series 2012-11-21 18:02:22 +05:30
Anand Doshi
f26511e466 refactored customer and supplier details fetch for sales and purchase return stock entry 2012-11-19 13:59:25 +05:30
Rushabh Mehta
dc06be26c6 docperm fix for appraisal, removed validation in item 2012-11-16 16:52:02 +05:30
Rushabh Mehta
ce4ed265d2 fixes to rename_tool, added serial no for rename 2012-11-16 14:25:03 +05:30
Rushabh Mehta
188185f3a3 help link fixes in lead, opportunity; delete cancelled sles for item 2012-11-16 12:39:05 +05:30
Rushabh Mehta
ab55e6b252 upgraded tinymce to 3.5.7 2012-11-12 19:13:28 +05:30
Rushabh Mehta
fe7b444903 reportview, grid_report part of build and separate default dates 2012-11-12 15:39:47 +05:30