Commit Graph

4848 Commits

Author SHA1 Message Date
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
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
c1db0a6220 fixes in patches 2013-02-20 16:08:21 +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
Anand Doshi
150d98d786 calculate total leave days on load 2013-02-19 18:52:20 +05:30
Anand Doshi
64e47afec1 calculate total leave days on load 2013-02-19 18:49:12 +05:30
Anand Doshi
f36a00bcbe changed description of allow users in Leave Block List 2013-02-19 18:43:20 +05:30
Anand Doshi
d70f7dec2b raise leave blocked error when status is saved as Approved 2013-02-19 18:37:51 +05:30
Anand Doshi
c25cf3f413 :erge branch 'master' of github.com:webnotes/erpnext 2013-02-19 16:55:42 +05:30
Anand Doshi
b05b1dacd5 added Follow Via Email 2013-02-19 16:54:49 +05:30
Nabin Hait
704d5f0f4a delete service order/quotation doctype 2013-02-19 16:23:21 +05:30
Nabin Hait
452de98a6c fixes in patch_list 2013-02-19 16:18:00 +05:30
Nabin Hait
0e5ea316cc fixes in naming series 2013-02-19 16:14:27 +05:30
Nabin Hait
f2d68e2fd5 display customer name instead of customer id in quotation print format 2013-02-19 15:55:11 +05:30
Rushabh Mehta
2fe861fa71 defaults cleanup 2013-02-19 15:54:15 +05:30
Nabin Hait
3fdad97b74 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-19 15:48:15 +05:30
Nabin Hait
39fc5179f9 display customer name instead of customer id in quotation print format 2013-02-19 15:47:19 +05:30
Rushabh Mehta
5c6216f0bd merge 2013-02-19 15:36:38 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Anand Doshi
63910e3f20 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-19 15:25:48 +05:30
Anand Doshi
7621a94ed9 allow leave application to have attachments 2013-02-19 15:24:34 +05:30