diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index bd459498189..322c3ececd9 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -231,6 +231,29 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_10",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_on_submit": 0,
"bold": 0,
@@ -585,7 +608,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-02-17 12:28:05.386806",
+ "modified": "2016-02-22 16:50:55.710869",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index e940b0315a2..58db279c2ec 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1532,7 +1532,7 @@
"collapsible": 0,
"fieldname": "language",
"fieldtype": "Data",
- "hidden": 0,
+ "hidden": 1,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
@@ -1541,7 +1541,7 @@
"no_copy": 0,
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
@@ -1738,7 +1738,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-02-18 12:18:22.464056",
+ "modified": "2016-02-22 16:30:39.776128",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",
diff --git a/erpnext/docs/assets/img/multilingual_print_format/alternate_language.png b/erpnext/docs/assets/img/multilingual_print_format/alternate_language.png
new file mode 100644
index 00000000000..12aa0ddeb27
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/alternate_language.png differ
diff --git a/erpnext/docs/assets/img/multilingual_print_format/custom_translation.png b/erpnext/docs/assets/img/multilingual_print_format/custom_translation.png
new file mode 100644
index 00000000000..c3fc2fc049d
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/custom_translation.png differ
diff --git a/erpnext/docs/assets/img/multilingual_print_format/customer_quotation.png b/erpnext/docs/assets/img/multilingual_print_format/customer_quotation.png
new file mode 100644
index 00000000000..7ea61d9acfb
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/customer_quotation.png differ
diff --git a/erpnext/docs/assets/img/multilingual_print_format/set_customer_default_lang.png b/erpnext/docs/assets/img/multilingual_print_format/set_customer_default_lang.png
new file mode 100644
index 00000000000..1984e74fd39
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/set_customer_default_lang.png differ
diff --git a/erpnext/docs/assets/img/multilingual_print_format/set_supplier_default_lang.png b/erpnext/docs/assets/img/multilingual_print_format/set_supplier_default_lang.png
new file mode 100644
index 00000000000..3f46d984baf
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/set_supplier_default_lang.png differ
diff --git a/erpnext/docs/assets/img/multilingual_print_format/supplier_quotation.png b/erpnext/docs/assets/img/multilingual_print_format/supplier_quotation.png
new file mode 100644
index 00000000000..990ebe35200
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/supplier_quotation.png differ
diff --git a/erpnext/docs/assets/img/multilingual_print_format/translation.png b/erpnext/docs/assets/img/multilingual_print_format/translation.png
new file mode 100644
index 00000000000..40716d51d8e
Binary files /dev/null and b/erpnext/docs/assets/img/multilingual_print_format/translation.png differ
diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt
index 0dfa0d5a94f..63f4a64733a 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -7,3 +7,4 @@ assignment
tags
articles
pos-view
+multilingual_print_format
diff --git a/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md b/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md
new file mode 100644
index 00000000000..bb482781261
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md
@@ -0,0 +1,50 @@
+####What is Multlingual Print Format?
+
+User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
+
+####How does it work?
+Set print language for customer, supplier on their respective form.
+
+`Selling -> Customer -> Customer List -> Click on New`
+
+Here user has set default language for customer Adalbert as deutsch.
+
+
+
+`Buying -> Supplier -> Supplier List -> Click on New`
+
+Here user has set default language for supplier Piero as Italiano.
+
+
+When user click on print icon on the document, system will load the print preview in their default language.
+
+Customer quotation standard print preview in customer's default language.
+
+
+
+Supplier quotation standard print preview in supplier's default language.
+
+
+
+####What to do if want to print with another language?
+
+User can have option to select alternate language on print view.
+
+
+
+
+####Custom Translation
+
+User can set their custom translations using translation form. For example user want to set description of the product in customer's language(Italiano). For that create new translation with language as Italiano, enter source data and Translated information.
+
+`Setup -> Settings -> Translation List -> Click on New`
+
+
+
+The translation is applied when user select language as Italiano on supplier quotation's print prieview.
+
+
+
+
+
+
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 1aecd02ddf0..346c956434d 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -334,6 +334,29 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_14",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_on_submit": 0,
"bold": 0,
@@ -844,7 +867,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-02-18 12:21:08.037196",
+ "modified": "2016-02-22 16:16:41.563405",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
diff --git a/erpnext/setup/doctype/translation/translation.json b/erpnext/setup/doctype/translation/translation.json
index ef108e14477..baf98e32410 100644
--- a/erpnext/setup/doctype/translation/translation.json
+++ b/erpnext/setup/doctype/translation/translation.json
@@ -44,7 +44,7 @@
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Source Name",
+ "label": "Source Data",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -139,7 +139,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-02-18 19:04:42.900104",
+ "modified": "2016-02-23 02:05:54.341357",
"modified_by": "Administrator",
"module": "Setup",
"name": "Translation",