Commit Graph

374 Commits

Author SHA1 Message Date
Anand Doshi
7f27d34f81 Material Request - Print Heading as a Link field 2013-02-25 15:38:28 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30
Nabin Hait
8a14cdb45d Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 12:45:40 +05:30
Nabin Hait
87d270a5b5 refactored code for reserved qty with testcases 2013-02-22 12:44:51 +05:30
Rushabh Mehta
c359a58766 added Item Name in pending type query reports 2013-02-22 10:48:07 +05:30
Anand Doshi
561556db58 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 19:51:10 +05:30
Anand Doshi
9a17051c8d material request should update bin, even if it is of type Material Transfer 2013-02-21 19:44:55 +05:30
Rushabh Mehta
86039fc614 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 16:58:27 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
1678f6d4ae update requested quantity in bin for both Purchase as well as Transfer type material request 2013-02-21 16:55:14 +05:30
Nabin Hait
c924c1ebb5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:53:42 +05:30
Nabin Hait
9082fad994 testcases for reserved qty 2013-02-21 14:49:44 +05:30
Anand Doshi
a96ba7b326 auto material request should be submitted 2013-02-21 14:38:24 +05:30
Anand Doshi
51fc7c0683 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 12:23:58 +05:30
Anand Doshi
c64da278ca fixed auto material request email 2013-02-21 12:04:42 +05:30
Nabin Hait
8f7899a642 added stopped condition in pending to deliver/received/billed report 2013-02-21 11:44:08 +05:30
Anand Doshi
2c9103fc05 changed save to set value for observer of Material Request 2013-02-21 11:21:34 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
2013-02-21 11:09:43 +05:30
Anand Doshi
8867cc2381 fixes in material request - hide sales order fields, changed Purchase Requisition to Material Request in some places 2013-02-21 11:02:10 +05:30
Rushabh Mehta
833b0f12d5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 09:48:35 +05:30
Anand Doshi
cf05580f8e fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled 2013-02-20 18:44:10 +05:30
Nabin Hait
4489c56b0c Merge branch 'master' of github.com:webnotes/erpnext 2013-02-20 16:25:46 +05:30
Nabin Hait
6f1a5ec209 Disable rounded total feature 2013-02-20 16:25:05 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Anand Doshi
a43b29e4b1 get label from doctype's doclist 2013-02-20 15:55:10 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Rushabh Mehta
b0a76bdfe2 material receipt from bin 2013-02-20 11:16:47 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Rushabh Mehta
51709b7eb3 Merge branch 'master' into edge 2013-02-12 19:23:48 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Anand Doshi
ca73b90a0d raw material supplied in purchase receipt should be a no copy field 2013-02-11 19:32:18 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
8595fcf910 purchase invoice taxes and totals calculations with test cases 2013-02-08 19:28:14 +05:30
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