Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

2026-05-15 11:09:17 +00:00 · 2013-07-05 12:57:41 +05:30
parent 901773a139 54352c7140
commit ef8d3bcb77
15 changed files with 219 additions and 117 deletions
--- a/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -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'"))
 }
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -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"
 }
 ]
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-03-25 10:53:52", 
  "docstatus": 0, 
-  "modified": "2013-06-28 14:27:11", 
+  "modified": "2013-07-05 10:27:45", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -37,6 +37,13 @@
  "doctype": "DocType", 
  "name": "Journal Voucher"
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "voucher_type_and_date", 
+  "fieldtype": "Section Break", 
+  "label": "Voucher Type and Date", 
+  "options": "icon-flag"
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break0", 
@@ -102,7 +109,7 @@
  "fieldtype": "Section Break", 
  "label": "Journal Entries", 
  "oldfieldtype": "Section Break", 
-  "options": "Simple", 
+  "options": "icon-table", 
  "read_only": 0
 }, 
 {
@@ -121,7 +128,6 @@
  "doctype": "DocField", 
  "fieldname": "section_break99", 
  "fieldtype": "Section Break", 
-  "options": "Simple", 
  "read_only": 0
 }, 
 {
@@ -180,6 +186,7 @@
  "fieldname": "reference", 
  "fieldtype": "Section Break", 
  "label": "Reference", 
+  "options": "icon-pushpin", 
  "read_only": 0
 }, 
 {
@@ -286,6 +293,7 @@
  "fieldtype": "Section Break", 
  "label": "More Info", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-file-text", 
  "read_only": 0
 }, 
 {
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-05-21 16:16:39", 
  "docstatus": 0, 
-  "modified": "2013-06-11 16:16:38", 
+  "modified": "2013-07-05 10:40:16", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -38,6 +38,13 @@
  "doctype": "DocType", 
  "name": "Purchase Invoice"
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "supplier_section", 
+  "fieldtype": "Section Break", 
+  "label": "Supplier", 
+  "options": "icon-user"
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break0", 
@@ -101,38 +108,34 @@
  "read_only": 1
 }, 
 {
-  "depends_on": "supplier", 
  "doctype": "DocField", 
  "fieldname": "address_display", 
  "fieldtype": "Small Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Address", 
  "read_only": 1
 }, 
 {
-  "depends_on": "supplier", 
  "doctype": "DocField", 
  "fieldname": "contact_display", 
  "fieldtype": "Small Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Contact", 
  "read_only": 1
 }, 
 {
-  "depends_on": "supplier", 
  "doctype": "DocField", 
  "fieldname": "contact_mobile", 
  "fieldtype": "Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Mobile No", 
  "read_only": 1
 }, 
 {
-  "depends_on": "supplier", 
  "doctype": "DocField", 
  "fieldname": "contact_email", 
  "fieldtype": "Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Contact Email", 
  "print_hide": 1, 
  "read_only": 1
@@ -195,6 +198,7 @@
  "fieldtype": "Section Break", 
  "label": "Items", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-shopping-cart", 
  "read_only": 0
 }, 
 {
@@ -226,7 +230,6 @@
  "doctype": "DocField", 
  "fieldname": "section_break_17", 
  "fieldtype": "Section Break", 
-  "options": "Simple", 
  "read_only": 0
 }, 
 {
@@ -267,6 +270,7 @@
  "fieldname": "currency_price_list", 
  "fieldtype": "Section Break", 
  "label": "Currency & Price List", 
+  "options": "icon-tag", 
  "read_only": 0
 }, 
 {
@@ -334,6 +338,7 @@
  "fieldtype": "Section Break", 
  "label": "Taxes", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-money", 
  "read_only": 0
 }, 
 {
@@ -402,6 +407,7 @@
  "fieldname": "contact_section", 
  "fieldtype": "Section Break", 
  "label": "Contact Info", 
+  "options": "icon-bullhorn", 
  "read_only": 0
 }, 
 {
@@ -434,6 +440,7 @@
  "fieldtype": "Section Break", 
  "label": "Totals", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-money", 
  "read_only": 0
 }, 
 {
@@ -647,6 +654,7 @@
  "fieldtype": "Section Break", 
  "label": "Advances", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-money", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -676,7 +684,8 @@
  "doctype": "DocField", 
  "fieldname": "terms_section_break", 
  "fieldtype": "Section Break", 
-  "label": "Terms and Conditions"
+  "label": "Terms and Conditions", 
+  "options": "icon-legal"
 }, 
 {
  "doctype": "DocField", 
@@ -704,6 +713,7 @@
  "fieldtype": "Section Break", 
  "label": "More Info", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-file-text", 
  "print_hide": 1, 
  "read_only": 0
 }, 
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -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);

--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-05-24 19:29:05", 
  "docstatus": 0, 
