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

[form cleanup]

Browse Source
This commit is contained in:
Rushabh Mehta 2013-07-05 12:43:59 +05:30
parent 8005362c6c
commit 54352c7140
9 changed files with 77 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/bank_reconciliation/bank_reconciliation.js
View File

@ -17,4 +17,6 @@
cur_frm.add_fetch("bank_account", "company", "company");
cur_frm.cscript.onload = function(doc, cdt, cdn){
cur_frm.set_intro('<i class="icon-question" /> ' +
wn._("Update clearance date of Journal Entries marked as 'Bank Vouchers'"))
}

18
accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
"modified": "2013-03-07 07:03:18",
"modified": "2013-07-05 11:05:59",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -54,6 +54,14 @@
"oldfieldtype": "Date",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
},
{
"doctype": "DocField",
"fieldname": "cheque_number",
@ -91,13 +99,5 @@
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
}
]

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -43,6 +43,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
this._super();
cur_frm.cscript.is_opening(doc, dt, dn);
cur_frm.dashboard.reset();
if(doc.docstatus==1) {
cur_frm.add_custom_button('View Ledger', function() {
@ -53,6 +54,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
};
wn.set_route("general-ledger");
});
cur_frm.dashboard.add_progress()
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);

11
hr/doctype/employee/employee.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
"modified": "2013-04-12 07:16:42",
"modified": "2013-07-05 11:23:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -608,12 +608,6 @@
"label": "Educational Qualification Details",
"options": "Employee Education"
},
{
"doctype": "DocField",
"fieldname": "career_history",
"fieldtype": "Section Break",
"label": "Career History"
},
{
"doctype": "DocField",
"fieldname": "previous_work_experience",
@ -762,7 +756,6 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "Employee",
@ -791,7 +784,6 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "HR User",
@ -801,7 +793,6 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "HR Manager",

2
selling/doctype/sales_order/sales_order.js
View File

@ -36,7 +36,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
cur_frm.dashboard.add_progress(cint(doc.per_delivered) + wn._("% Delivered"),
doc.per_delivered);
cur_frm.dashboard.add_progress(cint(doc.per_delivered) + wn._("% Billed"),
cur_frm.dashboard.add_progress(cint(doc.per_billed) + wn._("% Billed"),
doc.per_billed);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);

19
support/doctype/customer_issue/customer_issue.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
"modified": "2013-06-11 16:16:33",
"modified": "2013-07-05 12:31:46",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@ -38,6 +38,13 @@
"doctype": "DocType",
"name": "Customer Issue"
},
{
"doctype": "DocField",
"fieldname": "customer_section",
"fieldtype": "Section Break",
"label": "Customer",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "naming_series",
@ -121,7 +128,7 @@
"fieldtype": "Section Break",
"label": "Issue Details",
"oldfieldtype": "Section Break",
"options": "Simple"
"options": "icon-ticket"
},
{
"doctype": "DocField",
@ -212,7 +219,7 @@
"fieldtype": "Section Break",
"label": "Resolution",
"oldfieldtype": "Section Break",
"options": "Simple"
"options": "icon-thumbs-up"
},
{
"doctype": "DocField",
@ -250,7 +257,8 @@
"doctype": "DocField",
"fieldname": "contact_info",
"fieldtype": "Section Break",
"label": "Contact Info"
"label": "Contact Info",
"options": "icon-bullhorn"
},
{
"doctype": "DocField",
@ -333,7 +341,8 @@
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info"
"label": "More Info",
"options": "icon-file-text"
},
{
"doctype": "DocField",

16
support/doctype/support_ticket/support_ticket.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-02-01 10:36:25",
"docstatus": 0,
"modified": "2013-05-21 16:27:46",
"modified": "2013-07-05 12:27:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -40,6 +40,13 @@
"doctype": "DocType",
"name": "Support Ticket"
},
{
"doctype": "DocField",
"fieldname": "subject_section",
"fieldtype": "Section Break",
"label": "Subject",
"options": "icon-flag"
},
{
"doctype": "DocField",
"fieldname": "naming_series",
@ -99,7 +106,9 @@
{
"doctype": "DocField",
"fieldname": "sb00",
"fieldtype": "Section Break"
"fieldtype": "Section Break",
"label": "Messages",
"options": "icon-comments"
},
{
"depends_on": "eval:doc.__islocal",
@ -123,7 +132,8 @@
"doctype": "DocField",
"fieldname": "additional_info",
"fieldtype": "Section Break",
"label": "Additional Info",
"label": "Reference",
"options": "icon-pushpin",
"read_only": 1
},
{

12
utilities/doctype/address/address.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-07-01 17:25:00",
"modified": "2013-07-05 11:45:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -39,6 +39,13 @@
"doctype": "DocType",
"name": "Address"
},
{
"doctype": "DocField",
"fieldname": "address_details",
"fieldtype": "Section Break",
"label": "Address Details",
"options": "icon-map-marker"
},
{
"description": "Name of person or organization that this address belongs to.",
"doctype": "DocField",
@ -154,7 +161,8 @@
"doctype": "DocField",
"fieldname": "linked_with",
"fieldtype": "Section Break",
"label": "Linked With"
"label": "Reference",
"options": "icon-pushpin"
},
{
"depends_on": "eval:!doc.supplier && !doc.sales_partner",

31
utilities/doctype/contact/contact.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-02-11 14:32:13",
"modified": "2013-07-05 11:43:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -39,6 +39,13 @@
"doctype": "DocType",
"name": "Contact"
},
{
"doctype": "DocField",
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Contact Details",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "first_name",
@ -91,7 +98,9 @@
{
"doctype": "DocField",
"fieldname": "sb00",
"fieldtype": "Section Break"
"fieldtype": "Section Break",
"label": "Communication History",
"options": "icon-comments"
},
{
"doctype": "DocField",
@ -103,7 +112,8 @@
"doctype": "DocField",
"fieldname": "contact_details",
"fieldtype": "Section Break",
"label": "Contact Details"
"label": "Reference",
"options": "icon-pushpin"
},
{
"depends_on": "eval:!doc.supplier && !doc.sales_partner",
@ -125,6 +135,13 @@
"label": "Customer Name",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"width": "50%"
},
{
"depends_on": "eval:!doc.customer && !doc.sales_partner",
"doctype": "DocField",
@ -163,10 +180,10 @@
},
{
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"width": "50%"
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
"options": "icon-file-text"
},
{
"doctype": "DocField",