Commit Graph

4922 Commits

Author SHA1 Message Date
Anand Doshi
3e38d36580 fixes in sales email pulling 2013-02-22 13:08:14 +05:30
Anand Doshi
ff20067a6f Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 12:52:02 +05:30
Anand Doshi
5b859d84a1 fix in sales communication 2013-02-22 12:51:27 +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
96b91f49fa check toggle converted to true / false 2013-02-22 12:32:02 +05:30
Rushabh Mehta
25af38e509 show leave block day warning 2013-02-22 11:43:14 +05:30
Rushabh Mehta
d196ab4254 remove customer details from Project 2013-02-22 11:06:45 +05:30
Rushabh Mehta
c359a58766 added Item Name in pending type query reports 2013-02-22 10:48:07 +05:30
Rushabh Mehta
0ad995460c fixed tags in kb 2013-02-22 10:34:22 +05:30
Anand Doshi
d2b2174ee4 removed last sales order update in customer 2013-02-22 01:44:52 +05:30
Anand Doshi
5acd08205e fix in website pages - should be of _type POST 2013-02-21 20:06:57 +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
dcb1b659b5 added language 2013-02-21 17:05:01 +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
0f45e2b552 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 16:56:11 +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
Rushabh Mehta
2be3a115c6 max height in product_in_list 2013-02-21 15:25:54 +05:30
Rushabh Mehta
fb3158571f max height in product_in_list 2013-02-21 15:23:36 +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
Rushabh Mehta
f210f1f359 added html5 header 2013-02-21 14:47:51 +05:30
Rushabh Mehta
96d63dfb10 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:43:43 +05:30
Rushabh Mehta
da3a42fc51 added web clear patch 2013-02-21 14:42:34 +05:30
Rushabh Mehta
83833ce423 website.css, extended margin 2013-02-21 14:40:14 +05:30
Anand Doshi
a96ba7b326 auto material request should be submitted 2013-02-21 14:38:24 +05:30
Rushabh Mehta
b0a0a59404 website.css, extended margin 2013-02-21 14:32:54 +05:30
Rushabh Mehta
93313cfb93 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:26:34 +05:30
Rushabh Mehta
78db3ec2dd added responsive layout with groups 2013-02-21 14:25:30 +05:30
Anand Doshi
a56dd9ac15 Merge branch 'edge' 2013-02-21 14:14:06 +05:30
Anand Doshi
75641aad00 Mapper - Material Request to Stock Entry 2013-02-21 14:13:24 +05:30
Anand Doshi
a341af182d reload mappers related to Material Request 2013-02-21 13:38:58 +05:30
Anand Doshi
05f35b723d fix in test sending of newsletter 2013-02-21 12:51:42 +05:30
Anand Doshi
f7d5e22662 fix in test sending of newsletter 2013-02-21 12:50:43 +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
Rushabh Mehta
1e037fbe29 urllib quote encoding fix 2013-02-21 11:11:21 +05:30
Anand Doshi
135a4ccabd changed modified of global defaults.txt after merge conflict 2013-02-21 11:10:36 +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
1c36697556 updates to website footer 2013-02-21 10:54:04 +05:30
Rushabh Mehta
f2b17d91a1 updates to website footer 2013-02-21 10:49:37 +05:30
Rushabh Mehta
833b0f12d5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 09:48:35 +05:30
Anand Doshi
67160d48fd allow importing leave allocation 2013-02-20 19:11:54 +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
bd03b899b3 updated latest_updates page 2013-02-20 17:03:51 +05:30