Fields alignment
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 057383a..ea1e59a 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -104,6 +104,12 @@
"width": "300px"
},
{
+ "fieldname": "section_break_10",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "rate",
"fieldtype": "Float",
"in_list_view": 1,
@@ -216,7 +222,7 @@
"hide_heading": 1,
"idx": 1,
"istable": 1,
- "modified": "2015-02-23 15:01:31.895131",
+ "modified": "2015-03-04 16:05:08.553606",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Taxes and Charges",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 10aac98..45afb0b 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -443,10 +443,12 @@
"permlevel": 0
},
{
- "fieldname": "total_taxes_and_charges",
+ "fieldname": "base_total_taxes_and_charges",
"fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
@@ -458,12 +460,10 @@
"precision": ""
},
{
- "fieldname": "base_total_taxes_and_charges",
+ "fieldname": "total_taxes_and_charges",
"fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
@@ -554,30 +554,6 @@
"read_only": 1
},
{
- "fieldname": "total_advance",
- "fieldtype": "Currency",
- "label": "Total Advance",
- "oldfieldname": "total_advance",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "outstanding_amount",
- "fieldtype": "Currency",
- "in_list_view": 0,
- "label": "Outstanding Amount",
- "no_copy": 1,
- "oldfieldname": "outstanding_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
"fieldname": "column_break5",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -621,6 +597,30 @@
"read_only": 1
},
{
+ "fieldname": "total_advance",
+ "fieldtype": "Currency",
+ "label": "Total Advance",
+ "oldfieldname": "total_advance",
+ "oldfieldtype": "Currency",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "outstanding_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 0,
+ "label": "Outstanding Amount",
+ "no_copy": 1,
+ "oldfieldname": "outstanding_amount",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
"fieldname": "advances_section",
"fieldtype": "Section Break",
"label": "Advances",
@@ -676,7 +676,7 @@
"no_copy": 1,
"oldfieldname": "paid_amount",
"oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 0
@@ -716,7 +716,7 @@
"fieldtype": "Currency",
"label": "Write Off Amount",
"no_copy": 1,
- "options": "Company:company:default_currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 0
@@ -749,7 +749,7 @@
{
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
- "label": "",
+ "label": "Terms and Conditions",
"oldfieldtype": "Section Break",
"options": "icon-legal",
"permlevel": 0,
@@ -780,7 +780,7 @@
"fieldname": "contact_section",
"fieldtype": "Section Break",
"hidden": 0,
- "label": "",
+ "label": "Contact Info",
"options": "icon-bullhorn",
"permlevel": 0,
"read_only": 0
@@ -1244,7 +1244,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-03-03 02:47:05.467179",
+ "modified": "2015-03-04 16:08:58.641155",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 58af076..f117472 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -127,26 +127,6 @@
"width": "60px"
},
{
- "fieldname": "uom",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "UOM",
- "oldfieldname": "uom",
- "oldfieldtype": "Link",
- "options": "UOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "100px",
- "read_only": 0,
- "reqd": 1,
- "width": "100px"
- },
- {
- "fieldname": "col_break2",
- "fieldtype": "Column Break",
- "permlevel": 0
- },
- {
"fieldname": "stock_uom",
"fieldtype": "Link",
"hidden": 0,
@@ -163,6 +143,26 @@
"width": "100px"
},
{
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "UOM",
+ "oldfieldname": "uom",
+ "oldfieldtype": "Link",
+ "options": "UOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "100px",
+ "read_only": 0,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
"fieldname": "conversion_factor",
"fieldtype": "Float",
"hidden": 0,
@@ -536,7 +536,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-02-23 12:21:53.399279",
+ "modified": "2015-03-04 16:12:29.821493",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 1f5a664..a3e6678 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -856,7 +856,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 1,
- "modified": "2015-02-24 14:52:49.998224",
+ "modified": "2015-03-04 16:07:44.213726",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 0e988a5..4450c19 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -433,21 +433,6 @@
"permlevel": 0
},
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_46",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "precision": ""
- },
- {
"fieldname": "base_total_taxes_and_charges",
"fieldtype": "Currency",
"label": "Total Taxes and Charges (Company Currency)",
@@ -460,6 +445,21 @@
"width": "150px"
},
{
+ "fieldname": "column_break_46",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
"fieldname": "section_break_48",
"fieldtype": "Section Break",
"permlevel": 0,
@@ -1077,7 +1077,7 @@
"idx": 1,
"is_submittable": 1,
"issingle": 0,
- "modified": "2015-02-24 15:22:27.195416",
+ "modified": "2015-03-04 16:08:22.203274",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 8fd5702..2413a93 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -456,21 +456,6 @@
"permlevel": 0
},
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_47",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "precision": ""
- },
- {
"fieldname": "base_total_taxes_and_charges",
"fieldtype": "Currency",
"label": "Total Taxes and Charges (Company Currency)",
@@ -484,6 +469,21 @@
"width": "150px"
},
{
+ "fieldname": "column_break_47",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
"fieldname": "section_break_49",
"fieldtype": "Section Break",
"permlevel": 0,
@@ -1067,7 +1067,7 @@
"idx": 1,
"in_create": 0,
"is_submittable": 1,
- "modified": "2015-02-24 15:23:10.431286",
+ "modified": "2015-03-04 16:08:45.464202",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",