[cleanup] moved company to top section, hide company if only one exists, changed field labels

2026-05-29 18:04:46 +00:00 · 2013-07-09 13:03:39 +05:30
parent 8f050f4cd3
commit bdee6e074a
23 changed files with 616 additions and 742 deletions
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-05-24 19:29:08", 
  "docstatus": 0, 
-  "modified": "2013-07-08 15:51:41", 
+  "modified": "2013-07-09 12:48:56", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -236,7 +236,7 @@
  "doctype": "DocField", 
  "fieldname": "section_break0", 
  "fieldtype": "Section Break", 
-  "label": "Price List and Currency", 
+  "label": "Currency and Price List", 
  "options": "icon-tag", 
  "read_only": 0
 }, 
@@ -348,15 +348,20 @@
  "doctype": "DocField", 
  "fieldname": "net_total_export", 
  "fieldtype": "Currency", 
-  "label": "Net Total (Export)", 
+  "label": "Net Total", 
  "options": "currency", 
  "read_only": 1
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_28", 
+  "fieldtype": "Column Break"
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "net_total", 
  "fieldtype": "Currency", 
-  "label": "Net Total*", 
+  "label": "Net Total (Company Currency)", 
  "no_copy": 0, 
  "oldfieldname": "net_total", 
  "oldfieldtype": "Currency", 
@@ -366,15 +371,6 @@
  "reqd": 0, 
  "width": "100px"
 }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
 {
  "doctype": "DocField", 
  "fieldname": "taxes", 
@@ -445,19 +441,8 @@
  "doctype": "DocField", 
  "fieldname": "other_charges_total_export", 
  "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total (Export)", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "other_charges_total", 
-  "fieldtype": "Currency", 
  "label": "Taxes and Charges Total", 
-  "oldfieldname": "other_charges_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
+  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1
 }, 
@@ -468,12 +453,14 @@
 }, 
 {
  "doctype": "DocField", 
-  "fieldname": "calculate_charges", 
-  "fieldtype": "Button", 
-  "label": "Calculate Taxes and Charges", 
-  "oldfieldtype": "Button", 
+  "fieldname": "other_charges_total", 
+  "fieldtype": "Currency", 
+  "label": "Taxes and Charges Total (Company Currency)", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
  "print_hide": 1, 
-  "read_only": 0
+  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
@@ -539,7 +526,7 @@
  "doctype": "DocField", 
  "fieldname": "grand_total", 
  "fieldtype": "Currency", 
-  "label": "Grand Total*", 
+  "label": "Grand Total (Company Currency)", 
  "no_copy": 0, 
  "oldfieldname": "grand_total", 
  "oldfieldtype": "Currency", 
@@ -553,7 +540,7 @@
  "doctype": "DocField", 
  "fieldname": "rounded_total", 
  "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
  "no_copy": 0, 
  "oldfieldname": "rounded_total", 
  "oldfieldtype": "Currency", 
@@ -567,7 +554,7 @@
  "doctype": "DocField", 
  "fieldname": "in_words", 
  "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
  "no_copy": 0, 
  "oldfieldname": "in_words", 
  "oldfieldtype": "Data", 
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-03-07 11:42:57", 
  "docstatus": 0, 
-  "modified": "2013-05-22 12:10:32", 
+  "modified": "2013-07-09 12:24:21", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -174,7 +174,7 @@
  "doctype": "DocField", 
  "fieldname": "base_ref_rate", 
  "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
  "oldfieldname": "base_ref_rate", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -189,7 +189,7 @@
  "fieldname": "basic_rate", 
  "fieldtype": "Currency", 
  "in_filter": 0, 
-  "label": "Basic Rate*", 
+  "label": "Basic Rate (Company Currency)", 
  "oldfieldname": "basic_rate", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -206,7 +206,7 @@
  "fieldname": "amount", 
  "fieldtype": "Currency", 
  "in_filter": 0, 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
  "oldfieldname": "amount", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-06-18 12:39:59", 
  "docstatus": 0, 
-  "modified": "2013-07-08 15:54:25", 
+  "modified": "2013-07-09 12:47:46", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -210,7 +210,7 @@
  "fieldname": "po_no", 
  "fieldtype": "Data", 
  "hidden": 0, 
-  "label": "P.O. No", 
+  "label": "Customer's Purchase Order No", 
  "oldfieldname": "po_no", 
  "oldfieldtype": "Data", 
  "print_hide": 0, 
@@ -223,7 +223,7 @@
  "fieldname": "po_date", 
  "fieldtype": "Date", 
  "hidden": 0, 
-  "label": "P.O. Date", 
+  "label": "Customer's Purchase Order Date", 
  "oldfieldname": "po_date", 
  "oldfieldtype": "Date", 
  "print_hide": 0, 
@@ -255,7 +255,7 @@
  "doctype": "DocField", 
  "fieldname": "sec_break45", 
  "fieldtype": "Section Break", 
-  "label": "Price List and Currency", 
+  "label": "Currency and Price List", 
  "options": "icon-tag"
 }, 
 {
@@ -364,19 +364,29 @@
  "print_hide": 1, 
  "read_only": 1
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "section_break_31", 
+  "fieldtype": "Section Break"
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "net_total_export", 
  "fieldtype": "Currency", 
-  "label": "Net Total (Export)", 
+  "label": "Net Total", 
  "options": "currency", 
  "read_only": 1
 }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_33", 
