Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-07 05:56:17 +01:00
commit ac5b240936
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hr/doctype/leave_application/leave_application.js
View File

@ -19,6 +19,9 @@ cur_frm.add_fetch('employee','employee_name','employee_name');
cur_frm.cscript.onload = function(doc, dt, dn) {
if(!doc.posting_date)
set_multiple(dt,dn,{posting_date:get_today()});
if(doc.__islocal) {
cur_frm.set_value("status", "Open")
}
cur_frm.call({
method:"get_approver_list",
callback: function(r) {
@ -29,6 +32,9 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
}
cur_frm.cscript.refresh = function(doc, dt, dn) {
if(doc.__islocal) {
cur_frm.set_value("status", "Open")
}
cur_frm.set_intro("");
if(doc.__islocal && !in_list(user_roles, "HR User")) {
cur_frm.set_intro("Fill the form and save it")

5
hr/doctype/leave_application/leave_application.txt
View File

@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-05 14:11:53",
"creation": "2012-12-06 15:56:41",
"modified_by": "Administrator",
"modified": "2012-12-05 17:38:26"
"modified": "2012-12-07 10:23:53"
},
{
"is_submittable": 1,
@ -39,6 +39,7 @@
"colour": "White:FFF",
"doctype": "DocField",
"label": "Status",
"no_copy": 1,
"options": "Open\nApproved\nRejected",
"fieldname": "status",
"fieldtype": "Select",

0
selling/report/sales_orders_pending_to_be_delivered/__init__.py Normal file
View File

20
selling/report/sales_orders_pending_to_be_delivered/sales_orders_pending_to_be_delivered.txt Normal file
View File

@ -0,0 +1,20 @@
[
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-07 10:14:13",
"modified_by": "Administrator",
"modified": "2012-12-07 10:14:31"
},
{
"name": "__common__",
"ref_doctype": "Sales Order",
"doctype": "Report",
"is_standard": "Yes",
"query": "select \n `tabSales Order`.`name` as \"S.O. No.:Link/Sales Order:120\",\n `tabSales Order`.`transaction_date` as \"S.O. Date\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\",\n `tabSales Order`.`po_no` as \"P.O. No.\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc"
},
{
"name": "Sales Orders Pending To Be Delivered",
"doctype": "Report"
}
]