Commit Graph

419 Commits

Author SHA1 Message Date
Nabin Hait
c06e29ddbc removed sales order pending items report 2013-02-01 18:35:35 +05:30
Nabin Hait
ced855e38b purchase order items pending to be received 2013-02-01 13:16:15 +05:30
Nabin Hait
124a6237bf purchase order items pending to be received 2013-02-01 13:11:52 +05:30
Nabin Hait
c063e653a9 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-01 10:36:17 +05:30
Anand Doshi
ec061b0dcc changed item code get query of stock entry 2013-01-31 12:36:32 +05:30
Nabin Hait
53595c6521 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-30 12:49:44 +05:30
Nabin Hait
bf495c9a6d GL Control rewrite and many other cleanup using inheritence 2013-01-30 12:49:08 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Nabin Hait
021dd54fed report: purchase order items pending to be received 2013-01-29 13:48:18 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
7b563f7569 added translation files 2013-01-28 11:19:03 +05:30
Nabin Hait
d4c7159f60 fixes in dynamic label setting and column hiding based on currency 2013-01-25 18:31:06 +05:30
Nabin Hait
f89fb1e41a Other charges in currect currency fixes for all classic/modern/spartan print g=format 2013-01-25 17:24:47 +05:30
Nabin Hait
671fcc00c0 stock ageing: apply zero filters 2013-01-25 15:04:35 +05:30
Rushabh Mehta
e281e670ba Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 07:32:10 +01:00
Rushabh Mehta
9babf9dbdb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 11:58:45 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
3525b62842 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 06:44:01 +01:00
Nabin Hait
27b4a92b02 error fixed in recurring invoices 2013-01-25 11:10:29 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
877a1a9274 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 15:56:15 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Rushabh Mehta
46e8084aea fixes to language 2013-01-24 15:22:06 +05:30
Nabin Hait
8cf90f18f0 check item/item group with same name while creating item group/item 2013-01-24 14:58:21 +05:30
Nabin Hait
1290284c80 validation fixes in mantenance schedule and error fixes in setting serial no warranty expiry date 2013-01-24 13:23:20 +05:30
Nabin Hait
a4a20cbf7b issue fixed in packing slip 2013-01-24 12:37:50 +05:30
Nabin Hait
fd23153f50 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 11:03:24 +05:30
Nabin Hait
8df3f125e5 stripped serial nos before processing 2013-01-24 11:02:48 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Rushabh Mehta
5842ee0918 removed amendment_date mandatory validation from purchase cucle 2013-01-23 09:17:51 +01:00
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Nabin Hait
92a0218091 added uom column in stock reports 2013-01-22 17:52:43 +05:30
Nabin Hait
bf95405c6d Merge branch 'master' of github.com:webnotes/erpnext 2013-01-22 16:50:23 +05:30
Nabin Hait
6e9756b8bb valuation rate mandatory for opening stock reco 2013-01-22 16:49:55 +05:30
Rushabh Mehta
efe8102351 merge 2013-01-22 15:23:58 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
319fb92d18 consider global val method if not specified in item master and apply zero filters 2013-01-22 14:40:20 +05:30
Nabin Hait
025e01322c stock balance report: qty and value in same page, valuation method from item master 2013-01-22 14:03:34 +05:30
Nabin Hait
ec52db8490 commonified in_words function and introduced selling_controller 2013-01-22 11:53:14 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Rushabh Mehta
a495b86848 description in stock level 2013-01-21 18:48:26 +05:30
Rushabh Mehta
70d4fbb7ea changed item from select to link in stock ledger and stock level 2013-01-21 18:19:52 +05:30
Nabin Hait
223897f145 fixes merge conflict 2013-01-21 17:30:35 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Nabin Hait
aeb992a4fd get_query for item code in batch master 2013-01-21 14:20:02 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +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
Nabin Hait
f947368881 added validation for sales return and purchase return 2013-01-18 16:04:51 +05:30
Anand Doshi
75c85a0ff5 Merge branch 'master' into edge 2013-01-18 16:01:53 +05:30
Nabin Hait
e5f1152c01 fixes in stock entry 2013-01-18 15:17:40 +05:30
Nabin Hait
dad280ed8e fixes in stock entry 2013-01-18 15:01:30 +05:30
Anand Doshi
35af9ba4e6 Merge branch 'master' into edge 2013-01-18 14:50:25 +05:30
Nabin Hait
a1716543c2 fixes in stock entry 2013-01-18 14:26:43 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Anand Doshi
8b940ee451 fixes after merge 2013-01-18 13:07:02 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Anand Doshi
8957bf9e09 print hide price list related fields 2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Rushabh Mehta
8af47e8413 Merge branch 'edge' 2013-01-17 18:24:09 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Nabin Hait
1b4f56c57f fixes in c-form 2013-01-17 17:01:51 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Nabin Hait
feee252093 fixes in website page_name for item 2013-01-17 13:03:30 +05:30
Nabin Hait
64d7c4b2d5 fixes in get_incoming_rate 2013-01-17 12:22:59 +05:30
Anand Doshi
03fa78597d Merge branch 'master' into purchase_price_list 2013-01-17 10:58:41 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Nabin Hait
6b1f21d1bb fixes in get_incoming_rate 2013-01-16 17:17:17 +05:30
Nabin Hait
831207ff54 incoming rate for sales return as per delivery note outgoing rate 2013-01-16 14:15:48 +05:30
Nabin Hait
44ffd4360c reorder level and qty added in stock level report 2013-01-16 11:16:21 +05:30
Nabin Hait
c57c0d4e1d item name and description added in stock ageing report 2013-01-16 10:31:55 +05:30
Anand Doshi
8ec06aed5c only allow upto 100 rows in stock reco 2013-01-15 18:54:16 +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
Anand Doshi
5c03869472 fixed stock reco json to long text 2013-01-15 12:26:28 +05:30
Anand Doshi
62af43c9ff changed reconciliation json to long text 2013-01-15 12:25:02 +05:30
Anand Doshi
3817f2b9ba Merge branch 'master' of github.com:webnotes/erpnext 2013-01-15 12:00:44 +05:30
Anand Doshi
4fc5d92ac5 fixes in stock ledger report 2013-01-15 11:58:19 +05:30
Nabin Hait
d09d091db1 test case added for stock reco 2013-01-15 11:24:48 +05:30
Nabin Hait
e998ccd82a stock reco fises 2013-01-15 11:14:17 +05:30
Rushabh Mehta
ed34ab43e8 stock_ledger, removed un-necessary incoming_rate calculation 2013-01-15 10:42:39 +05:30
Rushabh Mehta
aae09ce82c updates to datetime.js 2013-01-14 18:17:58 +05:30
Rushabh Mehta
1cfde3ed41 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-14 16:11:30 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +05:30
Anand Doshi
9437f39c86 fixes in stock reco 2013-01-14 15:52:22 +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
c313d662df -m 2013-01-14 15:46:17 +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
914c6df478 testcase for stock reco 2013-01-14 13:15:42 +05:30
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