+  "fieldtype": "Column Break"
+ }, 
 {
  "doctype": "DocField", 
  "fieldname": "net_total", 
  "fieldtype": "Currency", 
-  "label": "Net Total*", 
+  "label": "Net Total (Company Currency)", 
  "oldfieldname": "net_total", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -385,15 +395,6 @@
  "reqd": 0, 
  "width": "150px"
 }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1, 
-  "search_index": 0
- }, 
 {
  "doctype": "DocField", 
  "fieldname": "taxes", 
@@ -458,23 +459,11 @@
  "doctype": "DocField", 
  "fieldname": "other_charges_total_export", 
  "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total (Export)", 
+  "label": "Taxes and Charges Total", 
  "options": "currency", 
  "print_hide": 1, 
  "read_only": 1
 }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "other_charges_total", 
-  "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total", 
-  "oldfieldname": "other_charges_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "width": "150px"
- }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break_46", 
@@ -482,11 +471,15 @@
 }, 
 {
  "doctype": "DocField", 
-  "fieldname": "calculate_charges", 
-  "fieldtype": "Button", 
-  "label": "Calculate Taxes and Charges", 
-  "oldfieldtype": "Button", 
-  "print_hide": 0
+  "fieldname": "other_charges_total", 
+  "fieldtype": "Currency", 
+  "label": "Taxes and Charges Total (Company Currency)", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
 }, 
 {
  "doctype": "DocField", 
@@ -501,7 +494,7 @@
  "doctype": "DocField", 
  "fieldname": "grand_total_export", 
  "fieldtype": "Currency", 
-  "label": "Grand Total (Export)", 
+  "label": "Grand Total", 
  "oldfieldname": "grand_total_export", 
  "oldfieldtype": "Currency", 
  "options": "currency", 
@@ -514,7 +507,7 @@
  "doctype": "DocField", 
  "fieldname": "rounded_total_export", 
  "fieldtype": "Currency", 
-  "label": "Rounded Total (Export)", 
+  "label": "Rounded Total", 
  "oldfieldname": "rounded_total_export", 
  "oldfieldtype": "Currency", 
  "options": "currency", 
@@ -526,7 +519,7 @@
  "doctype": "DocField", 
  "fieldname": "in_words_export", 
  "fieldtype": "Data", 
-  "label": "In Words (Export)", 
+  "label": "In Words", 
  "oldfieldname": "in_words_export", 
  "oldfieldtype": "Data", 
  "print_hide": 0, 
@@ -545,7 +538,7 @@
  "doctype": "DocField", 
  "fieldname": "grand_total", 
  "fieldtype": "Currency", 
-  "label": "Grand Total*", 
+  "label": "Grand Total (Company Currency)", 
  "oldfieldname": "grand_total", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -558,7 +551,7 @@
  "doctype": "DocField", 
  "fieldname": "rounded_total", 
  "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
  "oldfieldname": "rounded_total", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -571,7 +564,7 @@
  "doctype": "DocField", 
  "fieldname": "in_words", 
  "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
  "oldfieldname": "in_words", 
  "oldfieldtype": "Data", 
  "print_hide": 1, 
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-03-07 11:42:58", 
  "docstatus": 0, 
-  "modified": "2013-05-22 12:10:03", 
+  "modified": "2013-07-09 12:28:31", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -163,7 +163,7 @@
  "doctype": "DocField", 
  "fieldname": "base_ref_rate", 
  "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
  "oldfieldname": "base_ref_rate", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -177,7 +177,7 @@
  "doctype": "DocField", 
  "fieldname": "basic_rate", 
  "fieldtype": "Currency", 
-  "label": "Basic Rate*", 
+  "label": "Basic Rate (Company Currency)", 
  "oldfieldname": "basic_rate", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
@@ -192,7 +192,7 @@
  "doctype": "DocField", 
  "fieldname": "amount", 
  "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
  "no_copy": 0, 
  "oldfieldname": "amount", 
  "oldfieldtype": "Currency", 
@@ -337,7 +337,7 @@
  "fieldtype": "Link", 
  "hidden": 0, 
  "in_filter": 1, 
-  "label": "Quotation No.", 
+  "label": "Quotation", 
  "no_copy": 1, 
  "oldfieldname": "prevdoc_docname", 
  "oldfieldtype": "Link",