-  "modified": "2013-06-27 11:35:29", 
+  "modified": "2013-07-05 10:37:41", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -39,6 +39,13 @@
  "doctype": "DocType", 
  "name": "Sales Invoice"
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "customer_section", 
+  "fieldtype": "Section Break", 
+  "label": "Customer", 
+  "options": "icon-user"
+ }, 
 {
  "description": "To manage multiple series please go to Setup > Manage Series", 
  "doctype": "DocField", 
@@ -94,38 +101,34 @@
  "read_only": 1
 }, 
 {
-  "depends_on": "customer", 
  "doctype": "DocField", 
  "fieldname": "address_display", 
  "fieldtype": "Small Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Address", 
  "read_only": 1
 }, 
 {
-  "depends_on": "customer", 
  "doctype": "DocField", 
  "fieldname": "contact_display", 
  "fieldtype": "Small Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Contact", 
  "read_only": 1
 }, 
 {
-  "depends_on": "customer", 
  "doctype": "DocField", 
  "fieldname": "contact_mobile", 
  "fieldtype": "Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Mobile No", 
  "read_only": 1
 }, 
 {
-  "depends_on": "customer", 
  "doctype": "DocField", 
  "fieldname": "contact_email", 
  "fieldtype": "Text", 
-  "hidden": 0, 
+  "hidden": 1, 
  "label": "Contact Email", 
  "print_hide": 1, 
  "read_only": 1
@@ -137,6 +140,16 @@
  "oldfieldtype": "Column Break", 
  "read_only": 0
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "is_pos", 
+  "fieldtype": "Check", 
+  "label": "Is POS", 
+  "oldfieldname": "is_pos", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
+  "read_only": 0
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "amended_from", 
@@ -205,31 +218,12 @@
  "options": "link:Mode of Payment", 
  "read_only": 0
 }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "is_pos", 
-  "fieldtype": "Check", 
-  "label": "Is POS", 
-  "oldfieldname": "is_pos", 
-  "oldfieldtype": "Check", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "update_stock", 
-  "fieldtype": "Check", 
-  "label": "Update Stock", 
-  "oldfieldname": "update_stock", 
-  "oldfieldtype": "Check", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
 {
  "doctype": "DocField", 
  "fieldname": "currency_section", 
  "fieldtype": "Section Break", 
  "label": "Price List and Currency", 
+  "options": "icon-tag", 
  "read_only": 0
 }, 
 {
@@ -304,6 +298,17 @@
  "fieldtype": "Section Break", 
  "label": "Items", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-shopping-cart", 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "update_stock", 
+  "fieldtype": "Check", 
+  "label": "Update Stock", 
+  "oldfieldname": "update_stock", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
  "read_only": 0
 }, 
 {
@@ -323,6 +328,7 @@
  "fieldname": "packing_list", 
  "fieldtype": "Section Break", 
  "label": "Packing List", 
+  "options": "icon-suitcase", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -347,7 +353,6 @@
  "doctype": "DocField", 
  "fieldname": "section_break0", 
  "fieldtype": "Section Break", 
-  "options": "Simple", 
  "read_only": 0
 }, 
 {
@@ -426,6 +431,7 @@
  "fieldtype": "Section Break", 
  "label": "Taxes and Charges", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-money", 
  "read_only": 0
 }, 
 {
@@ -524,6 +530,7 @@
  "fieldtype": "Section Break", 
  "label": "Totals", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-money", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -657,6 +664,7 @@
  "fieldtype": "Section Break", 
  "label": "Advances", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-money", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -686,6 +694,7 @@
  "fieldname": "payments_section", 
  "fieldtype": "Section Break", 
  "label": "Payments", 
+  "options": "icon-money", 
  "read_only": 0
 }, 
 {
@@ -765,6 +774,7 @@
  "fieldtype": "Section Break", 
  "label": "Terms and Conditions", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-legal", 
  "read_only": 0
 }, 
 {
@@ -813,6 +823,7 @@
  "fieldtype": "Section Break", 
  "hidden": 0, 
  "label": "Contact Info", 
+  "options": "icon-bullhorn", 
  "read_only": 0
 }, 
 {
@@ -869,6 +880,7 @@
  "fieldtype": "Section Break", 
  "label": "More Info", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-file-text", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -1033,6 +1045,7 @@
  "fieldtype": "Section Break", 
  "label": "Sales Team", 
  "oldfieldtype": "Section Break", 
+  "options": "icon-group", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -1091,7 +1104,6 @@
  "doctype": "DocField", 
  "fieldname": "section_break2", 
  "fieldtype": "Section Break", 
-  "options": "Simple", 
  "print_hide": 1, 
  "read_only": 0
 }, 
@@ -1112,6 +1124,7 @@
  "fieldname": "recurring_invoice", 
  "fieldtype": "Section Break", 
  "label": "Recurring Invoice", 
+  "options": "icon-time", 
  "print_hide": 1, 
  "read_only": 0
 },