Commit Graph

385 Commits

Author SHA1 Message Date
Nabin Hait
2604a99072 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 14:08:28 +05:30
Nabin Hait
0739e7f573 fixed conflict 2013-02-08 14:07:29 +05:30
Nabin Hait
a76a0687ef get_query continued 2013-02-08 14:04:13 +05:30
Anand Doshi
6a5efa972b added test record for purchase invoice test case 2013-02-08 13:57:05 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Nabin Hait
dc95c15002 changed args to filters in get_query 2013-02-07 12:08:38 +05:30
Nabin Hait
c39d13b6a7 fixes in item: duplicate tax validation 2013-02-07 11:36:37 +05:30
Nabin Hait
9986ae8c6f stock_qty now editable in PO item and PR Item table 2013-02-07 10:51:40 +05:30
Nabin Hait
b5bc99376e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-06 17:40:46 +05:30
Nabin Hait
fa230e47f4 get_query shifted to server for account 2013-02-06 17:40:14 +05:30
Anand Doshi
613cb6a9f9 bug fix in clear unallocated advances 2013-02-06 17:33:46 +05:30
Nabin Hait
6fb3814b92 added project column in to be delivered/billed report 2013-02-05 16:56:14 +05:30
Rushabh Mehta
4310fd6aa0 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-04 14:03:05 +05:30
Nabin Hait
cb5a05ea98 fixes in stock ledger report 2013-02-04 13:57:54 +05:30
Rushabh Mehta
0dbe898d82 added warehouse user to retrict entry and also introduced query handlers 2013-02-04 13:56:50 +05:30
Rushabh Mehta
9665fd967e fixes in alter table and updated listviews for delivery note and purchase receipt 2013-02-02 19:20:35 +05:30
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