diff --git a/.travis.yml b/.travis.yml
index 7db78a2..0cb7090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,4 @@
   - mysql -e 'create database test_frappe'
   - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
   - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
-  
+
diff --git a/README.md b/README.md
index efa3e33..f2b628e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # ERPNext - Open source ERP for small and medium-size business [![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext)
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [https://erpnext.com](https://erpnext.com)
 
 Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Requires MariaDB.
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 0292bb3..77eb223 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -177,7 +177,7 @@
  "icon": "icon-money", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-01-05 11:03:07.861934", 
+ "modified": "2015-02-05 05:11:34.054236", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -196,6 +196,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -255,6 +256,7 @@
    "report": 1, 
    "role": "Accounts Manager", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 790ba1d..9df3b88 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -40,7 +40,7 @@
 					})
 
 					if root_account:
-						account.ignore_mandatory = True
+						account.flags.ignore_mandatory = True
 
 					account.insert()
 
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index b1f7a65..9ef011b 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -43,7 +43,7 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2014-09-29 15:42:18.976866", 
+ "modified": "2015-02-05 05:11:34.163902", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
@@ -56,6 +56,7 @@
    "print": 1, 
    "read": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
index c5a2a96..f93467a 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
@@ -85,7 +85,7 @@
  "icon": "icon-check", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-01-19 07:49:15.830001", 
+ "modified": "2015-02-05 05:11:34.776660", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 
@@ -100,6 +100,7 @@
    "read": 1, 
    "report": 0, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index 7b89fad..9266911 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -139,7 +139,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "max_attachments": 3, 
- "modified": "2014-12-24 15:20:08.627169", 
+ "modified": "2015-02-05 05:11:35.427357", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 
@@ -154,6 +154,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -165,6 +166,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index f8d59f8..17e7865 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -79,7 +79,7 @@
    "permlevel": 0
   }, 
   {
-   "description": "Select Budget Distribution, if you want to track based on seasonality.", 
+   "description": "Select Monthly Distribution, if you want to track based on seasonality.", 
    "fieldname": "distribution_id", 
    "fieldtype": "Link", 
    "label": "Distribution Id", 
@@ -145,7 +145,7 @@
  "icon": "icon-money", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2014-12-25 15:35:09.968578", 
+ "modified": "2015-02-05 05:11:36.155435", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -161,6 +161,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index cddb60d..4059be4 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -49,7 +49,7 @@
  ], 
  "icon": "icon-calendar", 
  "idx": 1, 
- "modified": "2014-12-24 14:50:49.742088", 
+ "modified": "2015-02-05 05:11:38.994147", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year", 
@@ -64,6 +64,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 2bdcdfd..330c122 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -457,7 +457,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 18:06:21.042991", 
+ "modified": "2015-02-05 05:11:40.139467", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 
@@ -475,6 +475,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -489,6 +490,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 8a1f5e1..e132f66 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -29,7 +29,7 @@
  ], 
  "icon": "icon-credit-card", 
  "idx": 1, 
- "modified": "2015-01-06 17:21:12.485997", 
+ "modified": "2015-02-05 05:11:41.346436", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
@@ -43,6 +43,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 095c64a..9d53c3f 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -1,12 +1,12 @@
 {
  "autoname": "field:distribution_id", 
  "creation": "2013-01-10 16:34:05", 
- "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
+ "description": "**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "fields": [
   {
-   "description": "Name of the Budget Distribution", 
+   "description": "Name of the Monthly Distribution", 
    "fieldname": "distribution_id", 
    "fieldtype": "Data", 
    "in_list_view": 1, 
@@ -40,7 +40,7 @@
  ], 
  "icon": "icon-bar-chart", 
  "idx": 1, 
- "modified": "2014-12-25 15:45:04.729489", 
+ "modified": "2015-02-05 05:11:41.429491", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Monthly Distribution", 
@@ -58,6 +58,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/monthly_distribution/test_records.json b/erpnext/accounts/doctype/monthly_distribution/test_records.json
index ffc6c68..8dbf210 100644
--- a/erpnext/accounts/doctype/monthly_distribution/test_records.json
+++ b/erpnext/accounts/doctype/monthly_distribution/test_records.json
@@ -1,8 +1,8 @@
 [{
-	"doctype": "Budget Distribution",
+	"doctype": "Monthly Distribution",
 	"distribution_id": "_Test Distribution",
 	"fiscal_year": "_Test Fiscal Year 2013",
-	"budget_distribution_details": [
+	"percentages": [
 		{
 			"month": "January",
 			"percentage_allocation": "8"
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index bdd9c73..d4ac467 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -132,7 +132,7 @@
  "hide_toolbar": 1, 
  "icon": "icon-resize-horizontal", 
  "issingle": 1, 
- "modified": "2014-12-24 14:49:48.714639", 
+ "modified": "2015-02-05 05:11:42.105088", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation", 
@@ -146,6 +146,7 @@
    "permlevel": 0, 
    "read": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -156,6 +157,7 @@
    "permlevel": 0, 
    "read": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.json b/erpnext/accounts/doctype/payment_tool/payment_tool.json
index 82a3465..e7973f9 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.json
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.json
@@ -1,361 +1,363 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "creation": "2014-07-23 15:12:27.746665",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "creation": "2014-07-23 15:12:27.746665", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
  "fields": [
   {
-   "fieldname": "sec_break1",
-   "fieldtype": "Section Break",
-   "label": "Party Details",
+   "fieldname": "sec_break1", 
+   "fieldtype": "Section Break", 
+   "label": "Party Details", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "permlevel": 0,
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "label": "Company", 
+   "options": "Company", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "default": "Customer",
-   "fieldname": "party_type",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Party Type",
-   "no_copy": 0,
-   "options": "DocType",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "default": "Customer", 
+   "fieldname": "party_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Party Type", 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "depends_on": "",
-   "fieldname": "party",
-   "fieldtype": "Dynamic Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Party",
-   "no_copy": 0,
-   "options": "party_type",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "depends_on": "", 
+   "fieldname": "party", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Party", 
+   "no_copy": 0, 
+   "options": "party_type", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "fieldname": "party_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Party Account",
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
+   "fieldname": "party_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Party Account", 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
    "read_only": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "received_or_paid",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Received Or Paid",
-   "no_copy": 0,
-   "options": "Received\nPaid",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "received_or_paid", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Received Or Paid", 
+   "no_copy": 0, 
+   "options": "Received\nPaid", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "get_outstanding_vouchers",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Get Outstanding Vouchers",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "get_outstanding_vouchers", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Outstanding Vouchers", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Column Break 1",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Column Break 1", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "payment_mode",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Payment Mode",
-   "no_copy": 0,
-   "options": "Mode of Payment",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "payment_mode", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Mode", 
+   "no_copy": 0, 
+   "options": "Mode of Payment", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "payment_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Payment Account",
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "payment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Account", 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "reference_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Reference No",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "reference_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference No", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "reference_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Reference Date",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "reference_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Date", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && (doc.customer || doc.supplier))",
-   "fieldname": "sec_break3",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Against Voucher",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && (doc.customer || doc.supplier))", 
+   "fieldname": "sec_break3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Against Voucher", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "vouchers",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Against Vouchers",
-   "no_copy": 0,
-   "options": "Payment Tool Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "vouchers", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Against Vouchers", 
+   "no_copy": 0, 
+   "options": "Payment Tool Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && (doc.customer || doc.supplier))",
-   "fieldname": "section_break_19",
-   "fieldtype": "Section Break",
-   "permlevel": 0,
+   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && (doc.customer || doc.supplier))", 
+   "fieldname": "section_break_19", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
    "precision": ""
-  },
+  }, 
   {
-   "fieldname": "total_payment_amount",
-   "fieldtype": "Currency",
-   "label": "Total Payment Amount",
-   "permlevel": 0,
+   "fieldname": "total_payment_amount", 
+   "fieldtype": "Currency", 
+   "label": "Total Payment Amount", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "make_journal_entry",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Make Journal Entry",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "make_journal_entry", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Make Journal Entry", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
-  },
+  }, 
   {
-   "fieldname": "data_22",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "data_22", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "precision": ""
-  },
+  }, 
   {
-   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && (doc.customer || doc.supplier))",
-   "fieldname": "section_break_21",
-   "fieldtype": "Section Break",
-   "permlevel": 0,
+   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && (doc.customer || doc.supplier))", 
+   "fieldname": "section_break_21", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
    "precision": ""
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "fieldname": "make_jv_help",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
+   "allow_on_submit": 0, 
+   "fieldname": "make_jv_help", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 1,
- "icon": "icon-magic",
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "modified": "2014-12-26 16:28:30.612640",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payment Tool",
- "name_case": "",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 1, 
+ "icon": "icon-magic", 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "modified": "2015-02-05 05:11:42.181439", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts Manager",
-   "set_user_permissions": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index b6faf83..c01ec77 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -103,7 +103,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-05 11:27:11.937653", 
+ "modified": "2015-02-05 05:11:42.268561", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Period Closing Voucher", 
@@ -120,6 +120,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -134,6 +135,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.json b/erpnext/accounts/doctype/pos_setting/pos_setting.json
index 6b42098..aa8feff 100755
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.json
+++ b/erpnext/accounts/doctype/pos_setting/pos_setting.json
@@ -226,7 +226,7 @@
  ], 
  "icon": "icon-cog", 
  "idx": 1, 
- "modified": "2015-01-15 15:27:41.530538", 
+ "modified": "2015-02-05 05:11:42.344180", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Setting", 
@@ -241,6 +241,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 18515e8..e2a6873 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -244,7 +244,7 @@
  "icon": "icon-gift", 
  "idx": 1, 
  "istable": 0, 
- "modified": "2015-01-05 10:58:42.550092", 
+ "modified": "2015-02-05 05:11:42.530822", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 
@@ -259,6 +259,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -271,6 +272,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -280,6 +282,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -289,6 +292,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Website Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -300,6 +304,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }
  ], 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 10daafa..4054dd5 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -880,7 +880,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-15 07:34:54.049667", 
+ "modified": "2015-02-05 05:11:43.312905", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
@@ -898,6 +898,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -942,6 +943,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 6b9de1e..9b0b8b1 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -393,7 +393,7 @@
 	# Hence the first condition is an "OR"
 	return frappe.db.sql("""select tabAccount.name from `tabAccount`
 			where (tabAccount.report_type = "Profit and Loss"
-					or tabAccount.account_type = "Expense Account")
+					or tabAccount.account_type in ("Expense Account", "Fixed Asset"))
 				and tabAccount.group_or_ledger="Ledger"
 				and tabAccount.docstatus!=2
 				and tabAccount.company = '%(company)s'
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
index 580d989..924364f 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
@@ -6,5 +6,8 @@
 
 from frappe.model.document import Document
 
+from erpnext.controllers.print_settings import print_settings_for_item_table
+
 class PurchaseInvoiceItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
index 2197aa8..3b6b73b 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
@@ -71,7 +71,7 @@
  ], 
  "icon": "icon-money", 
  "idx": 1, 
- "modified": "2015-01-05 11:12:27.944849", 
+ "modified": "2015-02-05 05:11:44.223684", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges Master", 
@@ -101,6 +101,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/test_purchase_taxes_and_charges_master.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/test_purchase_taxes_and_charges_master.py
deleted file mode 100644
index 4f600bd..0000000
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/test_purchase_taxes_and_charges_master.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
-# See license.txt
-
-import frappe
-import unittest
-
-test_records = frappe.get_test_records('Purchase Taxes and Charges Master')
-
-class TestPurchaseTaxesandChargesMaster(unittest.TestCase):
-	pass
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/test_records.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/test_records.json
deleted file mode 100644
index e230c20..0000000
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/test_records.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-	{
-		"doctype": "Purchase Taxes and Charges Master",
-		"name": "_Test Purchase Taxes and Charges Master 1"
-	}
-]
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index b4529bc..7ceab70 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1202,7 +1202,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-15 07:33:52.971354", 
+ "modified": "2015-02-05 05:11:45.330358", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
@@ -1219,6 +1219,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -1234,6 +1235,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 63aef26..132304f 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -152,7 +152,7 @@
 			if d.time_log_batch:
 				tlb = frappe.get_doc("Time Log Batch", d.time_log_batch)
 				tlb.sales_invoice = sales_invoice
-				tlb.ignore_validate_update_after_submit = True
+				tlb.flags.ignore_validate_update_after_submit = True
 				tlb.save()
 
 	def validate_time_logs_are_submitted(self):
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
index efc3eb4..46b7201 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -5,14 +5,13 @@
 frappe.listview_settings['Sales Invoice'] = {
 	add_fields: ["customer", "customer_name", "grand_total", "outstanding_amount", "due_date", "company",
 		"currency"],
-	filters: [["outstanding_amount", ">", "0"]],
 	get_indicator: function(doc) {
 		if(doc.outstanding_amount==0) {
-			return [__("Paid"), "green", "oustanding_amount,=,0"]
+			return [__("Paid"), "green", "outstanding_amount,=,0"]
 		} else if (doc.outstanding_amount > 0 && doc.due_date > frappe.datetime.get_today()) {
-			return [__("Unpaid"), "orange", "oustanding_amount,>,0|due_date,>,Today"]
+			return [__("Unpaid"), "orange", "outstanding_amount,>,0|due_date,>,Today"]
 		} else if (doc.outstanding_amount > 0 && doc.due_date <= frappe.datetime.get_today()) {
-			return [__("Overdue"), "red", "oustanding_amount,>,0|due_date,<=,Today"]
+			return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<=,Today"]
 		}
 	},
 	right_column: "grand_total_export"
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py
index 3fa0f2e..0400010 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py
@@ -5,6 +5,8 @@
 import frappe
 
 from frappe.model.document import Document
+from erpnext.controllers.print_settings import print_settings_for_item_table
 
 class SalesInvoiceItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
index 83d34e4..fcf22ae 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
@@ -80,7 +80,7 @@
  ], 
  "icon": "icon-money", 
  "idx": 1, 
- "modified": "2015-01-05 11:12:09.596733", 
+ "modified": "2015-02-05 05:11:46.282418", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Taxes and Charges Master", 
@@ -110,6 +110,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -123,6 +124,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index 37fc7d8..b737879 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -102,7 +102,7 @@
  ], 
  "icon": "icon-truck", 
  "idx": 1, 
- "modified": "2015-01-05 14:59:25.045126", 
+ "modified": "2015-02-05 05:11:46.634371", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule", 
@@ -137,6 +137,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -148,6 +149,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 9d4f86b..5c57a90 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -81,7 +81,7 @@
 def make_entry(args, adv_adj, update_outstanding):
 	args.update({"doctype": "GL Entry"})
 	gle = frappe.get_doc(args)
-	gle.ignore_permissions = 1
+	gle.flags.ignore_permissions = 1
 	gle.insert()
 	gle.run_method("on_update_with_args", adv_adj, update_outstanding)
 	gle.submit()
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index 98fc58e..6aa4c0f 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -7,7 +7,7 @@
 // edit node
 // see ledger
 
-pscript['onload_Accounts Browser'] = function(wrapper){
+frappe.pages["Accounts Browser"].on_page_load  = function(wrapper){
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		single_column: true
@@ -58,7 +58,6 @@
 			var ctype = frappe.get_route()[1] || 'Account';
 			erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(),
 				chart_area.get(0));
-			pscript.set_title(wrapper, ctype, $(this).val());
 		})
 
 	// load up companies
@@ -74,18 +73,13 @@
 	});
 }
 
-pscript.set_title = function(wrapper, ctype, val) {
-}
-
-pscript['onshow_Accounts Browser'] = function(wrapper){
+frappe.pages["Accounts Browser"].on_page_show = function(wrapper){
 	// set route
 	var ctype = frappe.get_route()[1] || 'Account';
 
 	if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
 		wrapper.$company_select.change();
 	}
-
-	pscript.set_title(wrapper, ctype);
 }
 
 erpnext.AccountsChart = Class.extend({
@@ -260,7 +254,7 @@
 		});
 
 		// show
-		d.onshow = function() {
+		d.on_page_show = function() {
 			$(fd.group_or_ledger.input).change();
 			$(fd.account_type.input).change();
 		}
diff --git a/erpnext/accounts/page/financial_analytics/financial_analytics.js b/erpnext/accounts/page/financial_analytics/financial_analytics.js
index aa08c92..4e50711 100644
--- a/erpnext/accounts/page/financial_analytics/financial_analytics.js
+++ b/erpnext/accounts/page/financial_analytics/financial_analytics.js
@@ -3,7 +3,7 @@
 
 frappe.require("assets/erpnext/js/account_tree_grid.js");
 
-frappe.pages['financial-analytics'].onload = function(wrapper) {
+frappe.pages['financial-analytics'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Financial Analytics'),
@@ -49,7 +49,7 @@
 	],
 	setup_columns: function() {
 		var std_columns = [
-			{id: "check", name: __("Plot"), field: "check", width: 30,
+			{id: "_check", name: __("Plot"), field: "_check", width: 30,
 				formatter: this.check_formatter},
 			{id: "name", name: __("Account"), field: "name", width: 300,
 				formatter: this.tree_formatter},
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 7dceb64..c3b3c03 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1,4 +1,4 @@
-frappe.pages['pos'].onload = function(wrapper) {
+frappe.pages['pos'].on_page_load = function(wrapper) {
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Start POS'),
diff --git a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
index d5a1e62..5445f66 100755
--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
@@ -5,7 +5,7 @@
  "doctype": "Print Format",
  "html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Payment Receipt Note\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n    {%- for label, value in (\n        (_(\"Received On\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Received From\"), doc.pay_to_recd_from),\n        (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"Remarks\"), doc.remark)\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-3\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-9\">{{ value }}</div>\n    </div>\n\n    {%- endfor -%}\n\n    <hr>\n    <br>\n    <p class=\"strong\">\n        {{ _(\"For\") }} {{ doc.company }},<br>\n        <br>\n        <br>\n        <br>\n        {{ _(\"Authorized Signatory\") }}\n    </p>\n</div>\n\n",
  "idx": 1,
- "modified": "2015-01-12 11:03:22.893209",
+ "modified": "2015-01-16 11:03:22.893209",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Receipt Voucher",
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 9e66771..f0ca4c8 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -29,6 +29,7 @@
 		row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.supplier,
 			d.supplier_name, d.credit_to, d.project_name, d.company, d.purchase_order,
 			purchase_receipt, expense_account, d.qty, d.base_rate, d.base_amount]
+
 		for tax in tax_accounts:
 			row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
 
@@ -67,8 +68,8 @@
 	match_conditions = frappe.build_match_conditions("Purchase Invoice")
 
 	return frappe.db.sql("""select pi_item.parent, pi.posting_date, pi.credit_to, pi.company,
-		pi.supplier, pi.remarks, pi_item.item_code, pi_item.item_name, pi_item.item_group,
-		pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt, pi_item.po_detail,
+		pi.supplier, pi.remarks, pi.net_total, pi_item.item_code, pi_item.item_name, pi_item.item_group,
+		pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt, pi_item.po_detail
 		pi_item.expense_account, pi_item.qty, pi_item.base_rate, pi_item.base_amount, pi.supplier_name
 		from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item
 		where pi.name = pi_item.parent and pi.docstatus = 1 %s %s
@@ -81,13 +82,16 @@
 	import json
 	item_tax = {}
 	tax_accounts = []
+	invoice_wise_items = {}
+	for d in item_list:
+		invoice_wise_items.setdefault(d.parent, []).append(d)
 
-	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail
+	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, tax_amount
 		from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
 		and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
-		and parent in (%s)""" % ', '.join(['%s']*len(item_list)), tuple([item.parent for item in item_list]))
+		and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys()))
 
-	for parent, account_head, item_wise_tax_detail in tax_details:
+	for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
 		if account_head not in tax_accounts:
 			tax_accounts.append(account_head)
 
@@ -100,6 +104,10 @@
 
 			except ValueError:
 				continue
+		elif charge_type == "Actual" and tax_amount:
+			for d in invoice_wise_items.get(parent, []):
+				item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \
+					(tax_amount * d.base_amount) / d.net_total
 
 	tax_accounts.sort()
 	columns += [account_head + ":Currency:80" for account_head in tax_accounts]
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 48cb8e1..d79db0f 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import msgprint, _
+from frappe import _
 from frappe.utils import flt
 
 def execute(filters=None):
@@ -67,7 +67,7 @@
 def get_items(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select si_item.parent, si.posting_date, si.debit_to, si.project_name,
-		si.customer, si.remarks, si.territory, si.company, si_item.item_code, si_item.item_name,
+		si.customer, si.remarks, si.territory, si.company, si.net_total, si_item.item_code, si_item.item_name,
 		si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account,
 		si_item.qty, si_item.base_rate, si_item.base_amount, si.customer_name,
 		si.customer_group, si_item.so_detail
@@ -79,14 +79,17 @@
 	import json
 	item_tax = {}
 	tax_accounts = []
+	invoice_wise_items = {}
+	for d in item_list:
+		invoice_wise_items.setdefault(d.parent, []).append(d)
 
-	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail
+	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, tax_amount
 		from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
 		and docstatus = 1 and ifnull(account_head, '') != ''
-		and parent in (%s)""" % ', '.join(['%s']*len(item_list)),
-		tuple([item.parent for item in item_list]))
+		and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)),
+		tuple(invoice_wise_items.keys()))
 
-	for parent, account_head, item_wise_tax_detail in tax_details:
+	for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
 		if account_head not in tax_accounts:
 			tax_accounts.append(account_head)
 
@@ -98,6 +101,10 @@
 						 flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
 			except ValueError:
 				continue
+		elif charge_type == "Actual" and tax_amount:
+			for d in invoice_wise_items.get(parent, []):
+				item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \
+					flt((tax_amount * d.base_amount) / d.net_total)
 
 	tax_accounts.sort()
 	columns += [account_head + ":Currency:80" for account_head in tax_accounts]
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 8ecbc8d..415a51a 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -209,7 +209,7 @@
 		ch.docstatus = 1
 
 	# will work as update after submit
-	jv_obj.ignore_validate_update_after_submit = True
+	jv_obj.flags.ignore_validate_update_after_submit = True
 	jv_obj.save()
 
 def remove_against_link_from_jv(ref_type, ref_no, against_field):
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 602b0b7..0ffe121 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -1,75 +1,76 @@
 {
- "creation": "2013-06-25 11:04:03.000000",
- "description": "Settings for Buying Module",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
+ "creation": "2013-06-25 11:04:03", 
+ "description": "Settings for Buying Module", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
  "fields": [
   {
-   "default": "Supplier Name",
-   "fieldname": "supp_master_name",
-   "fieldtype": "Select",
-   "label": "Supplier Naming By",
-   "options": "Supplier Name\nNaming Series",
+   "default": "Supplier Name", 
+   "fieldname": "supp_master_name", 
+   "fieldtype": "Select", 
+   "label": "Supplier Naming By", 
+   "options": "Supplier Name\nNaming Series", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "supplier_type",
-   "fieldtype": "Link",
-   "label": "Default Supplier Type",
-   "options": "Supplier Type",
+   "fieldname": "supplier_type", 
+   "fieldtype": "Link", 
+   "label": "Default Supplier Type", 
+   "options": "Supplier Type", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "buying_price_list",
-   "fieldtype": "Link",
-   "label": "Default Buying Price List",
-   "options": "Price List",
+   "fieldname": "buying_price_list", 
+   "fieldtype": "Link", 
+   "label": "Default Buying Price List", 
+   "options": "Price List", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "maintain_same_rate",
-   "fieldtype": "Check",
-   "label": "Maintain same rate throughout purchase cycle",
+   "fieldname": "maintain_same_rate", 
+   "fieldtype": "Check", 
+   "label": "Maintain same rate throughout purchase cycle", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "po_required",
-   "fieldtype": "Select",
-   "label": "Purchase Order Required",
-   "options": "No\nYes",
+   "fieldname": "po_required", 
+   "fieldtype": "Select", 
+   "label": "Purchase Order Required", 
+   "options": "No\nYes", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "pr_required",
-   "fieldtype": "Select",
-   "label": "Purchase Receipt Required",
-   "options": "No\nYes",
+   "fieldname": "pr_required", 
+   "fieldtype": "Select", 
+   "label": "Purchase Receipt Required", 
+   "options": "No\nYes", 
    "permlevel": 0
   }
- ],
- "icon": "icon-cog",
- "idx": 1,
- "issingle": 1,
- "modified": "2014-02-19 19:02:00.000000",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Buying Settings",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2015-02-05 05:11:35.373253", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Buying Settings", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "create": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "role": "System Manager",
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 376b287..ff1d4f5 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -186,26 +186,17 @@
 
 	calculate_totals: function() {
 		var tax_count = this.frm.doc["taxes"] ? this.frm.doc["taxes"].length : 0;
-		this.frm.doc.grand_total = flt(tax_count ?
-			this.frm.doc["taxes"][tax_count - 1].total : this.frm.doc.net_total);
-		this.frm.doc.grand_total_import = flt(tax_count ?
-			flt(this.frm.doc.grand_total / this.frm.doc.conversion_rate) : this.frm.doc.net_total_import);
+		this.frm.doc.grand_total = flt(tax_count ? this.frm.doc["taxes"][tax_count - 1].total : this.frm.doc.net_total);
 
-		this.frm.doc.total_tax = flt(this.frm.doc.grand_total - this.frm.doc.net_total,
-			precision("total_tax"));
+		this.frm.doc.total_tax = flt(this.frm.doc.grand_total - this.frm.doc.net_total, precision("total_tax"));
 
 		this.frm.doc.grand_total = flt(this.frm.doc.grand_total, precision("grand_total"));
-		this.frm.doc.grand_total_import = flt(this.frm.doc.grand_total_import, precision("grand_total_import"));
 
 		// rounded totals
 		if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) {
 			this.frm.doc.rounded_total = Math.round(this.frm.doc.grand_total);
 		}
 
-		if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total_import", this.frm.doc.name)) {
-			this.frm.doc.rounded_total_import = Math.round(this.frm.doc.grand_total_import);
-		}
-
 		// other charges added/deducted
 		this.frm.doc.other_charges_added = 0.0
 		this.frm.doc.other_charges_deducted = 0.0
@@ -223,6 +214,16 @@
 			frappe.model.round_floats_in(this.frm.doc,
 				["other_charges_added", "other_charges_deducted"]);
 		}
+
+		this.frm.doc.grand_total_import = flt((this.frm.doc.other_charges_added || this.frm.doc.other_charges_deducted) ?
+			flt(this.frm.doc.grand_total / this.frm.doc.conversion_rate) : this.frm.doc.net_total_import);
+
+		this.frm.doc.grand_total_import = flt(this.frm.doc.grand_total_import, precision("grand_total_import"));
+
+		if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total_import", this.frm.doc.name)) {
+			this.frm.doc.rounded_total_import = Math.round(this.frm.doc.grand_total_import);
+		}
+
 		this.frm.doc.other_charges_added_import = flt(this.frm.doc.other_charges_added /
 			this.frm.doc.conversion_rate, precision("other_charges_added_import"));
 		this.frm.doc.other_charges_deducted_import = flt(this.frm.doc.other_charges_deducted /
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index b43af26..4fb74ad 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -117,7 +117,7 @@
    "report_hide": 0
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -775,7 +775,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-15 07:34:27.901777", 
+ "modified": "2015-02-05 05:11:43.673323", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
@@ -807,6 +807,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -822,6 +823,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py
index 8c7c0a8..9129254 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py
@@ -6,5 +6,8 @@
 
 from frappe.model.document import Document
 
+from erpnext.controllers.print_settings import print_settings_for_item_table
+
 class PurchaseOrderItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
index ae2722b..4f41d3b 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
@@ -207,7 +207,7 @@
  "icon": "icon-search", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-12-24 16:37:43.755107", 
+ "modified": "2015-02-05 05:11:44.292242", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Quality Inspection", 
@@ -224,6 +224,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Quality Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 2c7363e..87f8008 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -1,244 +1,245 @@
 {
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "naming_series:",
- "creation": "2013-01-10 16:34:11",
- "description": "Supplier of Goods or Services.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "naming_series:", 
+ "creation": "2013-01-10 16:34:11", 
+ "description": "Supplier of Goods or Services.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
  "fields": [
   {
-   "fieldname": "basic_info",
-   "fieldtype": "Section Break",
-   "label": "Basic Info",
-   "oldfieldtype": "Section Break",
-   "options": "icon-user",
+   "fieldname": "basic_info", 
+   "fieldtype": "Section Break", 
+   "label": "Basic Info", 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-user", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "SUPP-",
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "label": "Series", 
+   "no_copy": 1, 
+   "oldfieldname": "naming_series", 
+   "oldfieldtype": "Select", 
+   "options": "SUPP-", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "supplier_name",
-   "fieldtype": "Data",
-   "in_list_view": 0,
-   "label": "Supplier Name",
-   "no_copy": 1,
-   "oldfieldname": "supplier_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
+   "fieldname": "supplier_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "Supplier Name", 
+   "no_copy": 1, 
+   "oldfieldname": "supplier_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "supplier_type",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Supplier Type",
-   "oldfieldname": "supplier_type",
-   "oldfieldtype": "Link",
-   "options": "Supplier Type",
-   "permlevel": 0,
+   "fieldname": "supplier_type", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Supplier Type", 
+   "oldfieldname": "supplier_type", 
+   "oldfieldtype": "Link", 
+   "options": "Supplier Type", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "address_contacts",
-   "fieldtype": "Section Break",
-   "label": "Address & Contacts",
-   "oldfieldtype": "Column Break",
-   "options": "icon-map-marker",
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "address_contacts", 
+   "fieldtype": "Section Break", 
+   "label": "Address & Contacts", 
+   "oldfieldtype": "Column Break", 
+   "options": "icon-map-marker", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "address_html",
-   "fieldtype": "HTML",
-   "label": "Address HTML",
-   "permlevel": 0,
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "label": "Address HTML", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "contact_html",
-   "fieldtype": "HTML",
-   "label": "Contact HTML",
-   "permlevel": 0,
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "label": "Contact HTML", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "default_payable_accounts",
-   "fieldtype": "Section Break",
-   "label": "Default Payable Accounts",
+   "fieldname": "default_payable_accounts", 
+   "fieldtype": "Section Break", 
+   "label": "Default Payable Accounts", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "accounts",
-   "fieldtype": "Table",
-   "label": "Accounts",
-   "options": "Party Account",
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "label": "Accounts", 
+   "options": "Party Account", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "More Info",
-   "oldfieldtype": "Section Break",
-   "options": "icon-file-text",
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "label": "More Info", 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-file-text", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "default_currency",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Currency",
-   "no_copy": 1,
-   "options": "Currency",
+   "fieldname": "default_currency", 
+   "fieldtype": "Link", 
+   "ignore_user_permissions": 1, 
+   "label": "Default Currency", 
+   "no_copy": 1, 
+   "options": "Currency", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "default_price_list",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Price List",
-   "options": "Price List",
+   "fieldname": "default_price_list", 
+   "fieldtype": "Link", 
+   "ignore_user_permissions": 1, 
+   "label": "Price List", 
+   "options": "Price List", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "default_taxes_and_charges",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Taxes and Charges",
-   "options": "Purchase Taxes and Charges Master",
+   "fieldname": "default_taxes_and_charges", 
+   "fieldtype": "Link", 
+   "ignore_user_permissions": 1, 
+   "label": "Taxes and Charges", 
+   "options": "Purchase Taxes and Charges Master", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "credit_days",
-   "fieldtype": "Int",
-   "label": "Credit Days",
+   "fieldname": "credit_days", 
+   "fieldtype": "Int", 
+   "label": "Credit Days", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break2", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "website",
-   "fieldtype": "Data",
-   "label": "Website",
-   "oldfieldname": "website",
-   "oldfieldtype": "Data",
+   "fieldname": "website", 
+   "fieldtype": "Data", 
+   "label": "Website", 
+   "oldfieldname": "website", 
+   "oldfieldtype": "Data", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Statutory info and other general information about your Supplier",
-   "fieldname": "supplier_details",
-   "fieldtype": "Text",
-   "label": "Supplier Details",
-   "oldfieldname": "supplier_details",
-   "oldfieldtype": "Code",
+   "description": "Statutory info and other general information about your Supplier", 
+   "fieldname": "supplier_details", 
+   "fieldtype": "Text", 
+   "label": "Supplier Details", 
+   "oldfieldname": "supplier_details", 
+   "oldfieldtype": "Code", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "communications",
-   "fieldtype": "Table",
-   "hidden": 1,
-   "label": "Communications",
-   "options": "Communication",
-   "permlevel": 0,
+   "fieldname": "communications", 
+   "fieldtype": "Table", 
+   "hidden": 1, 
+   "label": "Communications", 
+   "options": "Communication", 
+   "permlevel": 0, 
    "print_hide": 1
   }
- ],
- "icon": "icon-user",
- "idx": 1,
- "modified": "2015-01-06 17:32:39.936580",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Supplier",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "modified": "2015-02-05 05:11:47.468728", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Supplier", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
    "role": "Purchase User"
-  },
+  }, 
   {
-   "amend": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Manager",
-   "submit": 0,
+   "amend": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Manager", 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Master Manager",
-   "submit": 0,
+   "amend": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Master Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "apply_user_permissions": 1,
-   "permlevel": 0,
-   "read": 1,
+   "apply_user_permissions": 1, 
+   "permlevel": 0, 
+   "read": 1, 
    "role": "Material User"
-  },
+  }, 
   {
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
    "role": "Material Manager"
-  },
+  }, 
   {
-   "apply_user_permissions": 1,
-   "permlevel": 0,
-   "read": 1,
+   "apply_user_permissions": 1, 
+   "permlevel": 0, 
+   "read": 1, 
    "role": "Accounts User"
-  },
+  }, 
   {
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
    "role": "Accounts Manager"
   }
- ],
- "search_fields": "supplier_name,supplier_type",
+ ], 
+ "search_fields": "supplier_name, supplier_type", 
  "title_field": "supplier_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index a938481..ff365cc 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -117,7 +117,7 @@
    "report_hide": 0
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -575,7 +575,7 @@
  "icon": "icon-shopping-cart", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-15 07:34:12.734538", 
+ "modified": "2015-02-05 05:11:47.602292", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
@@ -592,6 +592,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Manufacturing Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -606,6 +607,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -621,6 +623,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.py b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.py
index 16e6e12..b8e690e 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.py
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.py
@@ -6,5 +6,8 @@
 
 from frappe.model.document import Document
 
+from erpnext.controllers.print_settings import print_settings_for_item_table
+
 class SupplierQuotationItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
index dea6a86..33fb9b2 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.pages['purchase-analytics'].onload = function(wrapper) {
+frappe.pages['purchase-analytics'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Purchase Analytics'),
@@ -74,7 +74,7 @@
 		this.tree_grid = this.tree_grids[this.tree_type];
 
 		var std_columns = [
-			{id: "check", name: __("Plot"), field: "check", width: 30,
+			{id: "_check", name: __("Plot"), field: "_check", width: 30,
 				formatter: this.check_formatter},
 			{id: "name", name: this.tree_grid.label, field: "name", width: 300,
 				formatter: this.tree_formatter},
diff --git a/erpnext/contacts/doctype/party_type/party_type.json b/erpnext/contacts/doctype/party_type/party_type.json
index 0f9e760..19ffefb 100644
--- a/erpnext/contacts/doctype/party_type/party_type.json
+++ b/erpnext/contacts/doctype/party_type/party_type.json
@@ -64,7 +64,7 @@
    "read_only": 1
   }
  ], 
- "modified": "2014-05-27 03:49:14.598212", 
+ "modified": "2015-02-05 05:11:42.046004", 
  "modified_by": "Administrator", 
  "module": "Contacts", 
  "name": "Party Type", 
@@ -76,6 +76,7 @@
    "permlevel": 0, 
    "read": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -84,6 +85,7 @@
    "permlevel": 0, 
    "read": 1, 
    "role": "Purchase User", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 82da90e..72b4ba0 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -15,9 +15,8 @@
 class BuyingController(StockController):
 	def __setup__(self):
 		if hasattr(self, "items"):
-			self.table_print_templates = {
-				"items": "templates/print_formats/includes/item_grid.html",
-				"taxes": "templates/print_formats/includes/taxes.html",
+			self.print_templates = {
+				"taxes": "templates/print_formats/includes/taxes.html"
 			}
 
 	def get_feed(self):
@@ -95,8 +94,7 @@
 				item.rate = flt(item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
 					self.precision("rate", item))
 
-			item.amount = flt(item.rate * item.qty,
-				self.precision("amount", item))
+			item.amount = flt(item.rate * item.qty, self.precision("amount", item))
 			item.item_tax_amount = 0.0;
 
 			self._set_in_company_currency(item, "amount", "base_amount")
@@ -115,20 +113,14 @@
 
 	def calculate_totals(self):
 		self.grand_total = flt(self.get("taxes")[-1].total if self.get("taxes") else self.net_total)
-		self.grand_total_import = flt(self.grand_total / self.conversion_rate) \
-			if self.get("taxes") else self.net_total_import
 
 		self.total_tax = flt(self.grand_total - self.net_total, self.precision("total_tax"))
 
 		self.grand_total = flt(self.grand_total, self.precision("grand_total"))
-		self.grand_total_import = flt(self.grand_total_import, self.precision("grand_total_import"))
 
 		if self.meta.get_field("rounded_total"):
 			self.rounded_total = rounded(self.grand_total)
 
-		if self.meta.get_field("rounded_total_import"):
-			self.rounded_total_import = rounded(self.grand_total_import)
-
 		if self.meta.get_field("other_charges_added"):
 			self.other_charges_added = flt(sum([flt(d.tax_amount) for d in self.get("taxes")
 				if d.add_deduct_tax=="Add" and d.category in ["Valuation and Total", "Total"]]),
@@ -139,6 +131,14 @@
 				if d.add_deduct_tax=="Deduct" and d.category in ["Valuation and Total", "Total"]]),
 				self.precision("other_charges_deducted"))
 
+		self.grand_total_import = flt(self.grand_total / self.conversion_rate) \
+			if (self.other_charges_added or self.other_charges_deducted) else self.net_total_import
+
+		self.grand_total_import = flt(self.grand_total_import, self.precision("grand_total_import"))
+
+		if self.meta.get_field("rounded_total_import"):
+			self.rounded_total_import = rounded(self.grand_total_import)
+
 		if self.meta.get_field("other_charges_added_import"):
 			self.other_charges_added_import = flt(self.other_charges_added /
 				self.conversion_rate, self.precision("other_charges_added_import"))
diff --git a/erpnext/controllers/print_settings.py b/erpnext/controllers/print_settings.py
new file mode 100644
index 0000000..e760f24
--- /dev/null
+++ b/erpnext/controllers/print_settings.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2015, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+def print_settings_for_item_table(doc):
+	doc.print_templates = {
+		"description": "templates/print_formats/includes/item_table_description.html",
+		"qty": "templates/print_formats/includes/item_table_qty.html"
+	}
+	doc.hide_in_print_layout = ["item_code", "item_name", "image", "uom", "stock_uom"]
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 328894c..0e56fc7 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -13,9 +13,8 @@
 class SellingController(StockController):
 	def __setup__(self):
 		if hasattr(self, "items"):
-			self.table_print_templates = {
-				"items": "templates/print_formats/includes/item_grid.html",
-				"taxes": "templates/print_formats/includes/taxes.html",
+			self.print_templates = {
+				"taxes": "templates/print_formats/includes/taxes.html"
 			}
 
 	def get_feed(self):
@@ -49,8 +48,7 @@
 	def set_missing_lead_customer_details(self):
 		if getattr(self, "customer", None):
 			from erpnext.accounts.party import _get_party_details
-			party_details = _get_party_details(self.customer,
-				ignore_permissions=getattr(self, "ignore_permissions", None))
+			party_details = _get_party_details(self.customer, ignore_permissions=self.flags.ignore_permissions)
 			if not self.meta.get_field("sales_team"):
 				party_details.pop("sales_team")
 
@@ -217,10 +215,11 @@
 	def calculate_totals(self):
 		self.grand_total = flt(self.get("taxes")[-1].total if self.get("taxes") else self.net_total)
 
-		self.grand_total_export = flt(self.grand_total / self.conversion_rate)
-
 		self.other_charges_total = flt(self.grand_total - self.net_total, self.precision("other_charges_total"))
 
+		self.grand_total_export = flt(self.grand_total / self.conversion_rate) \
+			if (self.other_charges_total or self.discount_amount) else self.net_total_export
+
 		self.other_charges_total_export = flt(self.grand_total_export - self.net_total_export +
 			flt(self.discount_amount), self.precision("other_charges_total_export"))
 
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index c76ec1c..e16c725 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -17,6 +17,7 @@
 		["Submitted", "eval:self.docstatus==1"],
 		["Lost", "eval:self.status=='Lost'"],
 		["Quotation", "has_quotation"],
+		["Converted", "has_ordered_quotation"],
 		["Cancelled", "eval:self.docstatus==2"],
 	],
 	"Quotation": [
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 5bdd50b..100dc7e 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -197,9 +197,9 @@
 		sl_dict.update(args)
 		return sl_dict
 
-	def make_sl_entries(self, sl_entries, is_amended=None):
+	def make_sl_entries(self, sl_entries, is_amended=None, allow_negative_stock=False):
 		from erpnext.stock.stock_ledger import make_sl_entries
-		make_sl_entries(sl_entries, is_amended)
+		make_sl_entries(sl_entries, is_amended, allow_negative_stock)
 
 	def make_gl_entries_on_cancel(self):
 		if frappe.db.sql("""select name from `tabGL Entry` where voucher_type=%s
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 54f2044..2499a61 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -55,7 +55,8 @@
 		"erpnext.stock.reorder_item.reorder_item",
 		"erpnext.setup.doctype.email_digest.email_digest.send",
 		"erpnext.support.doctype.issue.issue.auto_close_tickets",
-		"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year"
+		"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
+		"erpnext.hr.doctype.employee.employee.send_birthday_reminders"
 	],
 	"daily_long": [
 		"erpnext.setup.doctype.backup_manager.backup_manager.take_backups_daily"
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index bb239ac..1f4e239 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -197,7 +197,7 @@
  "icon": "icon-thumbs-up", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 14:51:15.943276", 
+ "modified": "2015-02-05 05:11:34.405796", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
@@ -214,6 +214,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Employee", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -228,6 +229,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -243,6 +245,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 6971db1..3710561 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
@@ -47,7 +47,7 @@
  ], 
  "icon": "icon-file-text", 
  "idx": 1, 
- "modified": "2015-01-15 15:26:55.553233", 
+ "modified": "2015-02-05 05:11:34.496238", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Template", 
@@ -62,6 +62,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index 41ef499..bf72327 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -130,7 +130,7 @@
  "icon": "icon-ok", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 14:45:03.326807", 
+ "modified": "2015-02-05 05:11:34.545262", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 
@@ -146,6 +146,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -160,6 +161,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -173,6 +175,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json
index 03a726a..b37569f 100644
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json
@@ -20,7 +20,7 @@
  ], 
  "icon": "icon-code-fork", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:08.179137", 
+ "modified": "2015-02-05 05:11:35.266252", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Branch", 
@@ -36,6 +36,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -48,6 +49,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/deduction_type/deduction_type.json b/erpnext/hr/doctype/deduction_type/deduction_type.json
index 4d9b0aa..8917ca9 100644
--- a/erpnext/hr/doctype/deduction_type/deduction_type.json
+++ b/erpnext/hr/doctype/deduction_type/deduction_type.json
@@ -30,7 +30,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:09.624972", 
+ "modified": "2015-02-05 05:11:37.070363", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Deduction Type", 
@@ -46,6 +46,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index 17b1f6e..1e862f8 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -29,7 +29,7 @@
  ], 
  "icon": "icon-sitemap", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:10.061057", 
+ "modified": "2015-02-05 05:11:37.460611", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Department", 
@@ -45,6 +45,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index b792548..3f353a6 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -20,7 +20,7 @@
  ], 
  "icon": "icon-bookmark", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:10.099099", 
+ "modified": "2015-02-05 05:11:37.500898", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Designation", 
@@ -36,6 +36,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/earning_type/earning_type.json b/erpnext/hr/doctype/earning_type/earning_type.json
index 507acd9..4b117e9 100644
--- a/erpnext/hr/doctype/earning_type/earning_type.json
+++ b/erpnext/hr/doctype/earning_type/earning_type.json
@@ -31,7 +31,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2014-07-31 07:25:26.606030", 
+ "modified": "2015-02-05 05:11:37.761378", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Earning Type", 
@@ -47,6 +47,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 0bcd7df..d2e547a 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -674,7 +674,7 @@
  ], 
  "icon": "icon-user", 
  "idx": 1, 
- "modified": "2015-01-07 14:37:39.988374", 
+ "modified": "2015-02-05 05:11:38.234802", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
@@ -705,6 +705,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "user_permission_doctypes": "[\"Branch\",\"Company\",\"Department\",\"Designation\"]", 
    "write": 1
@@ -720,6 +721,7 @@
    "report": 1, 
    "role": "HR Manager", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index b5bb755..9cd029b 100644
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -51,8 +51,6 @@
 			self.update_user()
 			self.update_user_permissions()
 
-		self.update_dob_event()
-
 	def update_user_permissions(self):
 		frappe.permissions.add_user_permission("Employee", self.name, self.user_id)
 		frappe.permissions.set_user_permission_if_allowed("Company", self.company, self.user_id)
@@ -60,7 +58,7 @@
 	def update_user(self):
 		# add employee role if missing
 		user = frappe.get_doc("User", self.user_id)
-		user.ignore_permissions = True
+		user.flags.ignore_permissions = True
 
 		if "Employee" not in user.get("user_roles"):
 			user.add_roles("Employee")
@@ -136,8 +134,6 @@
 			throw(_("User {0} is already assigned to Employee {1}").format(self.user_id, employee[0]))
 
 	def validate_employee_leave_approver(self):
-		from erpnext.hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
-
 		for l in self.get("leave_approvers")[:]:
 			if "Leave Approver" not in frappe.get_roles(l.leave_approver):
 				self.get("leave_approvers").remove(l)
@@ -147,39 +143,6 @@
 		if self.reports_to == self.name:
 			throw(_("Employee cannot report to himself."))
 
-	def update_dob_event(self):
-		if self.status == "Active" and self.date_of_birth \
-			and not cint(frappe.db.get_value("HR Settings", None, "stop_birthday_reminders")):
-			birthday_event = frappe.db.sql("""select name from `tabEvent` where repeat_on='Every Year'
-				and ref_type='Employee' and ref_name=%s""", self.name)
-
-			starts_on = self.date_of_birth + " 00:00:00"
-			ends_on = self.date_of_birth + " 00:15:00"
-
-			if birthday_event:
-				event = frappe.get_doc("Event", birthday_event[0][0])
-				event.starts_on = starts_on
-				event.ends_on = ends_on
-				event.save()
-			else:
-				frappe.get_doc({
-					"doctype": "Event",
-					"subject": _("Birthday") + ": " + self.employee_name,
-					"description": _("Happy Birthday!") + " " + self.employee_name,
-					"starts_on": starts_on,
-					"ends_on": ends_on,
-					"event_type": "Public",
-					"all_day": 1,
-					"send_reminder": 1,
-					"repeat_this_event": 1,
-					"repeat_on": "Every Year",
-					"ref_type": "Employee",
-					"ref_name": self.name
-				}).insert()
-		else:
-			frappe.db.sql("""delete from `tabEvent` where repeat_on='Every Year' and
-				ref_type='Employee' and ref_name=%s""", self.name)
-
 	def on_trash(self):
 		delete_events(self.doctype, self.name)
 
@@ -217,3 +180,31 @@
 	if "Employee" in [d.role for d in doc.get("user_roles")]:
 		employee = frappe.get_doc("Employee", {"user_id": doc.name})
 		employee.update_user_permissions()
+
+def send_birthday_reminders():
+	"""Send Employee birthday reminders if no 'Stop Birthday Reminders' is not set."""
+	if int(frappe.db.get_single_value("HR Settings", "stop_birthday_reminders") or 0):
+		return
+
+	from frappe.utils.user import get_enabled_system_users
+	users = None
+
+	birthdays = get_employees_who_are_born_today()
+
+	if birthdays:
+		if not users:
+			users = [u.email_id or u.name for u in get_enabled_system_users()]
+
+		for e in birthdays:
+			frappe.sendmail(recipients=filter(lambda u: u not in (e.company_email, e.personal_email), users),
+				subject=_("Birthday Reminder for {0}").format(e.employee_name),
+				message=_("""Today is {0}'s birthday!""").format(e.employee_name),
+				reply_to=e.company_email or e.personal_email,
+				bulk=True)
+
+def get_employees_who_are_born_today():
+	"""Get Employee properties whose birthday is today."""
+	return frappe.db.sql("""select name, personal_email, company_email, employee_name
+		from tabEmployee where day(date_of_birth) = day(curdate())
+		and month(date_of_birth) = month(curdate())
+		and status = 'Active'""", as_dict=True)
diff --git a/erpnext/hr/doctype/employee/test_employee.py b/erpnext/hr/doctype/employee/test_employee.py
index 699e439..8b2549d 100644
--- a/erpnext/hr/doctype/employee/test_employee.py
+++ b/erpnext/hr/doctype/employee/test_employee.py
@@ -3,4 +3,31 @@
 
 
 import frappe
-test_records = frappe.get_test_records('Employee')
\ No newline at end of file
+import unittest
+import frappe.utils
+
+test_records = frappe.get_test_records('Employee')
+
+class TestEmployee(unittest.TestCase):
+	def test_birthday_reminders(self):
+		employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
+		employee.date_of_birth = "1990" + frappe.utils.nowdate()[4:]
+		employee.company_email = "test@example.com"
+		employee.save()
+
+		from erpnext.hr.doctype.employee.employee import get_employees_who_are_born_today, send_birthday_reminders
+
+		self.assertTrue(employee.name in [e.name for e in get_employees_who_are_born_today()])
+
+		frappe.db.sql("delete from `tabBulk Email`")
+
+		hr_settings = frappe.get_doc("HR Settings", "HR Settings")
+		hr_settings.stop_birthday_reminders = 0
+		hr_settings.save()
+
+		send_birthday_reminders()
+
+		bulk_mails = frappe.db.sql("""select * from `tabBulk Email`""", as_dict=True)
+		self.assertTrue("Subject: Birthday Reminder for {0}".format(employee.employee_name) \
+			in bulk_mails[0].message)
+
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index 8562662..ad2dcb5 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -20,7 +20,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2015-01-15 15:24:46.680451", 
+ "modified": "2015-02-05 05:11:38.516592", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employment Type", 
@@ -36,6 +36,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -48,6 +49,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 0c86601..c71a379 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -202,7 +202,7 @@
  "icon": "icon-money", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 11:31:12.783147", 
+ "modified": "2015-02-05 05:11:38.702422", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
@@ -218,6 +218,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Employee", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -235,6 +236,7 @@
    "report": 1, 
    "role": "HR Manager", 
    "set_user_permissions": 0, 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -250,6 +252,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Expense Approver", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -265,6 +268,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index e733da0..3affbc4 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -1,7 +1,7 @@
 {
  "allow_import": 1, 
  "autoname": "field:expense_type", 
- "creation": "2012-03-27 14:35:55.000000", 
+ "creation": "2012-03-27 14:35:55", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Master", 
@@ -29,7 +29,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2013-12-20 19:24:07.000000", 
+ "modified": "2015-02-05 05:11:38.794964", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Type", 
@@ -43,6 +43,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json
index 6862c97..d30fde5 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.json
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.json
@@ -74,7 +74,7 @@
  ], 
  "icon": "icon-calendar", 
  "idx": 1, 
- "modified": "2015-01-15 15:26:20.031592", 
+ "modified": "2015-02-05 05:11:39.099428", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Holiday List", 
@@ -90,6 +90,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index 227a3b3..1b184f7 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -1,5 +1,5 @@
 {
- "creation": "2013-08-02 13:45:23.000000", 
+ "creation": "2013-08-02 13:45:23", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
@@ -43,7 +43,7 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2014-02-19 17:40:18.000001", 
+ "modified": "2015-02-05 05:11:39.153447", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "HR Settings", 
@@ -56,6 +56,7 @@
    "print": 1, 
    "read": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.py b/erpnext/hr/doctype/hr_settings/hr_settings.py
index 5cafbda..89614cb 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.py
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.py
@@ -6,30 +6,10 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import cint
-
 from frappe.model.document import Document
 
 class HRSettings(Document):
-		
 	def validate(self):
-		self.update_birthday_reminders()
-
 		from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
-		set_by_naming_series("Employee", "employee_number", 
+		set_by_naming_series("Employee", "employee_number",
 			self.get("emp_created_by")=="Naming Series", hide_name_field=True)
-			
-	def update_birthday_reminders(self):
-		original_stop_birthday_reminders = cint(frappe.db.get_value("HR Settings", 
-			None, "stop_birthday_reminders"))
-
-		# reset birthday reminders
-		if cint(self.stop_birthday_reminders) != original_stop_birthday_reminders:
-			frappe.db.sql("""delete from `tabEvent` where repeat_on='Every Year' and ref_type='Employee'""")
-		
-			if not self.stop_birthday_reminders:
-				for employee in frappe.db.sql_list("""select name from `tabEmployee` where status='Active' and 
-					ifnull(date_of_birth, '')!=''"""):
-					frappe.get_doc("Employee", employee).update_dob_event()
-					
-			frappe.msgprint(frappe._("Updated Birthday Reminders"))
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 822cd2a..8f92a03 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -65,7 +65,7 @@
  ], 
  "icon": "icon-user", 
  "idx": 1, 
- "modified": "2015-01-07 14:52:03.446405", 
+ "modified": "2015-02-05 05:11:40.029237", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Applicant", 
@@ -81,6 +81,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.py b/erpnext/hr/doctype/job_applicant/job_applicant.py
index ddbf97f..a0b2388 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.py
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.py
@@ -11,3 +11,7 @@
 class JobApplicant(Document):
 	def validate(self):
 		self.set_status()
+
+	def set_sender(self, sender):
+		"""Will be called by **Communication** when a Job Application is created from an incoming email."""
+		self.email_id = sender
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index 36e31f8..149b974 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -33,7 +33,7 @@
  ], 
  "icon": "icon-bookmark", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:12.248194", 
+ "modified": "2015-02-05 05:11:40.083704", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Opening", 
@@ -49,6 +49,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index ede86f3..362b14c 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -137,7 +137,7 @@
  "icon": "icon-ok", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-06-23 07:55:48.989894", 
+ "modified": "2015-02-05 05:11:40.529337", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
@@ -155,6 +155,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -169,6 +170,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 91e96b8..cb15d42 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -192,7 +192,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "max_attachments": 3, 
- "modified": "2015-01-07 14:40:16.244403", 
+ "modified": "2015-02-05 05:11:40.611487", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
@@ -208,6 +208,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Employee", 
+   "share": 1, 
    "user_permission_doctypes": "[\"Company\",\"Employee\",\"Fiscal Year\",\"Leave Application\"]", 
    "write": 1
   }, 
@@ -225,6 +226,7 @@
    "report": 1, 
    "role": "HR Manager", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -252,6 +254,7 @@
    "report": 1, 
    "role": "HR User", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "submit": 1, 
    "user_permission_doctypes": "[\"Company\"]", 
    "write": 1
@@ -268,6 +271,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Leave Approver", 
+   "share": 1, 
    "submit": 1, 
    "user_permission_doctypes": "[\"Company\",\"User\"]", 
    "write": 1
diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
index 916e356..d554167 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
@@ -72,7 +72,7 @@
  ], 
  "icon": "icon-calendar", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:13.198735", 
+ "modified": "2015-02-05 05:11:40.729590", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List", 
@@ -86,6 +86,7 @@
    "print": 1, 
    "read": 1, 
    "role": "HR User", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index a0c048c..2eb4eb6 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -98,7 +98,7 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2014-05-09 02:16:44.996178", 
+ "modified": "2015-02-05 05:11:40.791976", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Control Panel", 
@@ -110,6 +110,7 @@
    "read": 1, 
    "report": 0, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index ff19dd2..ac4525b 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -63,7 +63,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2015-01-15 12:37:30.557739", 
+ "modified": "2015-02-05 05:11:40.849495", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Type", 
@@ -79,6 +79,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -91,6 +92,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/salary_manager/salary_manager.js
index 6e20bff..65667c9 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.js
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.js
@@ -2,9 +2,9 @@
 // License: GNU General Public License v3. See license.txt
 
 var display_activity_log = function(msg) {
-	if(!pscript.ss_html)
-		pscript.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
-	pscript.ss_html.innerHTML =
+	if(!cur_frm.ss_html)
+		cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
+	cur_frm.ss_html.innerHTML =
 		'<div class="panel"><div class="panel-heading">'+__("Activity Log:")+'</div>'+msg+'</div>';
 }
 
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.json b/erpnext/hr/doctype/salary_manager/salary_manager.json
index 7b25ec2..f49832e 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.json
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.json
@@ -1,163 +1,164 @@
 {
- "allow_copy": 1,
- "allow_email": 1,
- "allow_print": 1,
- "creation": "2012-03-27 14:35:59",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
+ "allow_copy": 1, 
+ "allow_email": 1, 
+ "allow_print": 1, 
+ "creation": "2012-03-27 14:35:59", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
  "fields": [
   {
-   "fieldname": "document_description",
-   "fieldtype": "HTML",
-   "label": "Document Description",
-   "options": "<div class=\"alert alert-info\">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>",
+   "fieldname": "document_description", 
+   "fieldtype": "HTML", 
+   "label": "Document Description", 
+   "options": "<div class=\"alert alert-info\">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "section_break0",
-   "fieldtype": "Section Break",
+   "fieldname": "section_break0", 
+   "fieldtype": "Section Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company",
-   "permlevel": 0,
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Company", 
+   "options": "Company", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "branch",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Branch",
-   "options": "Branch",
+   "fieldname": "branch", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Branch", 
+   "options": "Branch", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "label": "Department",
-   "options": "Department",
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "label": "Department", 
+   "options": "Department", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "designation",
-   "fieldtype": "Link",
-   "label": "Designation",
-   "options": "Designation",
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "label": "Designation", 
+   "options": "Designation", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "fiscal_year",
-   "fieldtype": "Link",
-   "label": "Fiscal Year",
-   "options": "Fiscal Year",
-   "permlevel": 0,
+   "fieldname": "fiscal_year", 
+   "fieldtype": "Link", 
+   "label": "Fiscal Year", 
+   "options": "Fiscal Year", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "month",
-   "fieldtype": "Select",
-   "label": "Month",
-   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
-   "permlevel": 0,
+   "fieldname": "month", 
+   "fieldtype": "Select", 
+   "label": "Month", 
+   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
-   "fieldname": "send_email",
-   "fieldtype": "Check",
-   "label": "Send Email",
+   "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip", 
+   "fieldname": "send_email", 
+   "fieldtype": "Check", 
+   "label": "Send Email", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "section_break1",
-   "fieldtype": "Section Break",
+   "fieldname": "section_break1", 
+   "fieldtype": "Section Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break2", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "description": "Creates salary slip for above mentioned criteria.",
-   "fieldname": "create_salary_slip",
-   "fieldtype": "Button",
-   "label": "Create Salary Slip",
+   "description": "Creates salary slip for above mentioned criteria.", 
+   "fieldname": "create_salary_slip", 
+   "fieldtype": "Button", 
+   "label": "Create Salary Slip", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break3",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break3", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "25%"
-  },
+  }, 
   {
-   "description": "Submit all salary slips for the above selected criteria",
-   "fieldname": "submit_salary_slip",
-   "fieldtype": "Button",
-   "label": "Submit Salary Slip",
+   "description": "Submit all salary slips for the above selected criteria", 
+   "fieldname": "submit_salary_slip", 
+   "fieldtype": "Button", 
+   "label": "Submit Salary Slip", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break4",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break4", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "25%"
-  },
+  }, 
   {
-   "description": "Create Bank Entry for the total salary paid for the above selected criteria",
-   "fieldname": "make_bank_entry",
-   "fieldtype": "Button",
-   "label": "Make Bank Entry",
+   "description": "Create Bank Entry for the total salary paid for the above selected criteria", 
+   "fieldname": "make_bank_entry", 
+   "fieldtype": "Button", 
+   "label": "Make Bank Entry", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "section_break2",
-   "fieldtype": "Section Break",
+   "fieldname": "section_break2", 
+   "fieldtype": "Section Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "activity_log",
-   "fieldtype": "HTML",
-   "label": "Activity Log",
+   "fieldname": "activity_log", 
+   "fieldtype": "HTML", 
+   "label": "Activity Log", 
    "permlevel": 0
   }
- ],
- "icon": "icon-cog",
- "idx": 1,
- "issingle": 1,
- "modified": "2014-12-25 06:46:39.437061",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Manager",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2015-02-05 05:11:44.876131", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Salary Manager", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "create": 1,
-   "permlevel": 0,
-   "read": 1,
-   "role": "HR Manager",
+   "create": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "role": "HR Manager", 
+   "share": 1, 
    "write": 1
   }
- ],
- "sort_field": "modified",
+ ], 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index fe4c86a..a3906f3 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -337,7 +337,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 14:49:28.835615", 
+ "modified": "2015-02-05 05:11:44.967827", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
@@ -354,6 +354,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 1, 
    "user_permission_doctypes": "[\"Branch\",\"Company\",\"Department\",\"Designation\",\"Fiscal Year\",\"Salary Slip\"]", 
    "write": 1
@@ -369,6 +370,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 3e15cd9..10b1f78 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -45,7 +45,7 @@
 
 	def get_leave_details(self, lwp=None):
 		if not self.fiscal_year:
-			self.fiscal_year = frappe.get_default("fiscal_year")
+			self.fiscal_year = frappe.db.get_default("fiscal_year")
 		if not self.month:
 			self.month = "%02d" % getdate(nowdate()).month
 
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 12219e1..5cbe0d2 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -227,7 +227,7 @@
  ], 
  "icon": "icon-file-text", 
  "idx": 1, 
- "modified": "2014-12-24 16:39:45.518474", 
+ "modified": "2015-02-05 05:11:45.120566", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 
@@ -243,6 +243,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -255,6 +256,7 @@
    "read": 1, 
    "report": 1, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.json b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
index 6aa2861..195879d 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@@ -1,5 +1,5 @@
 {
-  "creation": "2013-01-25 11:34:53.000000", 
+ "creation": "2013-01-25 11:34:53", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "fields": [
@@ -57,7 +57,7 @@
  "idx": 1, 
  "issingle": 1, 
  "max_attachments": 1, 
- "modified": "2013-12-20 19:21:54.000000", 
+ "modified": "2015-02-05 05:11:48.540845", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Upload Attendance", 
@@ -71,6 +71,7 @@
    "read": 1, 
    "report": 0, 
    "role": "HR User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -82,6 +83,7 @@
    "read": 1, 
    "report": 0, 
    "role": "HR Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 19c3fcf..a230cf4 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -10,9 +10,6 @@
 		cur_frm.add_custom_button(__("Update Cost"), cur_frm.cscript.update_cost,
 			"icon-money", "btn-default");
 	}
-
-	cur_frm.cscript.with_operations(doc);
-	erpnext.bom.set_operation(doc);
 }
 
 cur_frm.cscript.update_cost = function() {
@@ -25,29 +22,8 @@
 	})
 }
 
-cur_frm.cscript.with_operations = function(doc) {
-	cur_frm.fields_dict["items"].grid.set_column_disp("operation", doc.with_operations);
-	cur_frm.fields_dict["items"].grid.toggle_reqd("operation", doc.with_operations);
-}
-
-erpnext.bom.set_operation = function(doc) {
-	var op_table = doc["operations"] || [];
-	var operations = [];
-
-	for (var i=0, j=op_table.length; i<j; i++) {
-		operations[i] = (i+1);
-	}
-
-	frappe.meta.get_docfield("BOM Item", "operation", cur_frm.docname).options = operations.join("\n");
-
-	refresh_field("items");
-}
-
-cur_frm.cscript.operations_remove = function(){
-	erpnext.bom.set_operation(doc);
-}
-
 cur_frm.add_fetch("item", "description", "description");
+cur_frm.add_fetch("item", "item_name", "item_name");
 cur_frm.add_fetch("item", "stock_uom", "uom");
 
 
@@ -196,7 +172,6 @@
 		callback: function (data) {
 			frappe.model.set_value(d.doctype, d.name, "opn_description", data.message.opn_description);
 			frappe.model.set_value(d.doctype, d.name, "workstation", data.message.workstation);
-			erpnext.bom.set_operation(frm.doc);
 		}
 	})
 });
@@ -217,3 +192,13 @@
 		}
 	})
 });
+
+frappe.ui.form.on("BOM Operation", "operations_remove", function(frm) {
+	erpnext.bom.calculate_op_cost(frm.doc);
+	erpnext.bom.calculate_total(frm.doc);
+});
+
+frappe.ui.form.on("BOM Item", "items_remove", function(frm) {
+	erpnext.bom.calculate_rm_cost(frm.doc);
+	erpnext.bom.calculate_total(frm.doc);
+});
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 7dac33c..c95507d 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -22,6 +22,33 @@
    "search_index": 1
   }, 
   {
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "label": "Item Name", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "fieldname": "rm_cost_as_per", 
+   "fieldtype": "Select", 
+   "label": "Rate Of Materials Based On", 
+   "options": "Valuation Rate\nLast Purchase Rate\nPrice List", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", 
+   "fieldname": "buying_price_list", 
+   "fieldtype": "Link", 
+   "label": "Price List", 
+   "options": "Price List", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
    "allow_on_submit": 1, 
    "default": "1", 
    "fieldname": "is_active", 
@@ -48,11 +75,6 @@
    "permlevel": 0
   }, 
   {
-   "fieldname": "cb0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0
-  }, 
-  {
    "description": "Manage cost of operations", 
    "fieldname": "with_operations", 
    "fieldtype": "Check", 
@@ -60,21 +82,6 @@
    "permlevel": 0
   }, 
   {
-   "fieldname": "rm_cost_as_per", 
-   "fieldtype": "Select", 
-   "label": "Rate Of Materials Based On", 
-   "options": "Valuation Rate\nLast Purchase Rate\nPrice List", 
-   "permlevel": 0
-  }, 
-  {
-   "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", 
-   "fieldname": "buying_price_list", 
-   "fieldtype": "Link", 
-   "label": "Price List", 
-   "options": "Price List", 
-   "permlevel": 0
-  }, 
-  {
    "depends_on": "with_operations", 
    "description": "Specify the operations, operating cost and give a unique Operation no to your operations.", 
    "fieldname": "operations_section", 
@@ -245,7 +252,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-01-07 11:11:07.047695", 
+ "modified": "2015-02-05 05:11:35.113320", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 
@@ -261,6 +268,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Manufacturing Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -275,6 +283,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Manufacturing User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 636d86b..702fdef 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -27,11 +27,12 @@
 		self.validate_main_item()
 
 		from erpnext.utilities.transaction_base import validate_uom_is_integer
-		validate_uom_is_integer(self, "stock_uom", "qty")
+		validate_uom_is_integer(self, "stock_uom", "qty", "BOM Item")
 
 		self.validate_materials()
 		self.set_bom_material_details()
 		self.calculate_cost()
+		self.validate_operations()
 
 	def on_update(self):
 		self.check_recursion()
@@ -53,7 +54,7 @@
 		self.manage_default_bom()
 
 	def get_item_det(self, item_code):
-		item = frappe.db.sql("""select name, is_asset_item, is_purchase_item,
+		item = frappe.db.sql("""select name, item_name, is_asset_item, is_purchase_item,
 			docstatus, description, is_sub_contracted_item, stock_uom, default_bom,
 			last_purchase_rate
 			from `tabItem` where name=%s""", item_code, as_dict = 1)
@@ -69,7 +70,7 @@
 
 	def set_bom_material_details(self):
 		for item in self.get("items"):
-			ret = self.get_bom_material_detail({"item_code": item.item_code, "bom_no": item.bom_no,
+			ret = self.get_bom_material_detail({"item_code": item.item_code, "item_name": item.item_name, "bom_no": item.bom_no,
 				"qty": item.qty})
 
 			for r in ret:
@@ -93,6 +94,7 @@
 
 		rate = self.get_rm_rate(args)
 		ret_item = {
+			 'item_name'	: item and args['item_name'] or '',
 			 'description'  : item and args['description'] or '',
 			 'stock_uom'	: item and args['stock_uom'] or '',
 			 'bom_no'		: args['bom_no'],
@@ -129,7 +131,7 @@
 				d.rate = rate
 
 		if self.docstatus == 1:
-			self.ignore_validate_update_after_submit = True
+			self.flags.ignore_validate_update_after_submit = True
 			self.calculate_cost()
 		self.save()
 
@@ -184,8 +186,6 @@
 	def clear_operations(self):
 		if not self.with_operations:
 			self.set('operations', [])
-			for d in self.get("items"):
-				d.operation = None
 
 	def validate_main_item(self):
 		""" Validate main FG item"""
@@ -193,29 +193,25 @@
 		if not item:
 			frappe.throw(_("Item {0} does not exist in the system or has expired").format(self.item))
 		else:
-			ret = frappe.db.get_value("Item", self.item, ["description", "stock_uom"])
+			ret = frappe.db.get_value("Item", self.item, ["description", "stock_uom", "item_name"])
 			self.description = ret[0]
 			self.uom = ret[1]
+			self.item_name= ret[2]
 
 	def validate_materials(self):
 		""" Validate raw material entries """
+		if not self.get('items'):
+			frappe.throw(_("Raw Materials cannot be blank."))
 		check_list = []
 		for m in self.get('items'):
-
 			if m.bom_no:
 				validate_bom_no(m.item_code, m.bom_no)
-
 			if flt(m.qty) <= 0:
 				frappe.throw(_("Quantity required for Item {0} in row {1}").format(m.item_code, m.idx))
-
-			self.check_if_item_repeated(m.item_code, m.operation, check_list)
-
-
-	def check_if_item_repeated(self, item, op, check_list):
-		if [cstr(item), cstr(op)] in check_list:
-			frappe.throw(_("Item {0} has been entered multiple times against same operation").format(item))
-		else:
-			check_list.append([cstr(item), cstr(op)])
+			check_list.append(cstr(m.item_code))
+		unique_chk_list = set(check_list)
+		if len(unique_chk_list)	!= len(check_list):
+			frappe.throw(_("Same item has been entered multiple times."))
 
 	def check_recursion(self):
 		""" Check whether recursion occurs in any bom"""
@@ -303,6 +299,7 @@
 			else:
 				self.add_to_cur_exploded_items(frappe._dict({
 					'item_code'				: d.item_code,
+					'item_name'				: d.item_name,
 					'description'			: d.description,
 					'stock_uom'				: d.stock_uom,
 					'qty'					: flt(d.qty),
@@ -318,7 +315,7 @@
 	def get_child_exploded_items(self, bom_no, qty):
 		""" Add all items from Flat BOM of child BOM"""
 		# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
-		child_fb_items = frappe.db.sql("""select bom_item.item_code, bom_item.description,
+		child_fb_items = frappe.db.sql("""select bom_item.item_code, bom_item.item_name, bom_item.description,
 			bom_item.stock_uom, bom_item.qty, bom_item.rate,
 			ifnull(bom_item.qty, 0 ) / ifnull(bom.quantity, 1) as qty_consumed_per_unit
 			from `tabBOM Explosion Item` bom_item, tabBOM bom
@@ -327,6 +324,7 @@
 		for d in child_fb_items:
 			self.add_to_cur_exploded_items(frappe._dict({
 				'item_code'				: d['item_code'],
+				'item_name'				: d['item_name'],
 				'description'			: d['description'],
 				'stock_uom'				: d['stock_uom'],
 				'qty'					: d['qty_consumed_per_unit']*qty,
@@ -356,6 +354,10 @@
 			if act_pbom and act_pbom[0][0]:
 				frappe.throw(_("Cannot deactivate or cancel BOM as it is linked with other BOMs"))
 
+	def validate_operations(self):
+		if self.with_operations and not self.get('operations'):
+			frappe.throw(_("Operations cannot be left blank."))
+
 def get_bom_items_as_dict(bom, qty=1, fetch_exploded=1):
 	item_dict = {}
 
diff --git a/erpnext/manufacturing/doctype/bom/test_records.json b/erpnext/manufacturing/doctype/bom/test_records.json
index c37cef0..6f10b21 100644
--- a/erpnext/manufacturing/doctype/bom/test_records.json
+++ b/erpnext/manufacturing/doctype/bom/test_records.json
@@ -67,7 +67,6 @@
    ],
   "items": [
    {
-    "operation": 1,
     "amount": 5000.0,
     "doctype": "BOM Item",
     "item_code": "_Test Item",
@@ -77,7 +76,6 @@
     "stock_uom": "_Test UOM"
    },
    {
-    "operation": 1,
     "amount": 2000.0,
     "bom_no": "BOM/_Test Item Home Desktop Manufactured/001",
     "doctype": "BOM Item",
@@ -108,7 +106,6 @@
    ],
   "items": [
    {
-    "operation": 1,
     "amount": 5000.0,
     "doctype": "BOM Item",
     "item_code": "_Test Item",
diff --git a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
index 58b505d..71b6da5 100644
--- a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+++ b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
@@ -17,6 +17,21 @@
    "read_only": 1
   }, 
   {
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
    "fieldname": "description", 
    "fieldtype": "Text", 
    "in_list_view": 1, 
@@ -29,6 +44,12 @@
    "width": "300px"
   }, 
   {
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "in_list_view": 1, 
@@ -50,17 +71,22 @@
    "read_only": 1
   }, 
   {
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
+   "fieldname": "qty_consumed_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
    "in_list_view": 1, 
-   "label": "Amount", 
-   "oldfieldname": "amount_as_per_sr", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "label": "Qty Consumed Per Unit", 
+   "no_copy": 0, 
    "permlevel": 0, 
    "read_only": 1
   }, 
   {
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
    "fieldname": "stock_uom", 
    "fieldtype": "Link", 
    "in_list_view": 0, 
@@ -72,19 +98,20 @@
    "read_only": 1
   }, 
   {
-   "fieldname": "qty_consumed_per_unit", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
    "in_list_view": 1, 
-   "label": "Qty Consumed Per Unit", 
-   "no_copy": 0, 
+   "label": "Amount", 
+   "oldfieldname": "amount_as_per_sr", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "read_only": 1
   }
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-12-12 11:18:01.745641", 
+ "modified": "2015-01-20 13:28:52.258152", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Explosion Item", 
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index 872f532..6786ead 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -1,147 +1,145 @@
 {
- "creation": "2013-02-22 01:27:49",
- "docstatus": 0,
- "doctype": "DocType",
+ "creation": "2013-02-22 01:27:49", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "fieldname": "operation",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Operation",
-   "oldfieldname": "operation_no",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "reqd": 0
-  },
-  {
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Item Code",
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "reqd": 1,
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Item Code", 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "reqd": 1, 
    "search_index": 1
-  },
+  }, 
   {
-   "fieldname": "bom_no",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "BOM No",
-   "oldfieldname": "bom_no",
-   "oldfieldtype": "Link",
-   "options": "BOM",
-   "permlevel": 0,
-   "print_width": "150px",
-   "reqd": 0,
-   "search_index": 1,
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "fieldname": "bom_no", 
+   "fieldtype": "Link", 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "BOM No", 
+   "oldfieldname": "bom_no", 
+   "oldfieldtype": "Link", 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "print_width": "150px", 
+   "reqd": 0, 
+   "search_index": 1, 
    "width": "150px"
-  },
+  }, 
   {
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "description",
-   "fieldtype": "Text",
-   "label": "Item Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_width": "250px",
-   "reqd": 0,
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "label": "Item Description", 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_width": "250px", 
+   "reqd": 0, 
    "width": "250px"
-  },
+  }, 
   {
-   "fieldname": "quantity_and_rate",
-   "fieldtype": "Section Break",
-   "label": "Quantity and Rate",
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "label": "Quantity and Rate", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "in_list_view": 1,
-   "label": "Qty",
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "in_list_view": 1, 
+   "label": "Qty", 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "description": "See \"Rate Of Materials Based On\" in Costing Section",
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Rate",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
+   "description": "See \"Rate Of Materials Based On\" in Costing Section", 
+   "fieldname": "rate", 
+   "fieldtype": "Currency", 
+   "in_list_view": 1, 
+   "label": "Rate", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "in_list_view": 0,
-   "label": "Stock UOM",
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Data",
-   "options": "UOM",
-   "permlevel": 0,
-   "read_only": 1,
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "in_list_view": 0, 
+   "label": "Stock UOM", 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Data", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "read_only": 1, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Amount",
-   "oldfieldname": "amount_as_per_mar",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_width": "150px",
-   "read_only": 1,
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "oldfieldname": "amount_as_per_mar", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
    "width": "150px"
-  },
+  }, 
   {
-   "fieldname": "scrap",
-   "fieldtype": "Float",
-   "label": "Scrap %",
-   "oldfieldname": "scrap",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
+   "fieldname": "scrap", 
+   "fieldtype": "Float", 
+   "label": "Scrap %", 
+   "oldfieldname": "scrap", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
    "print_hide": 1
-  },
+  }, 
   {
-   "fieldname": "qty_consumed_per_unit",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "Qty Consumed Per Unit",
-   "oldfieldname": "qty_consumed_per_unit",
-   "oldfieldtype": "Float",
-   "permlevel": 0,
-   "print_hide": 1,
+   "fieldname": "qty_consumed_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 1, 
+   "label": "Qty Consumed Per Unit", 
+   "oldfieldname": "qty_consumed_per_unit", 
+   "oldfieldtype": "Float", 
+   "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 1
   }
- ],
- "idx": 1,
+ ], 
+ "idx": 1, 
  "istable": 1,
- "modified": "2014-12-12 11:15:43.798755",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "BOM Item",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
+ "modified": "2015-01-20 13:28:35.152945", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "BOM Item", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
index a5e3b4d..a1e215d 100644
--- a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
+++ b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
@@ -2,7 +2,7 @@
  "allow_copy": 1, 
  "allow_email": 1, 
  "allow_print": 1, 
- "creation": "2012-12-06 12:10:10.000000", 
+ "creation": "2012-12-06 12:10:10", 
  "description": "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -43,7 +43,7 @@
  "idx": 1, 
  "in_create": 1, 
  "issingle": 1, 
- "modified": "2013-07-05 14:27:52.000000", 
+ "modified": "2015-02-05 05:11:35.233845", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Replace Tool", 
@@ -55,6 +55,7 @@
    "read": 1, 
    "report": 0, 
    "role": "Manufacturing Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index a5bdecd..be5d5fc 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -51,7 +51,7 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2014-12-22 12:43:15.261503", 
+ "modified": "2015-02-05 05:11:41.192126", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Manufacturing Settings", 
@@ -73,6 +73,7 @@
    "report": 0, 
    "role": "Manufacturing Manager", 
    "set_user_permissions": 0, 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 8533648..4ef4a0f 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -65,7 +65,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2014-12-18 16:21:59.462435", 
+ "modified": "2015-02-05 05:11:41.666429", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Operation", 
@@ -87,6 +87,7 @@
    "report": 0, 
    "role": "Manufacturing User", 
    "set_user_permissions": 0, 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -99,6 +100,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Manufacturing Manager", 
+   "share": 1, 
    "write": 1
   }
  ], 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 502277b..f7ebaa9 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -7,6 +7,13 @@
 		cfn_set_fields(doc, dt, dn);
 
 		this.frm.add_fetch("sales_order", "delivery_date", "expected_delivery_date");
+		
+		if(doc.__islocal) {
+			cur_frm.set_value({
+			"actual_start_date": "",
+			"actual_end_date": ""
+			});
+		}
 	},
 
 	before_submit: function() {
@@ -60,10 +67,14 @@
 	bom_no: function() {
 		return this.frm.call({
 			doc: this.frm.doc,
-			method: "set_production_order_operations",
-			callback: function(r) {
-				if(!r.exc) refresh_field("operations");
-			}
+			method: "set_production_order_operations"
+		});
+	},
+	
+	planned_start_date: function() {
+		return this.frm.call({
+			doc: this.frm.doc,
+			method: "plan_operations"
 		});
 	},
 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index c6ef038..ce24ec2 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -351,7 +351,7 @@
  "idx": 1, 
  "in_create": 0, 
  "is_submittable": 1, 
- "modified": "2015-01-08 12:59:51.111895", 
+ "modified": "2015-02-05 05:11:42.851377", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
@@ -369,6 +369,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Manufacturing User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 9ac1c48..a962248 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -175,16 +175,17 @@
 		self.calculate_operating_cost()
 
 	def plan_operations(self):
-		scheduled_datetime = self.planned_start_date
-		for d in self.get('operations'):
-			while getdate(scheduled_datetime) in self.get_holidays(d.workstation):
-				scheduled_datetime = get_datetime(scheduled_datetime) + relativedelta(days=1)
+		if self.planned_start_date:
+			scheduled_datetime = self.planned_start_date
+			for d in self.get('operations'):
+				while getdate(scheduled_datetime) in self.get_holidays(d.workstation):
+					scheduled_datetime = get_datetime(scheduled_datetime) + relativedelta(days=1)
 
-			d.planned_start_time = scheduled_datetime
-			scheduled_datetime = get_datetime(scheduled_datetime) + relativedelta(minutes=d.time_in_mins)
-			d.planned_end_time = scheduled_datetime
+				d.planned_start_time = scheduled_datetime
+				scheduled_datetime = get_datetime(scheduled_datetime) + relativedelta(minutes=d.time_in_mins)
+				d.planned_end_time = scheduled_datetime
 
-		self.planned_end_date = scheduled_datetime
+			self.planned_end_date = scheduled_datetime
 
 
 	def get_holidays(self, workstation):
@@ -208,7 +209,16 @@
 				d.status = "Completed"
 			else:
 				frappe.throw(_("Completed Qty can not be greater than 'Qty to Manufacture'"))
-
+		
+	def set_actual_dates(self):
+		if self.get("operations"):
+			actual_date = frappe.db.sql("""select min(actual_start_time) as start_date, max(actual_end_time) as end_date from `tabProduction Order Operation`
+				where parent = %s and docstatus=1""", self.name, as_dict=1)[0]
+			self.actual_start_date = actual_date.start_date
+			self.actual_end_date = actual_date.end_date
+		else:
+			self.actual_start_date = None
+			self.actual_end_date = None
 
 @frappe.whitelist()
 def get_item_details(item):
@@ -281,6 +291,7 @@
 	time_log.project = project
 	time_log.operation= operation
 	time_log.workstation= workstation
+	time_log.activity_type= "Manufacturing"
 	time_log.completed_qty = flt(qty)
 	if from_time and to_time :
 		time_log.calculate_total_hours()
@@ -288,7 +299,7 @@
 
 @frappe.whitelist()
 def auto_make_time_log(production_order_id):
-	if frappe.db.get_value("Time Log", filters={"production_order": production_order_id}):
+	if frappe.db.get_value("Time Log", filters={"production_order": production_order_id, "docstatus":1}):
 		frappe.throw(_("Time logs already exists against this Production Order"))
 
 	time_logs = []
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
index 5c2de5b..f2c7cc7 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
@@ -1,180 +1,181 @@
 {
- "creation": "2013-01-21 12:03:47",
- "default_print_format": "Standard",
- "docstatus": 0,
- "doctype": "DocType",
+ "creation": "2013-01-21 12:03:47", 
+ "default_print_format": "Standard", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "description": "Select Sales Orders from which you want to create Production Orders.",
-   "fieldname": "select_sales_orders",
-   "fieldtype": "Section Break",
-   "label": "Select Sales Orders",
+   "description": "Select Sales Orders from which you want to create Production Orders.", 
+   "fieldname": "select_sales_orders", 
+   "fieldtype": "Section Break", 
+   "label": "Select Sales Orders", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "fg_item",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Filter based on item",
-   "options": "Item",
+   "fieldname": "fg_item", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Filter based on item", 
+   "options": "Item", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Filter based on customer",
-   "options": "Customer",
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Filter based on customer", 
+   "options": "Customer", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company",
-   "permlevel": 0,
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Company", 
+   "options": "Company", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "label": "From Date",
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "label": "From Date", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "label": "To Date",
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "label": "To Date", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "section_break1",
-   "fieldtype": "Section Break",
-   "options": "Simple",
+   "fieldname": "section_break1", 
+   "fieldtype": "Section Break", 
+   "options": "Simple", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Pull sales orders (pending to deliver) based on the above criteria",
-   "fieldname": "get_sales_orders",
-   "fieldtype": "Button",
-   "label": "Get Sales Orders",
-   "options": "get_open_sales_orders",
+   "description": "Pull sales orders (pending to deliver) based on the above criteria", 
+   "fieldname": "get_sales_orders", 
+   "fieldtype": "Button", 
+   "label": "Get Sales Orders", 
+   "options": "get_open_sales_orders", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "sales_orders",
-   "fieldtype": "Table",
-   "label": "Sales Orders",
-   "options": "Production Plan Sales Order",
+   "fieldname": "sales_orders", 
+   "fieldtype": "Table", 
+   "label": "Sales Orders", 
+   "options": "Production Plan Sales Order", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "items_for_production",
-   "fieldtype": "Section Break",
-   "label": "Select Items",
+   "fieldname": "items_for_production", 
+   "fieldtype": "Section Break", 
+   "label": "Select Items", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "get_items_from_so",
-   "fieldtype": "Button",
-   "label": "Get Items From Sales Orders",
-   "options": "get_items_from_so",
+   "fieldname": "get_items_from_so", 
+   "fieldtype": "Button", 
+   "label": "Get Items From Sales Orders", 
+   "options": "get_items_from_so", 
    "permlevel": 0
-  },
+  }, 
   {
-   "default": "1",
-   "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
-   "fieldname": "use_multi_level_bom",
-   "fieldtype": "Check",
-   "label": "Use Multi-Level BOM",
-   "permlevel": 0,
+   "default": "1", 
+   "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
+   "fieldname": "use_multi_level_bom", 
+   "fieldtype": "Check", 
+   "label": "Use Multi-Level BOM", 
+   "permlevel": 0, 
    "reqd": 0
-  },
+  }, 
   {
-   "fieldname": "items",
-   "fieldtype": "Table",
-   "label": "Items",
-   "options": "Production Plan Item",
+   "fieldname": "items", 
+   "fieldtype": "Table", 
+   "label": "Items", 
+   "options": "Production Plan Item", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.",
-   "fieldname": "create_production_orders",
-   "fieldtype": "Section Break",
-   "label": "Production Orders",
+   "description": "Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.", 
+   "fieldname": "create_production_orders", 
+   "fieldtype": "Section Break", 
+   "label": "Production Orders", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Separate production order will be created for each finished good item.",
-   "fieldname": "raise_production_order",
-   "fieldtype": "Button",
-   "label": "Create Production Orders",
-   "options": "raise_production_order",
+   "description": "Separate production order will be created for each finished good item.", 
+   "fieldname": "raise_production_order", 
+   "fieldtype": "Button", 
+   "label": "Create Production Orders", 
+   "options": "raise_production_order", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "sb5",
-   "fieldtype": "Section Break",
-   "label": "Material Requirement",
+   "fieldname": "sb5", 
+   "fieldtype": "Section Break", 
+   "label": "Material Requirement", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "purchase_request_for_warehouse",
-   "fieldtype": "Link",
-   "label": "Material Request For Warehouse",
-   "options": "Warehouse",
+   "fieldname": "purchase_request_for_warehouse", 
+   "fieldtype": "Link", 
+   "label": "Material Request For Warehouse", 
+   "options": "Warehouse", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty",
-   "fieldname": "raise_purchase_request",
-   "fieldtype": "Button",
-   "label": "Create Material Requests",
-   "options": "",
+   "description": "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty", 
+   "fieldname": "raise_purchase_request", 
+   "fieldtype": "Button", 
+   "label": "Create Material Requests", 
+   "options": "", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Download a report containing all raw materials with their latest inventory status",
-   "fieldname": "download_materials_required",
-   "fieldtype": "Button",
-   "label": "Download Materials Required",
+   "description": "Download a report containing all raw materials with their latest inventory status", 
+   "fieldname": "download_materials_required", 
+   "fieldtype": "Button", 
+   "label": "Download Materials Required", 
    "permlevel": 0
   }
- ],
- "icon": "icon-calendar",
- "idx": 1,
- "in_create": 1,
- "issingle": 1,
- "modified": "2015-01-11 21:53:21.253556",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "Production Planning Tool",
- "owner": "jai@webnotestech.com",
+ ], 
+ "icon": "icon-calendar", 
+ "idx": 1, 
+ "in_create": 1, 
+ "issingle": 1, 
+ "modified": "2015-02-05 05:11:43.010625", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "Production Planning Tool", 
+ "owner": "jai@webnotestech.com", 
  "permissions": [
   {
-   "create": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "Manufacturing User",
-   "submit": 0,
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Manufacturing User", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
+ ], 
  "read_only": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 713433e..24204f2 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -394,7 +394,7 @@
 						"sales_order_no": sales_order if sales_order!="No Sales Order" else None
 					})
 
-				pr_doc.ignore_permissions = 1
+				pr_doc.flags.ignore_permissions = 1
 				pr_doc.submit()
 				purchase_request_list.append(pr_doc.name)
 
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 14d4964..e4cda3d 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -138,7 +138,7 @@
  ], 
  "icon": "icon-wrench", 
  "idx": 1, 
- "modified": "2014-12-24 14:47:06.676335", 
+ "modified": "2015-02-05 05:13:38.580439", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Workstation", 
@@ -154,6 +154,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Manufacturing User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 9721646..00db68f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -101,6 +101,10 @@
 execute:frappe.db.sql("update `tabJournal Entry` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
 erpnext.patches.v4_2.party_model
 erpnext.patches.v4_1.fix_jv_remarks
+erpnext.patches.v4_2.update_landed_cost_voucher
+erpnext.patches.v4_2.set_item_has_batch
 erpnext.patches.v5_0.recalculate_total_amount_in_jv
 erpnext.patches.v5_0.remove_shopping_cart_app
 erpnext.patches.v5_0.update_companywise_payment_account
+erpnext.patches.v5_0.remove_birthday_events
+erpnext.patches.v5_0.update_item_name_in_bom
diff --git a/erpnext/patches/v4_0/apply_user_permissions.py b/erpnext/patches/v4_0/apply_user_permissions.py
index 7dae02f..52e0bb7 100644
--- a/erpnext/patches/v4_0/apply_user_permissions.py
+++ b/erpnext/patches/v4_0/apply_user_permissions.py
@@ -28,7 +28,7 @@
 	for employee in frappe.db.sql_list("""select name from `tabEmployee` where docstatus < 2"""):
 		try:
 			emp = frappe.get_doc("Employee", employee)
-			emp.ignore_mandatory = True
+			emp.flags.ignore_mandatory = True
 			emp.save()
 		except EmployeeUserDisabledError:
 			pass
diff --git a/erpnext/patches/v4_0/global_defaults_to_system_settings.py b/erpnext/patches/v4_0/global_defaults_to_system_settings.py
index 57b21ae..4c3ae76 100644
--- a/erpnext/patches/v4_0/global_defaults_to_system_settings.py
+++ b/erpnext/patches/v4_0/global_defaults_to_system_settings.py
@@ -31,9 +31,9 @@
 
 		system_settings.language = lang
 
-	system_settings.ignore_mandatory = True
+	system_settings.flags.ignore_mandatory = True
 	system_settings.save()
 
 	global_defaults = frappe.get_doc("Global Defaults")
-	global_defaults.ignore_mandatory = True
+	global_defaults.flags.ignore_mandatory = True
 	global_defaults.save()
diff --git a/erpnext/patches/v4_2/recalculate_bom_cost.py b/erpnext/patches/v4_2/recalculate_bom_cost.py
index 3a194ff..ff96cea 100644
--- a/erpnext/patches/v4_2/recalculate_bom_cost.py
+++ b/erpnext/patches/v4_2/recalculate_bom_cost.py
@@ -6,11 +6,11 @@
 
 def execute():
 	for d in frappe.db.sql("select name from `tabBOM` where docstatus < 2"):
-		try:	
+		try:
 			document = frappe.get_doc('BOM', d[0])
 			if document.docstatus == 1:
-				document.ignore_validate_update_after_submit = True
+				document.flags.ignore_validate_update_after_submit = True
 				document.calculate_cost()
 			document.save()
 		except:
-			pass
\ No newline at end of file
+			pass
diff --git a/erpnext/patches/v4_2/reset_bom_costs.py b/erpnext/patches/v4_2/reset_bom_costs.py
index 49f0b2e..0b49112 100644
--- a/erpnext/patches/v4_2/reset_bom_costs.py
+++ b/erpnext/patches/v4_2/reset_bom_costs.py
@@ -9,7 +9,7 @@
 	for d in frappe.db.sql("""select name from `tabBOM` where docstatus < 2""", as_dict=1):
 		try:
 			bom = frappe.get_doc('BOM', d.name)
-			bom.ignore_validate_update_after_submit = True
+			bom.flags.ignore_validate_update_after_submit = True
 			bom.calculate_cost()
 			bom.save()
 			frappe.db.commit()
diff --git a/erpnext/patches/v4_2/set_item_has_batch.py b/erpnext/patches/v4_2/set_item_has_batch.py
new file mode 100644
index 0000000..35ed2e0
--- /dev/null
+++ b/erpnext/patches/v4_2/set_item_has_batch.py
@@ -0,0 +1,65 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.sql("update tabItem set has_batch_no = 'No' where ifnull(has_batch_no, '') = ''")
+	frappe.db.sql("update tabItem set has_serial_no = 'No' where ifnull(has_serial_no, '') = ''")
+	
+	item_list = frappe.db.sql("""select name, has_batch_no, has_serial_no from tabItem 
+		where ifnull(is_stock_item, 'No') = 'Yes'""", as_dict=1)
+		
+	sle_count = get_sle_count()
+	sle_with_batch = get_sle_with_batch()
+	sle_with_serial = get_sle_with_serial()
+	
+	batch_items = get_items_with_batch()
+	serialized_items = get_items_with_serial()
+		
+	for d in item_list:	
+		if d.has_batch_no == 'Yes':
+			if d.name not in batch_items and sle_count.get(d.name) and sle_count.get(d.name) != sle_with_batch.get(d.name):
+					frappe.db.set_value("Item", d.name, "has_batch_no", "No")
+		else:
+			if d.name in batch_items or (sle_count.get(d.name) and sle_count.get(d.name) == sle_with_batch.get(d.name)):
+				frappe.db.set_value("Item", d.name, "has_batch_no", "Yes")
+		
+		if d.has_serial_no == 'Yes':
+			if d.name not in serialized_items and sle_count.get(d.name) and sle_count.get(d.name) != sle_with_serial.get(d.name):
+				frappe.db.set_value("Item", d.name, "has_serial_no", "No")
+		else:
+			if d.name in serialized_items or (sle_count.get(d.name) and sle_count.get(d.name) == sle_with_serial.get(d.name)):
+				frappe.db.set_value("Item", d.name, "has_serial_no", "Yes")
+		
+				
+def get_sle_count():
+	sle_count = {}
+	for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry` group by item_code""", as_dict=1):
+		sle_count.setdefault(d.item_code, d.cnt)
+		
+	return sle_count
+	
+def get_sle_with_batch():
+	sle_with_batch = {}
+	for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry` 
+		where ifnull(batch_no, '') != '' group by item_code""", as_dict=1):
+			sle_with_batch.setdefault(d.item_code, d.cnt)
+		
+	return sle_with_batch
+	
+
+def get_sle_with_serial():
+	sle_with_serial = {}
+	for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry` 
+		where ifnull(serial_no, '') != '' group by item_code""", as_dict=1):
+			sle_with_serial.setdefault(d.item_code, d.cnt)
+	
+	return sle_with_serial
+	
+def get_items_with_batch():
+	return frappe.db.sql_list("select item from tabBatch")
+	
+def get_items_with_serial():
+	return frappe.db.sql_list("select item_code from `tabSerial No`")
\ No newline at end of file
diff --git a/erpnext/patches/v4_2/update_landed_cost_voucher.py b/erpnext/patches/v4_2/update_landed_cost_voucher.py
new file mode 100644
index 0000000..6563b7b
--- /dev/null
+++ b/erpnext/patches/v4_2/update_landed_cost_voucher.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "landed_cost_voucher")
+	frappe.db.sql("""update `tabLanded Cost Voucher` set distribute_charges_based_on = 'Amount'
+		where docstatus=1""")
diff --git a/erpnext/patches/v5_0/remove_birthday_events.py b/erpnext/patches/v5_0/remove_birthday_events.py
new file mode 100644
index 0000000..589792a
--- /dev/null
+++ b/erpnext/patches/v5_0/remove_birthday_events.py
@@ -0,0 +1,6 @@
+import frappe
+
+def execute():
+	for e in frappe.db.sql_list("""select name from tabEvent where
+		repeat_on='Every Year' and ref_type='Employee'"""):
+		frappe.delete_doc("Event", e, force=True)
diff --git a/erpnext/patches/v5_0/update_item_name_in_bom.py b/erpnext/patches/v5_0/update_item_name_in_bom.py
new file mode 100644
index 0000000..6b56232
--- /dev/null
+++ b/erpnext/patches/v5_0/update_item_name_in_bom.py
@@ -0,0 +1,17 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+
+def execute():
+	frappe.reload_doc("manufacturing", "doctype", "bom")
+	frappe.reload_doc("manufacturing", "doctype", "bom_item")
+	frappe.reload_doc("manufacturing", "doctype", "bom_explosion_item")
+	frappe.reload_doc("manufacturing", "doctype", "bom_operation")
+
+	frappe.db.sql("""update `tabBOM` as bom  set bom.item_name = \
+		( select item.item_name from `tabItem` as item  where item.name = bom.item)""")
+	frappe.db.sql("""update `tabBOM Item` as bomItem set bomItem.item_name = ( select item.item_name  \
+		from `tabItem` as item where item.name = bomItem.item_code)""")
+	frappe.db.sql("""update `tabBOM Explosion Item` as explosionItem set explosionItem.item_name = \
+		( select item.item_name from `tabItem` as item where item.name = explosionItem.item_code)""")
diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index 73b22e1..9d1e15a 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -19,7 +19,7 @@
  "icon": "icon-flag", 
  "idx": 1, 
  "in_dialog": 0, 
- "modified": "2015-01-15 15:22:10.640553", 
+ "modified": "2015-02-05 05:11:34.201187", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Type", 
@@ -33,6 +33,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -44,6 +45,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Projects User", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 34c1f9a..f5cfde2 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -273,7 +273,7 @@
  "icon": "icon-puzzle-piece", 
  "idx": 1, 
  "max_attachments": 4, 
- "modified": "2015-01-07 15:03:59.981848", 
+ "modified": "2015-02-05 05:11:43.094638", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
@@ -290,6 +290,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Projects User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 12f8ba8..258f469 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -217,7 +217,7 @@
  "icon": "icon-check", 
  "idx": 1, 
  "max_attachments": 5, 
- "modified": "2015-01-07 14:57:22.370410", 
+ "modified": "2015-02-05 05:11:47.984820", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
@@ -233,6 +233,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Projects User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index 9a53836..3e28e70 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -10,13 +10,6 @@
 	}
 });
 
-frappe.ui.form.on("Time Log", "refresh", function(frm) {
-	var is_manufacturing = frm.doc.time_log_for=="Manufacturing" ? true : false;
-	frm.toggle_reqd("production_order", is_manufacturing);
-	frm.toggle_reqd("operation", is_manufacturing);
-	frm.toggle_reqd("completed_qty", is_manufacturing);
-});
-
 // set to time if hours is updated
 frappe.ui.form.on("Time Log", "hours", function(frm) {
 	if(!frm.doc.from_time) {
@@ -75,5 +68,11 @@
 				}
 			}
 		});
+	},
+	
+	time_log_for: function(doc) {
+		if (doc.time_log_for == 'Manufacturing') {
+			cur_frm.set_value("activity_type", "Manufacturing")
+		}
 	}
 });
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index ebe09cf..9dc2d59 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json
@@ -68,7 +68,7 @@
    "reqd": 0
   }, 
   {
-   "depends_on": "eval:doc.time_log_for != 'Manufacturing'", 
+   "depends_on": "", 
    "fieldname": "activity_type", 
    "fieldtype": "Link", 
    "in_list_view": 0, 
@@ -76,7 +76,7 @@
    "options": "Activity Type", 
    "permlevel": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 1
   }, 
   {
    "depends_on": "eval:doc.time_log_for != 'Manufacturing'", 
@@ -199,7 +199,7 @@
  "icon": "icon-time", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 15:11:45.194002", 
+ "modified": "2015-02-05 05:11:48.252723", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log", 
@@ -217,6 +217,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Projects User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -230,6 +231,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Projects Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index 5225743..33855af 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -23,6 +23,8 @@
 		self.validate_time_log_for()
 		self.check_workstation_timings()
 		self.validate_production_order()
+		self.validate_project()
+		self.validate_manufacturing()
 
 	def on_submit(self):
 		self.update_production_order()
@@ -108,9 +110,10 @@
 					tl.hours, self.production_order, operation[0], operation[1]))
 
 			pro_order = frappe.get_doc("Production Order", self.production_order)
-			pro_order.ignore_validate_update_after_submit = True
+			pro_order.flags.ignore_validate_update_after_submit = True
 			pro_order.update_operation_status()
 			pro_order.calculate_operating_cost()
+			pro_order.set_actual_dates()
 			pro_order.save()
 
 	def get_operation_start_end_time(self):
@@ -127,6 +130,26 @@
 			where production_order = %s and operation = %s and docstatus=1""",
 			(self.production_order, self.operation), as_dict=1)[0]
 
+	def validate_project(self):
+		if self.time_log_for == 'Project':
+			if not self.project:
+				frappe.throw(_("Project is Mandatory."))
+		if self.time_log_for == "":
+			self.project = None
+
+	def validate_manufacturing(self):
+		if self.time_log_for == 'Manufacturing':
+			if not self.production_order:
+				frappe.throw(_("Production Order is Mandatory"))
+			if not self.operation:
+				frappe.throw(_("Operation is Mandatory"))
+			if not self.completed_qty:
+				self.completed_qty=0
+		else:
+			self.production_order = None
+			self.operation = None
+			self.quantity = None
+
 @frappe.whitelist()
 def get_workstation(production_order, operation):
 	"""Returns workstation name from Production Order against an associated Operation.
@@ -163,7 +186,7 @@
 
 	data = frappe.db.sql("""select name, from_time, to_time,
 		activity_type, task, project, production_order, workstation from `tabTime Log`
-		where ( from_time between %(start)s and %(end)s or to_time between %(start)s and %(end)s )
+		where docstatus < 2 and ( from_time between %(start)s and %(end)s or to_time between %(start)s and %(end)s )
 		{conditions}""".format(conditions=conditions), {
 			"start": start,
 			"end": end
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.json b/erpnext/projects/doctype/time_log_batch/time_log_batch.json
index 9cf33f2..a42c4ea 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.json
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.json
@@ -83,7 +83,7 @@
  "icon": "icon-time", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-08 12:06:19.123049", 
+ "modified": "2015-02-05 05:11:48.360822", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log Batch", 
@@ -101,6 +101,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Projects User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.py b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
index e878577..d2e83e1 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.py
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
@@ -57,7 +57,7 @@
 			tl = frappe.get_doc("Time Log", d.time_log)
 			tl.time_log_batch = time_log_batch
 			tl.sales_invoice = self.sales_invoice
-			tl.ignore_validate_update_after_submit = True
+			tl.flags.ignore_validate_update_after_submit = True
 			tl.save()
 
 @frappe.whitelist()
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index 1c499a5..747311c 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -69,7 +69,7 @@
 .pos-toolbar, .pos-bill-toolbar {
 	padding: 10px 0px;
 	border-bottom: 1px solid #d1d8dd;
-	height: 55px;
+	height: 51px;
 }
 
 .pos-item-toolbar .form-group {
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index 397c36b..b76cfae 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -7,7 +7,7 @@
 $(document).bind('toolbar_setup', function() {
 	frappe.app.name = "ERPNext";
 
-	$('.navbar-brand').html('<i class="octicon octicon-home visible-xs"></i><span class="hidden-xs">ERPNext</span>');
+	$('.navbar-home').html('ERPNext');
 
 	$('[data-link="docs"]').attr("href", "https://erpnext.com/user-guide")
 });
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index bff50f2..bc72d13 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -371,30 +371,38 @@
 	_set_values_for_item_list: function(children) {
 		var me = this;
 		var price_list_rate_changed = false;
-		$.each(children, function(i, d) {
+		for(var i=0, l=children.length; i<l; i++) {
+			var d = children[i];
 			var existing_pricing_rule = frappe.model.get_value(d.doctype, d.name, "pricing_rule");
-			$.each(d, function(k, v) {
+
+			for(var k in d) {
+				var v = d[k];
 				if (["doctype", "name"].indexOf(k)===-1) {
 					if(k=="price_list_rate") {
 						if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true;
 					}
 					frappe.model.set_value(d.doctype, d.name, k, v);
 				}
-			});
+			}
+
 			// if pricing rule set as blank from an existing value, apply price_list
 			if(!me.frm.doc.ignore_pricing_rule && existing_pricing_rule && !d.pricing_rule) {
 				me.apply_price_list(frappe.get_doc(d.doctype, d.name));
 			}
+		}
 
-			if(!price_list_rate_changed) me.calculate_taxes_and_totals();
-		});
+		if(!price_list_rate_changed) me.calculate_taxes_and_totals();
 	},
 
 	apply_price_list: function(item) {
 		var me = this;
+		var args = this._get_args(item);
+		if(!args.item_list.length) {
+			return;
+		}
 		return this.frm.call({
 			method: "erpnext.stock.get_item_details.apply_price_list",
-			args: {	args: this._get_args(item) },
+			args: {	args: args },
 			callback: function(r) {
 				if (!r.exc) {
 					me.in_apply_price_list = true;
@@ -595,8 +603,13 @@
 
 	show_item_wise_taxes: function() {
 		if(this.frm.fields_dict.other_charges_calculation) {
-			$(this.get_item_wise_taxes_html())
-				.appendTo($(this.frm.fields_dict.other_charges_calculation.wrapper).empty());
+			var html = this.get_item_wise_taxes_html();
+			if (html) {
+				this.frm.toggle_display("other_charges_calculation", true);
+				$(this.frm.fields_dict.other_charges_calculation.wrapper).html(html);
+			} else {
+				this.frm.toggle_display("other_charges_calculation", false);
+			}
 		}
 	},
 
diff --git a/erpnext/public/js/feature_setup.js b/erpnext/public/js/feature_setup.js
index d3ff49e..536f956 100644
--- a/erpnext/public/js/feature_setup.js
+++ b/erpnext/public/js/feature_setup.js
@@ -13,7 +13,8 @@
 		}
 	}
 // ====================================================================*/
-pscript.feature_dict = {
+frappe.provide("erpnext.feature_setup");
+erpnext.feature_setup.feature_dict = {
 	'fs_projects': {
 		'BOM': {'fields':['project_name']},
 		'Delivery Note': {'fields':['project_name']},
@@ -183,15 +184,16 @@
 }
 
 $(document).bind('form_refresh', function() {
+	var feature_dict = erpnext.feature_setup.feature_dict;
 	for(var sys_feat in sys_defaults) {
 		if(sys_defaults[sys_feat]=='0'
-			&& (sys_feat in pscript.feature_dict)) { //"Features to hide" exists
-			if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) {
-				for(var fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) {
+			&& (sys_feat in feature_dict)) { //"Features to hide" exists
+			if(cur_frm.doc.doctype in feature_dict[sys_feat]) {
+				for(var fort in feature_dict[sys_feat][cur_frm.doc.doctype]) {
 					if(fort=='fields') {
-						hide_field(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]);
+						hide_field(feature_dict[sys_feat][cur_frm.doc.doctype][fort]);
 					} else if(cur_frm.fields_dict[fort]) {
-						cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort], false);
+						cur_frm.fields_dict[fort].grid.set_column_disp(feature_dict[sys_feat][cur_frm.doc.doctype][fort], false);
 					} else {
 						msgprint(__('Grid "')+fort+__('" does not exists'));
 					}
diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js
index 48a2b37..e6394f6 100644
--- a/erpnext/public/js/pos/pos.js
+++ b/erpnext/public/js/pos/pos.js
@@ -18,7 +18,7 @@
 		});
 
 		this.wrapper.find('input.discount-amount').on("change", function() {
-			frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", this.value);
+			frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", flt(this.value));
 		});
 	},
 	check_transaction_type: function() {
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index ef6633b..f8aeba9 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -36,7 +36,7 @@
 	},
 	setup_columns: function() {
 		var std_columns = [
-			{id: "check", name: __("Plot"), field: "check", width: 30,
+			{id: "_check", name: __("Plot"), field: "_check", width: 30,
 				formatter: this.check_formatter},
 			{id: "name", name: __("Item"), field: "name", width: 300,
 				formatter: this.tree_formatter},
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 093d59c..2dec015 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -48,7 +48,7 @@
  ], 
  "icon": "icon-bullhorn", 
  "idx": 1, 
- "modified": "2015-01-05 14:46:52.204964", 
+ "modified": "2015-02-05 05:11:35.510179", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Campaign", 
@@ -92,6 +92,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 1ebe461..562a9dc 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -267,7 +267,7 @@
  ], 
  "icon": "icon-user", 
  "idx": 1, 
- "modified": "2015-01-06 17:08:55.045595", 
+ "modified": "2015-02-05 05:11:36.603762", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
@@ -284,6 +284,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -313,6 +314,7 @@
    "report": 1, 
    "role": "Sales Master Manager", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 6b8ec9e..8a50de5 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -61,7 +61,7 @@
 			c.customer = self.name
 			c.customer_name = self.customer_name
 			c.is_primary_contact = 1
-			c.ignore_permissions = getattr(self, "ignore_permissions", None)
+			c.flags.ignore_permissions = self.flags.ignore_permissions
 			c.autoname()
 			if not frappe.db.exists("Contact", c.name):
 				c.insert()
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 43de09a..932bb0c 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -20,7 +20,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2015-01-05 15:02:09.356985", 
+ "modified": "2015-02-05 05:11:39.190793", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Industry Type", 
@@ -34,6 +34,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -53,6 +54,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 7251a67..ded7d6c 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -168,7 +168,7 @@
    "reqd": 1
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies.", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -237,7 +237,7 @@
  "icon": "icon-wrench", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 10:50:31.542246", 
+ "modified": "2015-02-05 05:11:39.246897", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 
@@ -255,6 +255,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/selling/doctype/lead/lead.json b/erpnext/selling/doctype/lead/lead.json
index c88c877..de43be7 100644
--- a/erpnext/selling/doctype/lead/lead.json
+++ b/erpnext/selling/doctype/lead/lead.json
@@ -331,7 +331,7 @@
  ], 
  "icon": "icon-user", 
  "idx": 1, 
- "modified": "2015-01-06 17:13:05.622160", 
+ "modified": "2015-02-05 05:11:40.379661", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Lead", 
@@ -361,6 +361,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -375,6 +376,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -389,6 +391,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/selling/doctype/lead/lead.py b/erpnext/selling/doctype/lead/lead.py
index 47d9b02..e0a148e 100644
--- a/erpnext/selling/doctype/lead/lead.py
+++ b/erpnext/selling/doctype/lead/lead.py
@@ -15,6 +15,10 @@
 	def get_feed(self):
 		return '{0}: {1}'.format(_(self.status), self.lead_name)
 
+	def set_sender(self, sender):
+		"""Will be called by **Communication** when a Lead is created from an incoming email."""
+		self.email_id = sender
+
 	def onload(self):
 		customer = frappe.db.get_value("Customer", {"lead_name": self.name})
 		self.get("__onload").is_customer = customer
diff --git a/erpnext/selling/doctype/opportunity/opportunity.js b/erpnext/selling/doctype/opportunity/opportunity.js
index 2ca1878..1180793 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.js
+++ b/erpnext/selling/doctype/opportunity/opportunity.js
@@ -28,7 +28,6 @@
 		if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year)
 			set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year });
 
-		if(this.frm.doc.customer && !this.frm.doc.customer_name) cur_frm.cscript.customer(this.frm.doc);
 
 		this.setup_queries();
 	},
diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json
index 0335982..980de56 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.json
+++ b/erpnext/selling/doctype/opportunity/opportunity.json
@@ -74,9 +74,10 @@
    "read_only": 0
   }, 
   {
-   "depends_on": "eval:doc.customer || doc.lead", 
+   "depends_on": "", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
+   "hidden": 1, 
    "label": "Customer / Lead Name", 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -390,7 +391,7 @@
  "icon": "icon-info-sign", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-07 11:00:31.557646", 
+ "modified": "2015-02-05 05:11:41.732687",
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Opportunity", 
@@ -408,6 +409,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -422,6 +424,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/selling/doctype/opportunity/opportunity.py b/erpnext/selling/doctype/opportunity/opportunity.py
index 001ba3b..31af3cd 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.py
+++ b/erpnext/selling/doctype/opportunity/opportunity.py
@@ -10,6 +10,56 @@
 from erpnext.utilities.transaction_base import TransactionBase
 
 class Opportunity(TransactionBase):
+
+	def validate(self):
+		self._prev = frappe._dict({
+			"contact_date": frappe.db.get_value("Opportunity", self.name, "contact_date") if \
+				(not cint(self.get("__islocal"))) else None,
+			"contact_by": frappe.db.get_value("Opportunity", self.name, "contact_by") if \
+				(not cint(self.get("__islocal"))) else None,
+		})
+
+		if not self.enquiry_from:
+			frappe.throw(_("Opportunity From field is mandatory"))
+
+		self.set_status()
+		self.validate_item_details()
+		self.validate_uom_is_integer("uom", "qty")
+		self.validate_lead_cust()
+		self.validate_cust_name()
+
+		from erpnext.accounts.utils import validate_fiscal_year
+		validate_fiscal_year(self.transaction_date, self.fiscal_year, "Opportunity Date")
+
+	def on_submit(self):
+		if self.lead:
+			frappe.get_doc("Lead", self.lead).set_status(update=True)
+
+	def on_cancel(self):
+		if self.has_quotation():
+			frappe.throw(_("Cannot Cancel Opportunity as Quotation Exists"))
+		self.set_status(update=True)
+
+	def declare_enquiry_lost(self,arg):
+		if not self.has_quotation():
+			frappe.db.set(self, 'status', 'Lost')
+			frappe.db.set(self, 'order_lost_reason', arg)
+		else:
+			frappe.throw(_("Cannot declare as lost, because Quotation has been made."))
+
+	def on_trash(self):
+		self.delete_events()
+
+	def has_quotation(self):
+		return frappe.db.get_value("Quotation Item", {"prevdoc_docname": self.name, "docstatus": 1})
+		
+	def has_ordered_quotation(self):
+		return frappe.db.sql("""select q.name from `tabQuotation` q, `tabQuotation Item` qi 
+			where q.name = qi.parent and q.docstatus=1 and qi.prevdoc_docname =%s and q.status = 'Ordered'""", self.name)
+			
+	def validate_cust_name(self):
+		self.customer_name = self.customer or self.lead
+		
 	def get_item_details(self, item_code):
 		item = frappe.db.sql("""select item_name, stock_uom, description_html, description, item_group, brand
 			from `tabItem` where name = %s""", item_code, as_dict=1)
@@ -80,52 +130,17 @@
 			frappe.throw(_("Items required"))
 
 	def validate_lead_cust(self):
-		if self.enquiry_from == 'Lead' and not self.lead:
-			frappe.throw(_("Lead must be set if Opportunity is made from Lead"))
-		elif self.enquiry_from == 'Customer' and not self.customer:
-			msgprint("Customer is mandatory if 'Opportunity From' is selected as Customer", raise_exception=1)
-
-	def validate(self):
-		self._prev = frappe._dict({
-			"contact_date": frappe.db.get_value("Opportunity", self.name, "contact_date") if \
-				(not cint(self.get("__islocal"))) else None,
-			"contact_by": frappe.db.get_value("Opportunity", self.name, "contact_by") if \
-				(not cint(self.get("__islocal"))) else None,
-		})
-
-		if not self.enquiry_from:
-			frappe.throw(_("Opportunity From field is mandatory"))
-
-		self.set_status()
-		self.validate_item_details()
-		self.validate_uom_is_integer("uom", "qty")
-		self.validate_lead_cust()
-
-		from erpnext.accounts.utils import validate_fiscal_year
-		validate_fiscal_year(self.transaction_date, self.fiscal_year, "Opportunity Date")
-
-	def on_submit(self):
-		if self.lead:
-			frappe.get_doc("Lead", self.lead).set_status(update=True)
-
-	def on_cancel(self):
-		if self.has_quotation():
-			frappe.throw(_("Cannot Cancel Opportunity as Quotation Exists"))
-		self.set_status(update=True)
-
-	def declare_enquiry_lost(self,arg):
-		if not self.has_quotation():
-			frappe.db.set(self, 'status', 'Lost')
-			frappe.db.set(self, 'order_lost_reason', arg)
-		else:
-			frappe.throw(_("Cannot declare as lost, because Quotation has been made."))
-
-	def on_trash(self):
-		self.delete_events()
-
-	def has_quotation(self):
-		return frappe.db.get_value("Quotation Item", {"prevdoc_docname": self.name, "docstatus": 1})
-
+		if self.enquiry_from == 'Lead':
+			if not self.lead:
+				frappe.throw(_("Lead must be set if Opportunity is made from Lead"))
+			else:
+				self.customer = None
+		elif self.enquiry_from == 'Customer':
+			if not self.customer:
+				msgprint("Customer is mandatory if 'Opportunity From' is selected as Customer", raise_exception=1)
+			else:
+				self.lead = None
+		
 @frappe.whitelist()
 def make_quotation(source_name, target_doc=None):
 	def set_missing_values(source, target):
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 38cce98..deb578d 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1,942 +1,946 @@
 {
- "allow_import": 1, 
- "autoname": "naming_series:", 
- "creation": "2013-05-24 19:29:08", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Transaction", 
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-24 19:29:08",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
  "fields": [
   {
-   "fieldname": "customer_section", 
-   "fieldtype": "Section Break", 
-   "label": "Customer", 
-   "options": "icon-user", 
+   "fieldname": "customer_section",
+   "fieldtype": "Section Break",
+   "label": "Customer",
+   "options": "icon-user",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "label": "Series", 
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "QTN-", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "QTN-",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "default": "Customer", 
-   "fieldname": "quotation_to", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Quotation To", 
-   "oldfieldname": "quotation_to", 
-   "oldfieldtype": "Select", 
-   "options": "\nLead\nCustomer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
+   "default": "Customer",
+   "fieldname": "quotation_to",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Quotation To",
+   "oldfieldname": "quotation_to",
+   "oldfieldtype": "Select",
+   "options": "\nLead\nCustomer",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.quotation_to == \"Customer\"", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Customer", 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "depends_on": "eval:doc.quotation_to == \"Customer\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Customer",
+   "oldfieldname": "customer",
+   "oldfieldtype": "Link",
+   "options": "Customer",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "search_index": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.quotation_to == \"Lead\"", 
-   "fieldname": "lead", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Lead", 
-   "oldfieldname": "lead", 
-   "oldfieldtype": "Link", 
-   "options": "Lead", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "depends_on": "eval:doc.quotation_to == \"Lead\"",
+   "fieldname": "lead",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Lead",
+   "oldfieldname": "lead",
+   "oldfieldtype": "Link",
+   "options": "Lead",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "in_list_view": 0, 
-   "label": "Customer / Lead Name", 
-   "permlevel": 0, 
+   "fieldname": "customer_name",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "in_list_view": 0,
+   "label": "Customer / Lead Name",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "in_filter": 0, 
-   "label": "Address", 
-   "oldfieldname": "customer_address", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "reqd": 0, 
+   "fieldname": "address_display",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "in_filter": 0,
+   "label": "Address",
+   "oldfieldname": "customer_address",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "in_filter": 0, 
-   "label": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "fieldname": "contact_display",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "in_filter": 0,
+   "label": "Contact",
+   "permlevel": 0,
+   "print_hide": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "label": "Mobile No", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "fieldname": "contact_mobile",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "label": "Mobile No",
+   "permlevel": 0,
+   "print_hide": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "contact_email", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "label": "Contact Email", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "contact_email",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "label": "Contact Email",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "ignore_user_permissions": 1, 
-   "label": "Amended From", 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Data", 
-   "options": "Quotation", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Amended From",
+   "no_copy": 1,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Data",
+   "options": "Quotation",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "description": "Select the relevant company name if you have multiple companies.", 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Company", 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
+   "description": "",
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Company",
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
+   "search_index": 0,
    "width": "150px"
-  }, 
+  },
   {
-   "default": "Today", 
-   "fieldname": "transaction_date", 
-   "fieldtype": "Date", 
-   "in_filter": 1, 
-   "label": "Date", 
-   "no_copy": 1, 
-   "oldfieldname": "transaction_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
+   "default": "Today",
+   "fieldname": "transaction_date",
+   "fieldtype": "Date",
+   "in_filter": 1,
+   "label": "Date",
+   "no_copy": 1,
+   "oldfieldname": "transaction_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 1,
+   "search_index": 1,
    "width": "100px"
-  }, 
+  },
   {
-   "default": "Sales", 
-   "fieldname": "order_type", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Order Type", 
-   "oldfieldname": "order_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nSales\nMaintenance\nShopping Cart", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "default": "Sales",
+   "fieldname": "order_type",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Order Type",
+   "oldfieldname": "order_type",
+   "oldfieldtype": "Select",
+   "options": "\nSales\nMaintenance\nShopping Cart",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "currency_and_price_list", 
-   "fieldtype": "Section Break", 
-   "label": "Currency and Price List", 
-   "options": "icon-tag", 
-   "permlevel": 0, 
+   "fieldname": "currency_and_price_list",
+   "fieldtype": "Section Break",
+   "label": "Currency and Price List",
+   "options": "icon-tag",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Currency", 
-   "oldfieldname": "currency", 
-   "oldfieldtype": "Select", 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Currency",
+   "oldfieldname": "currency",
+   "oldfieldtype": "Select",
+   "options": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
+   "search_index": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "description": "Rate at which customer's currency is converted to company's base currency", 
-   "fieldname": "conversion_rate", 
-   "fieldtype": "Float", 
-   "label": "Exchange Rate", 
-   "oldfieldname": "conversion_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "description": "Rate at which customer's currency is converted to company's base currency",
+   "fieldname": "conversion_rate",
+   "fieldtype": "Float",
+   "label": "Exchange Rate",
+   "oldfieldname": "conversion_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
    "width": "100px"
-  }, 
+  },
   {
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "selling_price_list", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Price List", 
-   "oldfieldname": "price_list_name", 
-   "oldfieldtype": "Select", 
-   "options": "Price List", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
+   "fieldname": "selling_price_list",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Price List",
+   "oldfieldname": "price_list_name",
+   "oldfieldtype": "Select",
+   "options": "Price List",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
+   "search_index": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "fieldname": "price_list_currency", 
-   "fieldtype": "Link", 
-   "label": "Price List Currency", 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
+   "fieldname": "price_list_currency",
+   "fieldtype": "Link",
+   "label": "Price List Currency",
+   "options": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
    "reqd": 1
-  }, 
+  },
   {
-   "description": "Rate at which Price list currency is converted to company's base currency", 
-   "fieldname": "plc_conversion_rate", 
-   "fieldtype": "Float", 
-   "label": "Price List Exchange Rate", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "description": "Rate at which Price list currency is converted to company's base currency",
+   "fieldname": "plc_conversion_rate",
+   "fieldtype": "Float",
+   "label": "Price List Exchange Rate",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "ignore_pricing_rule", 
-   "fieldtype": "Check", 
-   "label": "Ignore Pricing Rule", 
-   "no_copy": 1, 
-   "permlevel": 1, 
+   "fieldname": "ignore_pricing_rule",
+   "fieldtype": "Check",
+   "label": "Ignore Pricing Rule",
+   "no_copy": 1,
+   "permlevel": 1,
    "print_hide": 1
-  }, 
+  },
   {
-   "fieldname": "items_section", 
-   "fieldtype": "Section Break", 
-   "label": "Items", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
+   "fieldname": "items_section",
+   "fieldtype": "Section Break",
+   "label": "Items",
+   "oldfieldtype": "Section Break",
+   "options": "icon-shopping-cart",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "fieldname": "items", 
-   "fieldtype": "Table", 
-   "label": "Items", 
-   "oldfieldname": "quotation_details", 
-   "oldfieldtype": "Table", 
-   "options": "Quotation Item", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 1,
+   "fieldname": "items",
+   "fieldtype": "Table",
+   "label": "Items",
+   "oldfieldname": "quotation_details",
+   "oldfieldtype": "Table",
+   "options": "Quotation Item",
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 0,
    "width": "40px"
-  }, 
+  },
   {
-   "fieldname": "sec_break23", 
-   "fieldtype": "Section Break", 
-   "permlevel": 0, 
+   "fieldname": "sec_break23",
+   "fieldtype": "Section Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "net_total", 
-   "fieldtype": "Currency", 
-   "label": "Net Total (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "net_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "reqd": 0, 
+   "fieldname": "net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "net_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "reqd": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "fieldname": "column_break_28", 
-   "fieldtype": "Column Break", 
+   "fieldname": "column_break_28",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "net_total_export", 
-   "fieldtype": "Currency", 
-   "label": "Net Total", 
-   "options": "currency", 
-   "permlevel": 0, 
+   "fieldname": "net_total_export",
+   "fieldtype": "Currency",
+   "label": "Net Total",
+   "options": "currency",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "taxes_section", 
-   "fieldtype": "Section Break", 
-   "label": "Taxes and Charges", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
-   "permlevel": 0, 
+   "fieldname": "taxes_section",
+   "fieldtype": "Section Break",
+   "label": "Taxes and Charges",
+   "oldfieldtype": "Section Break",
+   "options": "icon-money",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Taxes and Charges", 
-   "oldfieldname": "charge", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Taxes and Charges Master", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "taxes_and_charges",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Taxes and Charges",
+   "oldfieldname": "charge",
+   "oldfieldtype": "Link",
+   "options": "Sales Taxes and Charges Master",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "column_break_34", 
-   "fieldtype": "Column Break", 
+   "fieldname": "column_break_34",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "shipping_rule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Shipping Rule", 
-   "oldfieldtype": "Button", 
-   "options": "Shipping Rule", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "shipping_rule",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Shipping Rule",
+   "oldfieldtype": "Button",
+   "options": "Shipping Rule",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "section_break_36", 
-   "fieldtype": "Section Break", 
+   "fieldname": "section_break_36",
+   "fieldtype": "Section Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "taxes", 
-   "fieldtype": "Table", 
-   "label": "Sales Taxes and Charges", 
-   "oldfieldname": "other_charges", 
-   "oldfieldtype": "Table", 
-   "options": "Sales Taxes and Charges", 
-   "permlevel": 0, 
+   "fieldname": "taxes",
+   "fieldtype": "Table",
+   "label": "Sales Taxes and Charges",
+   "oldfieldname": "other_charges",
+   "oldfieldtype": "Table",
+   "options": "Sales Taxes and Charges",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
-   "label": "Taxes and Charges Calculation", 
-   "oldfieldtype": "HTML", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "other_charges_calculation",
+   "fieldtype": "HTML",
+   "label": "Taxes and Charges Calculation",
+   "oldfieldtype": "HTML",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "section_break_39", 
-   "fieldtype": "Section Break", 
+   "fieldname": "section_break_39",
+   "fieldtype": "Section Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "other_charges_total_export", 
-   "fieldtype": "Currency", 
-   "label": "Taxes and Charges Total", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "other_charges_total_export",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Total",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "other_charges_total", 
-   "fieldtype": "Currency", 
-   "label": "Taxes and Charges Total (Company Currency)", 
-   "oldfieldname": "other_charges_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "other_charges_total",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Total (Company Currency)",
+   "oldfieldname": "other_charges_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "column_break_42", 
-   "fieldtype": "Column Break", 
+   "fieldname": "column_break_42",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "label": "Discount Amount", 
-   "options": "currency", 
+   "fieldname": "discount_amount",
+   "fieldtype": "Currency",
+   "label": "Discount Amount",
+   "options": "currency",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "label": "Discount Amount (Company Currency)", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
+   "fieldname": "base_discount_amount",
+   "fieldtype": "Currency",
+   "label": "Discount Amount (Company Currency)",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "totals", 
-   "fieldtype": "Section Break", 
-   "label": "Totals", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "totals",
+   "fieldtype": "Section Break",
+   "label": "Totals",
+   "oldfieldtype": "Section Break",
+   "options": "icon-money",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "grand_total", 
-   "fieldtype": "Currency", 
-   "label": "Grand Total (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "reqd": 0, 
+   "fieldname": "grand_total",
+   "fieldtype": "Currency",
+   "label": "Grand Total (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "grand_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "reqd": 0,
    "width": "200px"
-  }, 
+  },
   {
-   "fieldname": "rounded_total", 
-   "fieldtype": "Currency", 
-   "label": "Rounded Total (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
+   "fieldname": "rounded_total",
+   "fieldtype": "Currency",
+   "label": "Rounded Total (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "rounded_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
    "width": "200px"
-  }, 
+  },
   {
-   "description": "In Words will be visible once you save the Quotation.", 
-   "fieldname": "in_words", 
-   "fieldtype": "Data", 
-   "label": "In Words (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "in_words", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
+   "description": "In Words will be visible once you save the Quotation.",
+   "fieldname": "in_words",
+   "fieldtype": "Data",
+   "label": "In Words (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "in_words",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
    "width": "200px"
-  }, 
+  },
   {
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "grand_total_export", 
-   "fieldtype": "Currency", 
-   "in_list_view": 1, 
-   "label": "Grand Total", 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total_export", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "reqd": 0, 
+   "fieldname": "grand_total_export",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Grand Total",
+   "no_copy": 0,
+   "oldfieldname": "grand_total_export",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "reqd": 0,
    "width": "200px"
-  }, 
+  },
   {
-   "fieldname": "rounded_total_export", 
-   "fieldtype": "Currency", 
-   "label": "Rounded Total", 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total_export", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "reqd": 0, 
+   "fieldname": "rounded_total_export",
+   "fieldtype": "Currency",
+   "label": "Rounded Total",
+   "no_copy": 0,
+   "oldfieldname": "rounded_total_export",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "reqd": 0,
    "width": "200px"
-  }, 
+  },
   {
-   "fieldname": "in_words_export", 
-   "fieldtype": "Data", 
-   "label": "In Words", 
-   "no_copy": 0, 
-   "oldfieldname": "in_words_export", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
+   "fieldname": "in_words_export",
+   "fieldtype": "Data",
+   "label": "In Words",
+   "no_copy": 0,
+   "oldfieldname": "in_words_export",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
    "width": "200px"
-  }, 
+  },
   {
-   "fieldname": "fold", 
-   "fieldtype": "Fold", 
-   "label": "Fold", 
+   "fieldname": "fold",
+   "fieldtype": "Fold",
+   "label": "Fold",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "terms_section_break", 
-   "fieldtype": "Section Break", 
-   "label": "Terms and Conditions", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "fieldname": "terms_section_break",
+   "fieldtype": "Section Break",
+   "label": "Terms and Conditions",
+   "oldfieldtype": "Section Break",
+   "options": "icon-legal",
+   "permlevel": 0,
+   "print_hide": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "tc_name", 
-   "fieldtype": "Link", 
-   "label": "Terms", 
-   "oldfieldname": "tc_name", 
-   "oldfieldtype": "Link", 
-   "options": "Terms and Conditions", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "tc_name",
+   "fieldtype": "Link",
+   "label": "Terms",
+   "oldfieldname": "tc_name",
+   "oldfieldtype": "Link",
+   "options": "Terms and Conditions",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "report_hide": 1
-  }, 
+  },
   {
-   "fieldname": "terms", 
-   "fieldtype": "Text Editor", 
-   "label": "Term Details", 
-   "oldfieldname": "terms", 
-   "oldfieldtype": "Text Editor", 
-   "permlevel": 0, 
+   "fieldname": "terms",
+   "fieldtype": "Text Editor",
+   "label": "Term Details",
+   "oldfieldname": "terms",
+   "oldfieldtype": "Text Editor",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "contact_section", 
-   "fieldtype": "Section Break", 
-   "label": "Contact Info", 
-   "options": "icon-bullhorn", 
-   "permlevel": 0, 
+   "fieldname": "contact_section",
+   "fieldtype": "Section Break",
+   "label": "Contact Info",
+   "options": "icon-bullhorn",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Territory", 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "description": "",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Territory",
+   "options": "Territory",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "depends_on": "customer", 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Customer Group", 
-   "oldfieldname": "customer_group", 
-   "oldfieldtype": "Link", 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 0, 
+   "depends_on": "customer",
+   "description": "",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Customer Group",
+   "oldfieldname": "customer_group",
+   "oldfieldtype": "Link",
+   "options": "Customer Group",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "shipping_address_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Shipping Address", 
-   "options": "Address", 
-   "permlevel": 0, 
+   "fieldname": "shipping_address_name",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Shipping Address",
+   "options": "Address",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "fieldname": "shipping_address", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "label": "Shipping Address", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "shipping_address",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "label": "Shipping Address",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "depends_on": "customer", 
-   "fieldname": "col_break98", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "depends_on": "customer",
+   "fieldname": "col_break98",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Customer Address", 
-   "options": "Address", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "customer_address",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Customer Address",
+   "options": "Address",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.customer", 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Contact Person", 
-   "oldfieldname": "contact_person", 
-   "oldfieldtype": "Link", 
-   "options": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "depends_on": "eval:doc.customer",
+   "fieldname": "contact_person",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Contact Person",
+   "oldfieldname": "contact_person",
+   "oldfieldtype": "Link",
+   "options": "Contact",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "more_info", 
-   "fieldtype": "Section Break", 
-   "label": "More Info", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "label": "More Info",
+   "oldfieldtype": "Section Break",
+   "options": "icon-file-text",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "campaign", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Campaign", 
-   "no_copy": 0, 
-   "oldfieldname": "campaign", 
-   "oldfieldtype": "Link", 
-   "options": "Campaign", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "campaign",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Campaign",
+   "no_copy": 0,
+   "oldfieldname": "campaign",
+   "oldfieldtype": "Link",
+   "options": "Campaign",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "report_hide": 0
-  }, 
+  },
   {
-   "fieldname": "source", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "label": "Source", 
-   "no_copy": 0, 
-   "oldfieldname": "source", 
-   "oldfieldtype": "Select", 
-   "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "source",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "label": "Source",
+   "no_copy": 0,
+   "oldfieldname": "source",
+   "oldfieldtype": "Select",
+   "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "report_hide": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Status", 
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "reqd": 1, 
+   "allow_on_submit": 0,
+   "default": "Draft",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Status",
+   "no_copy": 1,
+   "oldfieldname": "status",
+   "oldfieldtype": "Select",
+   "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "fieldname": "order_lost_reason", 
-   "fieldtype": "Small Text", 
-   "label": "Quotation Lost Reason", 
-   "no_copy": 1, 
-   "oldfieldname": "order_lost_reason", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "allow_on_submit": 1,
+   "fieldname": "order_lost_reason",
+   "fieldtype": "Small Text",
+   "label": "Quotation Lost Reason",
+   "no_copy": 1,
+   "oldfieldname": "order_lost_reason",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "column_break4", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "column_break4",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "fieldname": "letter_head", 
-   "fieldtype": "Link", 
-   "label": "Letter Head", 
-   "oldfieldname": "letter_head", 
-   "oldfieldtype": "Select", 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "allow_on_submit": 1,
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "label": "Letter Head",
+   "oldfieldname": "letter_head",
+   "oldfieldtype": "Select",
+   "options": "Letter Head",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "fieldname": "select_print_heading", 
-   "fieldtype": "Link", 
-   "label": "Print Heading", 
-   "no_copy": 1, 
-   "oldfieldname": "select_print_heading", 
-   "oldfieldtype": "Link", 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "allow_on_submit": 1,
+   "fieldname": "select_print_heading",
+   "fieldtype": "Link",
+   "label": "Print Heading",
+   "no_copy": 1,
+   "oldfieldname": "select_print_heading",
+   "oldfieldtype": "Link",
+   "options": "Print Heading",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "report_hide": 1
-  }, 
+  },
   {
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Fiscal Year", 
-   "oldfieldname": "fiscal_year", 
-   "oldfieldtype": "Select", 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "fieldname": "fiscal_year",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Fiscal Year",
+   "oldfieldname": "fiscal_year",
+   "oldfieldtype": "Select",
+   "options": "Fiscal Year",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "enq_det", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "label": "Opportunity Item", 
-   "no_copy": 0, 
-   "oldfieldname": "enq_det", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
+   "fieldname": "enq_det",
+   "fieldtype": "Text",
+   "hidden": 1,
+   "label": "Opportunity Item",
+   "no_copy": 0,
+   "oldfieldname": "enq_det",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
    "report_hide": 0
   }
- ], 
- "hide_toolbar": 0, 
- "icon": "icon-shopping-cart", 
- "idx": 1, 
- "is_submittable": 1, 
- "max_attachments": 1, 
- "modified": "2015-01-15 07:33:06.919752", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Quotation", 
- "owner": "Administrator", 
+ ],
+ "hide_toolbar": 0,
+ "icon": "icon-shopping-cart",
+ "idx": 1,
+ "is_submittable": 1,
+ "max_attachments": 1,
+ "modified": "2015-02-05 05:11:44.426544",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Quotation",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "match": "", 
-   "permlevel": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "match": "",
+   "permlevel": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "cancel": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "match": "", 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
+   "cancel": 0,
+   "delete": 0,
+   "email": 1,
+   "match": "",
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
    "role": "Customer"
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "match": "", 
-   "permlevel": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "match": "",
+   "permlevel": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Maintenance Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "match": "", 
-   "permlevel": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance Manager", 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "match": "",
+   "permlevel": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Maintenance Manager",
    "submit": 0
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance User", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Maintenance User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "match": "", 
-   "permlevel": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance User", 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "match": "",
+   "permlevel": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Maintenance User",
    "submit": 0
   }
- ], 
- "read_only_onload": 1, 
- "search_fields": "status,transaction_date,customer,lead,order_type", 
- "sort_field": "modified", 
- "sort_order": "DESC", 
+ ],
+ "read_only_onload": 1,
+ "search_fields": "status,transaction_date,customer,lead,order_type",
+ "sort_field": "modified",
+ "sort_order": "DESC",
  "title_field": "customer_name"
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index e4d7cc8..5a05220 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -111,7 +111,7 @@
 			target.customer = customer.name
 			target.customer_name = customer.customer_name
 		target.ignore_pricing_rule = 1
-		target.ignore_permissions = ignore_permissions
+		target.flags.ignore_permissions = ignore_permissions
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
 
@@ -152,7 +152,7 @@
 			from erpnext.selling.doctype.lead.lead import _make_customer
 			customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
 			customer = frappe.get_doc(customer_doclist)
-			customer.ignore_permissions = ignore_permissions
+			customer.flags.ignore_permissions = ignore_permissions
 			if quotation[1] == "Shopping Cart":
 				customer.customer_group = frappe.db.get_value("Shopping Cart Settings", None,
 					"default_customer_group")
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.py b/erpnext/selling/doctype/quotation_item/quotation_item.py
index 426b199..a204531 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.py
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.py
@@ -5,6 +5,8 @@
 import frappe
 
 from frappe.model.document import Document
+from erpnext.controllers.print_settings import print_settings_for_item_table
 
 class QuotationItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/selling/doctype/sales_bom/sales_bom.json b/erpnext/selling/doctype/sales_bom/sales_bom.json
index 3f0b5a2..54babc0 100644
--- a/erpnext/selling/doctype/sales_bom/sales_bom.json
+++ b/erpnext/selling/doctype/sales_bom/sales_bom.json
@@ -46,7 +46,7 @@
  "icon": "icon-sitemap", 
  "idx": 1, 
  "is_submittable": 0, 
- "modified": "2014-12-24 16:40:11.941046", 
+ "modified": "2015-02-05 05:11:45.221748", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales BOM", 
@@ -62,6 +62,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -90,6 +91,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index e834e00..16a9bb7 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -125,7 +125,7 @@
    "width": "150px"
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies.", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -1034,7 +1034,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "issingle": 0, 
- "modified": "2015-01-15 07:51:42.642249", 
+ "modified": "2015-02-05 05:11:45.731715", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
@@ -1052,6 +1052,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -1069,6 +1070,7 @@
    "report": 1, 
    "role": "Sales Manager", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -1084,6 +1086,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Maintenance User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index ad90557..d4b92e4 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -5,7 +5,7 @@
 import frappe
 import frappe.utils
 from frappe.utils import cstr, flt, getdate, comma_and
-from frappe import _
+from frappe import _ , msgprint
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.controllers.selling_controller import SellingController
@@ -34,32 +34,23 @@
 				frappe.msgprint(_("Warning: Sales Order {0} already exists against same Purchase Order number").format(so[0][0]))
 
 	def validate_for_items(self):
-		check_list, flag = [], 0
-		chk_dupl_itm = []
+		check_list = []
 		for d in self.get('items'):
-			e = [d.item_code, d.description, d.warehouse, d.prevdoc_docname or '']
-			f = [d.item_code, d.description]
+			check_list.append(cstr(d.item_code))
 
 			if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 'Yes':
 				if not d.warehouse:
 					frappe.throw(_("Reserved warehouse required for stock item {0}").format(d.item_code))
 
-				if e in check_list:
-					frappe.throw(_("Item {0} has been entered twice").format(d.item_code))
-				else:
-					check_list.append(e)
-			else:
-				if f in chk_dupl_itm:
-					frappe.throw(_("Item {0} has been entered twice").format(d.item_code))
-				else:
-					chk_dupl_itm.append(f)
-
 			# used for production plan
 			d.transaction_date = self.transaction_date
 
 			tot_avail_qty = frappe.db.sql("select projected_qty from `tabBin` \
 				where item_code = %s and warehouse = %s", (d.item_code,d.warehouse))
 			d.projected_qty = tot_avail_qty and flt(tot_avail_qty[0][0]) or 0
+		unique_chk_list = set(check_list)
+		if len(unique_chk_list) != len(check_list):
+			frappe.msgprint(_("Warning:Same item has been entered multiple times."))
 
 	def validate_sales_mntc_quotation(self):
 		for d in self.get('items'):
@@ -143,6 +134,7 @@
 					frappe.throw(_("Quotation {0} is cancelled").format(quotation))
 
 				doc.set_status(update=True)
+				doc.update_opportunity()
 
 	def on_submit(self):
 		super(SalesOrder, self).on_submit()
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 6458ae9..36220c5 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -1,7 +1,6 @@
 frappe.listview_settings['Sales Order'] = {
 	add_fields: ["grand_total", "customer_name", "currency", "delivery_date", "per_delivered", "per_billed",
 		"status"],
-	filters: [["per_delivered", "<", 100]],
 	get_indicator: function(doc) {
         if(doc.status==="Stopped") {
 			return [__("Stopped"), "red", "status,=,Stopped"];
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.py b/erpnext/selling/doctype/sales_order_item/sales_order_item.py
index ef2ad09..34eb32f 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.py
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.py
@@ -5,6 +5,8 @@
 import frappe
 
 from frappe.model.document import Document
+from erpnext.controllers.print_settings import print_settings_for_item_table
 
 class SalesOrderItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index 17650cf..aafc31e 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -83,7 +83,7 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-01-01 14:30:05.798080", 
+ "modified": "2015-02-05 05:11:46.384538", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Selling Settings", 
@@ -96,6 +96,7 @@
    "print": 1, 
    "read": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json
index c259e97..e3b4243 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@@ -1,134 +1,135 @@
 {
-  "allow_copy": 1,
- "creation": "2013-01-10 16:34:22",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 1, 
+ "creation": "2013-01-10 16:34:22", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "send_to",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Send To",
-   "options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person",
+   "fieldname": "send_to", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Send To", 
+   "options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person", 
    "permlevel": 0
-  },
+  }, 
   {
-   "depends_on": "eval:doc.send_to=='All Customer Contact'",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Customer",
-   "options": "Customer",
+   "depends_on": "eval:doc.send_to=='All Customer Contact'", 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Customer", 
+   "options": "Customer", 
    "permlevel": 0
-  },
+  }, 
   {
-   "depends_on": "eval:doc.send_to=='All Supplier Contact'",
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Supplier",
-   "options": "Supplier",
+   "depends_on": "eval:doc.send_to=='All Supplier Contact'", 
+   "fieldname": "supplier", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Supplier", 
+   "options": "Supplier", 
    "permlevel": 0
-  },
+  }, 
   {
-   "depends_on": "eval:doc.send_to=='All Employee (Active)'",
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Department",
-   "options": "Department",
+   "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Department", 
+   "options": "Department", 
    "permlevel": 0
-  },
+  }, 
   {
-   "depends_on": "eval:doc.send_to=='All Employee (Active)'",
-   "fieldname": "branch",
-   "fieldtype": "Link",
-   "label": "Branch",
-   "options": "Branch",
+   "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
+   "fieldname": "branch", 
+   "fieldtype": "Link", 
+   "label": "Branch", 
+   "options": "Branch", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "create_receiver_list",
-   "fieldtype": "Button",
-   "label": "Create Receiver List",
-   "options": "create_receiver_list",
+   "fieldname": "create_receiver_list", 
+   "fieldtype": "Button", 
+   "label": "Create Receiver List", 
+   "options": "create_receiver_list", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "receiver_list",
-   "fieldtype": "Code",
-   "label": "Receiver List",
+   "fieldname": "receiver_list", 
+   "fieldtype": "Code", 
+   "label": "Receiver List", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break9",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break9", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "description": "Messages greater than 160 characters will be split into multiple messages",
-   "fieldname": "message",
-   "fieldtype": "Text",
-   "label": "Message",
-   "permlevel": 0,
+   "description": "Messages greater than 160 characters will be split into multiple messages", 
+   "fieldname": "message", 
+   "fieldtype": "Text", 
+   "label": "Message", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "total_characters",
-   "fieldtype": "Int",
-   "label": "Total Characters",
-   "permlevel": 0,
+   "fieldname": "total_characters", 
+   "fieldtype": "Int", 
+   "label": "Total Characters", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "total_messages",
-   "fieldtype": "Int",
-   "label": "Total Message(s)",
-   "permlevel": 0,
+   "fieldname": "total_messages", 
+   "fieldtype": "Int", 
+   "label": "Total Message(s)", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "send_sms",
-   "fieldtype": "Button",
-   "label": "Send SMS",
-   "options": "send_sms",
+   "fieldname": "send_sms", 
+   "fieldtype": "Button", 
+   "label": "Send SMS", 
+   "options": "send_sms", 
    "permlevel": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-mobile-phone",
- "idx": 1,
- "in_create": 0,
- "issingle": 1,
- "modified": "2014-06-18 08:59:51.755566",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "SMS Center",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-mobile-phone", 
+ "idx": 1, 
+ "in_create": 0, 
+ "issingle": 1, 
+ "modified": "2015-02-05 05:11:46.773913", 
+ "modified_by": "Administrator", 
+ "module": "Selling", 
+ "name": "SMS Center", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "export": 0,
-   "import": 0,
-   "permlevel": 0,
-   "read": 1,
-   "report": 0,
-   "role": "System Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "export": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
- "read_only": 1,
- "sort_field": "modified",
+ ], 
+ "read_only": 1, 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js
index 9d77516..ad2102a 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.pages['sales-analytics'].onload = function(wrapper) {
+frappe.pages['sales-analytics'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Sales Analytics'),
diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js
index 5ad60f1..2dbe71c 100644
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-pscript['onload_Sales Browser'] = function(wrapper){
+frappe.pages["Sales Browser"].on_page_load = function(wrapper){
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
 		single_column: true,
@@ -32,7 +32,7 @@
 	wrapper.make_tree();
 }
 
-pscript['onshow_Sales Browser'] = function(wrapper){
+frappe.pages['Sales Browser'].on_page_show = function(wrapper){
 	// set route
 	var ctype = frappe.get_route()[1] || 'Territory';
 
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index 47b6a14..fbba71e 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.pages['sales-funnel'].onload = function(wrapper) {
+frappe.pages['sales-funnel'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Sales Funnel'),
diff --git a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
index ce19f51..5e74431 100644
--- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
+++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
@@ -8,19 +8,22 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("company"),
+			"reqd": 1
 		},
 		{
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date")
+			"default": frappe.defaults.get_user_default("year_start_date"),
+			"reqd": 1
 		},
 		{
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date")
+			"default": frappe.defaults.get_user_default("year_end_date"),
+			"reqd": 1
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/report/lead_details/lead_details.json b/erpnext/selling/report/lead_details/lead_details.json
index 0edec21..b5113d8 100644
--- a/erpnext/selling/report/lead_details/lead_details.json
+++ b/erpnext/selling/report/lead_details/lead_details.json
@@ -5,12 +5,12 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.139224", 
+ "modified": "2015-02-02 11:39:57.231750", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Lead Details", 
  "owner": "Administrator", 
- "query": "SELECT\n    `tabLead`.name as \"Lead Id:Link/Lead:120\",\n    `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2), \n\t\ttabAddress.state, tabAddress.pincode, tabAddress.country\n\t) as 'Address::180',\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n    `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.lead=`tabLead`.name\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", 
+ "query": "SELECT\n    `tabLead`.name as \"Lead Id:Link/Lead:120\",\n    `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n    `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.lead=`tabLead`.name\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", 
  "ref_doctype": "Lead", 
  "report_name": "Lead Details", 
  "report_type": "Query Report"
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 43f51c0..50fadc8 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -250,10 +250,13 @@
 		var tax_count = this.frm.doc["taxes"] ? this.frm.doc["taxes"].length: 0;
 
 		this.frm.doc.grand_total = flt(tax_count ? this.frm.doc["taxes"][tax_count - 1].total : this.frm.doc.net_total);
-		this.frm.doc.grand_total_export = flt(this.frm.doc.grand_total / this.frm.doc.conversion_rate);
 
 		this.frm.doc.other_charges_total = flt(this.frm.doc.grand_total - this.frm.doc.net_total,
 			precision("other_charges_total"));
+
+		this.frm.doc.grand_total_export = (this.frm.doc.other_charges_total || this.frm.doc.discount_amount) ?
+			flt(this.frm.doc.grand_total / this.frm.doc.conversion_rate) : this.frm.doc.net_total_export;
+
 		this.frm.doc.other_charges_total_export = flt(this.frm.doc.grand_total_export -
 			this.frm.doc.net_total_export + flt(this.frm.doc.discount_amount),
 			precision("other_charges_total_export"));
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index 0a1ebd4..7e535f5 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -120,7 +120,7 @@
  ], 
  "icon": "icon-shield", 
  "idx": 1, 
- "modified": "2014-05-07 06:39:38.981478", 
+ "modified": "2015-02-05 05:11:34.624998", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Authorization Rule", 
@@ -136,6 +136,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.json b/erpnext/setup/doctype/backup_manager/backup_manager.json
index a82ab65..e8840d5 100644
--- a/erpnext/setup/doctype/backup_manager/backup_manager.json
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.json
@@ -1,5 +1,5 @@
 {
- "creation": "2013-04-30 12:58:38.000000", 
+ "creation": "2013-04-30 12:58:38", 
  "description": "System for managing Backups", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -140,7 +140,7 @@
  "icon": "icon-cloud-upload", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2013-12-20 19:22:55.000000", 
+ "modified": "2015-02-05 05:11:34.700674", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Backup Manager", 
@@ -153,6 +153,7 @@
    "print": 1, 
    "read": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 39a1477..2b20b10 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -33,7 +33,7 @@
  "icon": "icon-certificate", 
  "idx": 1, 
  "in_dialog": 0, 
- "modified": "2015-01-05 16:15:25.811253", 
+ "modified": "2015-02-05 05:11:35.319683", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Brand", 
@@ -48,6 +48,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 844bebf..13a42ae 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -375,7 +375,7 @@
  ], 
  "icon": "icon-building", 
  "idx": 1, 
- "modified": "2015-01-05 11:30:45.716971", 
+ "modified": "2015-02-05 05:11:35.790597", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
@@ -391,6 +391,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 67257bb..6247afd 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -102,7 +102,7 @@
 		for d in self.fld_dict.keys():
 			account.set(d, (d == 'parent_account' and lst[self.fld_dict[d]]) and lst[self.fld_dict[d]] +' - '+ self.abbr or lst[self.fld_dict[d]])
 		if not account.parent_account:
-			account.ignore_mandatory = True
+			account.flags.ignore_mandatory = True
 		account.insert()
 
 	def set_default_accounts(self):
@@ -146,10 +146,10 @@
 		for cc in cc_list:
 			cc.update({"doctype": "Cost Center"})
 			cc_doc = frappe.get_doc(cc)
-			cc_doc.ignore_permissions = True
+			cc_doc.flags.ignore_permissions = True
 
 			if cc.get("cost_center_name") == self.name:
-				cc_doc.ignore_mandatory = True
+				cc_doc.flags.ignore_mandatory = True
 			cc_doc.insert()
 
 		frappe.db.set(self, "cost_center", _("Main") + " - " + self.abbr)
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.json b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
index a51bd45..e4d3997 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
@@ -35,7 +35,7 @@
  ], 
  "icon": "icon-exchange", 
  "idx": 1, 
- "modified": "2014-05-27 03:49:09.092389", 
+ "modified": "2015-02-05 05:11:36.356182", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Currency Exchange", 
@@ -50,6 +50,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index ea03663..a08564d 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -126,7 +126,7 @@
  "icon": "icon-sitemap", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-01-01 15:35:30.178039", 
+ "modified": "2015-02-05 05:11:36.752161", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Customer Group", 
@@ -170,6 +170,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index 48819e0..de4d2c9 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json
@@ -328,7 +328,7 @@
  ], 
  "icon": "icon-envelope", 
  "idx": 1, 
- "modified": "2014-05-20 14:02:36.762220", 
+ "modified": "2015-02-05 05:11:38.024529", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Email Digest", 
@@ -344,6 +344,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/features_setup/features_setup.json b/erpnext/setup/doctype/features_setup/features_setup.json
index 3dd2b4e..590a73e 100644
--- a/erpnext/setup/doctype/features_setup/features_setup.json
+++ b/erpnext/setup/doctype/features_setup/features_setup.json
@@ -205,7 +205,7 @@
  "icon": "icon-glass", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2014-08-21 16:24:18.503070", 
+ "modified": "2015-02-05 05:11:38.842809", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Features Setup", 
@@ -220,6 +220,7 @@
    "read": 1, 
    "report": 0, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -231,6 +232,7 @@
    "read": 1, 
    "report": 0, 
    "role": "Administrator", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index fc9c335..811c279 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -105,7 +105,7 @@
  "idx": 1, 
  "in_create": 1, 
  "issingle": 1, 
- "modified": "2014-05-26 03:05:48.838329", 
+ "modified": "2015-02-05 05:11:39.042446", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Global Defaults", 
@@ -119,6 +119,7 @@
    "read": 1, 
    "report": 0, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index d7ae162..47a709d 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -190,7 +190,7 @@
  "in_create": 1, 
  "issingle": 0, 
  "max_attachments": 3, 
- "modified": "2015-01-01 14:30:02.349930", 
+ "modified": "2015-02-05 05:11:39.844136", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group", 
@@ -232,6 +232,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/naming_series/naming_series.json b/erpnext/setup/doctype/naming_series/naming_series.json
index 95faa48..b92bf3a 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.json
+++ b/erpnext/setup/doctype/naming_series/naming_series.json
@@ -1,5 +1,5 @@
 {
- "creation": "2013-01-25 11:35:08.000000", 
+ "creation": "2013-01-25 11:35:08", 
  "description": "Set prefix for numbering series on your transactions", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -76,7 +76,7 @@
  "icon": "icon-sort-by-order", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2013-12-20 19:23:21.000000", 
+ "modified": "2015-02-05 05:11:41.473793", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Naming Series", 
@@ -90,6 +90,7 @@
    "read": 1, 
    "report": 0, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index 6d1b7e9..5a12051 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -117,8 +117,8 @@
 
 	def validate_series_name(self, n):
 		import re
-		if not re.match("^[a-zA-Z0-9- /.#]*$", n):
-			throw(_('Special Characters except "-" and "/" not allowed in naming series'))
+		if not re.match("^[\w- /.#]*$", n, re.UNICODE):
+			throw(_('Special Characters except "-", "#", "." and "/" not allowed in naming series'))
 
 	def get_options(self, arg=None):
 		return frappe.get_meta(arg or self.select_doc_for_series).get_field("naming_series").options
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index e6a6a7f..fe1c57d 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -2,7 +2,7 @@
  "allow_copy": 1, 
  "allow_email": 1, 
  "allow_print": 1, 
- "creation": "2012-07-12 23:29:45.000000", 
+ "creation": "2012-07-12 23:29:45", 
  "description": "Send automatic emails to Contacts on Submitting transactions.", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -176,7 +176,7 @@
  "icon": "icon-envelope", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2013-07-10 19:24:07.000000", 
+ "modified": "2015-02-05 05:11:41.580894", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Notification Control", 
@@ -194,6 +194,7 @@
    "permlevel": 0, 
    "read": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index 4d16a24..79ebbfb 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -32,7 +32,7 @@
  ], 
  "icon": "icon-font", 
  "idx": 1, 
- "modified": "2015-01-15 15:25:32.907590", 
+ "modified": "2015-02-05 05:11:42.732646", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Print Heading", 
@@ -47,6 +47,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index 657f923..4eec166 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -19,7 +19,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2014-05-07 06:39:39.439590", 
+ "modified": "2015-02-05 05:11:44.681689", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Quotation Lost Reason", 
@@ -36,6 +36,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 52a44c5..aed0c50 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -118,7 +118,7 @@
    "reqd": 0
   }, 
   {
-   "description": "Select Budget Distribution to unevenly distribute targets across months.", 
+   "description": "Select Monthly Distribution to unevenly distribute targets across months.", 
    "fieldname": "distribution_id", 
    "fieldtype": "Link", 
    "label": "Target Distribution", 
@@ -200,7 +200,7 @@
  "icon": "icon-user", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-01-05 14:52:04.562481", 
+ "modified": "2015-02-05 05:11:46.087123", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Partner", 
@@ -243,6 +243,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 04791fe..a2e4b58 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -120,7 +120,7 @@
    "permlevel": 0
   }, 
   {
-   "description": "Select Budget Distribution to unevenly distribute targets across months.", 
+   "description": "Select Monthly Distribution to unevenly distribute targets across months.", 
    "fieldname": "distribution_id", 
    "fieldtype": "Link", 
    "label": "Target Distribution", 
@@ -143,7 +143,7 @@
  "icon": "icon-user", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-01-01 15:39:11.451348", 
+ "modified": "2015-02-05 05:11:46.204837", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
@@ -186,6 +186,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/setup/doctype/sales_person/sales_person.py b/erpnext/setup/doctype/sales_person/sales_person.py
index ce7b572..a4a1f6a 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.py
+++ b/erpnext/setup/doctype/sales_person/sales_person.py
@@ -11,7 +11,7 @@
 	nsm_parent_field = 'parent_sales_person';
 
 	def validate(self):
-		for d in self.get('targets'):
+		for d in self.get('targets') or []:
 			if not flt(d.target_qty) and not flt(d.target_amount):
 				frappe.throw(_("Either target qty or target amount is mandatory."))
 
diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.json b/erpnext/setup/doctype/sms_settings/sms_settings.json
index ce1fdec..aa054f5 100755
--- a/erpnext/setup/doctype/sms_settings/sms_settings.json
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.json
@@ -1,78 +1,79 @@
 {
- "allow_copy": 1,
- "allow_email": 1,
- "allow_print": 1,
- "creation": "2013-01-10 16:34:24",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 1, 
+ "allow_email": 1, 
+ "allow_print": 1, 
+ "creation": "2013-01-10 16:34:24", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "description": "Eg. smsgateway.com/api/send_sms.cgi",
-   "fieldname": "sms_gateway_url",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "SMS Gateway URL",
-   "permlevel": 0,
+   "description": "Eg. smsgateway.com/api/send_sms.cgi", 
+   "fieldname": "sms_gateway_url", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "SMS Gateway URL", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "description": "Enter url parameter for message",
-   "fieldname": "message_parameter",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Message Parameter",
-   "permlevel": 0,
+   "description": "Enter url parameter for message", 
+   "fieldname": "message_parameter", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Message Parameter", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "description": "Enter url parameter for receiver nos",
-   "fieldname": "receiver_parameter",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Receiver Parameter",
-   "permlevel": 0,
+   "description": "Enter url parameter for receiver nos", 
+   "fieldname": "receiver_parameter", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Receiver Parameter", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "static_parameters_section",
-   "fieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "static_parameters_section", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "description": "Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",
-   "fieldname": "parameters",
-   "fieldtype": "Table",
-   "label": "Static Parameters",
-   "options": "SMS Parameter",
+   "description": "Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)", 
+   "fieldname": "parameters", 
+   "fieldtype": "Table", 
+   "label": "Static Parameters", 
+   "options": "SMS Parameter", 
    "permlevel": 0
   }
- ],
- "icon": "icon-cog",
- "idx": 1,
- "in_create": 0,
- "issingle": 1,
- "modified": "2014-12-26 16:42:57.956544",
- "modified_by": "Administrator",
- "module": "Setup",
- "name": "SMS Settings",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "in_create": 0, 
+ "issingle": 1, 
+ "modified": "2015-02-05 05:11:46.834990", 
+ "modified_by": "Administrator", 
+ "module": "Setup", 
+ "name": "SMS Settings", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "create": 1,
-   "permlevel": 0,
-   "read": 1,
-   "report": 0,
-   "role": "System Manager",
-   "submit": 0,
+   "create": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
+ ], 
  "read_only": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index 827d9e6..d6a2809 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -39,7 +39,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2014-12-25 12:48:28.195655", 
+ "modified": "2015-02-05 05:11:47.821736", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Supplier Type", 
@@ -82,6 +82,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index e967df0..cb1b6e1 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -32,7 +32,7 @@
  ], 
  "icon": "icon-legal", 
  "idx": 1, 
- "modified": "2015-01-05 14:58:21.277113", 
+ "modified": "2015-02-05 05:11:48.092112", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Terms and Conditions", 
@@ -48,6 +48,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -80,6 +81,7 @@
    "read": 1, 
    "report": 1, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -93,6 +95,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index e74582c..ab1d7e7 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -123,7 +123,7 @@
    "permlevel": 0
   }, 
   {
-   "description": "Select Budget Distribution to unevenly distribute targets across months.", 
+   "description": "Select Monthly Distribution to unevenly distribute targets across months.", 
    "fieldname": "distribution_id", 
    "fieldtype": "Link", 
    "label": "Target Distribution", 
@@ -136,7 +136,7 @@
  "icon": "icon-map-marker", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-01-01 15:36:03.787473", 
+ "modified": "2015-02-05 05:11:48.158225", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Territory", 
@@ -153,6 +153,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/doctype/territory/territory.py b/erpnext/setup/doctype/territory/territory.py
index 8eb4dce..e4fe9c5 100644
--- a/erpnext/setup/doctype/territory/territory.py
+++ b/erpnext/setup/doctype/territory/territory.py
@@ -14,7 +14,7 @@
 	nsm_parent_field = 'parent_territory'
 
 	def validate(self):
-		for d in self.get('targets'):
+		for d in self.get('targets') or []:
 			if not flt(d.target_qty) and not flt(d.target_amount):
 				frappe.throw(_("Either target qty or target amount is mandatory"))
 
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index 7b07e63..c0bb4e1 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -27,7 +27,7 @@
  ], 
  "icon": "icon-compass", 
  "idx": 1, 
- "modified": "2015-01-05 16:14:43.862637", 
+ "modified": "2015-02-05 05:11:48.493718", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "UOM", 
@@ -43,6 +43,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index fdbbe9e..ce7af6d 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -20,7 +20,7 @@
 def feature_setup():
 	"""save global defaults and features setup"""
 	doc = frappe.get_doc("Features Setup", "Features Setup")
-	doc.ignore_permissions = True
+	doc.flags.ignore_permissions = True
 
 	# store value as 1 for all these fields
 	flds = ['fs_item_serial_nos', 'fs_item_batch_nos', 'fs_brands', 'fs_item_barcode',
diff --git a/erpnext/setup/page/setup_wizard/install_fixtures.py b/erpnext/setup/page/setup_wizard/install_fixtures.py
index 4bdf15e..96ea0d9 100644
--- a/erpnext/setup/page/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/page/setup_wizard/install_fixtures.py
@@ -135,6 +135,7 @@
 		{'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
 		{'doctype': 'Activity Type', 'activity_type': _('Execution')},
 		{'doctype': 'Activity Type', 'activity_type': _('Communication')},
+		{'doctype': 'Activity Type', 'activity_type': _('Manufacturing')},
 
 		# Industry Type
 		{'doctype': 'Industry Type', 'industry': _('Accounting')},
@@ -187,7 +188,11 @@
 		{'doctype': 'Industry Type', 'industry': _('Telecommunications')},
 		{'doctype': 'Industry Type', 'industry': _('Television')},
 		{'doctype': 'Industry Type', 'industry': _('Transportation')},
-		{'doctype': 'Industry Type', 'industry': _('Venture Capital')}
+		{'doctype': 'Industry Type', 'industry': _('Venture Capital')},
+
+		{'doctype': "Email Account", "email_id": "sales@example.com", "append_to": "Lead"},
+		{'doctype': "Email Account", "email_id": "support@example.com", "append_to": "Issue"},
+		{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"}
 	]
 
 	from frappe.modules import scrub
@@ -198,6 +203,6 @@
 		# ignore mandatory for root
 		parent_link_field = ("parent_" + scrub(doc.doctype))
 		if doc.meta.get_field(parent_link_field) and not doc.get(parent_link_field):
-			doc.ignore_mandatory = True
+			doc.flags.ignore_mandatory = True
 
 		doc.insert()
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index 2ba6dd4..c31fab4 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -1,4 +1,4 @@
-frappe.pages['setup-wizard'].onload = function(wrapper) {
+frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
 	if(sys_defaults.company) {
 		frappe.set_route("desktop");
 		return;
@@ -356,7 +356,7 @@
 	erpnext.wiz = new frappe.wiz.Wizard(wizard_settings)
 }
 
-frappe.pages['setup-wizard'].onshow = function(wrapper) {
+frappe.pages['setup-wizard'].on_page_show = function(wrapper) {
 	if(frappe.get_route()[1])
 		erpnext.wiz.show(frappe.get_route()[1]);
 }
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 3ee089c..5b54485 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -41,7 +41,7 @@
 		if not quotation.get(fieldname):
 			throw(_("{0} is required").format(quotation.meta.get_label(fieldname)))
 
-	quotation.ignore_permissions = True
+	quotation.flags.ignore_permissions = True
 	quotation.submit()
 
 	if quotation.lead:
@@ -53,7 +53,7 @@
 	for item in sales_order.get("items"):
 		item.reserved_warehouse = frappe.db.get_value("Item", item.item_code, "website_warehouse") or None
 
-	sales_order.ignore_permissions = True
+	sales_order.flags.ignore_permissions = True
 	sales_order.insert()
 	sales_order.submit()
 	frappe.local.cookie_manager.delete_cookie("cart_count")
@@ -88,7 +88,7 @@
 		frappe.delete_doc("Quotation", quotation.name, ignore_permissions=True)
 		quotation = _get_cart_quotation()
 	else:
-		quotation.ignore_permissions = True
+		quotation.flags.ignore_permissions = True
 		quotation.save()
 
 	set_cart_count(quotation)
@@ -117,7 +117,7 @@
 
 	apply_cart_settings(quotation=quotation)
 
-	quotation.ignore_permissions = True
+	quotation.flags.ignore_permissions = True
 	quotation.save()
 
 	return get_cart_quotation(quotation)
@@ -175,7 +175,7 @@
 			qdoc.contact_person = frappe.db.get_value("Contact", {"email_id": frappe.session.user,
 				"customer": party.name})
 
-		qdoc.ignore_permissions = True
+		qdoc.flags.ignore_permissions = True
 		qdoc.run_method("set_missing_values")
 		apply_cart_settings(party, qdoc)
 
@@ -201,18 +201,18 @@
 		contact.customer_name = party.customer_name
 		contact.mobile_no = mobile_no
 		contact.phone = phone
-		contact.ignore_permissions = True
+		contact.flags.ignore_permissions = True
 		contact.save()
 
 	party_doc = frappe.get_doc(party.as_dict())
-	party_doc.ignore_permissions = True
+	party_doc.flags.ignore_permissions = True
 	party_doc.save()
 
 	qdoc = _get_cart_quotation(party)
 	if not qdoc.get("__islocal"):
 		qdoc.customer_name = company_name or fullname
 		qdoc.run_method("set_missing_lead_customer_details")
-		qdoc.ignore_permissions = True
+		qdoc.flags.ignore_permissions = True
 		qdoc.save()
 
 def apply_cart_settings(party=None, quotation=None):
@@ -276,7 +276,7 @@
 		})
 
 		if frappe.session.user not in ("Guest", "Administrator"):
-			lead_doc.ignore_permissions = True
+			lead_doc.flags.ignore_permissions = True
 			lead_doc.insert()
 
 		return lead_doc
@@ -303,7 +303,7 @@
 
 	apply_cart_settings(quotation=quotation)
 
-	quotation.ignore_permissions = True
+	quotation.flags.ignore_permissions = True
 	quotation.save()
 
 	return get_cart_quotation(quotation)
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index ce2fb8e..93d57b2 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -96,7 +96,7 @@
  "icon": "icon-shopping-cart", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2014-12-24 16:42:14.262882", 
+ "modified": "2015-02-05 05:11:46.714019", 
  "modified_by": "Administrator", 
  "module": "Shopping Cart", 
  "name": "Shopping Cart Settings", 
@@ -109,6 +109,7 @@
    "print": 1, 
    "read": 1, 
    "role": "Website Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 180949d..756955b 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -62,7 +62,7 @@
  "icon": "icon-archive", 
  "idx": 1, 
  "max_attachments": 5, 
- "modified": "2015-01-07 16:24:13.422480", 
+ "modified": "2015-02-05 05:11:34.824412", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Batch", 
@@ -78,6 +78,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/stock/doctype/batch/batch_list.js b/erpnext/stock/doctype/batch/batch_list.js
index c9a7e15..2138fa1 100644
--- a/erpnext/stock/doctype/batch/batch_list.js
+++ b/erpnext/stock/doctype/batch/batch_list.js
@@ -4,7 +4,9 @@
 		if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) {
 			return [__("Expired"), "red", "expiry_date,>=,Today"]
 		} else if(doc.expiry_date) {
-			return [__("Not Expired"), "darkgrey", "expiry_date,<,Today"]
+			return [__("Not Expired"), "green", "expiry_date,<,Today"]
+		} else {
+			return ["Not Set", "darkgrey", ""];
 		}
 	}
 };
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index e3269e8..1fb1e2d 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -23,7 +23,7 @@
 			if (not getattr(self, f, None)) or (not self.get(f)):
 				self.set(f, 0.0)
 
-	def update_stock(self, args):
+	def update_stock(self, args, allow_negative_stock=False):
 		self.update_qty(args)
 
 		if args.get("actual_qty") or args.get("voucher_type") == "Stock Reconciliation":
@@ -38,7 +38,7 @@
 				"warehouse": self.warehouse,
 				"posting_date": args.get("posting_date"),
 				"posting_time": args.get("posting_time")
-			})
+			}, allow_negative_stock=allow_negative_stock)
 
 	def update_qty(self, args):
 		# update the stock values (for current quantities)
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 8d00f94..4eb9357 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -142,7 +142,7 @@
    "width": "150px"
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -1024,7 +1024,7 @@
  "idx": 1, 
  "in_create": 0, 
  "is_submittable": 1, 
- "modified": "2015-01-15 07:33:24.245923", 
+ "modified": "2015-02-05 05:11:37.151596", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
@@ -1042,6 +1042,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -1056,6 +1057,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -1071,6 +1073,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.py b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.py
index 3789cda..82844ac 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.py
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.py
@@ -5,6 +5,8 @@
 import frappe
 
 from frappe.model.document import Document
+from erpnext.controllers.print_settings import print_settings_for_item_table
 
 class DeliveryNoteItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index e12c764..36d2109 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -687,20 +687,7 @@
    "read_only": 0
   }, 
   {
-   "default": "No", 
-   "description": "Selecting \"Yes\" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.", 
-   "fieldname": "is_manufactured_item", 
-   "fieldtype": "Select", 
-   "label": "Allow Bill of Materials", 
-   "oldfieldname": "is_manufactured_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 1
-  }, 
-  {
-   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
+   "depends_on": "", 
    "fieldname": "default_bom", 
    "fieldtype": "Link", 
    "ignore_user_permissions": 1, 
@@ -714,7 +701,7 @@
   }, 
   {
    "default": "No", 
-   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
+   "depends_on": "", 
    "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", 
    "fieldname": "is_pro_applicable", 
    "fieldtype": "Select", 
@@ -877,7 +864,7 @@
  "icon": "icon-tag", 
  "idx": 1, 
  "max_attachments": 1, 
- "modified": "2015-01-08 14:59:49.747106", 
+ "modified": "2015-02-05 05:11:39.507487", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
@@ -893,6 +880,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 8c74f09..351f717 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -57,6 +57,7 @@
 		self.validate_reorder_level()
 		self.validate_warehouse_for_reorder()
 		self.validate_variants()
+		self.update_item_desc()
 
 		if not self.get("__islocal"):
 			self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
@@ -390,7 +391,7 @@
 			if not frappe.db.exists("Item", newdn):
 				frappe.throw(_("Item {0} does not exist").format(newdn))
 
-			field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no", "is_manufactured_item"]
+			field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no"]
 			new_properties = [cstr(d) for d in frappe.db.get_value("Item", newdn, field_list)]
 			if new_properties != [cstr(self.get(fld)) for fld in field_list]:
 				frappe.throw(_("To merge, following properties must be same for both items")
@@ -433,7 +434,13 @@
 					row = self.append("website_specifications")
 					row.label = label
 					row.description = desc
-
+					
+	def update_item_desc(self):
+		if frappe.db.get_value('BOM',self.name, 'description') != self.description:
+			frappe.db.sql("""update `tabBOM` set description = %s where item = %s and docstatus < 2""",(self.description, self.name))
+			frappe.db.sql("""update `tabBOM Item` set description = %s where item_code = %s and docstatus < 2""",(self.description, self.name))
+			frappe.db.sql("""update `tabBOM Explosion Item` set description = %s where item_code = %s and docstatus < 2""",(self.description, self.name))		
+		
 def validate_end_of_life(item_code, end_of_life=None, verbose=1):
 	if not end_of_life:
 		end_of_life = frappe.db.get_value("Item", item_code, "end_of_life")
diff --git a/erpnext/stock/doctype/item/test_records.json b/erpnext/stock/doctype/item/test_records.json
index 7d0f4b0..51dd9fb 100644
--- a/erpnext/stock/doctype/item/test_records.json
+++ b/erpnext/stock/doctype/item/test_records.json
@@ -64,7 +64,6 @@
   "income_account": "Sales - _TC",
   "inspection_required": "No",
   "is_asset_item": "No",
-  "is_manufactured_item": "No",
   "is_pro_applicable": "No",
   "is_purchase_item": "Yes",
   "is_sales_item": "Yes",
@@ -94,7 +93,6 @@
   "income_account": "Sales - _TC",
   "inspection_required": "No",
   "is_asset_item": "No",
-  "is_manufactured_item": "No",
   "is_pro_applicable": "No",
   "is_purchase_item": "Yes",
   "is_sales_item": "Yes",
@@ -214,9 +212,7 @@
   "income_account": "Sales - _TC",
   "inspection_required": "No",
   "is_asset_item": "No",
-  "is_manufactured_item": "Yes",
   "is_pro_applicable": "Yes",
-  "is_purchase_item": "Yes",
   "is_sales_item": "Yes",
   "is_service_item": "No",
   "is_stock_item": "Yes",
@@ -242,7 +238,6 @@
   "is_service_item": "No",
   "is_stock_item": "Yes",
   "is_sub_contracted_item": "Yes",
-  "is_manufactured_item": "Yes",
   "item_code": "_Test FG Item 2",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test FG Item 2",
@@ -263,7 +258,6 @@
   "is_sales_item": "Yes",
   "is_service_item": "No",
   "is_stock_item": "Yes",
-  "is_manufactured_item": "Yes",
   "is_sub_contracted_item": "Yes",
   "item_code": "_Test Variant Item",
   "item_group": "_Test Item Group Desktops",
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index ce0190d..3b2bd0e 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -54,7 +54,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-01-15 15:25:52.728797", 
+ "modified": "2015-02-05 05:11:39.794192", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Attribute", 
@@ -76,6 +76,7 @@
    "report": 1, 
    "role": "Material Master Manager", 
    "set_user_permissions": 0, 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index e3535b1..da5e196 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -105,7 +105,7 @@
  "idx": 1, 
  "in_create": 0, 
  "istable": 0, 
- "modified": "2014-07-08 15:38:23.653034", 
+ "modified": "2015-02-05 05:11:39.951804", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 
@@ -121,6 +121,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
@@ -133,6 +134,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Master Manager", 
+   "share": 1, 
    "write": 1
   }
  ], 
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index aed6c66..c2a4ea2 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
@@ -1,41 +1,41 @@
 {
- "creation": "2014-07-11 11:51:00.453717", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
+ "creation": "2014-07-11 11:51:00.453717",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
  "fields": [
   {
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "permlevel": 0, 
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Description",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "col_break3", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "col_break3",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "in_list_view": 1, 
-   "label": "Amount", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
    "reqd": 1
   }
- ], 
- "istable": 1, 
- "modified": "2015-01-10 11:32:46.466371", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Landed Cost Taxes and Charges", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "sort_field": "modified", 
+ ],
+ "istable": 1,
+ "modified": "2015-01-21 11:51:33.964438",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Landed Cost Taxes and Charges",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 6cc68e7..1eb557f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -26,30 +26,32 @@
 	},
 
 	refresh: function() {
-		var help_content = ['<table class="table table-bordered" style="background-color: #f9f9f9;">',
-			'<tr><td>',
-				'<h4><i class="icon-hand-right"></i> ',
-					__('Notes'),
-				':</h4>',
-				'<ul>',
-					'<li>',
-						__("Charges will be distributed proportionately based on item amount"),
-					'</li>',
-					'<li>',
-						__("Remove item if charges is not applicable to that item"),
-					'</li>',
-					'<li>',
-						__("Charges are updated in Purchase Receipt against each item"),
-					'</li>',
-					'<li>',
-						__("Item valuation rate is recalculated considering landed cost voucher amount"),
-					'</li>',
-					'<li>',
-						__("Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"),
-					'</li>',
-				'</ul>',
-			'</td></tr>',
-		'</table>'].join("\n");
+		var help_content = [
+			'<br><br>',
+			'<table class="table table-bordered" style="background-color: #f9f9f9;">',
+				'<tr><td>',
+					'<h4><i class="icon-hand-right"></i> ',
+						__('Notes'),
+					':</h4>',
+					'<ul>',
+						'<li>',
+							__("Charges will be distributed proportionately based on item qty or amount, as per your selection"),
+						'</li>',
+						'<li>',
+							__("Remove item if charges is not applicable to that item"),
+						'</li>',
+						'<li>',
+							__("Charges are updated in Purchase Receipt against each item"),
+						'</li>',
+						'<li>',
+							__("Item valuation rate is recalculated considering landed cost voucher amount"),
+						'</li>',
+						'<li>',
+							__("Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"),
+						'</li>',
+					'</ul>',
+				'</td></tr>',
+			'</table>'].join("\n");
 
 		set_field_options("landed_cost_help", help_content);
 	},
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index aafc0df..184c351 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -1,99 +1,129 @@
 {
- "allow_import": 0, 
- "autoname": "LCV.####", 
- "creation": "2014-07-11 11:33:42.547339", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Transaction", 
+ "allow_import": 0,
+ "autoname": "LCV.####",
+ "creation": "2014-07-11 11:33:42.547339",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
  "fields": [
   {
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Company", 
-   "options": "Company", 
-   "permlevel": 0, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "purchase_receipts", 
-   "fieldtype": "Table", 
-   "label": "Purchase Receipts", 
-   "options": "Landed Cost Purchase Receipt", 
+   "fieldname": "purchase_receipts",
+   "fieldtype": "Table",
+   "label": "Purchase Receipts",
+   "options": "Landed Cost Purchase Receipt",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "get_items_from_purchase_receipts", 
-   "fieldtype": "Button", 
-   "label": "Get Items From Purchase Receipts", 
+   "fieldname": "get_items_from_purchase_receipts",
+   "fieldtype": "Button",
+   "label": "Get Items From Purchase Receipts",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "items", 
-   "fieldtype": "Table", 
-   "label": "Purchase Receipt Items", 
-   "no_copy": 1, 
-   "options": "Landed Cost Item", 
-   "permlevel": 0, 
+   "fieldname": "items",
+   "fieldtype": "Table",
+   "label": "Purchase Receipt Items",
+   "no_copy": 1,
+   "options": "Landed Cost Item",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "taxes", 
-   "fieldtype": "Table", 
-   "label": "Taxes and Charges", 
-   "options": "Landed Cost Taxes and Charges", 
+   "fieldname": "taxes",
+   "fieldtype": "Table",
+   "label": "Taxes and Charges",
+   "options": "Landed Cost Taxes and Charges",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "total_taxes_and_charges", 
-   "fieldtype": "Currency", 
-   "label": "Total Taxes and Charges", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "read_only": 1, 
+   "fieldname": "sec_break1",
+   "fieldtype": "Section Break",
+   "options": "Simple",
+   "permlevel": 0,
+   "precision": ""
+  },
+  {
+   "fieldname": "total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "label": "Total Taxes and Charges",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "read_only": 1,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "landed_cost_help", 
-   "fieldtype": "HTML", 
-   "label": "Landed Cost Help", 
-   "options": "", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "label": "Amended From", 
-   "no_copy": 1, 
-   "options": "Landed Cost Voucher", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Landed Cost Voucher",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "precision": ""
+  },
+  {
+   "default": "Amount",
+   "fieldname": "distribute_charges_based_on",
+   "fieldtype": "Select",
+   "label": "Distribute Charges Based On",
+   "options": "\nQty\nAmount",
+   "permlevel": 0,
+   "precision": "",
+   "reqd": 1
+  },
+  {
+   "fieldname": "sec_break2",
+   "fieldtype": "Section Break",
+   "permlevel": 0,
+   "precision": ""
+  },
+  {
+   "fieldname": "landed_cost_help",
+   "fieldtype": "HTML",
+   "label": "Landed Cost Help",
+   "options": "",
+   "permlevel": 0
   }
- ], 
- "icon": "icon-usd", 
- "is_submittable": 1, 
- "modified": "2014-12-25 12:36:24.982094", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Landed Cost Voucher", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-usd",
+ "is_submittable": 1,
+ "modified": "2015-02-05 05:11:40.305974",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Landed Cost Voucher",
+ "name_case": "",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "export": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "export": 1,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Material Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "sort_field": "modified", 
+ ],
+ "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index f5b8b5f..5bd7e56 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -7,9 +7,6 @@
 from frappe.utils import flt
 from frappe.model.document import Document
 
-from erpnext.stock.utils import get_valuation_method
-from erpnext.stock.stock_ledger import get_previous_sle
-
 class LandedCostVoucher(Document):
 	def get_items_from_purchase_receipts(self):
 		self.set("items", [])
@@ -69,10 +66,11 @@
 		self.total_taxes_and_charges = sum([flt(d.amount) for d in self.get("taxes")])
 
 	def set_applicable_charges_for_item(self):
-		total_item_cost = sum([flt(d.amount) for d in self.get("items")])
+		based_on = self.distribute_charges_based_on.lower()
+		total = sum([flt(d.get(based_on)) for d in self.get("items")])
 
 		for item in self.get("items"):
-			item.applicable_charges = flt(item.amount) *  flt(self.total_taxes_and_charges) / flt(total_item_cost)
+			item.applicable_charges = flt(item.get(based_on)) *  flt(self.total_taxes_and_charges) / flt(total)
 
 	def on_submit(self):
 		self.update_landed_cost()
@@ -92,12 +90,12 @@
 			pr.update_valuation_rate("items")
 
 			# save will update landed_cost_voucher_amount and voucher_amount in PR,
-			# as those fields are ellowed to edit after submit
+			# as those fields are allowed to edit after submit
 			pr.save()
 
 			# update stock & gl entries for cancelled state of PR
 			pr.docstatus = 2
-			pr.update_stock_ledger()
+			pr.update_stock_ledger(allow_negative_stock=True)
 			pr.make_gl_entries_on_cancel()
 
 			# update stock & gl entries for submit state of PR
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index bd7dab6..625baa4 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -54,7 +54,7 @@
    "width": "150px"
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -236,7 +236,7 @@
  "icon": "icon-ticket", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-06 17:38:12.250644", 
+ "modified": "2015-02-05 05:11:41.240828", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 
@@ -253,6 +253,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -267,6 +268,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -282,6 +284,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -297,6 +300,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js
index f0d97cb..173ed67 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.js
+++ b/erpnext/stock/doctype/material_request/material_request_list.js
@@ -1,6 +1,5 @@
 frappe.listview_settings['Material Request'] = {
 	add_fields: ["material_request_type", "status", "per_ordered"],
-	filters: [["per_ordered", "<", 100]],
 	get_status: function(doc) {
 		if(doc.status=="Stopped") {
 			return [__("Stopped"), "red", "status,=,Stopped"];
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 6fe73fc..ded9a0a 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -216,7 +216,7 @@
 
 		mr.update_status('Submitted')
 
-		se.ignore_validate_update_after_submit = True
+		se.flags.ignore_validate_update_after_submit = True
 		se.submit()
 		mr.update_status('Stopped')
 		self.assertRaises(frappe.InvalidStatusError, se.cancel)
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 1fa0e49..3884042 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -197,7 +197,7 @@
  "icon": "icon-suitcase", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-12-24 16:22:16.446193", 
+ "modified": "2015-02-05 05:11:41.872466", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip", 
@@ -215,6 +215,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -230,6 +231,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -244,6 +246,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -258,6 +261,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -272,6 +276,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index c304bc5..fbb700b 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -166,4 +166,4 @@
 	 			and %s like "%s" %s
 	 			limit  %s, %s """ % ("%s", searchfield, "%s",
 	 			get_match_cond(doctype), "%s", "%s"),
-	 			(filters["delivery_note"], "%%%s%%" % txt, start, page_len))
+	 			((filters or {}).get("delivery_note"), "%%%s%%" % txt, start, page_len))
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index 1a645c3..3349559 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -74,7 +74,7 @@
  "icon": "icon-tags", 
  "idx": 1, 
  "max_attachments": 1, 
- "modified": "2014-12-24 14:59:23.413738", 
+ "modified": "2015-02-05 05:11:42.450750", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List", 
@@ -100,6 +100,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -118,6 +119,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase Master Manager", 
+   "share": 1, 
    "write": 1
   }, 
   {
diff --git a/erpnext/stock/doctype/price_list/price_list.py b/erpnext/stock/doctype/price_list/price_list.py
index 5f46869..35bd8dc 100644
--- a/erpnext/stock/doctype/price_list/price_list.py
+++ b/erpnext/stock/doctype/price_list/price_list.py
@@ -51,7 +51,7 @@
 
 			if self.name == b.get(price_list_fieldname):
 				b.set(price_list_fieldname, None)
-				b.ignore_permissions = True
+				b.flags.ignore_permissions = True
 				b.save()
 
 		for module in ["Selling", "Buying"]:
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 9a84d3d..dc35407 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -596,7 +596,7 @@
    "report_hide": 1
   }, 
   {
-   "description": "Select the relevant company name if you have multiple companies", 
+   "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -767,7 +767,7 @@
  "icon": "icon-truck", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-15 07:34:39.475183", 
+ "modified": "2015-02-05 05:11:43.969108", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
@@ -784,6 +784,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -799,6 +800,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
@@ -814,6 +816,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }, 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index bfb2eaf..e7606fd 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -126,7 +126,7 @@
 				 if not d.prevdoc_docname:
 					 frappe.throw(_("Purchase Order number required for Item {0}").format(d.item_code))
 
-	def update_stock_ledger(self):
+	def update_stock_ledger(self, allow_negative_stock=False):
 		sl_entries = []
 		stock_items = self.get_stock_items()
 
@@ -135,10 +135,11 @@
 				pr_qty = flt(d.qty) * flt(d.conversion_factor)
 
 				if pr_qty:
+					val_rate_db_precision = 6 if cint(self.precision("valuation_rate")) <= 6 else 9
 					sl_entries.append(self.get_sl_entries(d, {
 						"actual_qty": flt(pr_qty),
 						"serial_no": cstr(d.serial_no).strip(),
-						"incoming_rate": d.valuation_rate
+						"incoming_rate": flt(d.valuation_rate, val_rate_db_precision)
 					}))
 
 				if flt(d.rejected_qty) > 0:
@@ -150,7 +151,7 @@
 					}))
 
 		self.bk_flush_supp_wh(sl_entries)
-		self.make_sl_entries(sl_entries)
+		self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock)
 
 	def update_ordered_qty(self):
 		po_map = {}
@@ -285,14 +286,16 @@
 			if d.item_code in stock_items and flt(d.valuation_rate) and flt(d.qty):
 				if warehouse_account.get(d.warehouse):
 
+					val_rate_db_precision = 6 if cint(self.precision("valuation_rate")) <= 6 else 9
+
 					# warehouse account
 					gl_entries.append(self.get_gl_dict({
 						"account": warehouse_account[d.warehouse],
 						"against": stock_rbnb,
 						"cost_center": d.cost_center,
 						"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
-						"debit": flt(flt(d.valuation_rate) * flt(d.qty) * flt(d.conversion_factor),
-							self.precision("valuation_rate", d))
+						"debit": flt(flt(d.valuation_rate, val_rate_db_precision) * flt(d.qty) * flt(d.conversion_factor),
+							self.precision("base_amount", d))
 					}))
 
 					# stock received but not billed
@@ -326,6 +329,24 @@
 							"credit": flt(d.rm_supp_cost)
 						}))
 
+					# divisional loss adjustment
+					if not self.get("other_charges"):
+						sle_valuation_amount = flt(flt(d.valuation_rate, val_rate_db_precision) * flt(d.qty) * flt(d.conversion_factor),
+								self.precision("base_amount", d))
+
+						distributed_amount = flt(flt(d.base_amount, self.precision("base_amount", d))) + \
+							flt(d.landed_cost_voucher_amount) + flt(d.rm_supp_cost)
+
+						divisional_loss = flt(distributed_amount - sle_valuation_amount, self.precision("base_amount", d))
+						if divisional_loss:
+							gl_entries.append(self.get_gl_dict({
+								"account": stock_rbnb,
+								"against": warehouse_account[d.warehouse],
+								"cost_center": d.cost_center,
+								"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+								"debit": divisional_loss
+							}))
+
 				elif d.warehouse not in warehouse_with_no_account or \
 					d.rejected_warehouse not in warehouse_with_no_account:
 						warehouse_with_no_account.append(d.warehouse)
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py
index 35fca0d..21acbed 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py
@@ -5,6 +5,8 @@
 import frappe
 
 from frappe.model.document import Document
+from erpnext.controllers.print_settings import print_settings_for_item_table
 
 class PurchaseReceiptItem(Document):
-	pass
\ No newline at end of file
+	def __setup__(self):
+		print_settings_for_item_table(self)
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index c66ec62..77cd328 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -417,7 +417,7 @@
  "icon": "icon-barcode", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-01-05 16:03:49.825174", 
+ "modified": "2015-02-05 05:11:46.454105", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 
@@ -432,6 +432,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index d55daa0..59871dd 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -278,7 +278,7 @@
 	sr = frappe.new_doc("Serial No")
 	sr.warehouse = None
 	sr.dont_update_if_missing.append("warehouse")
-	sr.ignore_permissions = True
+	sr.flags.ignore_permissions = True
 
 	sr.serial_no = serial_no
 	sr.item_code = sle.item_code
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 1f8d7a0..cc7169b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -21,6 +21,12 @@
 			};
 		};
 
+		this.frm.fields_dict.bom_no.get_query = function() {
+			return {
+				filters:{ 'docstatus': 1 }
+			};
+		};
+
 		this.frm.fields_dict.items.grid.get_field('item_code').get_query = function() {
 			if(in_list(["Sales Return", "Purchase Return"], me.frm.doc.purpose) &&
 				me.get_doctype_docname()) {
@@ -65,7 +71,7 @@
 		this.show_stock_ledger();
 		this.show_general_ledger();
 
-		if(this.frm.doc.docstatus === 1 && frappe.boot.user.can_create.indexOf("Journal Entry")!==-1 
+		if(this.frm.doc.docstatus === 1 && frappe.boot.user.can_create.indexOf("Journal Entry")!==-1
 			&& this.frm.doc.__onload.credit_debit_note_exists == 0 ) {
 			if(this.frm.doc.purpose === "Sales Return") {
 				this.frm.add_custom_button(__("Make Credit Note"),
@@ -227,8 +233,8 @@
 		if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse;
 	},
 
-	source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return"],
-	target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return"],
+	source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract"],
+	target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract"],
 
 	from_warehouse: function(doc) {
 		var me = this;
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index e2b92df..7746d98 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -1,670 +1,674 @@
 {
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "creation": "2013-04-09 11:43:55", 
- "docstatus": 0, 
- "doctype": "DocType", 
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "creation": "2013-04-09 11:43:55",
+ "docstatus": 0,
+ "doctype": "DocType",
  "fields": [
   {
-   "fieldname": "col1", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
+   "fieldname": "col1",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_width": "50%",
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Series", 
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "STE-", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
+   "allow_on_submit": 0,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Series",
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "STE-",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "default": "Material Issue", 
-   "fieldname": "purpose", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Purpose", 
-   "no_copy": 0, 
-   "oldfieldname": "purpose", 
-   "oldfieldtype": "Select", 
-   "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nManufacture\nRepack\nSubcontract\nSales Return\nPurchase Return", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
+   "allow_on_submit": 0,
+   "default": "Material Issue",
+   "fieldname": "purpose",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Purpose",
+   "no_copy": 0,
+   "oldfieldname": "purpose",
+   "oldfieldtype": "Select",
+   "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nManufacture\nRepack\nSubcontract\nSales Return\nPurchase Return",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-   "fieldname": "delivery_note_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Delivery Note No", 
-   "no_copy": 1, 
-   "oldfieldname": "delivery_note_no", 
-   "oldfieldtype": "Link", 
-   "options": "Delivery Note", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Sales Return\"",
+   "fieldname": "delivery_note_no",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Delivery Note No",
+   "no_copy": 1,
+   "oldfieldname": "delivery_note_no",
+   "oldfieldtype": "Link",
+   "options": "Delivery Note",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-   "fieldname": "sales_invoice_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Sales Invoice No", 
-   "no_copy": 1, 
-   "options": "Sales Invoice", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "depends_on": "eval:doc.purpose==\"Sales Return\"",
+   "fieldname": "sales_invoice_no",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Sales Invoice No",
+   "no_copy": 1,
+   "options": "Sales Invoice",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-   "fieldname": "purchase_receipt_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Purchase Receipt No", 
-   "no_copy": 1, 
-   "oldfieldname": "purchase_receipt_no", 
-   "oldfieldtype": "Link", 
-   "options": "Purchase Receipt", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Purchase Return\"",
+   "fieldname": "purchase_receipt_no",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Purchase Receipt No",
+   "no_copy": 1,
+   "oldfieldname": "purchase_receipt_no",
+   "oldfieldtype": "Link",
+   "options": "Purchase Receipt",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "col2", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
+   "fieldname": "col2",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_width": "50%",
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "default": "Today", 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Posting Date", 
-   "no_copy": 1, 
-   "oldfieldname": "posting_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
+   "allow_on_submit": 0,
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Posting Date",
+   "no_copy": 1,
+   "oldfieldname": "posting_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "posting_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Posting Time", 
-   "no_copy": 1, 
-   "oldfieldname": "posting_time", 
-   "oldfieldtype": "Time", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
+   "allow_on_submit": 0,
+   "fieldname": "posting_time",
+   "fieldtype": "Time",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Posting Time",
+   "no_copy": 1,
+   "oldfieldname": "posting_time",
+   "oldfieldtype": "Time",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "items_section", 
-   "fieldtype": "Section Break", 
-   "label": "Items", 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
+   "fieldname": "items_section",
+   "fieldtype": "Section Break",
+   "label": "Items",
+   "oldfieldtype": "Section Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "from_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Default Source Warehouse", 
-   "no_copy": 1, 
-   "oldfieldname": "from_warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "fieldname": "from_warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Default Source Warehouse",
+   "no_copy": 1,
+   "oldfieldname": "from_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "cb0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "cb0",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "to_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Default Target Warehouse", 
-   "no_copy": 1, 
-   "oldfieldname": "to_warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "fieldname": "to_warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Default Target Warehouse",
+   "no_copy": 1,
+   "oldfieldname": "to_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "sb0", 
-   "fieldtype": "Section Break", 
-   "options": "Simple", 
-   "permlevel": 0, 
+   "fieldname": "sb0",
+   "fieldtype": "Section Break",
+   "options": "Simple",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "items", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Items", 
-   "no_copy": 0, 
-   "oldfieldname": "mtn_details", 
-   "oldfieldtype": "Table", 
-   "options": "Stock Entry Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "fieldname": "items",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Items",
+   "no_copy": 0,
+   "oldfieldname": "mtn_details",
+   "oldfieldtype": "Table",
+   "options": "Stock Entry Detail",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "description": "Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.", 
-   "fieldname": "get_stock_and_rate", 
-   "fieldtype": "Button", 
-   "label": "Get Stock and Rate", 
-   "oldfieldtype": "Button", 
-   "options": "get_stock_and_rate", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "description": "Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.",
+   "fieldname": "get_stock_and_rate",
+   "fieldtype": "Button",
+   "label": "Get Stock and Rate",
+   "oldfieldtype": "Button",
+   "options": "get_stock_and_rate",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "fold", 
-   "fieldtype": "Fold", 
+   "depends_on": "eval:(doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")",
+   "fieldname": "sb1",
+   "fieldtype": "Section Break",
+   "label": "From Bill of Materials",
+   "permlevel": 0,
+   "read_only": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture\"], doc.purpose)",
+   "fieldname": "production_order",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Production Order",
+   "no_copy": 0,
+   "oldfieldname": "production_order",
+   "oldfieldtype": "Link",
+   "options": "Production Order",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1
+  },
+  {
+   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
+   "fieldname": "bom_no",
+   "fieldtype": "Link",
+   "label": "BOM No",
+   "options": "BOM",
+   "permlevel": 0,
+   "read_only": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
+   "description": "As per Stock UOM",
+   "fieldname": "fg_completed_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Manufacturing Quantity",
+   "no_copy": 0,
+   "oldfieldname": "fg_completed_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "depends_on": "eval:inList([\"Manufacture\", \"Repack\"], doc.purpose)",
+   "fieldname": "additional_operating_cost",
+   "fieldtype": "Currency",
+   "label": "Additional Operating Cost",
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "read_only": 0
+  },
+  {
+   "fieldname": "cb1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
+   "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
+   "fieldname": "use_multi_level_bom",
+   "fieldtype": "Check",
+   "label": "Use Multi-Level BOM",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
+   "fieldname": "get_items",
+   "fieldtype": "Button",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Get Items",
+   "no_copy": 0,
+   "oldfieldtype": "Button",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "fieldname": "fold",
+   "fieldtype": "Fold",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:(doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")", 
-   "fieldname": "sb1", 
-   "fieldtype": "Section Break", 
-   "label": "From Bill of Materials", 
-   "permlevel": 0, 
+   "depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")",
+   "fieldname": "contact_section",
+   "fieldtype": "Section Break",
+   "label": "Contact Info",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture\"], doc.purpose)", 
-   "fieldname": "production_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Production Order", 
-   "no_copy": 0, 
-   "oldfieldname": "production_order", 
-   "oldfieldtype": "Link", 
-   "options": "Production Order", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1
-  }, 
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Purchase Return\"",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Supplier",
+   "no_copy": 1,
+   "oldfieldname": "supplier",
+   "oldfieldtype": "Link",
+   "options": "Supplier",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
   {
-   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
-   "fieldname": "bom_no", 
-   "fieldtype": "Link", 
-   "label": "BOM No", 
-   "options": "BOM", 
-   "permlevel": 0, 
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Purchase Return\"",
+   "fieldname": "supplier_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Supplier Name",
+   "no_copy": 1,
+   "oldfieldname": "supplier_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Purchase Return\"",
+   "fieldname": "supplier_address",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Supplier Address",
+   "no_copy": 1,
+   "oldfieldname": "supplier_address",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Sales Return\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Customer",
+   "no_copy": 1,
+   "oldfieldname": "customer",
+   "oldfieldtype": "Link",
+   "options": "Customer",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Sales Return\"",
+   "fieldname": "customer_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Customer Name",
+   "no_copy": 1,
+   "oldfieldname": "customer_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "depends_on": "eval:doc.purpose==\"Sales Return\"",
+   "fieldname": "customer_address",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Customer Address",
+   "no_copy": 1,
+   "oldfieldname": "customer_address",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0
+  },
+  {
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "label": "More Info",
+   "oldfieldtype": "Section Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
-   "description": "As per Stock UOM", 
-   "fieldname": "fg_completed_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Manufacturing Quantity", 
-   "no_copy": 0, 
-   "oldfieldname": "fg_completed_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "depends_on": "eval:inList([\"Manufacture\", \"Repack\"], doc.purpose)", 
-   "fieldname": "additional_operating_cost", 
-   "fieldtype": "Currency", 
-   "label": "Additional Operating Cost", 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
+   "fieldname": "project_name",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Project Name",
+   "oldfieldname": "project_name",
+   "oldfieldtype": "Link",
+   "options": "Project",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "cb1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
-   "default": "1", 
-   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
-   "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
-   "fieldname": "use_multi_level_bom", 
-   "fieldtype": "Check", 
-   "label": "Use Multi-Level BOM", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
-   "fieldname": "get_items", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Get Items", 
-   "no_copy": 0, 
-   "oldfieldtype": "Button", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "fieldname": "remarks",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Remarks",
+   "no_copy": 1,
+   "oldfieldname": "remarks",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")", 
-   "fieldname": "contact_section", 
-   "fieldtype": "Section Break", 
-   "label": "Contact Info", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Supplier", 
-   "no_copy": 1, 
-   "oldfieldname": "supplier", 
-   "oldfieldtype": "Link", 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-   "fieldname": "supplier_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Supplier Name", 
-   "no_copy": 1, 
-   "oldfieldname": "supplier_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-   "fieldname": "supplier_address", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Supplier Address", 
-   "no_copy": 1, 
-   "oldfieldname": "supplier_address", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Customer", 
-   "no_copy": 1, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Customer Name", 
-   "no_copy": 1, 
-   "oldfieldname": "customer_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-   "fieldname": "customer_address", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Customer Address", 
-   "no_copy": 1, 
-   "oldfieldname": "customer_address", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "fieldname": "more_info", 
-   "fieldtype": "Section Break", 
-   "label": "More Info", 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
-   "fieldname": "project_name", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Project Name", 
-   "oldfieldname": "project_name", 
-   "oldfieldtype": "Link", 
-   "options": "Project", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "remarks", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Remarks", 
-   "no_copy": 1, 
-   "oldfieldname": "remarks", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "fieldname": "col5", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
+   "fieldname": "col5",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "print_width": "50%",
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "total_amount", 
-   "fieldtype": "Currency", 
-   "label": "Total Amount", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
+   "fieldname": "total_amount",
+   "fieldtype": "Currency",
+   "label": "Total Amount",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Company", 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
+   "allow_on_submit": 0,
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Company",
+   "no_copy": 0,
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "in_filter": 0, 
-   "label": "Fiscal Year", 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "fiscal_year",
+   "fieldtype": "Link",
+   "in_filter": 0,
+   "label": "Fiscal Year",
+   "options": "Fiscal Year",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "fieldname": "select_print_heading", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Print Heading", 
-   "no_copy": 0, 
-   "oldfieldname": "select_print_heading", 
-   "oldfieldtype": "Link", 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 1,
+   "fieldname": "select_print_heading",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 0,
+   "label": "Print Heading",
+   "no_copy": 0,
+   "oldfieldname": "select_print_heading",
+   "oldfieldtype": "Link",
+   "options": "Print Heading",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "label": "Amended From", 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Link", 
-   "options": "Stock Entry", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "allow_on_submit": 0,
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "in_filter": 0,
+   "label": "Amended From",
+   "no_copy": 1,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Link",
+   "options": "Stock Entry",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "credit_note", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "label": "Credit Note", 
-   "options": "Journal Entry", 
-   "permlevel": 0, 
+   "fieldname": "credit_note",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Credit Note",
+   "options": "Journal Entry",
+   "permlevel": 0,
    "precision": ""
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-file-text", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "max_attachments": 0, 
- "modified": "2015-01-07 17:38:40.170567", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Stock Entry", 
- "owner": "Administrator", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-file-text",
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "max_attachments": 0,
+ "modified": "2015-02-05 05:11:46.986620",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Stock Entry",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "apply_user_permissions": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material User", 
-   "submit": 1, 
+   "amend": 1,
+   "apply_user_permissions": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "apply_user_permissions": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Manufacturing User", 
-   "submit": 1, 
+   "amend": 1,
+   "apply_user_permissions": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Manufacturing User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Manufacturing Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Manufacturing Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks", 
- "sort_field": "modified", 
- "sort_order": "DESC", 
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks",
+ "sort_field": "modified",
+ "sort_order": "DESC",
  "title_field": "purpose"
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 3f9e03b..4faa644 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -34,14 +34,14 @@
 			for item in self.get("items"):
 				item.update(get_available_qty(item.item_code,
 					item.s_warehouse))
-	
+
 		count = frappe.db.exists({
 			"doctype": "Journal Entry",
 			"stock_entry":self.name,
-			"docstatus":1	
+			"docstatus":1
 		})
 		self.get("__onload").credit_debit_note_exists = 1 if count else 0
-	
+
 	def validate(self):
 		self.validate_posting_time()
 		self.validate_purpose()
@@ -55,7 +55,6 @@
 		self.validate_warehouse(pro_obj)
 		self.validate_production_order()
 		self.get_stock_and_rate()
-		self.validate_incoming_rate()
 		self.validate_bom()
 		self.validate_finished_goods()
 		self.validate_return_reference_doc()
@@ -64,7 +63,6 @@
 		self.validate_valuation_rate()
 		self.set_total_amount()
 
-
 	def on_submit(self):
 		self.update_stock_ledger()
 
@@ -123,8 +121,8 @@
 	def validate_warehouse(self, pro_obj):
 		"""perform various (sometimes conditional) validations on warehouse"""
 
-		source_mandatory = ["Material Issue", "Material Transfer", "Purchase Return"]
-		target_mandatory = ["Material Receipt", "Material Transfer", "Sales Return"]
+		source_mandatory = ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract"]
+		target_mandatory = ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract"]
 
 		validate_for_manufacture_repack = any([d.bom_no for d in self.get("items")])
 
@@ -275,7 +273,7 @@
 					if not flt(d.incoming_rate) or force:
 						operation_cost_per_unit = self.get_operation_cost_per_unit(d.bom_no, d.qty)
 						d.incoming_rate = operation_cost_per_unit + (raw_material_cost / flt(d.transfer_qty))
-					d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
+					d.amount = flt(flt(d.transfer_qty) * flt(d.incoming_rate), self.precision("transfer_qty", d))
 					break
 
 	def get_operation_cost_per_unit(self, bom_no, qty):
@@ -316,11 +314,6 @@
 
 		return incoming_rate
 
-	def validate_incoming_rate(self):
-		for d in self.get('items'):
-			if d.t_warehouse:
-				self.validate_value("incoming_rate", ">", 0, d, raise_exception=IncorrectValuationRateError)
-
 	def validate_bom(self):
 		for d in self.get('items'):
 			if d.bom_no:
@@ -330,7 +323,8 @@
 		"""validation: finished good quantity should be same as manufacturing quantity"""
 		for d in self.get('items'):
 			if d.bom_no and flt(d.transfer_qty) != flt(self.fg_completed_qty):
-				frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}").format(d.idx, d.transfer_qty, self.fg_completed_qty))
+				frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
+					format(d.idx, d.transfer_qty, self.fg_completed_qty))
 
 	def validate_return_reference_doc(self):
 		"""validate item with reference doc"""
@@ -508,28 +502,23 @@
 				self.production_order = None
 
 		if self.bom_no:
-			if self.purpose in ("Material Issue", "Material Transfer", "Manufacture",
-				"Repack", "Subcontract"):
-
-				if self.production_order:
-					# production: stores -> wip
-					if self.purpose == "Material Transfer":
-						item_dict = self.get_pending_raw_materials(pro_obj)
+			if self.purpose in ["Material Issue", "Material Transfer", "Manufacture", "Repack",
+					"Subcontract"]:
+				if self.production_order and self.purpose == "Material Transfer":
+					item_dict = self.get_pending_raw_materials(pro_obj)
+					if self.to_warehouse and pro_obj:
 						for item in item_dict.values():
 							item["to_warehouse"] = pro_obj.wip_warehouse
-
-					# production: wip -> finished goods
-					elif self.purpose == "Manufacture":
-						item_dict = self.get_bom_raw_materials(self.fg_completed_qty)
-						for item in item_dict.values():
-								item["from_warehouse"] = pro_obj.wip_warehouse
-
-					else:
-						frappe.throw(_("Stock Entry against Production Order must be for 'Material Transfer' or 'Manufacture'"))
 				else:
 					if not self.fg_completed_qty:
 						frappe.throw(_("Manufacturing Quantity is mandatory"))
+
 					item_dict = self.get_bom_raw_materials(self.fg_completed_qty)
+					for item in item_dict.values():
+						if pro_obj:
+							item["from_warehouse"] = pro_obj.wip_warehouse
+
+						item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""
 
 				# add raw materials to Stock Entry Detail table
 				self.add_to_stock_entry_detail(item_dict)
@@ -568,8 +557,7 @@
 		item_dict = get_bom_items_as_dict(self.bom_no, qty=qty, fetch_exploded = self.use_multi_level_bom)
 
 		for item in item_dict.values():
-			item.from_warehouse = item.default_warehouse
-			item.to_warehouse = ""
+			item.from_warehouse = self.from_warehouse or item.default_warehouse
 
 		return item_dict
 
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 7b65a67..0f90ca7 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -33,16 +33,15 @@
 
 	#check for item quantity available in stock
 	def actual_amt_check(self):
-		if self.batch_no:
+		if self.batch_no and not self.get("allow_negative_stock"):
 			batch_bal_after_transaction = flt(frappe.db.sql("""select sum(actual_qty)
 				from `tabStock Ledger Entry`
 				where warehouse=%s and item_code=%s and batch_no=%s""",
 				(self.warehouse, self.item_code, self.batch_no))[0][0])
 
 			if batch_bal_after_transaction < 0:
-				frappe.throw(_("Negative balance {0} in Batch {1} for Item {2} at Warehouse {3} on {4} {5}")
-					.format(batch_bal_after_transaction - self.actual_qty, self.batch_no, self.item_code, self.warehouse,
-						formatdate(self.posting_date), self.posting_time))
+				frappe.throw(_("Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3}")
+					.format(self.batch_no, batch_bal_after_transaction, self.item_code, self.warehouse))
 
 	def validate_mandatory(self):
 		mandatory = ['warehouse','posting_date','voucher_type','voucher_no','company']
@@ -62,15 +61,16 @@
 			frappe.throw(_("Item {0} must be a stock Item").format(self.item_code))
 
 		# check if batch number is required
-		if item_det.has_batch_no =='Yes' and self.voucher_type != 'Stock Reconciliation':
-			if not self.batch_no:
-				frappe.throw("Batch number is mandatory for Item {0}".format(self.item_code))
-
-			# check if batch belongs to item
-			if not frappe.db.get_value("Batch",
-					{"item": self.item_code, "name": self.batch_no}):
-				frappe.throw(_("{0} is not a valid Batch Number for Item {1}").format(self.batch_no, self.item_code))
-
+		if self.voucher_type != 'Stock Reconciliation':
+			if item_det.has_batch_no =='Yes':
+				if not self.batch_no:
+					frappe.throw(_("Batch number is mandatory for Item {0}").format(self.item_code))
+				elif not frappe.db.get_value("Batch",{"item": self.item_code, "name": self.batch_no}):
+						frappe.throw(_("{0} is not a valid Batch Number for Item {1}").format(self.batch_no, self.item_code))
+			
+			elif item_det.has_batch_no =='No' and self.batch_no:
+					frappe.throw(_("The Item {0} cannot have Batch").format(self.item_code))
+			
 		if item_det.has_variants:
 			frappe.throw(_("Stock cannot exist for Item {0} since has variants").format(self.item_code),
 				ItemTemplateCannotHaveStock)
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index a7de288..a6c09ee 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -1,145 +1,146 @@
 {
- "allow_copy": 1,
- "autoname": "SR/.######",
- "creation": "2013-03-28 10:35:31",
- "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 1, 
+ "autoname": "SR/.######", 
+ "creation": "2013-03-28 10:35:31", 
+ "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Posting Date",
-   "oldfieldname": "reconciliation_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "read_only": 0,
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Posting Date", 
+   "oldfieldname": "reconciliation_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "read_only": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "posting_time",
-   "fieldtype": "Time",
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Posting Time",
-   "oldfieldname": "reconciliation_time",
-   "oldfieldtype": "Time",
-   "permlevel": 0,
-   "read_only": 0,
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Posting Time", 
+   "oldfieldname": "reconciliation_time", 
+   "oldfieldtype": "Time", 
+   "permlevel": 0, 
+   "read_only": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Stock Reconciliation",
-   "permlevel": 0,
-   "print_hide": 1,
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "ignore_user_permissions": 1, 
+   "label": "Amended From", 
+   "no_copy": 1, 
+   "options": "Stock Reconciliation", 
+   "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "permlevel": 0,
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "label": "Company", 
+   "options": "Company", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "fiscal_year",
-   "fieldtype": "Link",
-   "label": "Fiscal Year",
-   "options": "Fiscal Year",
-   "permlevel": 0,
-   "print_hide": 1,
+   "fieldname": "fiscal_year", 
+   "fieldtype": "Link", 
+   "label": "Fiscal Year", 
+   "options": "Fiscal Year", 
+   "permlevel": 0, 
+   "print_hide": 1, 
    "reqd": 1
-  },
+  }, 
   {
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "label": "Difference Account",
-   "options": "Account",
+   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "label": "Difference Account", 
+   "options": "Account", 
    "permlevel": 0
-  },
+  }, 
   {
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center",
+   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "label": "Cost Center", 
+   "options": "Cost Center", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "col1",
-   "fieldtype": "Column Break",
+   "fieldname": "col1", 
+   "fieldtype": "Column Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "upload_html",
-   "fieldtype": "HTML",
-   "label": "Upload HTML",
-   "permlevel": 0,
-   "print_hide": 1,
+   "fieldname": "upload_html", 
+   "fieldtype": "HTML", 
+   "label": "Upload HTML", 
+   "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 1
-  },
+  }, 
   {
-   "depends_on": "reconciliation_json",
-   "fieldname": "sb2",
-   "fieldtype": "Section Break",
-   "label": "Reconciliation Data",
+   "depends_on": "reconciliation_json", 
+   "fieldname": "sb2", 
+   "fieldtype": "Section Break", 
+   "label": "Reconciliation Data", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "reconciliation_html",
-   "fieldtype": "HTML",
-   "hidden": 0,
-   "label": "Reconciliation HTML",
-   "permlevel": 0,
-   "print_hide": 0,
+   "fieldname": "reconciliation_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "label": "Reconciliation HTML", 
+   "permlevel": 0, 
+   "print_hide": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "reconciliation_json",
-   "fieldtype": "Long Text",
-   "hidden": 1,
-   "label": "Reconciliation JSON",
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 1,
+   "fieldname": "reconciliation_json", 
+   "fieldtype": "Long Text", 
+   "hidden": 1, 
+   "label": "Reconciliation JSON", 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 1
   }
- ],
- "icon": "icon-upload-alt",
- "idx": 1,
- "is_submittable": 1,
- "max_attachments": 1,
- "modified": "2014-10-08 12:47:52.102135",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Stock Reconciliation",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-upload-alt", 
+ "idx": 1, 
+ "is_submittable": 1, 
+ "max_attachments": 1, 
+ "modified": "2015-02-05 05:11:47.153367", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Stock Reconciliation", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "permlevel": 0,
-   "read": 1,
-   "report": 1,
-   "role": "Material Manager",
-   "submit": 1,
+   "amend": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Material Manager", 
+   "share": 1, 
+   "submit": 1, 
    "write": 1
   }
- ],
- "read_only_onload": 0,
- "search_fields": "posting_date",
- "sort_field": "modified",
+ ], 
+ "read_only_onload": 0, 
+ "search_fields": "posting_date", 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index c845433..ba61981 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -103,7 +103,7 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-01-01 14:30:06.164157", 
+ "modified": "2015-02-05 05:11:47.229371", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Settings", 
@@ -116,6 +116,7 @@
    "print": 1, 
    "read": 1, 
    "role": "Material Manager", 
+   "share": 1, 
    "write": 1
   }
  ]
diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
index 4a0a0ac..9782606 100644
--- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
+++ b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
@@ -1,5 +1,5 @@
 {
- "creation": "2013-01-10 16:34:30.000000", 
+ "creation": "2013-01-10 16:34:30", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "fields": [
@@ -43,7 +43,7 @@
  "idx": 1, 
  "in_create": 0, 
  "issingle": 1, 
- "modified": "2013-12-20 19:21:48.000000", 
+ "modified": "2015-02-05 05:11:47.290476", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock UOM Replace Utility", 
@@ -57,6 +57,7 @@
    "read": 1, 
    "report": 0, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -68,6 +69,7 @@
    "read": 1, 
    "report": 0, 
    "role": "Material Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 3503877..e9bb900 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -151,7 +151,7 @@
  ], 
  "icon": "icon-building", 
  "idx": 1, 
- "modified": "2015-01-05 15:58:43.046509", 
+ "modified": "2015-02-05 05:11:48.803063", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Warehouse", 
@@ -167,6 +167,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Material Master Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 2c81c4c..48a0587 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -54,7 +54,7 @@
 						"warehouse": self.name,
 						"freeze_account": "No"
 					})
-					ac_doc.ignore_permissions = True
+					ac_doc.flags.ignore_permissions = True
 					ac_doc.insert()
 					msgprint(_("Account head {0} created").format(ac_doc.name))
 
diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.js b/erpnext/stock/page/stock_analytics/stock_analytics.js
index 8fd2d32..346750b 100644
--- a/erpnext/stock/page/stock_analytics/stock_analytics.js
+++ b/erpnext/stock/page/stock_analytics/stock_analytics.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 
-frappe.pages['stock-analytics'].onload = function(wrapper) { 
+frappe.pages['stock-analytics'].on_page_load = function(wrapper) { 
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Stock Analytics'),
diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.js b/erpnext/stock/page/stock_ledger/stock_ledger.js
index d9e89b2..3f6a9e3 100644
--- a/erpnext/stock/page/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/page/stock_ledger/stock_ledger.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.pages['stock-ledger'].onload = function(wrapper) {
+frappe.pages['stock-ledger'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Stock Ledger'),
diff --git a/erpnext/stock/page/stock_level/stock_level.js b/erpnext/stock/page/stock_level/stock_level.js
index 21d4220..be4ebd0 100644
--- a/erpnext/stock/page/stock_level/stock_level.js
+++ b/erpnext/stock/page/stock_level/stock_level.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.pages['stock-level'].onload = function(wrapper) {
+frappe.pages['stock-level'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Stock Level'),
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 62cc397..a77a629 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -14,7 +14,7 @@
 _exceptions = frappe.local('stockledger_exceptions')
 # _exceptions = []
 
-def make_sl_entries(sl_entries, is_amended=None):
+def make_sl_entries(sl_entries, is_amended=None, allow_negative_stock=False):
 	if sl_entries:
 		from erpnext.stock.utils import update_bin
 
@@ -28,14 +28,14 @@
 				sle['actual_qty'] = -flt(sle['actual_qty'])
 
 			if sle.get("actual_qty") or sle.get("voucher_type")=="Stock Reconciliation":
-				sle_id = make_entry(sle)
+				sle_id = make_entry(sle, allow_negative_stock)
 
 			args = sle.copy()
 			args.update({
 				"sle_id": sle_id,
 				"is_amended": is_amended
 			})
-			update_bin(args)
+			update_bin(args, allow_negative_stock)
 
 		if cancel:
 			delete_cancelled_entry(sl_entries[0].get('voucher_type'), sl_entries[0].get('voucher_no'))
@@ -46,10 +46,11 @@
 		where voucher_no=%s and voucher_type=%s""",
 		(now(), frappe.session.user, voucher_type, voucher_no))
 
-def make_entry(args):
+def make_entry(args, allow_negative_stock=False):
 	args.update({"doctype": "Stock Ledger Entry"})
 	sle = frappe.get_doc(args)
-	sle.ignore_permissions = 1
+	sle.flags.ignore_permissions = 1
+	sle.allow_negative_stock=allow_negative_stock
 	sle.insert()
 	sle.submit()
 	return sle.name
@@ -58,7 +59,7 @@
 	frappe.db.sql("""delete from `tabStock Ledger Entry`
 		where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
 
-def update_entries_after(args, allow_zero_rate=False, verbose=1):
+def update_entries_after(args, allow_zero_rate=False, allow_negative_stock=False, verbose=1):
 	"""
 		update valution rate and qty after transaction
 		from the current time-bucket onwards
@@ -73,6 +74,9 @@
 	if not _exceptions:
 		frappe.local.stockledger_exceptions = []
 
+	if not allow_negative_stock:
+		allow_negative_stock = cint(frappe.db.get_default("allow_negative_stock"))
+
 	previous_sle = get_sle_before_datetime(args)
 
 	qty_after_transaction = flt(previous_sle.get("qty_after_transaction"))
@@ -149,7 +153,7 @@
 			"item_code": args["item_code"],
 			"warehouse": args["warehouse"],
 		})
-		bin_wrapper.ignore_permissions = 1
+		bin_wrapper.flags.ignore_permissions = 1
 		bin_wrapper.insert()
 
 	frappe.db.sql("""update `tabBin` set valuation_rate=%s, actual_qty=%s,
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index a7759c5..ceb0ebf 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -64,18 +64,18 @@
 			"item_code": item_code,
 			"warehouse": warehouse,
 		})
-		bin_obj.ignore_permissions = 1
+		bin_obj.flags.ignore_permissions = 1
 		bin_obj.insert()
 	else:
 		bin_obj = frappe.get_doc('Bin', bin)
-	bin_obj.ignore_permissions = True
+	bin_obj.flags.ignore_permissions = True
 	return bin_obj
 
-def update_bin(args):
+def update_bin(args, allow_negative_stock=False):
 	is_stock_item = frappe.db.get_value('Item', args.get("item_code"), 'is_stock_item')
 	if is_stock_item == 'Yes':
 		bin = get_bin(args.get("item_code"), args.get("warehouse"))
-		bin.update_stock(args)
+		bin.update_stock(args, allow_negative_stock)
 		return bin
 	else:
 		frappe.msgprint(_("Item {0} ignored since it is not a stock item").format(args.get("item_code")))
diff --git a/erpnext/support/doctype/customer_issue/customer_issue.json b/erpnext/support/doctype/customer_issue/customer_issue.json
index cc1a6e4..41c185e 100644
--- a/erpnext/support/doctype/customer_issue/customer_issue.json
+++ b/erpnext/support/doctype/customer_issue/customer_issue.json
@@ -396,7 +396,7 @@
  "icon": "icon-bug", 
  "idx": 1, 
  "is_submittable": 0, 
- "modified": "2015-01-05 16:21:50.525893", 
+ "modified": "2015-02-05 05:11:36.857779", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Customer Issue", 
@@ -413,6 +413,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Maintenance User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index c158b5e..eea90fd 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -217,7 +217,7 @@
  ], 
  "icon": "icon-ticket", 
  "idx": 1, 
- "modified": "2015-01-05 16:16:58.927957", 
+ "modified": "2015-02-05 05:11:39.362659", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
@@ -233,6 +233,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Guest", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -247,6 +248,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Customer", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -261,6 +263,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Support Team", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 2000ea0..e322c9c 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -15,6 +15,10 @@
 	def get_portal_page(self):
 		return "ticket"
 
+	def set_sender(self, sender):
+		"""Will be called by **Communication** when the Issue is created from an incoming email."""
+		self.raised_by = sender
+
 	def validate(self):
 		self.update_status()
 		self.set_lead_contact(self.raised_by)
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
index f5776a7..821a872 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
@@ -228,7 +228,7 @@
  "icon": "icon-calendar", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-01 14:30:02.768146", 
+ "modified": "2015-02-05 05:11:40.965832", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Schedule", 
@@ -245,6 +245,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Maintenance Manager", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
index 6934c29..25a785d 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
@@ -279,7 +279,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-01-08 14:02:17.403671", 
+ "modified": "2015-02-05 05:11:41.072187", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Visit", 
@@ -297,6 +297,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Maintenance User", 
+   "share": 1, 
    "submit": 1, 
    "write": 1
   }
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.py b/erpnext/support/doctype/maintenance_visit/maintenance_visit.py
index fb42548..6ad0a9d 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.py
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.py
@@ -29,6 +29,7 @@
 					mntc_date = self.mntc_date
 					service_person = d.service_person
 					work_done = d.work_done
+					status = "Open"
 					if self.completion_status == 'Fully Completed':
 						status = 'Closed'
 					elif self.completion_status == 'Partially Completed':
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index 835e681..4ca15a2 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.pages['support-analytics'].onload = function(wrapper) {
+frappe.pages['support-analytics'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Support Analytics'),
@@ -37,7 +37,7 @@
 
 	setup_columns: function() {
 		var std_columns = [
-			{id: "check", name: __("Plot"), field: "check", width: 30,
+			{id: "_check", name: __("Plot"), field: "_check", width: 30,
 				formatter: this.check_formatter},
 			{id: "status", name: __("Status"), field: "status", width: 100},
 		];
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index 939d880..e792da0 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -64,7 +64,7 @@
 				var delivered = doc.doctype==="Sales Order Item" ?
 						doc.delivered_qty : doc.received_qty,
 					completed =
-						100 - cint((doc.qty - delivered) * 100 / doc.qty),
+						100 - cint((flt(doc.qty) - flt(delivered)) * 100 / flt(doc.qty)),
 					title = __("Delivered");
 				%}
 				{% include "templates/form_grid/includes/progress.html" %}
@@ -96,7 +96,7 @@
 			{% if(in_list(["Sales Order Item", "Purchase Order Item"],
 				doc.doctype) && frm.doc.docstatus===1 && doc.amount) {
 				var completed =
-					100 - cint((doc.amount - doc.billed_amt) * 100 / doc.amount),
+					100 - cint((flt(doc.amount) - flt(doc.billed_amt)) * 100 / flt(doc.amount)),
 					title = __("Billed");
 				%}
 				<br><small>&nbsp;</small>
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index c52629f..8597864 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -17,7 +17,7 @@
 			{% endfor %}
 		</div>
 			{% if (items|length)==100 %}
-				<div class="alert alert-info info">Showing top 100 items.</div>
+				<div class="text-muted info">Showing top 100 items.</div>
 			{% endif %}
 		{% else %}
 			<div class="text-muted">No items listed.</div>
diff --git a/erpnext/templates/pages/address.py b/erpnext/templates/pages/address.py
index 46dde92..d031494 100644
--- a/erpnext/templates/pages/address.py
+++ b/erpnext/templates/pages/address.py
@@ -53,7 +53,7 @@
 		party_fieldname: party.name,
 		(party_fieldname + "_name"): party.get(party_fieldname + "_name")
 	})
-	doc.ignore_permissions = True
+	doc.flags.ignore_permissions = True
 	doc.save()
 
 	if address_fieldname:
diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html
deleted file mode 100644
index 1d09f73..0000000
--- a/erpnext/templates/print_formats/includes/item_grid.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{%- from "templates/print_formats/standard_macros.html" import print_value -%}
-{%- set std_fields = ("item_code", "item_name", "description", "qty", "rate", "amount", "stock_uom", "uom") -%}
-{%- set visible_columns = get_visible_columns(doc.get(df.fieldname), table_meta) -%}
-{%- set hide_rate = data[0].meta.is_print_hide("rate") if data|length else False-%}
-{%- set hide_amount = data[0].meta.is_print_hide("amount") if data|length else False-%}
-
-<table class="table table-bordered">
-	<tbody>
-		<tr>
-			<th style="width: 3%">{{ _("Sr") }}</th>
-			<th style="width: 57%">{{ _("Item") }}</th>
-			<th style="width: 10%;" class="text-right">{{ _("Qty") }}</th>
-			{% if not hide_rate -%}<th style="width: 15%;" class="text-right">{{ _("Rate") }}</th>{%- endif %}
-			{% if not hide_amount -%}<th style="width: 15%;" class="text-right">{{ _("Amount") }}</th>{%- endif %}
-		</tr>
-		{%- for row in data -%}
-		<tr>
-			<td>{{ row.idx }}</td>
-			<td>
-				{% if not row.meta.is_print_hide("item_code") -%}
-					<div class="primary">{{ row.item_code }}</div>
-				{%- endif %}
-				{% if (not row.meta.is_print_hide("item_name") and
-					(row.meta.is_print_hide("item_code") or row.item_code != row.item_name)) -%}
-					<div class="primary">{{ row.get_formatted("item_name") }}</div>
-				{%- endif %}
-				{% if (not row.meta.is_print_hide("description") and row.description and
-					((row.meta.is_print_hide("item_code") and row.meta.is_print_hide("item_name"))
-						or not (row.item_code == row.item_name == row.description))) -%}
-					<p>{{ row.get_formatted("description") }}</p>
-				{%- endif %}
-				{%- for field in visible_columns -%}
-					{%- if (field.fieldname not in std_fields) and
-							(row[field.fieldname] not in (None, "", 0)) -%}
-					<div><strong>{{ _(field.label) }}:</strong>
-						{{ row.get_formatted(field.fieldname, doc) }}</div>
-					{%- endif -%}
-				{%- endfor -%}
-			</td>
-			<td style="text-align: right;">{{ row.get_formatted("qty", doc) }}<br>
-				<small>{{ row.uom or row.stock_uom }}</small></td>
-			{% if not hide_rate -%}<td style="text-align: right;">{{ row.get_formatted("rate", doc) }}</td>{%- endif %}
-			{% if not hide_amount -%}<td style="text-align: right;">{{ row.get_formatted("amount", doc) }}</td>{%- endif %}
-		</tr>
-		{%- endfor -%}
-	</tbody>
-</table>
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
new file mode 100644
index 0000000..39fe75e
--- /dev/null
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -0,0 +1,19 @@
+{% if doc.in_format_data("image") and doc.get("image") -%}
+<div class="pull-left" style="max-width: 20%; margin-right: 10px;">
+    <img src="{{ doc.image }}" style="max-width: 100%">
+</div>
+{%- endif %}
+<div>
+    {% if doc.in_format_data("item_code") -%}
+    	<div class="primary">{{ doc.item_code }}</div>
+    {%- endif %}
+    {% if (doc.in_format_data("item_name") and
+    	(not doc.in_format_data("item_code") or doc.item_code != doc.item_name)) -%}
+    	<div class="primary">{{ doc.get_formatted("item_name") }}</div>
+    {%- endif %}
+    {% if (doc.in_format_data("description") and doc.description and
+    	((not doc.in_format_data("item_code") and not doc.in_format_data("item_name"))
+    		or not (doc.item_code == doc.item_name == doc.description))) -%}
+    <p>{{ doc.get_formatted("description") }}</p>
+    {%- endif %}
+</div>
diff --git a/erpnext/templates/print_formats/includes/item_table_qty.html b/erpnext/templates/print_formats/includes/item_table_qty.html
new file mode 100644
index 0000000..4ce3c33
--- /dev/null
+++ b/erpnext/templates/print_formats/includes/item_table_qty.html
@@ -0,0 +1,2 @@
+{{ doc.get_formatted("qty", doc) }}<br>
+<small>{{ doc.uom or doc.stock_uom }}</small>
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 24ea3ca..affdc4d 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -1477,20 +1477,20 @@
 Landed Cost updated successfully,تحديث تكلفة هبطت بنجاح
 Language,لغة
 Last Name,اسم العائلة
-Last Purchase Rate,مشاركة الشراء قيم
+Last Purchase Rate,أخر سعر توريد
 Latest,آخر
-Lead,قيادة
-Lead Details,تفاصيل اعلان
-Lead Id,رقم الرصاص
-Lead Name,يؤدي اسم
-Lead Owner,يؤدي المالك
-Lead Source,تؤدي المصدر
-Lead Status,تؤدي الحالة
-Lead Time Date,تؤدي تاريخ الوقت
-Lead Time Days,يؤدي يوما مرة
+Lead,مبادرة بيع
+Lead Details,تفاصيل مبادرة بيع
+Lead Id,معرف مبادرة البيع
+Lead Name,اسم مبادرة البيع
+Lead Owner,مسئول مبادرة البيع
+Lead Source,مصدر مبادرة البيع
+Lead Status,حالة مبادرة البيع
+Lead Time Date,تاريخ و وقت مبادرة البيع
+Lead Time Days,يوم ووقت مبادرة البيع
 Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,يؤدي الوقت هو أيام عدد الأيام التي من المتوقع هذا البند في المستودع الخاص بك. يتم إحضار هذه الأيام في طلب المواد عند اختيار هذا البند.
-Lead Type,يؤدي النوع
-Lead must be set if Opportunity is made from Lead,يجب تعيين الرصاص إذا تم الفرص من الرصاص
+Lead Type,نوع مبادرة البيع
+Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع 
 Leave Allocation,ترك توزيع
 Leave Allocation Tool,ترك أداة تخصيص
 Leave Application,ترك التطبيق
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index af96de7..a94fe0c 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1,41 +1,41 @@
- (Half Day),(Halber Tag)
- and year: ,und Jahr:
+ (Half Day),(Halber Tag) #ok
+ and year: ,und Jahr: #ok
 """ does not exists",""" Existiert nicht"
 %  Delivered,%  geliefert
-% Amount Billed,% Betrag in Rechnung gestellt
-% Billed,% in Rechnung gestellt
+% Amount Billed,% Betrag berechnet
+% Billed,% berechnet
 % Completed,% abgeschlossen
 % Delivered,Geliefert %
 % Installed,% installiert
-% Milestones Achieved,% Milestones Achieved
-% Milestones Completed,% Milestones Completed
+% Milestones Achieved,% Meilensteine erreicht
+% Milestones Completed,% Meilensteine fertiggestellt
 % Received,% erhalten
-% Tasks Completed,% Tasks Completed
-% of materials billed against this Purchase Order.,% der für diese Bestellung in Rechnung gestellten Materialien.
+% Tasks Completed,% Aufgaben fertiggestellt
+% of materials billed against this Purchase Order.,% der für diesen Lieferatenauftrag in Rechnung gestellten Materialien.
 % of materials billed against this Sales Order,% der für diesen Kundenauftrag in Rechnung gestellten Materialien
-% of materials delivered against this Delivery Note,% der für diesen Lieferschein gelieferten Materialien
+% of materials delivered against this Delivery Note,% der für diesen Lieferschein gelieferten Materialien
 % of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien
 % of materials ordered against this Material Request,% der für diese Materialanfrage bestellten Materialien
-% of materials received against this Purchase Order,% der für diese Bestellung erhaltenen Materialeien
-'Actual Start Date' can not be greater than 'Actual End Date',"' Ist- Startdatum ""nicht größer als "" Actual End Date "" sein"
-'Based On' and 'Group By' can not be same,""" Based On "" und "" Group By "" nicht gleich sein"
-'Days Since Last Order' must be greater than or equal to zero,""" Tage seit dem letzten Auftrag "" muss größer als oder gleich Null sein"
+% of materials received against this Purchase Order,% der für diesen Lieferatenauftrag erhaltenen Materialien
+'Actual Start Date' can not be greater than 'Actual End Date',"das ""Startdatum"" kann nicht nach dem  ""Endedatum"" liegen"
+'Based On' and 'Group By' can not be same,"""basiert auf"" und ""guppiert durch"" können nicht gleich sein"
+'Days Since Last Order' must be greater than or equal to zero,"""Tage seit dem letzten Auftrag"" muss größer oder gleich Null sein"
 'Entries' cannot be empty,' Einträge ' darf nicht leer sein
-'Expected Start Date' can not be greater than 'Expected End Date',""" Erwartete Startdatum "" nicht größer als "" voraussichtlich Ende Datum "" sein"
-'From Date' is required,""" Von-Datum "" ist erforderlich,"
-'From Date' must be after 'To Date',"""Von Datum "" muss nach 'To Date "" sein"
-'Has Serial No' can not be 'Yes' for non-stock item,""" Hat Seriennummer "" kann nicht sein ""Ja"" für Nicht- Lagerware"
-'Notification Email Addresses' not specified for recurring %s,'Notification Email Addresses' not specified for recurring %s
-'Profit and Loss' type account {0} not allowed in Opening Entry,""" Gewinn und Verlust "" Typ Account {0} nicht in Öffnungs Eintrag erlaubt"
+'Expected Start Date' can not be greater than 'Expected End Date',"""erwartetes Startdatum"" nicht nach dem  ""voraussichtlichen Endedatum"" liegen"
+'From Date' is required,"""Von-Datum"" ist erforderlich,"
+'From Date' must be after 'To Date',"""von Datum"" muss nach 'bis Datum"" liegen"
+'Has Serial No' can not be 'Yes' for non-stock item,"""hat Seriennummer"" kann nicht ""Ja"" sein bei Nicht-Lagerartikeln"
+'Notification Email Addresses' not specified for recurring %s,'Benachrichtigungs-E-Mail-Adresse nicht angegeben für wiederkehrendes Ereignis %s'
+'Profit and Loss' type account {0} not allowed in Opening Entry,"""Gewinn und Verlust"" Konto {0} kann nicht im Eröffnungseintrag sein"
 'To Case No.' cannot be less than 'From Case No.','Bis Fall Nr.' kann nicht kleiner als 'Von Fall Nr.' sein
-'To Date' is required,"'To Date "" ist erforderlich,"
-'Update Stock' for Sales Invoice {0} must be set,'Update Auf ' für Sales Invoice {0} muss eingestellt werden
+'To Date' is required,"""bis Datum"" ist erforderlich,"
+'Update Stock' for Sales Invoice {0} must be set,'Lager aktualisieren' muss für Ausgangsrechnung {0} eingestellt werden
 * Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
 "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**","**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**"
 **Currency** Master,**Währung** Stamm
 **Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Geschäftsjahr** steht für ein Geschäftsjahr. Alle Buchungen und anderen großen Transaktionen werden mit dem **Geschäftsjahr** verglichen.
-1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent
-1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Um den kundenspezifischen Artikelcode zu erhalten und ihn auffindbar zu machen, verwenden Sie diese Option"
+1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,1 Währungseinheit = [?] Teileinheit. Z.b. 1 USD = 100 Cent
+1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Um die kundenspezifische Artikel-Nr zu erhalten und sie auffindbar zu machen, verwenden Sie diese Option"
 "<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Hinzufügen / Bearbeiten </ a>"
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Hinzufügen / Bearbeiten </ a>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Hinzufügen / Bearbeiten </ a>"
@@ -49,7 +49,7 @@
 A condition for a Shipping Rule,Vorraussetzung für eine Lieferbedinung
 A logical Warehouse against which stock entries are made.,Eine logisches Warenlager für das Bestandseinträge gemacht werden.
 A symbol for this currency. For e.g. $,"Ein Symbol für diese Währung, z.B. €"
-A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Partner, der die Produkte der Firma auf eigene Rechnung vertreibt"
+A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Ein Partner der die Produkte auf Provisionsbasis verkauft.
 "A user with ""Expense Approver"" role",Ein Benutzer mit der Berechtigung Ausgaben zu genehmigen
 AMC Expiry Date,AMC Verfalldatum
 Abbr,Abk.
@@ -57,7 +57,7 @@
 Above Value,Über Wert
 Absent,Abwesend
 Acceptance Criteria,Akzeptanzkriterium
-Accepted,akzeptiert
+Accepted,Genehmigt
 Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
 Accepted Quantity,Akzeptierte Menge
 Accepted Warehouse,Akzeptiertes Lager
@@ -94,7 +94,7 @@
 Account: {0} can only be updated via \					Stock Transactions,Konto {0} kann nur über Lagerbewegungen aktualisiert werden
 Accountant,Buchhalter
 Accounting,Buchhaltung
-"Accounting Entries can be made against leaf nodes, called","Buchhaltungseinträge können gegen Unterelemente gemacht werden , die so genannte"
+"Accounting Entries can be made against leaf nodes, called","Buchhaltungseinträge können gegen Unterelemente gemacht werden, die so genannte"
 Accounting Entry for Stock,Buchhaltungseintrag für Lager
 "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bis zu diesem Zeitpunkt gesperrter Buchhaltungseintrag, niemand außer der unten genannten Rolle kann den Eintrag bearbeiten/ändern."
 Accounting journal entries.,Buchhaltungsjournaleinträge
@@ -120,10 +120,10 @@
 Actual Invoice Date,Tatsächliches Rechnungsdatum
 Actual Posting Date,Tatsächliches Buchungsdatum
 Actual Qty,Tatsächliche Anzahl
-Actual Qty (at source/target),Tatsächliche Anzahl (an Ursprung/Ziel)
+Actual Qty (at source/target),Tatsächliche Anzahl (am Ursprung/Ziel)
 Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktion
 Actual Qty: Quantity available in the warehouse.,Tatsächliche Menge: Menge verfügbar im Lager.
-Actual Quantity,Istmenge
+Actual Quantity,Bestand
 Actual Start Date,Tatsächliches Startdatum
 Add,Hinzufügen
 Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
@@ -131,7 +131,7 @@
 Add Serial No,Seriennummer hinzufügen
 Add Taxes,Steuern hinzufügen
 Add or Deduct,Hinzuaddieren oder abziehen
-Add rows to set annual budgets on Accounts.,Zeilen hinzufügen Jahresbudgets in Konten festzulegen.
+Add rows to set annual budgets on Accounts.,Zeilen hinzufügen um Jahresbudgets in Konten festzulegen.
 Add to Cart,In den Warenkorb
 Add to calendar on this date,An diesem Tag zum Kalender hinzufügen
 Add/Remove Recipients,Empfänger hinzufügen/entfernen
@@ -151,7 +151,7 @@
 Administrative Expenses,Verwaltungskosten
 Administrative Officer,Administrative Officer
 Administrator,Administrator
-Advance Amount,Vorschussbetrag
+Advance Amount,Vorausbetrag
 Advance amount,Vorausbetrag
 Advances,Vorschüsse
 Advertisement,Anzeige
@@ -166,24 +166,24 @@
 Against Document No,Gegen Dokument Nr.
 Against Expense Account,Gegen Aufwandskonto
 Against Income Account,Gegen Einkommenskonto
-Against Journal Entry,Gegen Journalgutschein
-Against Journal Entry {0} does not have any unmatched {1} entry,Vor Blatt Gutschein {0} keine unerreichte {1} Eintrag haben
-Against Purchase Invoice,Gegen Einkaufsrechnung
-Against Sales Invoice,Gegen Verkaufsrechnung
-Against Sales Order,Vor Sales Order
-Against Supplier Invoice {0} dated {1},Against Supplier Invoice {0} dated {1}
+Against Journal Voucher,Gegen Buchungsbeleg
+Against Journal Voucher {0} does not have any unmatched {1} entry,zu Buchungsbeleg {0} gibt es keine nicht zugeordneten {1} Einträge
+Against Purchase Invoice,Gegen Eingangsrechnung
+Against Sales Invoice,Gegen Ausgangsrechnung
+Against Sales Order,Gegen Kundenauftrag
+Against Supplier Invoice {0} dated {1},Gegen Eingangsrechnung {0} vom {1}
 Against Voucher,Gegen Gutschein
 Against Voucher Type,Gegen Gutscheintyp
-Ageing Based On,"Altern, basiert auf"
-Ageing Date is mandatory for opening entry,Alternde Datum ist obligatorisch für die Öffnung der Eintrag
+Ageing Based On,Altern basiert auf
+Ageing Date is mandatory for opening entry,Alterungsdatum ist notwendig bei Starteinträgen
 Ageing date is mandatory for opening entry,Alternde Datum ist obligatorisch für die Öffnung der Eintrag
-Agent,Agent
-"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials"
+Agent,Beauftragter
+"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Zusammenfassen von einer Gruppe von **Artikeln** zu einem **Artikel**. Dies macht Sinn, wenn Sie bestimmte **Artikel** im Paket zusammenstellen und Sie diese Pakete am Lager vorhalten und nicht die **Einzelartikel**. Der Paket-**Artikel** wird bei ""Ist Lagerartikel"" ""Nein"" haben und bei ""ist Verkaufsartikel"" ein ""Ja"" haben. Wenn Sie Laptops und Laptoptaschen separat verkaufen und einen Sonderpreis für Kunden haben, die beides kaufen, dann wird aus Laptop + Laptoptasche eine Verkaufsstückliste."
 Aging Date,Fälligkeitsdatum
 Aging Date is mandatory for opening entry,Aging Datum ist obligatorisch für die Öffnung der Eintrag
 Agriculture,Landwirtschaft
 Airline,Fluggesellschaft
-All,All
+All,Alle
 All Addresses.,Alle Adressen
 All Contact,Alle Kontakte
 All Contacts.,Alle Kontakte
@@ -192,7 +192,7 @@
 All Day,Ganzer Tag
 All Employee (Active),Alle Mitarbeiter (Aktiv)
 All Item Groups,Alle Artikelgruppen
-All Lead (Open),Alle Leads (offen)
+All Lead (Open),Alle Interessenten (offen)
 All Products or Services.,Alle Produkte oder Dienstleistungen.
 All Sales Partner Contact,Alle Vertriebspartnerkontakte
 All Sales Person,Alle Vertriebsmitarbeiter
@@ -200,12 +200,12 @@
 All Supplier Contact,Alle Lieferantenkontakte
 All Supplier Types,Alle Lieferant Typen
 All Territories,Alle Staaten
-"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle Export verwandten Bereichen wie Währung , Conversion-Rate , Export insgesamt , Export Gesamtsumme etc sind in Lieferschein , POS, Angebot, Verkaufsrechnung , Auftrags usw."
-"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle Import verwandten Bereichen wie Währung , Conversion-Rate , Import insgesamt , Import Gesamtsumme etc sind in Kaufbeleg , Lieferant Angebot, Einkaufsrechnung , Bestellung usw."
+"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle Export verwandten Bereiche wie Währung, Wechselkurse, Summenexport, Gesamtsummenexport usw. sind in Lieferschein, POS, Angebot, Ausgangsrechnung, Kundenauftrag usw. verfügbar"
+"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle Import verwandten Bereiche wie Währung, Wechselkurs, Summenimport, Gesamtsummenimport etc sind in Eingangslieferschein, Lieferant Angebot, Eingangsrechnung, Lieferatenauftrag usw. verfügbar"
 All items have already been invoiced,Alle Einzelteile sind bereits abgerechnet
 All these items have already been invoiced,Alle diese Elemente sind bereits in Rechnung gestellt
 Allocate,Zuordnung
-Allocate leaves for a period.,Ordnen Blätter für einen Zeitraum .
+Allocate leaves for a period.,Jahresurlaube für einen Zeitraum.
 Allocate leaves for the year.,Jahresurlaube zuordnen.
 Allocated Amount,Zugewiesener Betrag
 Allocated Budget,Zugewiesenes Budget
@@ -213,7 +213,7 @@
 Allocated amount can not be negative,Geschätzter Betrag kann nicht negativ sein
 Allocated amount can not greater than unadusted amount,Geschätzter Betrag kann nicht größer als unadusted Menge
 Allow Bill of Materials,Stückliste zulassen
-Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,"Lassen Bill of Materials sollte ""Ja"" . Da eine oder mehrere zu diesem Artikel vorhanden aktiv Stücklisten"
+Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,"Stückliste erlauben sollte ""Ja"" sein, da eine oder mehrere zu diesem Artikel vorhandene Stücklisten aktiv sind"
 Allow Children,Lassen Sie Kinder
 Allow Dropbox Access,Dropbox-Zugang zulassen
 Allow Google Drive Access,Google Drive-Zugang zulassen
@@ -227,21 +227,21 @@
 Allowance Percent,Zulassen Prozent
 Allowance for over-{0} crossed for Item {1},Wertberichtigungen für Über {0} drücken für Artikel {1}
 Allowance for over-{0} crossed for Item {1}.,Wertberichtigungen für Über {0} drücken für Artikel {1}.
-Allowed Role to Edit Entries Before Frozen Date,"Erlaubt Rolle , um Einträge bearbeiten Bevor Gefrorene Datum"
+Allowed Role to Edit Entries Before Frozen Date,"Erlaubt der Rolle, Einträge vor dem Sperrdatum zu bearbeiten"
 Amended From,Geändert am
 Amount,Betrag
 Amount (Company Currency),Betrag (Unternehmenswährung)
 Amount Paid,Zahlbetrag
 Amount to Bill,Rechnungsbetrag
-Amounts not reflected in bank,Amounts not reflected in bank
-Amounts not reflected in system,Amounts not reflected in system
+Amounts not reflected in bank,bei der Bank nicht berücksichtigte Beträge
+Amounts not reflected in system,im System nicht berücksichtigte Beträge
 An Customer exists with same name,Ein Kunde mit dem gleichen Namen existiert
 "An Item Group exists with same name, please change the item name or rename the item group","Mit dem gleichen Namen eine Artikelgruppe existiert, ändern Sie bitte die Artikel -Namen oder die Artikelgruppe umbenennen"
 "An item exists with same name ({0}), please change the item group name or rename the item","Ein Element mit dem gleichen Namen existiert ({0} ), ändern Sie bitte das Einzelgruppennamen oder den Artikel umzubenennen"
 Analyst,Analytiker
 Annual,jährlich
 Another Period Closing Entry {0} has been made after {1},Eine weitere Periode Schluss Eintrag {0} wurde nach gemacht worden {1}
-Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.
+Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Eine andere Gehaltsstruktur {0} ist für diesen Mitarbeiter {1} aktiv. Setzen Sie dessen Status auf inaktiv um fortzufahren.
 "Any other comments, noteworthy effort that should go in the records.",Alle weiteren Kommentare sind bemerkenswert und sollten aufgezeichnet werden.
 Apparel & Accessories,Kleidung & Accessoires
 Applicability,Anwendbarkeit
@@ -270,7 +270,7 @@
 Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter erstellt {1} in der angegebenen Datumsbereich
 Apprentice,Lehrling
 Approval Status,Genehmigungsstatus
-Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""Genehmigt"" oder "" Abgelehnt """
+Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""genehmigt"" oder ""abgelehnt"" sein"
 Approved,Genehmigt
 Approver,Genehmigender
 Approving Role,Genehmigende Rolle
@@ -280,24 +280,24 @@
 Are you sure you want to STOP ,Sind Sie sicher das Sie dies anhalten möchten?
 Are you sure you want to UNSTOP ,Sind Sie sicher das Sie dies freigeben möchten?
 Arrear Amount,Ausstehender Betrag
-"As Production Order can be made for this item, it must be a stock item.","Als Fertigungsauftrag kann für diesen Artikel gemacht werden , es muss ein Lager Titel ."
-As per Stock UOM,Wie pro Bestand ME
-"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Da gibt es bestehende Aktientransaktionen zu diesem Artikel , können Sie die Werte von "" Hat Serien Nein ' nicht ändern , Ist Auf Artikel "" und "" Bewertungsmethode """
+"As Production Order can be made for this item, it must be a stock item.","Da für diesen Artikel Fertigungsaufträge erlaubt sind, es muss dieser ein Lagerartikel sein."
+As per Stock UOM,Wie pro Lager-ME
+"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Da es bestehende Lagertransaktionen zu diesem Artikel gibt, können Sie die Werte von 'hat Seriennummer', 'ist Lagerartikel'  und 'Bewertungsmethode' nicht ändern"
 Asset,Vermögenswert
 Assistant,Assistent
 Associate,Mitarbeiterin
-Atleast one of the Selling or Buying must be selected,Mindestens eines der Verkauf oder Kauf ausgewählt werden muss
+Atleast one of the Selling or Buying must be selected,Mindestens eines aus Vertrieb oder Einkauf muss ausgewählt werden
 Atleast one warehouse is mandatory,Mindestens ein Warenlager ist obligatorisch
 Attach Image,Bild anhängen
-Attach Letterhead,Briefkopf  anhängen
+Attach Letterhead,Briefkopf anhängen
 Attach Logo,Logo anhängen
-Attach Your Picture,Ihr Bild anhängen
+Attach Your Picture,fügen Sie Ihr Bild hinzu
 Attendance,Teilnahme
 Attendance Date,Teilnahmedatum
 Attendance Details,Teilnahmedetails
 Attendance From Date,Teilnahmedatum von
-Attendance From Date and Attendance To Date is mandatory,"""Teilnahmedatum von"" und ""Teilnahmedatum bis""  ist obligatorisch"
-Attendance To Date,Teilnahmedatum bis
+Attendance From Date and Attendance To Date is mandatory,Die Teilnahme von Datum bis Datum und Teilnahme ist obligatorisch
+Attendance To Date,Teilnahme bis Datum
 Attendance can not be marked for future dates,Die Teilnahme kann nicht für zukünftige Termine markiert werden
 Attendance for employee {0} is already marked,Die Teilnahme für Mitarbeiter {0} bereits markiert ist
 Attendance record.,Anwesenheitsnachweis
@@ -309,12 +309,12 @@
 Auto-raise Material Request if quantity goes below re-order level in a warehouse,"Automatische Erstellung einer Materialanforderung, wenn die Menge in einem Warenlager unter der Grenze für Neubestellungen liegt"
 Automatically compose message on submission of transactions.,Automatisch komponieren Nachricht auf Vorlage von Transaktionen.
 Automatically updated via Stock Entry of type Manufacture/Repack,Automatisch über Lagerbuchung vom Typ Herstellung/Umpacken aktualisiert
-Automotive,Automobile
+Automotive,Automotive
 Autoreply when a new mail is received,"Autoreply, wenn eine neue E-Mail eingegangen ist"
 Available,verfügbar
-Available Qty at Warehouse,Verfügbare Menge auf Lager
+Available Qty at Warehouse,Verfügbarer Lagerbestand
 Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
-"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Erhältlich in Stückliste, Lieferschein, Rechnung, Fertigungsauftrag, Bestellung, Kaufbeleg, Verkaufsrechnung, Auftrag, Lagerbeleg, Zeiterfassung"
+"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Lieferatenauftrag, Eingangslieferschein, Ausgangsrechnung, Kundenauftrag, Lagerbeleg, Zeiterfassung"
 Average Age,Durchschnittsalter
 Average Commission Rate,Durchschnittliche Kommission bewerten
 Average Discount,Durchschnittlicher Rabatt
@@ -328,13 +328,13 @@
 BOM Operation,Stücklistenvorgang
 BOM Operations,Stücklistenvorgänge
 BOM Replace Tool,Stücklisten-Ersetzungstool
-BOM number is required for manufactured Item {0} in row {1},Stücklistennummer wird für hergestellte Artikel erforderlich {0} in Zeile {1}
-BOM number not allowed for non-manufactured Item {0} in row {1},Stücklistennummer für Nicht- gefertigte Artikel darf {0} in Zeile {1}
-BOM recursion: {0} cannot be parent or child of {2},BOM Rekursion : {0} kann nicht Elternteil oder Kind von {2}
+BOM number is required for manufactured Item {0} in row {1},Stücklistennummer ist für hergestellten Artikel {0} erforderlich in Zeile {1}
+BOM number not allowed for non-manufactured Item {0} in row {1},Stücklistennummer für nicht hergestellten Artikel {0} in Zeile {1} ist nicht zulässig
+BOM recursion: {0} cannot be parent or child of {2},BOM Rekursion : {0} kann nicht Elternteil oder Kind von {2} sein
 BOM replaced,Stückliste ersetzt
-BOM {0} for Item {1} in row {2} is inactive or not submitted,Stückliste {0} für Artikel {1} in Zeile {2} ist inaktiv oder nicht vorgelegt
+BOM {0} for Item {1} in row {2} is inactive or not submitted,Stückliste {0} für Artikel {1} in Zeile {2} ist inaktiv oder nicht eingereicht
 BOM {0} is not active or not submitted,Stückliste {0} ist nicht aktiv oder nicht eingereicht
-BOM {0} is not submitted or inactive BOM for Item {1},Stückliste {0} nicht vorgelegt oder inaktiv Stückliste für Artikel {1}
+BOM {0} is not submitted or inactive BOM for Item {1},Stückliste {0} ist nicht eine eingereichte oder inaktive Stückliste für Artikel {1}
 Backup Manager,Datensicherungsverwaltung
 Backup Right Now,Jetzt eine Datensicherung durchführen
 Backups will be uploaded to,Datensicherungen werden hochgeladen nach
@@ -357,7 +357,7 @@
 Bank Reconciliation,Kontenabstimmung
 Bank Reconciliation Detail,Kontenabstimmungsdetail
 Bank Reconciliation Statement,Kontenabstimmungsauszug
-Bank Entry,Bankbeleg
+Bank Voucher,Bankbeleg
 Bank/Cash Balance,Bank-/Bargeldsaldo
 Banking,Bankwesen
 Barcode,Barcode
@@ -389,7 +389,7 @@
 Billed Amount,Rechnungsbetrag
 Billed Amt,Rechnungsbetrag
 Billing,Abrechnung
-Billing (Sales Invoice),Abrechnung (Handelsrechnung)
+Billing (Sales Invoice),Verkauf (Ausgangsrechnung)
 Billing Address,Rechnungsadresse
 Billing Address Name,Name der Rechnungsadresse
 Billing Status,Abrechnungsstatus
@@ -406,13 +406,13 @@
 Blog Post,Blog-Post
 Blog Subscriber,Blog-Abonnent
 Blood Group,Blutgruppe
-Both Warehouse must belong to same Company,Beide Lager müssen der selben Gesellschaft gehören
+Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Gesellschaft gehören
 Box,Kiste
 Branch,Filiale
-Brand,Firmenmarke
+Brand,Marke
 Brand Name,Markenname
-Brand master.,Firmenmarke Vorlage
-Brands,Firmenmarken
+Brand master.,Marke Vorlage
+Brands,Marken
 Breakdown,Übersicht
 Broadcasting,Rundfunk
 Brokerage,Provision
@@ -430,7 +430,7 @@
 Business Development Manager,Business Development Manager
 Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
 Buying,Einkauf
-Buying & Selling,Einkaufen und Verkaufen
+Buying & Selling,Einkauf und Vertrieb
 Buying Amount,Kaufbetrag
 Buying Settings,Einkaufs Einstellungen
 "Buying must be checked, if Applicable For is selected as {0}","Kaufen Sie muss überprüft werden, wenn Anwendbar ist als ausgewählt {0}"
@@ -454,37 +454,37 @@
 Campaign Name,Kampagnenname
 Campaign Name is required,Kampagnenname ist erforderlich
 Campaign Naming By,Kampagne benannt durch
-Campaign-.####,Kampagnen . # # # #
+Campaign-.####,Kampagne-.####
 Can be approved by {0},Kann von {0} genehmigt werden
 "Can not filter based on Account, if grouped by Account","Basierend auf Konto kann nicht filtern, wenn sie von Konto gruppiert"
 "Can not filter based on Voucher No, if grouped by Voucher","Basierend auf Gutschein kann nicht auswählen, Nein, wenn durch Gutschein gruppiert"
-Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann Zeile beziehen sich nur , wenn die Ladung ist ' On Zurück Reihe Betrag ""oder"" Zurück Reihe Total'"
+Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf diese Zeile beziehen, wenn die Berechnungsart 'bei vorherigem Zeilenbetrag' oder 'bei nachfolgendem Zeilenbetrag' ist"
 Cancel Material Visit {0} before cancelling this Customer Issue,Abbrechen Werkstoff Besuchen Sie {0} vor Streichung dieses Kunden Ausgabe
 Cancel Material Visits {0} before cancelling this Maintenance Visit,Abbrechen Werkstoff Besuche {0} vor Streichung dieses Wartungsbesuch
 Cancelled,Abgebrochen
-Cancelling this Stock Reconciliation will nullify its effect.,Annullierung dieses Lizenz Versöhnung wird ihre Wirkung zunichte machen .
+Cancelling this Stock Reconciliation will nullify its effect.,Abbruch der Lagerbewertung wird den Effekt zu nichte machen.
 Cannot Cancel Opportunity as Quotation Exists,Kann nicht Abbrechen Gelegenheit als Zitat vorhanden ist
-Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kann nicht genehmigen Urlaub , wie Sie sind nicht berechtigt, auf Block- Blätter Termine genehmigen"
+Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Diese Abwesenheit kann nicht genehmigt werden, da Sie nicht über die Berechtigung zur Genehmigung von Block-Abwesenheiten verfügen."
 Cannot cancel because Employee {0} is already approved for {1},"Kann nicht kündigen, weil Mitarbeiter {0} ist bereits genehmigt {1}"
 Cannot cancel because submitted Stock Entry {0} exists,"Kann nicht kündigen, weil eingereichten Lizenz Eintrag {0} existiert"
 Cannot carry forward {0},Kann nicht mitnehmen {0}
 Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Geschäftsjahr Startdatum und Geschäftsjahresende Datum, wenn die Geschäftsjahr wird gespeichert nicht ändern kann."
-"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kann nicht ändern Standardwährung des Unternehmens , weil es bestehende Transaktionen. Transaktionen müssen aufgehoben werden, um die Standardwährung zu ändern."
-Cannot convert Cost Center to ledger as it has child nodes,"Kann nicht konvertieren Kostenstelle zu Buch , wie es untergeordnete Knoten hat"
-Cannot covert to Group because Master Type or Account Type is selected.,"Kann nicht auf verdeckte Gruppe , weil Herr Art oder Kontotyp gewählt wird."
-Cannot deactive or cancle BOM as it is linked with other BOMs,"Kann nicht deaktiv oder cancle Stückliste , wie es mit anderen Stücklisten verknüpft"
-"Cannot declare as lost, because Quotation has been made.","Kann nicht erklären, wie verloren, da Zitat gemacht worden ."
-Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Kann nicht abziehen , wenn Kategorie ist für ""Bewertungstag "" oder "" Bewertung und Total '"
-"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","Kann nicht Seriennummer {0} in Lager löschen . Erstens ab Lager entfernen, dann löschen."
-"Cannot directly set amount. For 'Actual' charge type, use the rate field","Kann nicht direkt Betrag gesetzt . Für ""tatsächlichen"" Ladungstyp , verwenden Sie das Kursfeld"
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kann nicht die Standardwährung der Firma ändern, weil es bestehende Transaktionen gibt. Transaktionen müssen abgebrochen werden, um die Standardwährung zu ändern."
+Cannot convert Cost Center to ledger as it has child nodes,"Kann Kostenstelle nicht zu Kontenbuch konvertieren, da es untergeordnete Knoten hat"
+Cannot covert to Group because Master Type or Account Type is selected.,"Kann nicht zu Gruppe konvertiert werden, weil Hauptart oder Kontenart ausgewählt ist."
+Cannot deactive or cancle BOM as it is linked with other BOMs,"Kann Stückliste nicht deaktivieren oder abbrechen, da sie mit anderen Stücklisten verknüpft ist"
+"Cannot declare as lost, because Quotation has been made.","Kann nicht als Verloren deklariert werden, da dies bereits angeboten wurde."
+Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Bewertung"" oder ""Bewertung und Summe"" ist"
+"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","Kann Seriennummer {0} in Lager nicht löschen. Zuerst aus dem Lager entfernen, dann löschen."
+"Cannot directly set amount. For 'Actual' charge type, use the rate field","Kann Betrag nicht direkt setzen. Für ""tatsächliche"" Berechnungsart, verwenden Sie das Preisfeld"
 "Cannot overbill for Item {0} in row {0} more than {1}. To allow overbilling, please set in Stock Settings",Kann nicht für Artikel {0} in Zeile overbill {0} mehr als {1}. Um Überfakturierung erlauben Sie bitte Lizenzeinstellungen festgelegt
-Cannot produce more Item {0} than Sales Order quantity {1},Mehr Artikel kann nicht produzieren {0} als Sales Order Menge {1}
+Cannot produce more Item {0} than Sales Order quantity {1},"Kann nicht mehr Artikel {0} produzieren, als Kundenaufträge {1} dafür vorliegen"
 Cannot refer row number greater than or equal to current row number for this Charge type,Kann nicht Zeilennummer größer oder gleich aktuelle Zeilennummer für diesen Ladetypbeziehen
 Cannot return more than {0} for Item {1},Kann nicht mehr als {0} zurück zur Artikel {1}
 Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Kann nicht verantwortlich Typ wie 'On Zurück Reihe Betrag ""oder"" Auf Vorherige Row Total' für die erste Zeile auswählen"
 Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total,"Kann nicht verantwortlich Typ wie 'On Zurück Reihe Betrag ""oder"" Auf Vorherige Row Total' für die Bewertung zu wählen. Sie können nur die Option ""Total"" für die vorherige Zeile Betrag oder vorherigen Zeile Gesamt wählen"
-Cannot set as Lost as Sales Order is made.,Kann nicht als Passwort gesetzt als Sales Order erfolgt.
-Cannot set authorization on basis of Discount for {0},Kann Genehmigung nicht festgelegt auf der Basis der Rabatt für {0}
+Cannot set as Lost as Sales Order is made.,"Kann nicht als Verlust gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
+Cannot set authorization on basis of Discount for {0},Kann Genehmigung nicht auf der Basis des Rabattes für {0} festlegen
 Capacity,Kapazität
 Capacity Units,Kapazitätseinheiten
 Capital Account,Kapitalkonto
@@ -495,27 +495,27 @@
 Case No. cannot be 0,Fall Nr. kann nicht 0 sein
 Cash,Bargeld
 Cash In Hand,Bargeld in der Hand
-Cash Entry,Kassenbeleg
+Cash Voucher,Kassenbeleg
 Cash or Bank Account is mandatory for making payment entry,Barzahlung oder Bankkonto ist für die Zahlung Eintrag
 Cash/Bank Account,Kassen-/Bankkonto
 Casual Leave,Lässige Leave
 Cell Number,Mobiltelefonnummer
-Change Abbreviation,Change Abbreviation
+Change Abbreviation,Abkürzung ändern
 Change UOM for an Item.,ME für einen Artikel ändern.
 Change the starting / current sequence number of an existing series.,Startnummer/aktuelle laufende Nummer einer bestehenden Serie ändern.
 Channel Partner,Vertriebspartner
 Charge of type 'Actual' in row {0} cannot be included in Item Rate,Verantwortlicher für Typ ' Actual ' in Zeile {0} kann nicht in Artikel bewerten aufgenommen werden
 Chargeable,Gebührenpflichtig
-Charges are updated in Purchase Receipt against each item,Charges are updated in Purchase Receipt against each item
-Charges will be distributed proportionately based on item amount,Charges will be distributed proportionately based on item amount
+Charges are updated in Purchase Receipt against each item,die Gebühren im Eingangslieferschein wurden für jeden Artikel aktualisiert
+Charges will be distributed proportionately based on item amount,Die Gebühren werden anteilig auf die Artikel umgelegt
 Charity and Donations,Charity und Spenden
 Chart Name,Diagrammname
 Chart of Accounts,Kontenplan
 Chart of Cost Centers,Tabelle der Kostenstellen
 Check how the newsletter looks in an email by sending it to your email.,"Prüfen Sie, wie der Newsletter in einer E-Mail aussieht, indem Sie ihn an Ihre E-Mail senden."
 "Check if recurring invoice, uncheck to stop recurring or put proper End Date","Aktivieren, wenn dies eine wiederkehrende Rechnung ist, deaktivieren, damit es keine wiederkehrende Rechnung mehr ist oder ein gültiges Enddatum angeben."
-"Check if recurring order, uncheck to stop recurring or put proper End Date","Check if recurring order, uncheck to stop recurring or put proper End Date"
-"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Rechnungen benötigen. Nach dem Absenden einer Verkaufsrechnung, wird der Bereich für wiederkehrende Rechnungen angezeigt."
+"Check if recurring order, uncheck to stop recurring or put proper End Date",Aktivieren wenn es sich um eine wiederkehrende Bestellung handelt. Deaktivieren um die Wiederholungen anzuhalten oder geben Sie ein entsprechendes Ende-Datum an
+"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Absenden einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
 Check if you want to send salary slip in mail to each employee while submitting salary slip,"Aktivieren, wenn Sie die Gehaltsabrechnung per Post an jeden Mitarbeiter senden möchten."
 Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Aktivieren, wenn Sie den Benutzer zwingen möchten, vor dem Speichern eine Serie auszuwählen. Wenn Sie dies aktivieren, gibt es keine Standardeinstellung."
 Check this if you want to show in website,"Aktivieren, wenn Sie den Inhalt auf der Website anzeigen möchten."
@@ -528,7 +528,7 @@
 Cheque,Scheck
 Cheque Date,Scheckdatum
 Cheque Number,Schecknummer
-Child account exists for this account. You can not delete this account.,Kinder Konto existiert für dieses Konto. Sie können dieses Konto nicht löschen .
+Child account exists for this account. You can not delete this account.,ein Unterkonto existiert für dieses Konto. Sie können dieses Konto nicht löschen.
 City,Stadt
 City/Town,Stadt/Ort
 Claim Amount,Betrag einfordern
@@ -540,10 +540,10 @@
 Clearance Date,Löschdatum
 Clearance Date not mentioned,Räumungsdatumnicht genannt
 Clearance date cannot be before check date in row {0},Räumungsdatum kann nicht vor dem Check- in Datum Zeile {0}
-Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klicken Sie auf 'Verkaufsrechnung erstellen', um eine neue Verkaufsrechnung zu erstellen."
-Click on a link to get options to expand get options ,Click on a link to get options to expand get options 
+Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klicken Sie auf 'Ausgangsrechnung erstellen', um eine neue Ausgangsrechnung zu erstellen."
+Click on a link to get options to expand get options ,auf den Link klicken um die Optionen anzuzeigen 
 Client,Kunde
-Close Balance Sheet and book Profit or Loss.,Schließen Bilanz und Gewinn-und -Verlust- Buch .
+Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und Gewinn und Verlust buchen.
 Closed,Geschlossen
 Closing (Cr),Closing (Cr)
 Closing (Dr),Closing (Dr)
@@ -572,23 +572,23 @@
 Communication History,Kommunikationshistorie
 Communication log.,Kommunikationsprotokoll
 Communications,Kommunikation
-Company,Unternehmen
-Company (not Customer or Supplier) master.,Company ( nicht der Kunde oder Lieferant ) Master.
+Company,Firma
+Company (not Customer or Supplier) master.,Firma (nicht der Kunde bzw. Lieferant) Vorlage.
 Company Abbreviation,Firmen Abkürzung
 Company Details,Firmendetails
 Company Email,Firma E-Mail
-"Company Email ID not found, hence mail not sent","Firma E-Mail -ID nicht gefunden , daher Mail nicht gesendet"
-Company Info,Unternehmensinformationen
-Company Name,Unternehmensname
-Company Settings,Unternehmenseinstellungen
-Company is missing in warehouses {0},"Unternehmen, die in Lagerhäusern fehlt {0}"
-Company is required,"Gesellschaft ist verpflichtet,"
+"Company Email ID not found, hence mail not sent","Firmen E-Mail-Adresse nicht gefunden, daher wird die Mail nicht gesendet"
+Company Info,Firmeninformationen
+Company Name,Firmenname
+Company Settings,Firmeneinstellungen
+Company is missing in warehouses {0},Firma fehlt in Lagern {0}
+Company is required,"Firma ist verpflichtet,"
 Company registration numbers for your reference. Example: VAT Registration Numbers etc.,Firmenregistrierungsnummern für Ihre Referenz. Beispiel: Umsatzsteuer-Identifikationsnummern usw.
 Company registration numbers for your reference. Tax numbers etc.,Firmenregistrierungsnummern für Ihre Referenz. Steuernummern usw.
-"Company, Month and Fiscal Year is mandatory","Unternehmen , Monat und Geschäftsjahr ist obligatorisch"
+"Company, Month and Fiscal Year is mandatory","Unternehmen, Monat und Geschäftsjahr ist obligatorisch"
 Compensatory Off,Ausgleichs Off
 Complete,Abschließen
-Complete Setup,Vollständige Setup
+Complete Setup,Setup vervollständigen
 Completed,Abgeschlossen
 Completed Production Orders,Abgeschlossene Fertigungsaufträge
 Completed Qty,Abgeschlossene Menge
@@ -624,7 +624,7 @@
 Contacts,Impressum
 Content,Inhalt
 Content Type,Inhaltstyp
-Contra Entry,Gegen Gutschein
+Contra Voucher,Gegen Gutschein
 Contract,Vertrag
 Contract End Date,Vertragsende
 Contract End Date must be greater than Date of Joining,Vertragsende muss größer sein als Datum für Füge sein
@@ -642,7 +642,7 @@
 Cosmetics,Kosmetika
 Cost Center,Kostenstelle
 Cost Center Details,Kostenstellendetails
-Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
+Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr
 Cost Center Name,Kostenstellenname
 Cost Center is required for 'Profit and Loss' account {0},Kostenstelle wird für ' Gewinn-und Verlustrechnung des erforderlichen {0}
 Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in der Zeile erforderlich {0} in Tabelle Steuern für Typ {1}
@@ -653,22 +653,22 @@
 Costing,Kosten
 Country,Land
 Country Name,Ländername
-Country wise default Address Templates,Land weise Standardadressvorlagen
-"Country, Timezone and Currency","Land , Zeitzone und Währung"
+Country wise default Address Templates,landesspezifische Standardadressvorlagen
+"Country, Timezone and Currency","Land, Zeitzone und Währung"
 Cr,Cr
-Create Bank Entry for the total salary paid for the above selected criteria,Bankgutschein für das Gesamtgehalt nach den oben ausgewählten Kriterien erstellen
-Create Customer,Neues Kunden
+Create Bank Voucher for the total salary paid for the above selected criteria,Bankgutschein für das Gesamtgehalt nach den oben ausgewählten Kriterien erstellen
+Create Customer,neuen Kunden erstellen
 Create Material Requests,Materialanfragen erstellen
-Create New,Neu erstellen
-Create Opportunity,erstellen Sie Gelegenheit
+Create New,neuen Eintrag erstellen
+Create Opportunity,Gelegenheit erstellen
 Create Production Orders,Fertigungsaufträge erstellen
 Create Quotation,Angebot erstellen
 Create Receiver List,Empfängerliste erstellen
 Create Salary Slip,Gehaltsabrechnung erstellen
-Create Stock Ledger Entries when you submit a Sales Invoice,"Lagerbucheinträge erstellen, wenn Sie eine Verkaufsrechnung einreichen"
+Create Stock Ledger Entries when you submit a Sales Invoice,"Lagerbucheinträge erstellen, wenn Sie eine Ausgangsrechnung einreichen"
 Create and Send Newsletters,Newsletter erstellen und senden
-"Create and manage daily, weekly and monthly email digests.","Erstellen und Verwalten von täglichen, wöchentlichen und monatlichen E-Mail verdaut ."
-Create rules to restrict transactions based on values.,"Erstellen Sie Regeln , um Transaktionen auf Basis von Werten zu beschränken."
+"Create and manage daily, weekly and monthly email digests.","Erstellen und Verwalten von täglichen, wöchentlichen und monatlichen E-Mail Berichten."
+Create rules to restrict transactions based on values.,Erstellen Sie Regeln um Transaktionen auf Basis von Werten zu beschränken.
 Created By,Erstellt von
 Creates salary slip for above mentioned criteria.,Erstellt Gehaltsabrechnung für oben genannte Kriterien.
 Creation Date,Erstellungsdatum
@@ -679,7 +679,7 @@
 Credit,Guthaben
 Credit Amt,Guthabenbetrag
 Credit Card,Kreditkarte
-Credit Card Entry,Kreditkarten-Gutschein
+Credit Card Voucher,Kreditkarten-Gutschein
 Credit Controller,Kredit-Controller
 Credit Days,Kredittage
 Credit Limit,Kreditlimit
@@ -696,11 +696,11 @@
 Current Address Is,Aktuelle Adresse
 Current Assets,Umlaufvermögen
 Current BOM,Aktuelle SL
-Current BOM and New BOM can not be same,Aktuelle Stückliste und New BOM kann nicht gleich sein
+Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
 Current Fiscal Year,Laufendes Geschäftsjahr
 Current Liabilities,Kurzfristige Verbindlichkeiten
 Current Stock,Aktueller Lagerbestand
-Current Stock UOM,Aktueller Lagerbestand ME
+Current Stock UOM,Aktuelle Lager-ME
 Current Value,Aktueller Wert
 Custom,Benutzerdefiniert
 Custom Autoreply Message,Benutzerdefinierte Autoreply-Nachricht
@@ -708,16 +708,16 @@
 Customer,Kunde
 Customer (Receivable) Account,Kunde (Debitoren) Konto
 Customer / Item Name,Kunde/Artikelname
-Customer / Lead Address,Kunden / Lead -Adresse
-Customer / Lead Name,Kunden / Lead Namen
+Customer / Lead Address,Kunden / Interessenten-Adresse
+Customer / Lead Name,Kunden /Interessenten Namen
 Customer > Customer Group > Territory,Kunden> Kundengruppe> Territory
 Customer Account Head,Kundenkontoführer
 Customer Acquisition and Loyalty,Kundengewinnung und-bindung
 Customer Address,Kundenadresse
-Customer Addresses And Contacts,Kundenadressen und Kontakte
+Customer Addresses And Contacts,Kundenadressen und Ansprechpartner
 Customer Addresses and Contacts,Kundenadressen und Ansprechpartner
-Customer Code,Kundencode
-Customer Codes,Kundencodes
+Customer Code,Kunden-Nr.
+Customer Codes,Kundennummern
 Customer Details,Kundendaten
 Customer Feedback,Kundenrückmeldung
 Customer Group,Kundengruppe
@@ -731,13 +731,13 @@
 Customer Service,Kundenservice
 Customer database.,Kundendatenbank.
 Customer is required,"Kunde ist verpflichtet,"
-Customer master.,Kundenstamm .
+Customer master.,Kundenstamm.
 Customer required for 'Customerwise Discount',Kunden für ' Customerwise Discount ' erforderlich
 Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 Customer {0} does not exist,Kunden {0} existiert nicht
-Customer's Item Code,Kunden-Artikelcode
-Customer's Purchase Order Date,Kundenbestelldatum
-Customer's Purchase Order No,Kundenbestellnr.
+Customer's Item Code,Kunden-Artikel-Nr
+Customer's Purchase Order Date,Kundenauftrag
+Customer's Purchase Order No,Kundenauftrags-Nr
 Customer's Purchase Order Number,Kundenauftragsnummer
 Customer's Vendor,Kundenverkäufer
 Customers Not Buying Since Long Time,"Kunden, die seit langer Zeit nichts gekauft haben"
@@ -754,13 +754,13 @@
 Date Format,Datumsformat
 Date Of Retirement,Zeitpunkt der Pensionierung
 Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss größer sein als Datum für Füge sein
-Date is repeated,Datum wird wiederholt
+Date is repeated,Ereignis wiederholen
 Date of Birth,Geburtsdatum
-Date of Issue,Datum der Ausstellung
-Date of Joining,Datum des Beitritts
-Date of Joining must be greater than Date of Birth,Eintrittsdatum muss größer als sein Geburtsdatum
-Date on which lorry started from supplier warehouse,"Datum, an dem der LKW das Lieferantenlager verlassen hat"
-Date on which lorry started from your warehouse,"Datum, an dem der LKW Ihr Lager verlassen hat"
+Date of Issue,Ausstellungsdatum
+Date of Joining,Beitrittsdatum
+Date of Joining must be greater than Date of Birth,Beitrittsdatum muss nach dem Geburtsdatum sein
+Date on which lorry started from supplier warehouse,Abfahrtdatum des LKW aus dem Lieferantenlager
+Date on which lorry started from your warehouse,Abfahrtdatum des LKW aus Ihrem Lager
 Dates,Termine
 Days Since Last Order,Tage seit dem letzten Auftrag
 Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
@@ -794,23 +794,23 @@
 Default Item Group,Standard-Artikelgruppe
 Default Price List,Standardpreisliste
 Default Purchase Account in which cost of the item will be debited.,"Standard-Einkaufskonto, von dem die Kosten des Artikels eingezogen werden."
-Default Selling Cost Center,Standard- Selling Kostenstelle
+Default Selling Cost Center,Standard-Vertriebs Kostenstelle
 Default Settings,Standardeinstellungen
 Default Source Warehouse,Standard-Ursprungswarenlager
-Default Stock UOM,Standard Lagerbestands-ME
+Default Stock UOM,Standard Lager-ME
 Default Supplier,Standardlieferant
 Default Supplier Type,Standardlieferantentyp
 Default Target Warehouse,Standard-Zielwarenlager
 Default Territory,Standardregion
 Default Unit of Measure,Standardmaßeinheit
-"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Standard- Maßeinheit kann nicht direkt geändert werden , weil Sie bereits eine Transaktion (en) mit einer anderen Verpackung gemacht haben. Um die Standardmengeneinheitzu ändern, verwenden ' Verpackung ersetzen Utility "" -Tool unter Auf -Modul."
+"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Standard- Mengeneinheit kann nicht direkt geändert werden, weil Sie bereits Transaktion(en) mit einer anderen Mengeneinheit gemacht haben. Um die Standardmengeneinheit zu ändern, verwenden Sie das 'Verpackung ersetzen'-Tool im Lagermodul."
 Default Valuation Method,Standard-Bewertungsmethode
 Default Warehouse,Standardwarenlager
-Default Warehouse is mandatory for stock Item.,Standard- Warehouse ist für Lager Artikel .
-Default settings for accounting transactions.,Standardeinstellungen für Geschäftsvorfälle .
-Default settings for buying transactions.,Standardeinstellungen für Kauf -Transaktionen.
-Default settings for selling transactions.,Standardeinstellungen für Verkaufsgeschäfte .
-Default settings for stock transactions.,Standardeinstellungen für Aktientransaktionen .
+Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lager Artikel notwendig.
+Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen.
+Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen.
+Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen.
+Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen.
 Defense,Verteidigung
 "Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Budget für diese Kostenstelle festlegen. Zuordnen des Budgets, siehe <a href=""#!List/Company"">Unternehmensstamm</a>"
 Del,löschen
@@ -825,15 +825,15 @@
 Delivery Document No,Lieferbelegnummer
 Delivery Document Type,Lieferbelegtyp
 Delivery Note,Lieferschein
-Delivery Note Item,Lieferscheingegenstand
-Delivery Note Items,Lieferscheinpositionen
-Delivery Note Message,Lieferscheinnachricht
+Delivery Note Item,Lieferschein Artikel
+Delivery Note Items,Lieferschein Artikel
+Delivery Note Message,Lieferschein Nachricht
 Delivery Note No,Lieferscheinnummer
 Delivery Note Required,Lieferschein erforderlich
 Delivery Note Trends,Lieferscheintrends
-Delivery Note {0} is not submitted,Lieferschein {0} ist nicht eingereicht
-Delivery Note {0} must not be submitted,Lieferschein {0} muss nicht vorgelegt werden
-Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} muss vor Streichung dieses Sales Order storniert werden
+Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht eingereicht
+Delivery Note {0} must not be submitted,Lieferschein {0} muss nicht eingereicht werden
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Stornierung dieser Kundenaufträge storniert werden
 Delivery Status,Lieferstatus
 Delivery Time,Lieferzeit
 Delivery To,Lieferung an
@@ -850,19 +850,19 @@
 Details,Details
 Difference (Dr - Cr),Differenz ( Dr - Cr )
 Difference Account,Unterschied Konto
-"Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Unterschied Konto muss ""Haftung"" Typ Konto sein , da diese Lizenz Versöhnung ist ein Eintrag Eröffnung"
-Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Verpackung für Einzelteile werden zu falschen (Gesamt ) Nettogewichtswertführen . Stellen Sie sicher, dass die Netto-Gewicht der einzelnen Artikel ist in der gleichen Verpackung ."
+"Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss vom Typ ""Verbildlichkeit"" sein, da diese Lagerbewertung ein öffnender Eintag ist"
+Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Verpackung für Einzelteile werden zu falschen (Gesamt-) Nettogewichtswerten führen. Stellen Sie sicher, dass die Netto-Gewichte der einzelnen Artikel in der gleichen Mengeneinheit sind."
 Direct Expenses,Direkte Aufwendungen
 Direct Income,Direkte Einkommens
 Disable,Deaktivieren
 Disable Rounded Total,Abgerundete Gesamtsumme deaktivieren
 Disabled,Deaktiviert
-Discount,Discount
+Discount,Rabatt
 Discount  %,Rabatt %
 Discount %,Rabatt %
 Discount (%),Rabatt (%)
 Discount Amount,Discount Amount
-"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in der Bestellung, im Kaufbeleg und in der Rechnung zur Verfügung"
+"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in  Lieferatenauftrag, Eingangslieferschein und in der Eingangsrechnung zur Verfügung"
 Discount Percentage,Rabatt Prozent
 Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt Prozent kann entweder gegen eine Preisliste oder Preisliste für alle angewendet werden.
 Discount must be less than 100,Discount muss kleiner als 100 sein
@@ -877,13 +877,13 @@
 Divorced,Geschieden
 Do Not Contact,Nicht berühren
 Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
-Do really want to unstop production order: ,Do really want to unstop production order: 
-Do you really want to STOP ,Do you really want to STOP 
-Do you really want to STOP this Material Request?,"Wollen Sie wirklich , diese Materialanforderung zu stoppen?"
-Do you really want to Submit all Salary Slip for month {0} and year {1},"Glauben Sie wirklich , alle Gehaltsabrechnung für den Monat Absenden {0} und {1} Jahr wollen"
-Do you really want to UNSTOP ,Do you really want to UNSTOP 
-Do you really want to UNSTOP this Material Request?,"Wollen Sie wirklich , dieses Material anfordern aufmachen ?"
-Do you really want to stop production order: ,Do you really want to stop production order: 
+Do really want to unstop production order: ,Wollen Sie wirklich den Fertigungsauftrag fortsetzen: 
+Do you really want to STOP ,Möchten Sie dies wirklich anhalten
+Do you really want to STOP this Material Request?,Wollen Sie wirklich diese Materialanforderung anhalten?
+Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} versenden
+Do you really want to UNSTOP ,Möchten Sie dies wirklich fortsetzen
+Do you really want to UNSTOP this Material Request?,Wollen Sie wirklich diese Materialanforderung fortsetzen?
+Do you really want to stop production order: ,Möchten Sie den Fertigungsauftrag wirklich anhalten: 
 Doc Name,Dokumentenname
 Doc Type,Dokumententyp
 Document Description,Dokumentenbeschreibung
@@ -895,8 +895,8 @@
 Download Reconcilation Data,Laden Versöhnung Daten
 Download Template,Vorlage herunterladen
 Download a report containing all raw materials with their latest inventory status,"Einen Bericht herunterladen, der alle Rohstoffe mit ihrem neuesten Bestandsstatus angibt"
-"Download the Template, fill appropriate data and attach the modified file.","Laden Sie die Vorlage , füllen entsprechenden Daten und befestigen Sie die geänderte Datei ."
-"Download the Template, fill appropriate data and attach the modified file.All dates and employee combination in the selected period will come in the template, with existing attendance records","Download the Template, fill appropriate data and attach the modified file.All dates and employee combination in the selected period will come in the template, with existing attendance records"
+"Download the Template, fill appropriate data and attach the modified file.","Herunterladen der Vorlage, füllen Sie die entsprechenden Angaben aus und hängen Sie die geänderte Datei an."
+"Download the Template, fill appropriate data and attach the modified file.All dates and employee combination in the selected period will come in the template, with existing attendance records","Herunterladen der Vorlage, füllen Sie die entsprechenden Angaben aus und hängen Sie die geänderte Datei an. Alle Datumsangaben und Mitarbeiterkombinationen erscheinen in der ausgewählten Periode für die Anwesenheitseinträge in der Vorlage."
 Dr,Dr
 Draft,Entwurf
 Dropbox,Dropbox
@@ -906,7 +906,7 @@
 Due Date,Fälligkeitsdatum
 Due Date cannot be after {0},Fälligkeitsdatum kann nicht nach {0}
 Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum sein
-Duplicate Entry. Please check Authorization Rule {0},Doppelten Eintrag . Bitte überprüfen Sie Autorisierungsregel {0}
+Duplicate Entry. Please check Authorization Rule {0},Doppelter Eintrag. Bitte überprüfen Sie Autorisierungsregel {0}
 Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0}
 Duplicate entry,Duplizieren Eintrag
 Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
@@ -936,16 +936,16 @@
 Email,E-Mail
 Email Digest,Täglicher E-Mail-Bericht
 Email Digest Settings,Einstellungen täglicher E-Mail-Bericht
-Email Digest: ,Täglicher E-Mail-Bericht
+Email Digest: ,E-Mail-Bericht: 
 Email Id,E-Mail-ID
-"Email Id where a job applicant will email e.g. ""jobs@example.com""","E-Mail-ID, an die ein Bewerber schreibt, z. B. ""jobs@example.com"""
+"Email Id where a job applicant will email e.g. ""jobs@example.com""","E-Mail-Adresse, an die ein Bewerber schreibt, z. B. ""jobs@example.com"""
 Email Notifications,E-Mail- Benachrichtigungen
 Email Sent?,Wurde die E-Mail abgesendet?
 Email Settings for Outgoing and Incoming Emails.,E-Mail-Einstellungen für ausgehende und eingehende E-Mails.
-"Email id must be unique, already exists for {0}",E-Mail -ID muss eindeutig sein; Diese existiert bereits für {0}
-Email ids separated by commas.,E-Mail-IDs durch Kommas getrennt.
+"Email id must be unique, already exists for {0}",E-Mail-Adresse muss eindeutig sein; Diese existiert bereits für {0}
+Email ids separated by commas.,E-Mail-Adressen durch Kommas getrennt.
 "Email settings for jobs email id ""jobs@example.com""","E-Mail-Einstellungen für Bewerbungs-ID ""jobs@example.com"""
-"Email settings to extract Leads from sales email id e.g. ""sales@example.com""","E-Mail-Einstellungen, mit denen Leads aus Verkaufs-E-Mail-IDs wie z. B. ""sales@example.com"" extrahiert werden."
+"Email settings to extract Leads from sales email id e.g. ""sales@example.com""","E-Mail-Einstellungen, mit denen Interessenten aus Verkaufs-E-Mail-Adressen wie z.B. ""vertrieb@example.com"" extrahiert werden."
 Emergency Contact,Notfallkontakt
 Emergency Contact Details,Notfallkontaktdaten
 Emergency Phone,Notruf
@@ -965,18 +965,18 @@
 Employee Settings,Mitarbeitereinstellungen
 Employee Type,Mitarbeitertyp
 Employee can not be changed,Mitarbeiter kann nicht verändert werden
-"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)."
+"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z.B. Geschäftsführer, Direktor etc.)."
 Employee master.,Mitarbeiterstamm .
 Employee record is created using selected field. ,Mitarbeiter Datensatz erstellt anhand von ausgewählten Feld.
 Employee records.,Mitarbeiterdatensätze.
-Employee relieved on {0} must be set as 'Left',"Angestellter auf {0} entlastet , sind als "" links"" eingestellt werden"
+Employee relieved on {0} must be set as 'Left',"freigestellter Angestellter {0} muss als ""entlassen"" eingestellt werden"
 Employee {0} has already applied for {1} between {2} and {3},Angestellter {0} ist bereits für {1} zwischen angewendet {2} und {3}
 Employee {0} is not active or does not exist,Angestellter {0} ist nicht aktiv oder existiert nicht
-Employee {0} was on leave on {1}. Cannot mark attendance.,Angestellter {0} war auf Urlaub auf {1} . Kann nicht markieren anwesend.
-Employees Email Id,Mitarbeiter E-Mail-ID
+Employee {0} was on leave on {1}. Cannot mark attendance.,Angestellter {0} war in Urlaub am {1}. Kann nicht als anwesend gesetzt werden.
+Employees Email Id,Mitarbeiter E-Mail-Adresse
 Employment Details,Beschäftigungsdetails
 Employment Type,Art der Beschäftigung
-Enable / disable currencies.,Aktivieren / Deaktivieren von Währungen.
+Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen.
 Enabled,Aktiviert
 Encashment Date,Inkassodatum
 End Date,Enddatum
@@ -987,11 +987,11 @@
 Energy,Energie
 Engineer,Ingenieur
 Enter Verification Code,Sicherheitscode eingeben
-Enter campaign name if the source of lead is campaign.,"Namen der Kampagne eingeben, wenn die Lead-Quelle eine Kampagne ist."
+Enter campaign name if the source of lead is campaign.,"Namen der Kampagne eingeben, wenn die Interessenten-Quelle eine Kampagne ist."
 Enter department to which this Contact belongs,"Abteilung eingeben, zu der dieser Kontakt gehört"
 Enter designation of this Contact,Bezeichnung dieses Kontakts eingeben
-"Enter email id separated by commas, invoice will be mailed automatically on particular date","Geben Sie die durch Kommas getrennte E-Mail-ID  ein, die Rechnung wird automatisch an einem bestimmten Rechnungsdatum abgeschickt"
-"Enter email id separated by commas, order will be mailed automatically on particular date","Enter email id separated by commas, order will be mailed automatically on particular date"
+"Enter email id separated by commas, invoice will be mailed automatically on particular date","Geben Sie die durch Kommas getrennte E-Mail-Adresse  ein, die Rechnung wird automatisch an einem bestimmten Rechnungsdatum abgeschickt"
+"Enter email id separated by commas, order will be mailed automatically on particular date","Geben Sie die durch Kommas getrennte E-Mail-Adresse  ein, die Bestellung wird automatisch an einem bestimmten Datum abgeschickt"
 Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie die Fertigungsaufträge erhöhen möchten, oder laden Sie Rohstoffe für die Analyse herunter."
 Enter name of campaign if source of enquiry is campaign,"Geben Sie den Namen der Kampagne ein, wenn der Ursprung der Anfrage eine Kampagne ist"
 "Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Geben Sie hier statische URL-Parameter ein (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
@@ -1001,7 +1001,7 @@
 Entertainment & Leisure,Unterhaltung & Freizeit
 Entertainment Expenses,Bewirtungskosten
 Entries,Einträge
-Entries against ,Einträge für
+Entries against ,Einträge gegen
 Entries are not allowed against this Fiscal Year if the year is closed.,"Einträge sind für dieses Geschäftsjahr nicht zulässig, wenn es bereits abgeschlossen ist."
 Equity,Gerechtigkeit
 Error: {0} > {1},Fehler: {0}> {1}
@@ -1021,7 +1021,7 @@
 Excise Duty Edu Cess 2,Verbrauchsteuer Edu Cess 2
 Excise Duty SHE Cess 1,Verbrauchsteuer SHE Cess 1
 Excise Page Number,Seitenzahl ausschneiden
-Excise Entry,Gutschein ausschneiden
+Excise Voucher,Gutschein ausschneiden
 Execution,Ausführung
 Executive Search,Executive Search
 Exhibition,Ausstellung
@@ -1032,16 +1032,16 @@
 Expected Completion Date can not be less than Project Start Date,Erwartete Abschlussdatum kann nicht weniger als Projektstartdatumsein
 Expected Date cannot be before Material Request Date,Erwartete Datum kann nicht vor -Material anfordern Date
 Expected Delivery Date,Voraussichtlicher Liefertermin
-Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor Bestelldatumsein
-Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor Auftragsdatum sein
+Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Lieferatenauftragsdatum sein
+Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor Kundenauftragsdatum liegen
 Expected End Date,Voraussichtliches Enddatum
 Expected Start Date,Voraussichtliches Startdatum
-Expected balance as per bank,Expected balance as per bank
+Expected balance as per bank,erwartetet Kontostand laut Bank
 Expense,Ausgabe
 Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Aufwand / Differenz-Konto ({0}) muss ein ""Gewinn oder Verlust""-Konto sein"
 Expense Account,Aufwandskonto
 Expense Account is mandatory,Aufwandskonto ist obligatorisch
-Expense Approver,Ausgaben Genehmigen
+Expense Approver,Ausgaben Genehmiger
 Expense Claim,Spesenabrechnung
 Expense Claim Approved,Spesenabrechnung zugelassen
 Expense Claim Approved Message,Spesenabrechnung zugelassen Nachricht
@@ -1050,20 +1050,20 @@
 Expense Claim Rejected,Spesenabrechnung abgelehnt
 Expense Claim Rejected Message,Spesenabrechnung abgelehnt Nachricht
 Expense Claim Type,Spesenabrechnungstyp
-Expense Claim has been approved.,Spesenabrechnung genehmigt wurde .
+Expense Claim has been approved.,Spesenabrechnung wurde genehmigt.
 Expense Claim has been rejected.,Spesenabrechnung wurde abgelehnt.
-Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wird vorbehaltlich der Zustimmung . Nur die Kosten genehmigende Status zu aktualisieren.
+Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wird wartet auf Genehmigung. Nur der Ausgabenwilliger kann den Status aktualisieren.
 Expense Date,Datum der Aufwendung
 Expense Details,Details der Aufwendung
 Expense Head,Kopf der Aufwendungen
 Expense account is mandatory for item {0},Aufwandskonto ist für item {0}
-Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense oder Differenz -Konto ist Pflicht für Artikel {0} , da es Auswirkungen gesamten Aktienwert"
+Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ausgaben- oder Differenz-Konto ist Pflicht für Artikel {0}, da es Auswirkungen gesamten Lagerwert hat"
 Expenses,Kosten
 Expenses Booked,Gebuchte Aufwendungen
 Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 Expenses booked for the digest period,Gebuchte Aufwendungen für den Berichtszeitraum
-Expired,Expired
-Expiry,Expiry
+Expired,verfallen
+Expiry,Verfall
 Expiry Date,Verfalldatum
 Exports,Exporte
 External,Extern
@@ -1077,15 +1077,15 @@
 Feed Type,Art des Feeds
 Feedback,Feedback
 Female,Weiblich
-Fetch exploded BOM (including sub-assemblies),Fetch explodierte BOM ( einschließlich Unterbaugruppen )
-"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Feld in Lieferschein, Angebot, Verkaufsrechnung, Auftrag verfügbar"
+Fetch exploded BOM (including sub-assemblies),Abruch der Stücklisteneinträge (einschließlich der Unterelemente)
+"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Feld ist in Lieferschein, Angebot, Ausgangsrechnung, Kundenauftrag verfügbar"
 Files Folder ID,Dateien-Ordner-ID
 Fill the form and save it,Füllen Sie das Formular aus und speichern Sie sie
 Filter based on customer,Filtern nach Kunden
 Filter based on item,Filtern nach Artikeln
 Financial / accounting year.,Finanz / Rechnungsjahres.
 Financial Analytics,Finanzielle Analyse
-Financial Chart of Accounts. Imported from file.,Financial Chart of Accounts. Imported from file.
+Financial Chart of Accounts. Imported from file.,FInanzübersicht der Konten. Importiert aus einer Datei
 Financial Services,Finanzdienstleistungen
 Financial Year End Date,Geschäftsjahr Enddatum
 Financial Year Start Date,Geschäftsjahr Startdatum
@@ -1096,10 +1096,10 @@
 Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Geschäftsjahr Startdatum und Geschäftsjahresende Datum sind bereits im Geschäftsjahr gesetzt {0}
 Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart.,Geschäftsjahr Startdatum und Geschäftsjahresende Datum kann nicht mehr als ein Jahr betragen.
 Fiscal Year Start Date should not be greater than Fiscal Year End Date,Geschäftsjahr Startdatum sollte nicht größer als Geschäftsjahresende Date
-Fiscal Year {0} not found.,Fiscal Year {0} not found.
+Fiscal Year {0} not found.,Geschäftsjahr {0} nicht gefunden
 Fixed Asset,Fixed Asset
 Fixed Assets,Anlagevermögen
-Fold,Fold
+Fold,eingeklappt
 Follow via Email,Per E-Mail nachverfolgen
 "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.","Die folgende Tabelle zeigt die Werte, wenn Artikel von Zulieferern stammen. Diese Werte werden aus dem Stamm der ""Materialliste"" für Artikel von Zulieferern abgerufen."
 Food,Lebensmittel
@@ -1111,7 +1111,7 @@
 For Price List,Für Preisliste
 For Production,Für Produktion
 For Reference Only.,Nur zu Referenzzwecken.
-For Sales Invoice,Für Verkaufsrechnung
+For Sales Invoice,Für Ausgangsrechnungen
 For Server Side Print Formats,Für Druckformate auf Serverseite
 For Supplier,für Lieferanten
 For Warehouse,Für Warenlager
@@ -1120,7 +1120,7 @@
 For reference,Zu Referenzzwecken
 For reference only.,Nur zu Referenzzwecken.
 "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Um es den Kunden zu erleichtern, können diese Codes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
-Fraction,Bruch
+Fraction,Teilmenge
 Fraction Units,Bruchteile von Einheiten
 Freeze Stock Entries,Lagerbestandseinträge einfrieren
 Freeze Stocks Older Than [Days],Frieren Stocks Älter als [ Tage ]
@@ -1137,18 +1137,18 @@
 From Date cannot be greater than To Date,Von-Datum darf nicht größer als bisher sein
 From Date must be before To Date,Von-Datum muss vor dem Bis-Datum liegen
 From Date should be within the Fiscal Year. Assuming From Date = {0},"Von-Datum sollte im Geschäftsjahr sein. Unter der Annahme, Von-Datum = {0}"
-From Delivery Note,Aus Lieferschein
+From Delivery Note,von Lieferschein
 From Employee,Von Mitarbeiter
-From Lead,Aus Lead
+From Lead,von Interessent
 From Maintenance Schedule,Vom Wartungsplan
 From Material Request,Von Materialanforderung
 From Opportunity,von der Chance
 From Package No.,Von Paket-Nr.
-From Purchase Order,Von Bestellung
-From Purchase Receipt,Von Kaufbeleg
+From Purchase Order,von Lieferatenauftrag
+From Purchase Receipt,von Eingangslieferschein
 From Quotation,von Zitat
-From Sales Order,Aus Verkaufsauftrag
-From Supplier Quotation,Von Lieferant Zitat
+From Sales Order,Aus Kundenauftrag
+From Supplier Quotation,von Lieferantenangebot
 From Time,Von Zeit
 From Value,Von Wert
 From and To dates required,Von-und Bis Daten erforderlich
@@ -1171,20 +1171,20 @@
 Gender,Geschlecht
 General,Allgemein
 General Ledger,Hauptbuch
-General Settings,General Settings
+General Settings,Grundeinstellungen
 Generate Description HTML,Beschreibungs-HTML generieren
 Generate Material Requests (MRP) and Production Orders.,Materialanforderungen (MRP) und Fertigungsaufträge generieren.
 Generate Salary Slips,Gehaltsabrechnungen generieren
 Generate Schedule,Zeitplan generieren
 "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren."
 Generates HTML to include selected image in the description,"Generiert HTML, die das ausgewählte Bild in der Beschreibung enthält"
-Get Advances Paid,Gezahlte Vorschüsse aufrufen
+Get Advances Paid,Vorkasse aufrufen
 Get Advances Received,Erhaltene Anzahlungen aufrufen
 Get Current Stock,Aktuellen Lagerbestand aufrufen
 Get Items,Artikel aufrufen
-Get Items From Purchase Receipts,Get Items From Purchase Receipts
+Get Items From Purchase Receipts,Artikel vom Eingangslieferschein übernehmen
 Get Items From Sales Orders,Artikel aus Kundenaufträgen abrufen
-Get Items from BOM,Holen Sie Angebote von Stücklisten
+Get Items from BOM,Artikel aus der Stückliste holen
 Get Last Purchase Rate,Letzten Anschaffungskurs abrufen
 Get Outstanding Invoices,Ausstehende Rechnungen abrufen
 Get Relevant Entries,Holen Relevante Einträge
@@ -1199,8 +1199,8 @@
 Global Defaults,Globale Standardwerte
 Global POS Setting {0} already created for company {1},"Globale POS Einstellung {0} bereits für Unternehmen geschaffen, {1}"
 Global Settings,Globale Einstellungen
-"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type ""Bank""","Gehen Sie auf die entsprechende Gruppe (in der Regel Anwendung des Fonds> Umlaufvermögen > Bank Accounts und erstellen ein neues Konto Ledger (durch Klicken auf Add Kind) vom Typ "" Bank"""
-"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Gehen Sie auf die entsprechende Gruppe (in der Regel Quelle der Fonds> kurzfristige Verbindlichkeiten > Steuern und Abgaben und ein neues Konto Ledger (durch Klicken auf Child ) des Typs "" Tax"" und nicht den Steuersatz zu erwähnen."
+"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type ""Bank""","Gehen Sie auf die entsprechende Gruppe (in der Regel Anwendungszweck > Umlaufvermögen > Bankkonten und erstellen einen neuen Belegeintrag (durch Klicken auf Untereintrag hinzufügen) vom Typ ""Bank"""
+"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Gehen Sie auf die entsprechende Gruppe (in der Regel Quelle der Dahrlehen > kurzfristige Verbindlichkeiten > Steuern und Abgaben und legen einen neuen Buchungsbeleg (durch Klicken auf Unterelement einfügen) des Typs ""Steuer"" an und geben den Steuersatz mit an."
 Goal,Ziel
 Goals,Ziele
 Goods received from Suppliers.,Von Lieferanten erhaltene Ware.
@@ -1225,8 +1225,8 @@
 Group by Voucher,Gruppe von Gutschein
 Group or Ledger,Gruppen oder Sachbuch
 Groups,Gruppen
-Guest,Guest
-HR Manager,HR Verantwortlicher
+Guest,Gast
+HR Manager,HR-Manager
 HR Settings,HR-Einstellungen
 HR User,HR Mitarbeiter
 HTML / Banner that will show on the top of product list.,"HTML/Banner, das oben auf der der Produktliste angezeigt wird."
@@ -1282,14 +1282,14 @@
 "If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, veröffentlicht das System Bestandsbuchungseinträge automatisch."
 If more than one package of the same type (for print),Wenn mehr als ein Paket von der gleichen Art (für den Druck)
 "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin herrschen, werden die Benutzer aufgefordert, Priorität manuell einstellen, um Konflikt zu lösen."
-"If no change in either Quantity or Valuation Rate, leave the cell blank.","Wenn keine Änderung entweder Menge oder Bewertungs bewerten , lassen Sie die Zelle leer ."
+"If no change in either Quantity or Valuation Rate, leave the cell blank.","Wenn es keine Änderung entweder bei Mengen- oder Bewertungspreis gibt, lassen Sie das Eingabefeld leer."
 "If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung hinzugefügt werden, für die sie gilt."
-"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn ausgewählten Preisregel wird für 'Preis' gemacht, wird es überschrieben Preisliste. Pricing Rule Preis ist der Endpreis, so dass keine weiteren Rabatt angewendet werden sollten. Daher wird in Transaktionen wie zB Kundenauftrag, Bestellung usw., es wird im Feld 'Rate' abgerufen werden, sondern als Feld 'Preis List'."
+"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn Preisregel für 'Preis' ausgewählt wird, wird der Wert aus der Preisliste überschrieben. Der Preis der Preisregel ist der Endpreis, so dass keine weiteren Rabatt angewendet werden sollten. Daher wird in Transaktionen wie z.B. Kundenauftrag, Lieferatenauftrag usw., es nicht im Feld 'Preis' eingetragen werden, sondern im Feld 'Preisliste'."
 "If specified, send the newsletter using this email address","Wenn angegeben, senden Sie den Newsletter mit dieser E-Mail-Adresse"
 "If the account is frozen, entries are allowed to restricted users.","Wenn das Konto eingefroren ist, werden Einträge für eingeschränkte Benutzer erlaubt."
 "If this Account represents a Customer, Supplier or Employee, set it here.","Wenn dieses Konto zu einem Kunden, Lieferanten oder Mitarbeiter gehört, legen Sie dies hier fest."
 "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln werden auf der Grundlage der obigen Bedingungen festgestellt wird Priorität angewandt. Priorität ist eine Zahl zwischen 0 und 20, während Standardwert ist null (leer). Höhere Zahl bedeutet es Vorrang, wenn es mehrere Preisregeln mit gleichen Bedingungen."
-If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Wenn Sie Qualitätsprüfung folgen . Ermöglicht Artikel QA Pflicht und QS Nein in Kaufbeleg
+If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Wenn Sie Qualitätskontrollen druchführen. Aktiviert bei Artikel """"Qualitätssicherung notwendig"""" und """"Qualitätssicherung Nein"""" in Eingangslieferschein"
 If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,"Wenn Sie ein Verkaufsteam und Verkaufspartner (Vertriebskanalpartner) haben, können sie markiert werden und ihren Beitrag zur Umsatztätigkeit behalten"
 "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.","Wenn Sie eine Standardvorlage im Stamm für Verkaufssteuern und Abgaben erstellt haben, wählen Sie eine aus und klicken Sie unten auf die Schaltfläche."
 "If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.","Wenn Sie eine Standardvorlage im Stamm für Steuern und Abgaben erstellt haben, wählen Sie eine aus und klicken Sie unten auf die Schaltfläche."
@@ -1309,19 +1309,19 @@
 In Hours,In Stunden
 In Process,In Bearbeitung
 In Qty,Menge
-In Stock,In Stock
+In Stock,an Lager
 In Value,Wert bei
-In Words,In Words
-In Words (Company Currency),In Words (Unternehmenswährung)
-In Words (Export) will be visible once you save the Delivery Note.,"In Words (Export) wird sichtbar, wenn Sie den Lieferschein speichern."
-In Words will be visible once you save the Delivery Note.,"In Words wird sichtbar, sobald Sie den Lieferschein speichern."
-In Words will be visible once you save the Purchase Invoice.,"In Words wird sichtbar, sobald Sie die Einkaufsrechnung speichern."
-In Words will be visible once you save the Purchase Order.,"In Words wird sichtbar, sobald Sie die Bestellung speichern."
-In Words will be visible once you save the Purchase Receipt.,"In Words wird sichtbar, sobald Sie den Kaufbeleg speichern."
-In Words will be visible once you save the Quotation.,"In Words wird sichtbar, sobald Sie den Kostenvoranschlag speichern."
-In Words will be visible once you save the Sales Invoice.,"In Words wird sichtbar, sobald Sie die Verkaufsrechnung speichern."
-In Words will be visible once you save the Sales Order.,"In Words wird sichtbar, sobald Sie den Kundenauftrag speichern."
-Incentives,Anreiz
+In Words,In Worten
+In Words (Company Currency),In Worten (Unternehmenswährung)
+In Words (Export) will be visible once you save the Delivery Note.,"In Worten (Export) wird sichtbar, sobald Sie den Lieferschein speichern."
+In Words will be visible once you save the Delivery Note.,"In Worten wird sichtbar, sobald Sie den Lieferschein speichern."
+In Words will be visible once you save the Purchase Invoice.,"In Worten wird sichtbar, sobald Sie die Eingangsrechnung speichern."
+In Words will be visible once you save the Purchase Order.,"In Worten wird sichtbar, sobald Sie den Lieferatenauftrag speichern."
+In Words will be visible once you save the Purchase Receipt.,"In Worten wird sichtbar, sobald Sie den Eingangslieferschein speichern."
+In Words will be visible once you save the Quotation.,"In Worten wird sichtbar, sobald Sie den Kostenvoranschlag speichern."
+In Words will be visible once you save the Sales Invoice.,"In Worten wird sichtbar, sobald Sie die Ausgangsrechnung speichern."
+In Words will be visible once you save the Sales Order.,"In Worten wird sichtbar, sobald Sie den Kundenauftrag speichern."
+Incentives,Anreize
 Include Reconciled Entries,Fügen versöhnt Einträge
 Include holidays in Total no. of Working Days,Urlaub in die Gesamtzahl der Arbeitstage einschließen
 Income,Einkommen
@@ -1335,7 +1335,7 @@
 Incoming Rate,Eingehende Rate
 Incoming quality inspection.,Eingehende Qualitätsprüfung.
 Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Falsche Anzahl von Hauptbuch-Einträge gefunden. Sie könnten ein falsches Konto in der Transaktion ausgewählt haben.
-Incorrect or Inactive BOM {0} for Item {1} at row {2},Fehlerhafte oder Inaktive Stückliste {0} für Artikel {1} in Zeile {2}
+Incorrect or Inactive BOM {0} for Item {1} at row {2}, fehlerhafte oder inaktive Stückliste {0} für Artikel {1} in Zeile {2}
 Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ist ein Teil dieser Lieferung (nur Entwurf)"
 Indirect Expenses,Indirekte Aufwendungen
 Indirect Income,Indirekte Erträge
@@ -1363,9 +1363,9 @@
 Introduction,Einführung
 Invalid Barcode,Ungültige Barcode
 Invalid Barcode or Serial No,Ungültige Barcode oder Seriennummer
-Invalid Mail Server. Please rectify and try again.,Ungültige E-Mail -Server. Bitte korrigieren und versuchen Sie es erneut .
+Invalid Mail Server. Please rectify and try again.,Ungültiger E-Mail-Server. Bitte Angaben korrigieren und erneut versuchen.
 Invalid Master Name,Ungültige Master-Name
-Invalid User Name or Support Password. Please rectify and try again.,Ungültige Benutzername oder Passwort -Unterstützung . Bitte korrigieren und versuchen Sie es erneut .
+Invalid User Name or Support Password. Please rectify and try again.,Ungültiger Benutzername oder Passwort. Bitte Angaben korrigieren und erneut versuchen.
 Invalid quantity specified for item {0}. Quantity should be greater than 0.,Zum Artikel angegebenen ungültig Menge {0}. Menge sollte grßer als 0 sein.
 Inventory,Lagerbestand
 Inventory & Support,Inventar & Support
@@ -1376,8 +1376,8 @@
 Invoice No,Rechnungs-Nr.
 Invoice Number,Rechnungsnummer
 Invoice Type,Rechnungstyp
-Invoice/Journal Entry Details,Rechnung / Journal Gutschein-Details
-Invoiced Amount (Exculsive Tax),Rechnungsbetrag ( Exculsive MwSt.)
+Invoice/Journal Voucher Details,Rechnungs- / Buchungsbeleg-Details
+Invoiced Amount (Exculsive Tax),berechneter Betrag (ohne MwSt.)
 Is Active,Ist aktiv
 Is Advance,Ist Voraus
 Is Cancelled,Ist storniert
@@ -1391,7 +1391,7 @@
 Is POS,Ist POS
 Is Primary Contact,Ist primärer Kontakt
 Is Purchase Item,Ist Einkaufsartikel
-Is Recurring,Is Recurring
+Is Recurring,ist wiederkehrend
 Is Sales Item,Ist Verkaufsartikel
 Is Service Item,Ist Leistungsposition
 Is Stock Item,Ist Bestandsartikel
@@ -1404,14 +1404,14 @@
 Issued Items Against Production Order,Gegen Fertigungsauftrag ausgegebene Artikel
 It can also be used to create opening stock entries and to fix stock value.,"Es kann auch verwendet werden, um die Öffnung der Vorratszugänge zu schaffen und Bestandswert zu beheben."
 Item,Artikel
-Item #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,Item #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).
+Item #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,Artikel #{0}: Bestellmenge kann nicht kleiner sein als die Mindestbestellmenge (festgelegt im Artikelstamm)
 Item Advanced,Erweiterter Artikel
 Item Barcode,Artikelstrichcode
 Item Batch Nos,Artikel-Chargennummern
 Item Classification,Artikelklassifizierung
-Item Code,Artikelcode
-Item Code > Item Group > Brand,Item Code> Artikelgruppe> Marke
-Item Code and Warehouse should already exist.,Artikel-Code und Lager sollte bereits vorhanden sein .
+Item Code,Artikel-Nr
+Item Code > Item Group > Brand,Artikel-Nr > Artikelgruppe > Marke
+Item Code and Warehouse should already exist.,Artikel-Nummer und Lager sollten bereits vorhanden sein.
 Item Code cannot be changed for Serial No.,Item Code kann nicht für Seriennummer geändert werden
 Item Code is mandatory because Item is not automatically numbered,"Artikel-Code ist zwingend erforderlich, da Einzelteil wird nicht automatisch nummeriert"
 Item Code required at Row No {0},Item Code in Zeile Keine erforderlich {0}
@@ -1430,8 +1430,8 @@
 Item Price,Artikelpreis
 Item Prices,Artikelpreise
 Item Quality Inspection Parameter,Parameter der Artikel-Qualitätsprüfung
-Item Reorder,Artikelaufzeichner
-Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table
+Item Reorder,Artikel Wiederbestellung
+Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Artikel Zeile {0}: Eingangslieferschein {1} existiert nicht in den o.g. Eingangslieferscheinen
 Item Serial No,Artikel-Seriennummer
 Item Serial Nos,Artikel-Seriennummern
 Item Shortage Report,Artikel Mangel Bericht
@@ -1446,17 +1446,17 @@
 Item UOM,Artikel-ME
 Item Website Specification,Artikel-Webseitenspezifikation
 Item Website Specifications,Artikel-Webseitenspezifikationen
-Item Wise Tax Detail,Artikelweises Steuerdetail
+Item Wise Tax Detail,Artikel Wise UST Details
 Item Wise Tax Detail ,Artikel Wise UST Details
 Item is required,Artikel erforderlich
 Item is updated,Artikel wird aktualisiert
-Item master.,Artikelstamm .
-"Item must be a purchase item, as it is present in one or many Active BOMs","Einzelteil muss ein Kaufsache zu sein, wie es in einem oder mehreren Active Stücklisten vorhanden ist"
-Item must be added using 'Get Items from Purchase Receipts' button,Item must be added using 'Get Items from Purchase Receipts' button
+Item master.,Artikelstamm.
+"Item must be a purchase item, as it is present in one or many Active BOMs","Artikel muss ein Zukaufsartikel sein, da es in einer oder mehreren aktiven Stücklisten vorhanden ist"
+Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen mit dem Button ""Artikel von Eingangslieferschein übernehmen"" hinzugefühgt werden"
 Item or Warehouse for row {0} does not match Material Request,Artikel- oder Lagerreihe{0} ist Materialanforderung nicht überein
 Item table can not be blank,Artikel- Tabelle kann nicht leer sein
 Item to be manufactured or repacked,Hergestellter oder umgepackter Artikel
-Item valuation rate is recalculated considering landed cost voucher amount,Item valuation rate is recalculated considering landed cost voucher amount
+Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird anhand von Frachtkosten neu berechnet
 Item valuation updated,Artikel- Bewertung aktualisiert
 Item will be saved by this name in the data base.,Einzelteil wird mit diesem Namen in der Datenbank gespeichert.
 Item {0} appears multiple times in Price List {1},Artikel {0} erscheint mehrfach in Preisliste {1}
@@ -1495,13 +1495,13 @@
 Item-wise Purchase Register,Artikelweises Einkaufsregister
 Item-wise Sales History,Artikelweiser Vertriebsverlauf
 Item-wise Sales Register,Artikelweises Vertriebsregister
-"Item: {0} managed batch-wise, can not be reconciled using \					Stock Reconciliation, instead use Stock Entry","Item: {0} managed batch-wise, can not be reconciled using \					Stock Reconciliation, instead use Stock Entry"
+"Item: {0} managed batch-wise, can not be reconciled using \					Stock Reconciliation, instead use Stock Entry",Artikel: {0} wird stapelweise verarbeitet; kann nicht mit Lagerabgleich abgestimmt werden. Nutze nun Lagerbestand.
 Item: {0} not found in the system,Item: {0} nicht im System gefunden
 Items,Artikel
 Items To Be Requested,Artikel angefordert werden
 Items required,Artikel erforderlich
 "Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Angeforderte Artikel, die im gesamten Warenlager bezüglich der geforderten Menge und Mindestbestellmenge ""Nicht vorrätig"" sind."
-Items which do not exist in Item master can also be entered on customer's request,"Gegenstände, die nicht im Artikelstamm vorhanden sind, können auf Wunsch des Kunden auch eingetragen werden"
+Items which do not exist in Item master can also be entered on customer's request,"Artikel, die nicht im Artikelstamm vorhanden sind, können auf Wunsch des Kunden auch eingetragen werden"
 Itemwise Discount,Artikelweiser Rabatt
 Itemwise Recommended Reorder Level,Artikelweise empfohlene Neubestellungsebene
 Job Applicant,Bewerber
@@ -1512,43 +1512,42 @@
 Jobs Email Settings,Stellen-E-Mail-Einstellungen
 Journal Entries,Journaleinträge
 Journal Entry,Journaleintrag
-Journal Entry,Journal
-Journal Entry Account,Detailansicht Beleg
-Journal Entry Account No,Journalnummer
-Journal Entry {0} does not have account {1} or already matched,Blatt Gutschein {0} ist nicht Konto haben {1} oder bereits abgestimmt
-Journal Entries {0} are un-linked,Blatt Gutscheine {0} sind un -linked
-"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+Journal Voucher,Buchungsbeleg
+Journal Voucher Detail,Buchungsbeleg Detail
+Journal Voucher Detail No,Buchungsbeleg Detailnr.
+Journal Voucher {0} does not have account {1} or already matched,Buchungsbeleg {0} hat kein Konto {1} oder oder wurde bereits zugeordnet
+Journal Vouchers {0} are un-linked,{0} Buchungsbelege sind nicht verknüpft
+"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Verfolgung von Vertriebskampangen, Interessenten, Angebote, Kundenauftrag, usw. zur Beurteilung des Erfolges von Kampangen."
 Keep a track of communication related to this enquiry which will help for future reference.,Kommunikation bezüglich dieser Anfrage für zukünftige Zwecke aufbewahren.
-Keep it web friendly 900px (w) by 100px (h),"Bitte passende Größe für Webdarstellung wählen:
-900 Pixel breite und 100 Pixel Höhe"
+Keep it web friendly 900px (w) by 100px (h),halten Sie es Webfreundlich - 900px (breit) bei 100px (hoch)
 Key Performance Area,Wichtigster Leistungsbereich
 Key Responsibility Area,Wichtigster Verantwortungsbereich
 Kg,kg
 LR Date,LR-Datum
 LR No,LR-Nr.
 Label,Etikett
-Landed Cost Help,Hilfe zu Kosten
-Landed Cost Item,Kostenartikel
-Landed Cost Purchase Receipt,Kosten-Kaufbeleg
-Landed Cost Taxes and Charges,Kosten: Steuern und Abgaben
-Landed Cost Voucher,Kosten: Gebühren
-Landed Cost Voucher Amount,Kosten: Gebührenbetrag
+Landed Cost Help,Einstandpreis Hilfe
+Landed Cost Item,Einstandspreis Artikel
+Landed Cost Purchase Receipt,Einstandspreis Eingangslieferschein
+Landed Cost Taxes and Charges,Einstandspreis Steuern und Abgaben
+Landed Cost Voucher,Einstandspreis Gutschein
+Landed Cost Voucher Amount,Einstandspreis Gutscheinbetrag
 Language,Sprache
 Last Name,Familienname
-Last Purchase Rate,Letzter Einkaufspreis
+Last Purchase Rate,Letzter Anschaffungskurs
 Latest,neueste
 Lead,Interessent
-Lead Details,Details zu Interessent
-Lead Id,Interessenten-Id
-Lead Name,Interessenten-Name
-Lead Owner,Interessenten-Besitzer
-Lead Source,Interessentenquelle
-Lead Status,Status des Interessenten
+Lead Details,Interessent-Details
+Lead Id,Interessent Id
+Lead Name,Interessent Name
+Lead Owner,Interessent Eigentümer
+Lead Source,Interessent Ursprung
+Lead Status,Interessent Status
 Lead Time Date,Durchlaufzeit Datum
 Lead Time Days,Durchlaufzeit Tage
 Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,"""Durchlaufzeit Tage"" beschreibt die Anzahl der Tage, bis wann mit dem Eintreffen des Artikels im Lager zu rechnen ist. Diese Tage werden aus der Materialanforderung abgefragt, wenn Sie diesen Artikel auswählen."
 Lead Type,Lead-Typ
-Lead must be set if Opportunity is made from Lead,"Interessent muss angegeben werden, sofern die Chance aus einem Interessent erstellt wurde"
+Lead must be set if Opportunity is made from Lead,"Interessent muss eingestellt werden, wenn Chancen aus Interessenten erstellt werden"
 Leave Allocation,Urlaubszuordnung
 Leave Allocation Tool,Urlaubszuordnungs-Tool
 Leave Application,Abwesenheitsantrag
@@ -1589,22 +1588,22 @@
 Letter Head,Briefkopf
 Letter Heads for print templates.,Briefköpfe für Druckvorlagen.
 Level,Ebene
-Lft,Li
+Lft,li
 Liability,Haftung
-List a few of your customers. They could be organizations or individuals.,Listen Sie ein paar Ihrer Kunden auf. Dies können Organisationen oder Einzelpersonen sein .
-List a few of your suppliers. They could be organizations or individuals.,Listen Sie ein paar von Ihren Lieferanten auf. Dies können Organisationen oder Einzelpersonen sein.
+List a few of your customers. They could be organizations or individuals.,Geben Sie ein paar Ihrer Kunden an. Dies können Firmen oder Einzelpersonen sein.
+List a few of your suppliers. They could be organizations or individuals.,Geben Sie ein paar von Ihren Lieferanten an. Diese können Firmen oder Einzelpersonen sein.
 List items that form the package.,"Listenelemente, die das Paket bilden."
-List of users who can edit a particular Note,"Liste der Benutzer, die eine bestimmte Notiz bearbeiten können"
+List of users who can edit a particular Note,"Liste der Benutzer, die eine besondere Notiz bearbeiten können"
 List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Website auflisten.
-"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Auflistung Ihrer Produkte oder Dienstleistungen, die Sie kaufen oder verkaufen. Stellen Sie sicher, dass die Artikelgruppe, Einheit und weitere Eigenschaften überprüft haben. "
-"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Listen Sie Ihre Steuerköpfe auf (z.B. Mehrwertsteuer, Verbrauchssteuern; diese sollten eindeutige Namen haben) und ihre Standardsätze. Dies wird eine Standardvorlage erzeugen, die Sie auch später noch bearbeiten und ergänzen können."
+"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Geben Sie ein paar Ihrer Produkte oder Dienstleistungen an, die Sie kaufen oder verkaufen."
+"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Geben Sie Ihre Steuerangaben (z.B. Mehrwertsteuer, Verbrauchssteuern, etc.; Diese sollten eindeutige Namen haben) und die jeweiligen Standardsätze an."
 Loading...,Wird geladen ...
-Loans (Liabilities),Darlehen (Passiva)
-Loans and Advances (Assets),Darlehen und Vorschüsse
+Loans (Liabilities),Kredite (Passiva)
+Loans and Advances (Assets),Forderungen (Aktiva)
 Local,lokal
 "Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Protokoll der von Benutzern durchgeführten Aktivitäten bei Aufgaben, die zum Protokollieren von Zeit und zur Rechnungslegung verwendet werden."
 Login,Anmelden
-Login with your new User ID,Loggen Sie sich mit Ihrem neuen Benutzer-ID ein
+Login with your new User ID,Loggen Sie sich mit Ihrer neuen Benutzer-ID ein
 Logo,Logo
 Logo and Letter Heads,Logo und Briefköpfe
 Lost,verloren
@@ -1625,7 +1624,7 @@
 Maintenance Schedule Item,Wartungsplanposition
 Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
 Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} existiert
-Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Streichung dieses Kundenauftrages storniert werden
+Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages storniert werden
 Maintenance Schedules,Wartungspläne
 Maintenance Status,Wartungsstatus
 Maintenance Time,Wartungszeit
@@ -1633,12 +1632,12 @@
 Maintenance User,Mitarbeiter für die Wartung
 Maintenance Visit,Wartungsbesuch
 Maintenance Visit Purpose,Wartungsbesuch Zweck
-Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Streichung dieses Kundenauftrages storniert werden
+Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages storniert werden
 Maintenance start date can not be before delivery date for Serial No {0},Wartung Startdatum kann nicht vor dem Liefertermin für Seriennummer {0} sein
 Major/Optional Subjects,Wichtiger/optionaler Betreff
-Make ,Make 
+Make ,Ausführen 
 Make Accounting Entry For Every Stock Movement,Machen Accounting Eintrag für jede Lagerbewegung
-Make Bank Entry,Bankbeleg erstellen
+Make Bank Voucher,Bankbeleg erstellen
 Make Credit Note,Gutschrift erstellen
 Make Debit Note,Lastschrift erstellen
 Make Delivery,Lieferung erstellen
@@ -1670,13 +1669,13 @@
 Manage cost of operations,Betriebskosten verwalten
 Management,Management
 Manager,Manager
-"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Obligatorisch, wenn Bestandsartikel „Ja“ ist. Auch das Standardwarenlager, in dem die Menge über den Auftrag reserviert wurde."
-Manufacture against Sales Order,Fertigungsauftrag aus Verkaufsauftrag
+"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Notwendige Angabe, wenn Bestandsartikel ""Ja"" ist. Ebenfalls das Standardwarenlager, in dem die Menge über den Kundenauftrag reserviert wurde."
+Manufacture against Sales Order,Herstellung laut Kundenauftrag
 Manufacture/Repack,Herstellung/Neuverpackung
 Manufactured Item,Fertigungsartikel
 Manufactured Qty,Hergestellte Menge
-Manufactured quantity will be updated in this warehouse,Hergestellte Menge wird diesem Lager zugebucht
-Manufactured quantity {0} cannot be greater than planned quanitity {1} in Production Order {2},Hergestellt Menge {0} kann nicht größer sein als geplante Menge {1} in Fertigungsauftrag {2}
+Manufactured quantity will be updated in this warehouse,Hergestellte Menge wird in diesem Lager aktualisiert
+Manufactured quantity {0} cannot be greater than planned quanitity {1} in Production Order {2},Hergestellte Menge {0} kann nicht größer sein als die geplante Menge {1} in Fertigungsauftrag {2}
 Manufacturer,Hersteller
 Manufacturer Part Number,Hersteller-Teilenummer
 Manufacturing,Produktionsplanung
@@ -1698,7 +1697,7 @@
 Match non-linked Invoices and Payments.,Zuordnung nicht verknüpfter Rechnungen und Zahlungen.
 Material Issue,Materialentnahme
 Material Manager,Lager Verantwortlicher
-Material Master Manager,Supply Chain Verantwortlicher
+Material Master Manager,Lager Hauptverantwortlicher
 Material Receipt,Materialannahme
 Material Request,Materialanforderung
 Material Request Detail No,Detailnr. der Materialanforderung
@@ -1707,10 +1706,10 @@
 Material Request Items,Materialanforderungspositionen
 Material Request No,Materialanforderungsnr.
 Material Request Type,Materialanforderungstyp
-Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanforderung von maximal {0} kann für Artikel {1} gemacht werden gegen Sales Order {2}
+Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanforderung von maximal {0} kann für Artikel {1} aus Kundenauftrag {2} gemacht werden
 Material Request used to make this Stock Entry,Verwendete Materialanforderung für diesen Lagereintrag
 Material Request {0} is cancelled or stopped,Materialanforderung {0} wird abgebrochen oder gestoppt
-Material Requests for which Supplier Quotations are not created,"Material Anträge , für die Lieferant Zitate werden nicht erstellt"
+Material Requests for which Supplier Quotations are not created,Materialanfragen für die Lieferantenbestellungen werden nicht erstellt
 Material Requests {0} created,Material Requests {0} erstellt
 Material Requirement,Materialanforderung
 Material Transfer,Materialtransfer
@@ -1767,14 +1766,14 @@
 Moving Average Rate,Gleitende Mittelwertsrate
 Mr,Herr
 Ms,Frau
-Multiple Item prices.,Mehrere Artikelpreise .
-"Multiple Price Rule exists with same criteria, please resolve \			conflict by assigning priority. Price Rules: {0}","Multiple Price Rule exists with same criteria, please resolve \			conflict by assigning priority. Price Rules: {0}"
+Multiple Item prices.,Mehrere Artikelpreise.
+"Multiple Price Rule exists with same criteria, please resolve \			conflict by assigning priority. Price Rules: {0}","mehrere Preisregeln exisitieren mit den gleich Kriterien, bitte beheben durch Angabe der Priorität- Preisregel: {0}"
 Music,Musik
 Must be Whole Number,Muss eine Ganzzahl sein
 Name,Name
 Name and Description,Name und Beschreibung
 Name and Employee ID,Name und Personalnummer
-"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Name des neuen Konto . Hinweis : Bitte keine Konten für Kunden und Lieferanten zu schaffen , werden sie automatisch von der Kunden-und Lieferantenstamm angelegt"
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Name des neuen Kontos. Hinweis: Bitte erstellen Sie keine Konten für Kunden und Lieferanten zu schaffen, diese werden automatisch vom Kunden- und Lieferantenstamm angelegt"
 Name of person or organization that this address belongs to.,"Name der Person oder des Unternehmens, zu dem diese Adresse gehört."
 Name of the Budget Distribution,Name der Budgetverteilung
 Naming Series,Benennungsreihenfolge
@@ -1792,7 +1791,7 @@
 Net Weight of each Item,Nettogewicht der einzelnen Artikel
 Net pay cannot be negative,Nettolohn kann nicht negativ sein
 Never,Nie
-New ,New 
+New ,Neue 
 New Account,Neues Konto
 New Account Name,New Account Name
 New BOM,Neue Stückliste
@@ -1800,39 +1799,39 @@
 New Company,Neue Gesellschaft
 New Cost Center,Neue Kostenstelle
 New Cost Center Name,Neue Kostenstellennamen
-New Delivery Notes,Neuer Lieferschein
+New Delivery Notes,Neue Lieferscheine
 New Enquiries,Neue Anfragen
-New Leads,Neue Leads
+New Leads,Neue Interessenten
 New Leave Application,Neuer Urlaubsantrag
 New Leaves Allocated,Neue Urlaubszuordnung
 New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen)
 New Material Requests,Neue Materialanfragen
 New Projects,Neue Projekte
-New Purchase Orders,Neue Bestellungen
-New Purchase Receipts,Neue Kaufbelege
+New Purchase Orders,Neue Lieferatenaufträge
+New Purchase Receipts,Neue Eingangslieferscheine
 New Quotations,Neue Angebote
 New Sales Orders,Neue Kundenaufträge
-New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Neue Seriennummer kann nicht sein Warehouse. Warehouse müssen von Lizenz Eintrag oder Kaufbeleg eingestellt werden
+New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Neue Seriennummer kann kann kein Lager haben. Lagerangaben müssen durch Lagerzugang oder Eingangslieferschein erstellt werden
 New Stock Entries,Neue Lagerbestandseinträge
 New Stock UOM,Neue Lagerbestands-ME
-New Stock UOM is required,Neue Lizenz Verpackung erforderlich
-New Stock UOM must be different from current stock UOM,Neue Lizenz Verpackung muss sich von aktuellen Aktien Verpackung sein
+New Stock UOM is required,Neue Lager-ME erforderlich
+New Stock UOM must be different from current stock UOM,Neue Lager-ME muss sich von aktuellen Lager-ME unterscheiden
 New Supplier Quotations,Neue Lieferantenangebote
 New Support Tickets,Neue Support-Tickets
-New UOM must NOT be of type Whole Number,Neue Verpackung darf NICHT vom Typ ganze Zahl sein
+New UOM must NOT be of type Whole Number,Neue Mengeneinheit darf NICHT vom Typ ganze Zahl sein
 New Workplace,Neuer Arbeitsplatz
-New {0}: #{1},New {0}: #{1}
+New {0}: #{1},Neu: {0} - #{1}
 Newsletter,Newsletter
 Newsletter Content,Newsletter-Inhalt
 Newsletter Status,Newsletter-Status
 Newsletter has already been sent,Newsletter wurde bereits gesendet
-"Newsletters to contacts, leads.","Newsletter an Kontakte, Leads"
+"Newsletters to contacts, leads.","Newsletter an Kontakte, Interessenten"
 Newspaper Publishers,Zeitungsverleger
-Next,nächste
-Next Contact By,Nächster Kontakt durch
-Next Contact Date,Nächstes Kontaktdatum
-Next Date,Nächster Termin
-Next Recurring {0} will be created on {1},Next Recurring {0} will be created on {1}
+Next,weiter
+Next Contact By,nächster Kontakt durch
+Next Contact Date,nächstes Kontaktdatum
+Next Date,nächster Termin
+Next Recurring {0} will be created on {1},nächste Wiederholung von {0} wird erstellt am {1}
 Next email will be sent on:,Nächste E-Mail wird gesendet am:
 No,Nein
 No Customer Accounts found.,Keine Kundenkonten gefunden.
@@ -1842,13 +1841,13 @@
 No Items to pack,Keine Artikel zu packen
 No Permission,Keine Berechtigung
 No Production Orders created,Keine Fertigungsaufträge erstellt
-No Remarks,No Remarks
+No Remarks,ohne Anmerkungen
 No Supplier Accounts found. Supplier Accounts are identified based on 'Master Type' value in account record.,Keine Lieferantenkontengefunden. Lieferant Konten werden basierend auf dem Wert 'Master Type' in Kontodatensatz identifiziert.
 No accounting entries for the following warehouses,Keine Buchungen für die folgenden Hallen
 No addresses created,Keine Adressen erstellt
 No contacts created,Keine Kontakte erstellt
-No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Kein Standardadressvorlage gefunden. Bitte erstellen Sie ein neues Setup> Druck-und Branding-> Adressvorlage.
-No default BOM exists for Item {0},Kein Standardstücklisteexistiert für Artikel {0}
+No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Kein Standardadressvorlage gefunden. Bitte erstellen Sie eine Neue unter Setup > Druck und Branding -> Adressvorlage.
+No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
 No description given,Keine Beschreibung angegeben
 No employee found,Kein Mitarbeiter gefunden
 No employee found!,Kein Mitarbeiter gefunden!
@@ -1859,17 +1858,17 @@
 No record found,Kein Eintrag gefunden
 No records found in the Invoice table,Keine Einträge in der Rechnungstabelle gefunden
 No records found in the Payment table,Keine Datensätze in der Tabelle gefunden Zahlung
-No salary slip found for month: ,Kein Gehaltsabrechnung für den Monat gefunden:
-Non Profit,Non-Profit-
-Nos,nos
-Not Active,Nicht aktiv
-Not Applicable,Nicht anwendbar
+No salary slip found for month: ,Keine Gehaltsabrechnung gefunden für den Monat:
+Non Profit,Non-Profit
+Nos,Stk
+Not Active,nicht aktiv
+Not Applicable,nicht anwendbar
 Not Available,nicht verfügbar
-Not Billed,Nicht abgerechnet
-Not Delivered,Nicht geliefert
-Not In Stock,Not In Stock
-Not Sent,Not Sent
-Not Set,Nicht festgelegt
+Not Billed,nicht abgerechnet
+Not Delivered,nicht geliefert
+Not In Stock,nicht an Lager
+Not Sent,nicht versendet
+Not Set,nicht festgelegt
 Not allowed to update stock transactions older than {0},"Nicht erlaubt, um zu aktualisieren, Aktiengeschäfte, die älter als {0}"
 Not authorized to edit frozen Account {0},Keine Berechtigung für gefrorene Konto bearbeiten {0}
 Not authroized since {0} exceeds limits,Nicht authroized seit {0} überschreitet Grenzen
@@ -1885,7 +1884,7 @@
 Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlung Eintrag nicht da ""Cash oder Bankkonto ' wurde nicht angegeben erstellt werden"
 Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System wird nicht über Lieferung und Überbuchung überprüfen zu Artikel {0} als Menge oder die Menge ist 0
 Note: There is not enough leave balance for Leave Type {0},Hinweis: Es ist nicht genügend Urlaubsbilanz für Leave Typ {0}
-Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Hinweis: Diese Kostenstelle ist eine Gruppe. Kann nicht machen Buchungen gegen Gruppen .
+Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Hinweis: Diese Kostenstelle ist eine Gruppe. Kann nicht gegen eine Gruppe buchen.
 Note: {0},Hinweis: {0}
 Notes,Notizen
 Notes:,Notizen:
@@ -1907,7 +1906,7 @@
 Online Auctions,Online-Auktionen
 Only Leave Applications with status 'Approved' can be submitted,"Nur Lassen Anwendungen mit dem Status ""Genehmigt"" eingereicht werden können"
 "Only Serial Nos with status ""Available"" can be delivered.","Nur Seriennummernmit dem Status ""Verfügbar"" geliefert werden."
-Only leaf nodes are allowed in transaction,In der Transaktion sind nur Blattknoten erlaubt
+Only leaf nodes are allowed in transaction,In der Transaktion sind nur Unterelemente erlaubt
 Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Datum Genehmiger können diese Urlaubsantrag einreichen
 Open,Offen
 Open Production Orders,Offene Fertigungsaufträge
@@ -1941,15 +1940,15 @@
 Ordered Items To Be Billed,"Abzurechnende, bestellte Artikel"
 Ordered Items To Be Delivered,"Zu liefernde, bestellte Artikel"
 Ordered Qty,bestellte Menge
-"Ordered Qty: Quantity ordered for purchase, but not received.","Bestellte Menge: Bestellmenge für den Kauf, aber nicht empfangen ."
+"Ordered Qty: Quantity ordered for purchase, but not received.","Bestellte Menge: Bestellmenge für den Kauf, aber nicht erhalten."
 Ordered Quantity,Bestellte Menge
 Orders released for production.,Für die Produktion freigegebene Bestellungen.
-Organization Name,Name der Organisation
-Organization Profile,Unternehmensprofil
-Organization branch master.,Organisation Niederlassung Master.
-Organization unit (department) master.,Organisationseinheit ( Abteilung ) Master.
-Other,Sonstige
-Other Details,Weitere Details
+Organization Name,Firmenname
+Organization Profile,Firmenprofil
+Organization branch master.,Firmen-Niederlassungen Vorlage.
+Organization unit (department) master.,Firmeneinheit (Abteilung) Vorlage.
+Other,sonstige
+Other Details,weitere Details
 Others,andere
 Out Qty,out Menge
 Out Value,out Wert
@@ -1958,18 +1957,18 @@
 Outgoing,Postausgang
 Outstanding Amount,Ausstehender Betrag
 Outstanding for {0} cannot be less than zero ({1}),Herausragende für {0} kann nicht kleiner als Null sein ({1})
-Overdue,Overdue
-Overdue: ,Overdue: 
-Overhead,Overhead
+Overdue,überfällig
+Overdue: ,überfällig:
+Overhead,Gemeinkosten
 Overheads,Gemeinkosten
-Overlapping conditions found between:,Overlapping Bedingungen zwischen gefunden:
+Overlapping conditions found between:,überlagernde Bedingungen gefunden zwischen:
 Overview,Überblick
 Owned,Im Besitz
 Owner,Eigentümer
 P L A - Cess Portion,PLA - Cess Portion
 PL or BS,PL oder BS
 PO Date,Bestelldatum
-PO No,PO Nein
+PO No,Lieferantenauftag Nr
 POP3 Mail Server,POP3-Mail-Server
 POP3 Mail Settings,POP3-Mail-Einstellungen
 POP3 mail server (e.g. pop.gmail.com),POP3-Mail-Server (z. B. pop.gmail.com)
@@ -2018,9 +2017,9 @@
 Partner Type,Partnertyp
 Partner's Website,Webseite des Partners
 Party,Gruppe
-Party Account,Party Account
-Party Type,Party- Typ
-Party Type Name,Party- Typ Name
+Party Account,Gruppenzugang
+Party Type,Gruppen-Typ
+Party Type Name,Gruppen-Typ Name
 Passive,Passiv
 Passport Number,Passnummer
 Password,Passwort
@@ -2030,7 +2029,7 @@
 Payables Group,Verbindlichkeiten Gruppe
 Payment Days,Zahltage
 Payment Due Date,Zahlungstermin
-Payment Pending,Payment Pending
+Payment Pending,Zahlung ausstehend
 Payment Period Based On Invoice Date,Zahlungszeitraum basiert auf Rechnungsdatum
 Payment Reconciliation,Zahlungsabstimmung
 Payment Reconciliation Invoice,Zahlung Versöhnung Rechnung
@@ -2058,9 +2057,9 @@
 Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Zusätzlich zur bestellten Menge zulässiger Prozentsatz, der empfangen oder geliefert werden kann. Zum Beispiel: Wenn Sie 100 Einheiten bestellt haben und Ihre Spanne beträgt 10 %, dann können Sie 110 Einheiten empfangen."
 Performance appraisal.,Mitarbeiterbeurteilung
 Period,Zeit
-Period Closing Entry,Period Closing Entry
+Period Closing Entry,Zeitraum Abschluss Eintrag
 Period Closing Voucher,Zeitraum Abschluss Gutschein
-Period From and Period To dates mandatory for recurring %s,Period From and Period To dates mandatory for recurring %s
+Period From and Period To dates mandatory for recurring %s,Zeitraum von und Zeitraum bis sind notwendig bei wiederkehrendem Eintrag %s
 Periodicity,Periodizität
 Permanent Address,Dauerhafte Adresse
 Permanent Address Is,Permanent -Adresse ist
@@ -2077,7 +2076,7 @@
 Place of Issue,Ausstellungsort
 Plan for maintenance visits.,Wartungsbesuche planen
 Planned Qty,Geplante Menge
-"Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.","Geplante Menge : Menge , für die , Fertigungsauftrag ausgelöst wurde , aber steht noch hergestellt werden ."
+"Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.","Geplante Menge: Menge, für die Fertigungsaufträge ausgelöst wurden, aber noch hergestellt wurden."
 Planned Quantity,Geplante Menge
 Planning,Planung
 Plant,Fabrik
@@ -2086,37 +2085,37 @@
 Please Update SMS Settings,Bitte aktualisiere SMS-Einstellungen
 Please add expense voucher details,Bitte fügen Sie Kosten Gutschein Details
 Please add to Modes of Payment from Setup.,Bitte um Zahlungsmodalitäten legen aus einrichten.
-Please check 'Is Advance' against Account {0} if this is an advance entry.,"Bitte prüfen ' Ist Voraus ' gegen Konto {0} , wenn dies ein Fortschritt Eintrag ."
-Please click on 'Generate Schedule',"Bitte klicken Sie auf "" Generieren Zeitplan '"
-Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte klicken Sie auf "" Generieren Zeitplan ' zu holen Seriennummer für Artikel hinzugefügt {0}"
-Please click on 'Generate Schedule' to get schedule,"Bitte klicken Sie auf "" Generieren Schedule ' Plan bekommen"
-Please create Customer from Lead {0},Bitte erstellen Sie Kunde aus Blei {0}
+Please check 'Is Advance' against Account {0} if this is an advance entry.,"Bitte prüfen Sie 'Ist Vorkasse' zu Konto {0}, wenn dies ein Vorkassen-Eintrag ist."
+Please click on 'Generate Schedule',"Bitte klicken Sie auf ""Zeitplan generieren"""
+Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte klicken Sie auf ""Zeitplan generieren"" die Seriennummer für Artikel {0} hinzuzufügen"
+Please click on 'Generate Schedule' to get schedule,"Bitte klicken Sie auf ""Zeitplan generieren"" um den Zeitplan zu bekommen"
+Please create Customer from Lead {0},Bitte erstellen Sie einen Kunden aus dem Interessent {0}
 Please create Salary Structure for employee {0},Legen Sie bitte Gehaltsstruktur für Mitarbeiter {0}
-Please create new account from Chart of Accounts.,Bitte neues Konto erstellen von Konten .
-Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Bitte nicht erstellen Account ( Ledger ) für Kunden und Lieferanten . Sie werden direkt von den Kunden- / Lieferanten -Master erstellt.
-Please enter 'Expected Delivery Date',"Bitte geben Sie "" Voraussichtlicher Liefertermin """
-Please enter 'Is Subcontracted' as Yes or No,"Bitte geben Sie "" Untervergabe "" als Ja oder Nein"
-Please enter 'Repeat on Day of Month' field value,"Bitte geben Sie 'Repeat auf Tag des Monats "" Feldwert"
+Please create new account from Chart of Accounts.,Bitte neues Konto erstellen von Kontenübersicht.
+Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Bitte keine Konten (Buchungsbelege) für Kunden und Lieferanten erstellen. Diese werden direkt von den Kunden-/Lieferanten-Stammdaten aus erstellt.
+Please enter 'Expected Delivery Date',"Bitte geben Sie den ""voraussichtlichen Liefertermin"" ein"
+Please enter 'Is Subcontracted' as Yes or No,"Bitte geben Sie Untervergabe"""" als Ja oder Nein ein"""
+Please enter 'Repeat on Day of Month' field value,"Bitte geben Sie ""Wiederholung am Tag des Monats"" als Feldwert ein"
 Please enter Account Receivable/Payable group in company master,Bitte geben Sie Debitoren / Kreditorengruppein der Firma Master
 Please enter Approving Role or Approving User,Bitte geben Sie die Genehmigung von Rolle oder Genehmigung Benutzer
 Please enter BOM for Item {0} at row {1},Bitte geben Sie Stückliste für Artikel {0} in Zeile {1}
 Please enter Company,Bitte geben Sie Firmen
 Please enter Cost Center,Bitte geben Sie Kostenstelle
-Please enter Delivery Note No or Sales Invoice No to proceed,"Geben Sie die Lieferschein- oder die Verkaufsrechnungsnummer ein, um fortzufahren"
+Please enter Delivery Note No or Sales Invoice No to proceed,"Geben Sie die Lieferschein- oder die Ausgangsrechnungs-Nr ein, um fortzufahren"
 Please enter Employee Id of this sales parson,Bitte geben Sie die Mitarbeiter-ID dieses Verkaufs Pfarrer
 Please enter Expense Account,Geben Sie das Aufwandskonto ein
 Please enter Item Code to get batch no,Bitte geben Sie Artikel-Code zu Charge nicht bekommen
-Please enter Item Code.,Bitte geben Sie Artikel-Code .
+Please enter Item Code.,Bitte geben Sie die Artikel-Nummer ein.
 Please enter Item first,Bitte geben Sie zuerst Artikel
 Please enter Maintaince Details first,Bitte geben Sie Maintaince Einzelheiten ersten
-Please enter Master Name once the account is created.,"Bitte geben Sie Namen , wenn der Master- Account erstellt ."
+Please enter Master Name once the account is created.,Bitte geben Sie den Hauptmamen ein sobald das Konto angelegt wurde.
 Please enter Planned Qty for Item {0} at row {1},Bitte geben Sie Geplante Menge für Artikel {0} in Zeile {1}
 Please enter Production Item first,Bitte geben Sie zuerst Herstellungs Artikel
-Please enter Purchase Receipt No to proceed,"Geben Sie 'Kaufbeleg Nein' ein, um fortzufahren"
-Please enter Purchase Receipt first,Please enter Purchase Receipt first
-Please enter Purchase Receipts,Please enter Purchase Receipts
+Please enter Purchase Receipt No to proceed,"Geben Sie 'Eingangslieferschein-Nr.' ein, um fortzufahren"
+Please enter Purchase Receipt first,erfassen Sie zuerst den Eingangslieferschein
+Please enter Purchase Receipts,Erfassen Sie die Eingangslieferscheine
 Please enter Reference date,Bitte geben Sie Stichtag
-Please enter Taxes and Charges,Please enter Taxes and Charges
+Please enter Taxes and Charges,Erfassen Sie die Steuern und Abgaben
 Please enter Warehouse for which Material Request will be raised,Bitte geben Sie für die Warehouse -Material anfordern wird angehoben
 Please enter Write Off Account,Bitte geben Sie Write Off Konto
 Please enter atleast 1 invoice in the table,Bitte geben Sie atleast 1 Rechnung in der Tabelle
@@ -2124,34 +2123,34 @@
 Please enter company name first,Bitte geben erste Firmennamen
 Please enter default Unit of Measure,Bitte geben Sie Standard Maßeinheit
 Please enter default currency in Company Master,Bitte geben Sie die Standardwährung in Firmen Meister
-Please enter email address,Bitte geben Sie E-Mail -Adresse
-Please enter item details,Bitte geben Sie Artikel-Seite
-Please enter message before sending,Bitte geben Sie eine Nachricht vor dem Versenden
-Please enter parent account group for warehouse {0},Please enter parent account group for warehouse {0}
+Please enter email address,Bitte geben Sie eine E-Mail-Adresse an
+Please enter item details,Bitte geben Sie Artikel-Details an
+Please enter message before sending,Bitte geben Sie eine Nachricht vor dem Versenden ein
+Please enter parent account group for warehouse {0},Bitte geben Sie die Stammkontengruppe für das Lager {0} an
 Please enter parent cost center,Bitte geben Sie Mutterkostenstelle
 Please enter quantity for Item {0},Bitte geben Sie Menge für Artikel {0}
 Please enter relieving date.,Bitte geben Sie Linderung Datum.
-Please enter sales order in the above table,Bitte geben Sie Kundenauftrag in der obigen Tabelle
+Please enter sales order in the above table,Bitte geben Sie den Kundenauftrag in der obigen Tabelle an
 Please enter valid Company Email,Bitte geben Sie eine gültige E-Mail- Gesellschaft
 Please enter valid Email Id,Bitte geben Sie eine gültige E-Mail -ID
 Please enter valid Personal Email,Bitte geben Sie eine gültige E-Mail- Personal
 Please enter valid mobile nos,Bitte geben Sie eine gültige Mobil nos
-Please find attached {0} #{1},Please find attached {0} #{1}
-Please install dropbox python module,Installieren Sie das Dropbox-Modul Python
+Please find attached {0} #{1},Bitte nehmen Sie den Anhang {0} #{1} zur Kenntnis
+Please install dropbox python module,Installieren Sie das Dropbox Python-Modul
 Please mention no of visits required,Bitte erwähnen Sie keine Besuche erforderlich
-Please pull items from Delivery Note,Bitte ziehen Sie Elemente aus Lieferschein
-Please save the Newsletter before sending,Bitte bewahren Sie den Newsletter vor dem Senden
-Please save the document before generating maintenance schedule,Bitte speichern Sie das Dokument vor der Erzeugung Wartungsplan
-Please see attachment,S. Anhang
+Please pull items from Delivery Note,Bitte nehmen Sie die Artikel aus dem Lieferschein
+Please save the Newsletter before sending,Bitte speichern Sie den Newsletter vor dem Senden
+Please save the document before generating maintenance schedule,Bitte speichern Sie das Dokument vor dem Speichern des Wartungsplans
+Please see attachment,siehe Anhang
 Please select Bank Account,Wählen Sie ein Bankkonto aus
 Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Klicken Sie auf 'Übertragen', wenn Sie auch die Bilanz des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbeziehen möchten."
 Please select Category first,Bitte wählen Sie zuerst Kategorie
-Please select Charge Type first,Bitte wählen Sie Entgeltart ersten
+Please select Charge Type first,Bitte wählen Sie zunächst Ladungstyp
 Please select Fiscal Year,Bitte wählen Geschäftsjahr
 Please select Group or Ledger value,Bitte wählen Sie Gruppen-oder Buchwert
 Please select Incharge Person's name,Bitte wählen Sie Incharge Person Name
 Please select Invoice Type and Invoice Number in atleast one row,Bitte wählen Sie Rechnungstyp und Rechnungsnummer in einer Zeile atleast
-"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Bitte wählen Sie Artikel , wo ""Ist Auf Item"" ist ""Nein"" und ""Ist Verkaufsartikel "" ist "" Ja"", und es gibt keinen anderen Vertriebsstückliste"
+"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Bitte wählen Sie den Artikel, bei dem ""Ist Lageratikel"" ""Nein"" ist und ""Ist Verkaufsartikel ""Ja"" ist und es keine andere Vertriebsstückliste gibt"
 Please select Price List,Wählen Sie eine Preisliste aus
 Please select Start Date and End Date for Item {0},Bitte wählen Sie Start -und Enddatum für den Posten {0}
 Please select Time Logs.,Wählen Sie Zeitprotokolle aus.
@@ -2161,7 +2160,7 @@
 "Please select an ""Image"" first","Bitte wählen Sie einen ""Bild"" erste"
 Please select charge type first,Bitte wählen Sie zunächst Ladungstyp
 Please select company first,Bitte wählen Unternehmen zunächst
-Please select company first.,Bitte wählen Sie Firma .
+Please select company first.,Bitte wählen zuerst die Firma aus.
 Please select item code,Bitte wählen Sie Artikel Code
 Please select month and year,Wählen Sie Monat und Jahr aus
 Please select prefix first,Bitte wählen Sie zunächst Präfix
@@ -2177,8 +2176,8 @@
 Please set {0},Bitte setzen Sie {0}
 Please setup Employee Naming System in Human Resource > HR Settings,Richten Sie das Mitarbeiterbenennungssystem unter Personalwesen > HR-Einstellungen ein
 Please setup numbering series for Attendance via Setup > Numbering Series,Bitte Setup Nummerierungsserie für Besucher über Setup> Nummerierung Serie
-Please setup your POS Preferences,Please setup your POS Preferences
-Please setup your chart of accounts before you start Accounting Entries,"Bitte Einrichtung Ihrer Kontenbuchhaltung, bevor Sie beginnen Einträge"
+Please setup your POS Preferences,Bitte richten Sie zunächst die POS-Einstellungen ein
+Please setup your chart of accounts before you start Accounting Entries,"Bitte richten Sie zunächst Ihre Kontenbuchhaltung ein, bevor Sie Einträge vornehmen"
 Please specify,Geben Sie Folgendes an
 Please specify Company,Geben Sie das Unternehmen an
 Please specify Company to proceed,"Geben Sie das Unternehmen an, um fortzufahren"
@@ -2200,7 +2199,7 @@
 Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit ist obligatorisch
 Posting timestamp must be after {0},Buchungszeitmarkemuss nach {0}
 Potential Sales Deal,Mögliches Umsatzgeschäft
-Potential opportunities for selling.,Mögliche Gelegenheiten für den Verkauf.
+Potential opportunities for selling.,Mögliche Gelegenheiten für den Vertrieb.
 Preferred Billing Address,Bevorzugte Rechnungsadresse
 Preferred Shipping Address,Bevorzugte Lieferadresse
 Prefix,Präfix
@@ -2208,7 +2207,7 @@
 Prevdoc DocType,Dokumententyp Prevdoc
 Prevdoc Doctype,Dokumententyp Prevdoc
 Preview,Vorschau
-Previous,früher
+Previous,zurück
 Previous Work Experience,Vorherige Berufserfahrung
 Price,Preis
 Price / Discount,Preis / Rabatt
@@ -2219,9 +2218,9 @@
 Price List Master,Preislistenstamm
 Price List Name,Preislistenname
 Price List Rate,Preislistenrate
-Price List Rate (Company Currency),Preislistenrate (Unternehmenswährung)
+Price List Rate (Company Currency),Preislisten-Preis (Unternehmenswährung)
 Price List master.,Preisliste Master.
-Price List must be applicable for Buying or Selling,Preisliste ist gültig für Kauf oder Verkauf sein
+Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
 Price List not selected,Preisliste nicht ausgewählt
 Price List {0} is disabled,Preisliste {0} ist deaktiviert
 Price or Discount,Preis -oder Rabatt-
@@ -2246,11 +2245,11 @@
 Product Enquiry,Produktanfrage
 Production,Produktion
 Production Order,Fertigungsauftrag
-Production Order status is {0},Fertigungsauftragsstatusist {0}
-Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Streichung dieses Sales Order storniert werden
-Production Order {0} must be submitted,Fertigungsauftrag {0} muss vorgelegt werden
+Production Order status is {0},Status des Fertigungsauftrags lautet {0}
+Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages storniert werden
+Production Order {0} must be submitted,Fertigungsauftrag {0} muss eingereicht werden
 Production Orders,Fertigungsaufträge
-Production Orders in Progress,Fertigungsaufträge
+Production Orders in Progress,Fertigungsaufträge in Arbeit
 Production Plan Item,Produktionsplan Artikel
 Production Plan Items,Produktionsplan Artikel
 Production Plan Sales Order,Produktionsplan Kundenauftrag
@@ -2296,59 +2295,59 @@
 Purchase Common,Einkauf Allgemein
 Purchase Details,Kaufinformationen
 Purchase Discounts,Einkaufsrabatte
-Purchase Invoice,Einkaufsrechnung
-Purchase Invoice Advance,Einkaufsrechnung Vorschuss
-Purchase Invoice Advances,Einkaufsrechnung Vorschüsse
-Purchase Invoice Item,Rechnungsposition Einkauf
-Purchase Invoice Trends,Einkauf Rechnungstrends
-Purchase Invoice {0} is already submitted,Einkaufsrechnung {0} ist bereits eingereicht
+Purchase Invoice,Eingangsrechnung
+Purchase Invoice Advance,Eingangsrechnung Vorkasse
+Purchase Invoice Advances,Eingangsrechnung Vorkasse
+Purchase Invoice Item,Eingangsrechnung Artikel
+Purchase Invoice Trends,Eingangsrechnung Trends
+Purchase Invoice {0} is already submitted,Eingangsrechnung {0} ist bereits eingereicht
 Purchase Item,Einkaufsartikel
-Purchase Manager,Einkauf Verantwortlicher
-Purchase Master Manager,Einkauf Oberste Leitung
-Purchase Order,Bestellung
-Purchase Order Item,Bestellposition
-Purchase Order Item No,Bestellposition Nr.
-Purchase Order Item Supplied,Bestellposition geliefert
-Purchase Order Items,Bestellpositionen
-Purchase Order Items Supplied,Gelieferte Bestellpositionen
-Purchase Order Items To Be Billed,Abzurechnende Bestellpositionen
-Purchase Order Items To Be Received,Eingehende Bestellpositionen
-Purchase Order Message,Bestellung Nachricht
-Purchase Order Required,Bestellung erforderlich
-Purchase Order Trends,Bestellungstrends
-Purchase Order number required for Item {0},Auftragsnummer für den Posten erforderlich {0}
-Purchase Order {0} is 'Stopped',"Purchase Order {0} ""Kasse"""
-Purchase Order {0} is not submitted,Bestellung {0} ist nicht eingereicht
-Purchase Orders given to Suppliers.,An Lieferanten weitergegebene Bestellungen.
-Purchase Receipt,Kaufbeleg
-Purchase Receipt Item,Kaufbelegposition
-Purchase Receipt Item Supplied,Kaufbeleg gelieferter Artikel
-Purchase Receipt Item Supplieds,Kaufbeleg gelieferte Artikel
-Purchase Receipt Items,Kaufbeleg Artikel
-Purchase Receipt Message,Kaufbeleg Nachricht
-Purchase Receipt No,Kaufbeleg Nr.
-Purchase Receipt Required,Kaufbeleg Erforderlich
-Purchase Receipt Trends,Kaufbeleg Trends
-Purchase Receipt must be submitted,Purchase Receipt must be submitted
-Purchase Receipt number required for Item {0},Kaufbeleg Artikelnummer für erforderlich {0}
-Purchase Receipt {0} is not submitted,Kaufbeleg {0} ist nicht eingereicht
-Purchase Receipts,Purchase Receipts
+Purchase Manager,Einkaf Verantwortlicher
+Purchase Master Manager,Einkauf Hauptverantwortlicher
+Purchase Order,Lieferatenauftrag
+Purchase Order Item,Lieferatenauftrag Artikel
+Purchase Order Item No,Lieferatenauftrag Artikel-Nr.
+Purchase Order Item Supplied,Lieferatenauftrag Artikel geliefert
+Purchase Order Items,Lieferatenauftrag Artikel
+Purchase Order Items Supplied,Lieferatenauftrag Artikel geliefert
+Purchase Order Items To Be Billed,Abzurechnende Lieferatenauftrags-Artikel
+Purchase Order Items To Be Received,Eingehende Lieferatenauftrags-Artikel
+Purchase Order Message,Lieferatenauftrag Nachricht
+Purchase Order Required,Lieferatenauftrag erforderlich
+Purchase Order Trends,Lieferatenauftrag Trends
+Purchase Order number required for Item {0},Lieferatenauftragsnummer ist für den Artikel {0} erforderlich
+Purchase Order {0} is 'Stopped',Lieferatenauftrag {0} wurde 'angehalten'
+Purchase Order {0} is not submitted,Lieferatenauftrag {0} wurde nicht eingereicht
+Purchase Orders given to Suppliers.,An Lieferanten weitergegebene Lieferatenaufträge.
+Purchase Receipt,Eingangslieferschein
+Purchase Receipt Item,Eingangslieferschein Artikel
+Purchase Receipt Item Supplied,Eingangslieferschein Artikel geliefert
+Purchase Receipt Item Supplieds,Eingangslieferschein Artikel geliefert
+Purchase Receipt Items,Eingangslieferschein Artikel
+Purchase Receipt Message,Eingangslieferschein Nachricht
+Purchase Receipt No,Eingangslieferschein Nr.
+Purchase Receipt Required,Eingangslieferschein notwendig
+Purchase Receipt Trends,Eingangslieferschein Trends
+Purchase Receipt must be submitted,Eingangslieferscheine müssen eingereicht werden
+Purchase Receipt number required for Item {0},Eingangslieferschein-Nr ist für Artikel {0} erforderlich
+Purchase Receipt {0} is not submitted,Eingangslieferschein {0} wurde nicht eingereicht
+Purchase Receipts,Eingangslieferscheine
 Purchase Register,Einkaufsregister
 Purchase Return,Warenrücksendung
 Purchase Returned,Zurückgegebene Ware
 Purchase Taxes and Charges,Einkauf Steuern und Abgaben
 Purchase Taxes and Charges Master,Einkaufssteuern und Abgabenstamm
 Purchase User,Einkauf Mitarbeiter
-Purchse Order number required for Item {0},Purchse Bestellnummer für Artikel erforderlich {0}
+Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
 Purpose,Zweck
 Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
 QA Inspection,QA-Inspektion
-Qty,Mng
+Qty,Menge
 Qty Consumed Per Unit,Verbrauchte Menge pro Einheit
 Qty To Manufacture,Herzustellende Menge
-Qty as per Stock UOM,Menge nach Bestand-ME
+Qty as per Stock UOM,Menge nach Lager-ME
 Qty to Deliver,Menge zu liefern
-Qty to Order,Bestellmenge
+Qty to Order,Menge zu bestellen
 Qty to Receive,Menge zu erhalten
 Qty to Transfer,Menge zu versenden
 Qualification,Qualifikation
@@ -2388,7 +2387,7 @@
 Raised By (Email),Gemeldet von (E-Mail)
 Random,Zufällig
 Range,Bandbreite
-Rate,Satz
+Rate,Rate
 Rate ,Rate
 Rate (%),Satz ( %)
 Rate (Company Currency),Satz (Firmen Währung)
@@ -2401,7 +2400,7 @@
 Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Lieferantenwährung in die Basiswährung des Unternehmens umgerechnet wird"
 Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewendet wird"
 Raw Material,Rohstoff
-Raw Material Item Code,Artikelcode Rohstoffe
+Raw Material Item Code,Artikel-Nr Rohstoffe
 Raw Materials Supplied,Gelieferte Rohstoffe
 Raw Materials Supplied Cost,Kosten gelieferter Rohstoffe
 Raw material cannot be same as main Item,Raw Material nicht wie Haupt Titel
@@ -2448,7 +2447,7 @@
 Record item movement.,Verschiebung Datenposition
 Recurring Id,Wiederkehrende ID
 Recurring Invoice,Wiederkehrende Rechnung
-Recurring Order,Recurring Order
+Recurring Order,sich Wiederholende Bestellung
 Recurring Type,Wiederkehrender Typ
 Reduce Deduction for Leave Without Pay (LWP),Abzug für unbezahlten Urlaub (LWP) senken
 Reduce Earning for Leave Without Pay (LWP),Verdienst für unbezahlten Urlaub (LWP) senken
@@ -2463,7 +2462,7 @@
 Reference No is mandatory if you entered Reference Date,"Referenznummer ist obligatorisch, wenn Sie Stichtag eingegeben"
 Reference Number,Referenznummer
 Reference Row #,Referenz Row #
-Refresh,Aktualisieren
+Refresh,aktualisieren
 Registration Details,Details zur Anmeldung
 Registration Info,Anmeldungsinfo
 Rejected,Abgelehnt
@@ -2476,7 +2475,7 @@
 Relieving Date must be greater than Date of Joining,Entlastung Datum muss größer sein als Datum für Füge sein
 Remark,Bemerkung
 Remarks,Bemerkungen
-Remove item if charges is not applicable to that item,Remove item if charges is not applicable to that item
+Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechtet werden können"
 Rename,umbenennen
 Rename Log,Protokoll umbenennen
 Rename Tool,Tool umbenennen
@@ -2492,7 +2491,7 @@
 Report Type,Berichtstyp
 Report Type is mandatory,Berichtstyp ist verpflichtend
 Reports to,Berichte an
-Reqd By Date,Erf nach Datum
+Reqd By Date,Reqd nach Datum
 Reqd by Date,Reqd nach Datum
 Request Type,Anfragetyp
 Request for Information,Informationsanfrage
@@ -2502,7 +2501,7 @@
 Requested Items To Be Ordered,"Angeforderte Artikel, die bestellt werden sollen"
 Requested Items To Be Transferred,"Angeforderte Artikel, die übertragen werden sollen"
 Requested Qty,Angeforderte Menge
-"Requested Qty: Quantity requested for purchase, but not ordered.","Angeforderte Menge : Menge für den Kauf erbeten, aber nicht bestellt ."
+"Requested Qty: Quantity requested for purchase, but not ordered.","Angeforderte Menge : Menge durch einen Verkauf benötigt, aber nicht bestellt."
 Requests for items.,Artikelanfragen
 Required By,Erforderlich nach
 Required Date,Erforderliches Datum
@@ -2515,11 +2514,11 @@
 Reseller,Wiederverkäufer
 Reserved,reserviert
 Reserved Qty,reservierte Menge
-"Reserved Qty: Quantity ordered for sale, but not delivered.","Reservierte Menge: bestellte Menge zu verkaufen, aber nicht geliefert ."
+"Reserved Qty: Quantity ordered for sale, but not delivered.","Reservierte Menge: Für den Verkauf bestellte Menge, aber noch nicht geliefert."
 Reserved Quantity,Reservierte Menge
 Reserved Warehouse,Reserviertes Warenlager
-Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserviertes Warenlager in Kundenauftrag / Fertigwarenlager
-Reserved Warehouse is missing in Sales Order,Reserviertes Warenlager fehlt in Kundenauftrag
+Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservierte Ware im Lager aus Kundenaufträgen / Fertigwarenlager
+Reserved Warehouse is missing in Sales Order,Reservierendes Lager fehlt in Kundenauftrag
 Reserved Warehouse required for stock Item {0} in row {1},Reserviert Lagerhaus Lager Artikel erforderlich {0} in Zeile {1}
 Reserved warehouse required for stock item {0},Reserviert Lager für Lagerware erforderlich {0}
 Reserves and Surplus,Rücklagen und Überschüsse
@@ -2534,13 +2533,13 @@
 Retail & Wholesale,Retail & Wholesale
 Retailer,Einzelhändler
 Review Date,Bewertung
-Rgt,Rt
+Rgt,re
 Role Allowed to edit frozen stock,Rolle darf eingefrorenen Bestand bearbeiten
 Role that is allowed to submit transactions that exceed credit limits set.,"Rolle darf Transaktionen einreichen, die das gesetzte Kreditlimit überschreiten."
 Root Type,root- Typ
 Root Type is mandatory,Root- Typ ist obligatorisch
-Root account can not be deleted,Root-Konto kann nicht gelöscht werden!
-Root cannot be edited.,Root-Konto kann nicht bearbeitet werden!
+Root account can not be deleted,Haupt-Konto kann nicht gelöscht werden
+Root cannot be edited.,Haupt-Konto kann nicht bearbeitet werden.
 Root cannot have a parent cost center,Stamm darf keine übergeordnete Kostenstelle haben
 Rounded Off,abgerundet
 Rounded Total,Abgerundete Gesamtsumme
@@ -2548,20 +2547,20 @@
 Row # ,Zeile #
 Row # {0}: ,Zeile # {0}:
 Row #{0}: Please specify Serial No for Item {1},Row # {0}: Bitte Seriennummer für Artikel {1}
-Row {0}: Account does not match with \						Purchase Invoice Credit To account,Row {0}: Account does not match with \						Purchase Invoice Credit To account
-Row {0}: Account does not match with \						Sales Invoice Debit To account,Row {0}: Account does not match with \						Sales Invoice Debit To account
+Row {0}: Account does not match with \						Purchase Invoice Credit To account,Zeile {0}: Konto stimmt nicht mit Eingangsrechnungswert überein
+Row {0}: Account does not match with \						Sales Invoice Debit To account,Zeile {0}: Konto stimmt nicht mit Ausgangsrechnungsbetrag überein
 Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist obligatorisch
-Row {0}: Credit entry can not be linked with a Purchase Invoice,Row {0} : Kredit Eintrag kann nicht mit einer Einkaufsrechnung verknüpft werden
-Row {0}: Debit entry can not be linked with a Sales Invoice,Row {0} : Debit- Eintrag kann nicht mit einer Verkaufsrechnung verknüpft werden
+Row {0}: Credit entry can not be linked with a Purchase Invoice,Row {0} : Kredit Eintrag kann nicht mit einer Eingangsrechnung verknüpft werden
+Row {0}: Debit entry can not be linked with a Sales Invoice,Zeile {0}: Debit-Eintrag kann nicht mit einer Ausgangsrechnung verknüpft werden
 Row {0}: Payment amount must be less than or equals to invoice outstanding amount. Please refer Note below.,Row {0}: Zahlungsbetrag muss kleiner als oder gleich zu ausstehenden Betrag in Rechnung stellen können. Bitte beachten Sie folgenden Hinweis.
 Row {0}: Qty is mandatory,Row {0}: Menge ist obligatorisch
-"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty not avalable in warehouse {1} on {2} {3}.					Available Qty: {4}, Transfer Qty: {5}"
-"Row {0}: To set {1} periodicity, difference between from and to date \						must be greater than or equal to {2}","Row {0}: To set {1} periodicity, difference between from and to date \						must be greater than or equal to {2}"
+"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.					Available Qty: {4}, Transfer Qty: {5}",Zeile {0}: Menge {2} {3} ist auf Lager {1} nicht verfügbar. Verfügbare Menge: {4}
+"Row {0}: To set {1} periodicity, difference between from and to date \						must be greater than or equal to {2}",Zeile {0}: Um {1} als wiederholend zu setzen muss der Unterschied zwischen von und bis Datum größer oder gleich {2} sein
 Row {0}:Start Date must be before End Date,Row {0}: Startdatum muss vor dem Enddatum liegen
 Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten.
-Rules for applying pricing and discount.,Regeln für die Anwendung von Preis-und Rabatt .
+Rules for applying pricing and discount.,Regeln für die Anwendung von Preis und Rabatt.
 Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
-S.O. No.,S.O. Nein.
+S.O. No.,Lieferantenbestellung Nein.
 SHE Cess on Excise,SHE Cess Verbrauch
 SHE Cess on Service Tax,SHE Cess auf Service Steuer
 SHE Cess on TDS,SHE Cess auf TDS
@@ -2581,19 +2580,19 @@
 Salary Slip,Gehaltsabrechnung
 Salary Slip Deduction,Gehaltsabrechnung Abzug
 Salary Slip Earning,Gehaltsabrechnung Verdienst
-Salary Slip of employee {0} already created for this month,Gehaltsabrechnung der Mitarbeiter {0} bereits für diesen Monat erstellt
+Salary Slip of employee {0} already created for this month,Gehaltsabrechnung für Mitarbeiter {0} wurde bereits für diesen Monat erstellt
 Salary Structure,Gehaltsstruktur
 Salary Structure Deduction,Gehaltsstruktur Abzug
 Salary Structure Earning,Gehaltsstruktur Verdienst
 Salary Structure Earnings,Gehaltsstruktur Verdienst
 Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Verdienst und Abzug.
 Salary components.,Gehaltskomponenten
-Salary template master.,Gehalt Master -Vorlage .
+Salary template master.,Gehalt Stammdaten.
 Sales,Vertrieb
 Sales Analytics,Vertriebsanalyse
 Sales BOM,Verkaufsstückliste
 Sales BOM Help,Verkaufsstückliste Hilfe
-Sales BOM Item,Verkaufsstücklistenposition
+Sales BOM Item,Verkaufsstücklistenartikel
 Sales BOM Items,Verkaufsstücklistenpositionen
 Sales Browser,Verkauf Browser
 Sales Details,Verkaufsdetails
@@ -2602,38 +2601,38 @@
 Sales Expenses,Vertriebskosten
 Sales Extras,Verkauf Extras
 Sales Funnel,Vertriebskanal
-Sales Invoice,Verkaufsrechnung
-Sales Invoice Advance,Verkaufsrechnung Geleistete
-Sales Invoice Item,Verkaufsrechnung Artikel
-Sales Invoice Items,Verkaufsrechnung Artikel
-Sales Invoice Message,Verkaufsrechnung Nachricht
-Sales Invoice No,Verkaufsrechnungsnummer
-Sales Invoice Trends,Verkaufsrechnungstrends
-Sales Invoice {0} has already been submitted,Verkaufsrechnung {0} wurde bereits eingereicht
-Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkaufsrechnung {0} muss vor Streichung dieses Verkaufsauftrages storniert werden
+Sales Invoice,Ausgangsrechnung
+Sales Invoice Advance,Ausgangsrechnung erweitert
+Sales Invoice Item,Ausgangsrechnung Artikel
+Sales Invoice Items,Ausgangsrechnung Artikel
+Sales Invoice Message,Ausgangsrechnung Nachricht
+Sales Invoice No,Ausgangsrechnungs-Nr.
+Sales Invoice Trends,Ausgangsrechnung Trends
+Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits eingereicht
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Streichung dieses Kundenauftrag storniert werden
 Sales Item,Verkaufsartikel
-Sales Manager,Verkauf Verantwortlicher
-Sales Master Manager,Verkauf Oberste Leitung
+Sales Manager,Vertriebsleiter
+Sales Master Manager,Hauptvertriebsleiter
 Sales Order,Kundenauftrag
 Sales Order Date,Kundenauftrag Datum
-Sales Order Item,Kundenauftragsposition
-Sales Order Items,Kundensauftragspositionen
+Sales Order Item,Kundenauftrag Artikel
+Sales Order Items,Kundenauftrag Artikel
 Sales Order Message,Kundenauftrag Nachricht
-Sales Order No,Kundenauftragsnummer
+Sales Order No,Kundenauftrag-Nr.
 Sales Order Required,Kundenauftrag erforderlich
-Sales Order Trends,Trends zu Kundenaufträge
-Sales Order required for Item {0},Kundenauftrag ist für den Posten {0} erforderlich
-Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+Sales Order Trends,Kundenauftrag Trends
+Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
+Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht eingereicht
 Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
-Sales Order {0} is stopped,Kundenauftrag {0} wurde angehalten
+Sales Order {0} is stopped,Kundenauftrag {0} ist angehalten
 Sales Partner,Vertriebspartner
 Sales Partner Name,Vertriebspartner Name
 Sales Partner Target,Vertriebspartner Ziel
 Sales Partners Commission,Vertriebspartner-Kommission
 Sales Person,Verkäufer
-Sales Person Name,Verkäufername
+Sales Person Name,Vertriebsmitarbeiter Name
 Sales Person Target Variance Item Group-Wise,Verkäufer Zielabweichung zu Artikel (gruppiert)
-Sales Person Targets,Ziele für Verkäufer
+Sales Person Targets,Ziele für Vertriebsmitarbeiter
 Sales Person-wise Transaction Summary,Vertriebsmitarbeiterweise Zusammenfassung der Transaktion
 Sales Register,Vertriebsregister
 Sales Return,Absatzertrag
@@ -2642,12 +2641,12 @@
 Sales Taxes and Charges Master,Umsatzsteuern und Abgabenstamm
 Sales Team,Verkaufsteam
 Sales Team Details,Verkaufsteamdetails
-Sales Team1,Verkaufsteam 1
+Sales Team1,Verkaufsteam1
 Sales User,Verkauf Mitarbeiter
 Sales and Purchase,Vertrieb und Einkauf
 Sales campaigns.,Vertriebskampagnen.
 Salutation,Anrede
-Sample Size,Muster Größe
+Sample Size,Stichprobenumfang
 Sanctioned Amount,Sanktionierter Betrag
 Saturday,Samstag
 Schedule,Zeitplan
@@ -2677,16 +2676,16 @@
 Select Brand...,Marke auswählen...
 Select Budget Distribution to unevenly distribute targets across months.,"Wählen Sie Budgetverteilung aus, um Ziele ungleichmäßig über Monate hinweg zu verteilen."
 "Select Budget Distribution, if you want to track based on seasonality.","Wählen Sie Budgetverteilung, wenn Sie nach Saisonalität verfolgen möchten."
-Select Company...,Wählen Gesellschaft ...
+Select Company...,Firma auswählen...
 Select DocType,Dokumenttyp auswählen
 Select Fiscal Year...,Wählen Sie das Geschäftsjahr ...
 Select Items,Artikel auswählen
 Select Project...,Wählen Sie Projekt ...
 Select Sales Orders,Kundenaufträge auswählen
 Select Sales Orders from which you want to create Production Orders.,"Kundenaufträge auswählen, aus denen Sie Fertigungsaufträge erstellen möchten."
-Select Time Logs and Submit to create a new Sales Invoice.,"Wählen Sie Zeitprotokolle und ""Absenden"" aus, um eine neue Verkaufsrechnung zu erstellen."
+Select Time Logs and Submit to create a new Sales Invoice.,"Wählen Sie Zeitprotokolle und ""Absenden"" aus, um eine neue Ausgangsrechnung zu erstellen."
 Select Transaction,Transaktion auswählen
-Select Warehouse...,Auswahl Lager ...
+Select Warehouse...,Lager auswählen...
 Select Your Language,Wählen Sie Ihre Sprache
 Select account head of the bank where cheque was deposited.,"Wählen Sie den Kontenführer der Bank, bei der der Scheck eingereicht wurde."
 Select company name first.,Wählen Sie zuerst den Firmennamen aus.
@@ -2697,15 +2696,15 @@
 Select the relevant company name if you have multiple companies.,"Wählen Sie den entsprechenden Firmennamen aus, wenn mehrere Unternehmen vorhanden sind."
 Select type of transaction,Transaktionstyp auswählen
 Select who you want to send this newsletter to,"Wählen Sie aus, an wen dieser Newsletter gesendet werden soll"
-Select your home country and check the timezone and currency.,Wählen Sie Ihr Heimatland und überprüfen Sie die Zeitzone und Währung.
-"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Wenn Sie „Ja“ auswählen, wird dieser Artikel in Bestellung und Kaufbeleg angezeigt."
-"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Wenn Sie „Ja“ auswählen, wird dieser Artikel in Auftrag und Lieferschein angezeigt"
+Select your home country and check the timezone and currency.,Wählen Sie Ihr Land und überprüfen Sie die Zeitzone und Währung.
+"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Wenn Sie „Ja“ auswählen, wird dieser Artikel in Lieferatenaufträgen und Eingangslieferscheinen angezeigt."
+"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Wenn Sie „Ja“ auswählen, wird dieser Artikel in Kundenauftrag und Lieferschein angezeigt"
 "Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.","Wenn Sie „Ja“ auswählen, können Sie eine Materialliste erstellen, die Rohstoff- und Betriebskosten anzeigt, die bei der Herstellung dieses Artikels anfallen."
 "Selecting ""Yes"" will allow you to make a Production Order for this item.","Wenn Sie „Ja“ auswählen, können Sie einen Fertigungsauftrag für diesen Artikel erstellen."
 "Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wenn Sie „Ja“ auswählen, wird jeder Einheit dieses Artikels eine eindeutige Identität zugeteilt, die im Seriennummernstamm angezeigt werden kann."
 Selling,Vertrieb
-Selling Settings,Verkaufseinstellungen
-"Selling must be checked, if Applicable For is selected as {0}","Selling muss überprüft werden, wenn Anwendbar ist als gewählte {0}"
+Selling Settings,Vertriebseinstellungen
+"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwendbar auf"" ausgewählt ist bei {0}"
 Send,Absenden
 Send Autoreply,Autoreply absenden
 Send Email,E-Mail absenden
@@ -2731,21 +2730,21 @@
 Serial No Warranty Expiry,Seriennr. Garantieverfall
 Serial No is mandatory for Item {0},Seriennummer ist für Artikel {0} obligatorisch.
 Serial No {0} created,Seriennummer {0} erstellt
-Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht auf Lieferschein {1}
+Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
 Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
 Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
 Serial No {0} does not exist,Seriennummer {0} existiert nicht
-Serial No {0} has already been received,Seriennummer {0} bereits empfangen
+Serial No {0} has already been received,Seriennummer {0} bereits erhalten
 Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist unter Wartungsvertrag bis {1}
 Serial No {0} is under warranty upto {1},Seriennummer {0} ist unter Garantie bis {1}
 Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
 Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
-Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} Menge {1} kann nicht ein Bruchteil sein
-Serial No {0} status must be 'Available' to Deliver,Seriennummer {0} Status muss zur Auslieferung verfügbar sein
-Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für Artikel {0}
+Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
+Serial No {0} status must be 'Available' to Deliver,"Seriennummer {0} muss den Status ""verfügbar"" haben um ihn ausliefern zu können"
+Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
 Serial Number Series,Seriennummern Reihe
-Serial number {0} entered more than once,Seriennummer {0} wurde mehr als einmal erfasst
-Serialized Item {0} cannot be updated \					using Stock Reconciliation,Artikel mit Seriennummer {0} kann nicht aktualisiert werden / benutze Lagerabgleich
+Serial number {0} entered more than once,Seriennummer {0} wurde bereits mehrfach erfasst
+Serialized Item {0} cannot be updated \					using Stock Reconciliation,Artikel mit Seriennummer {0} kann nicht aktualisiert werden durch Lagerneubewertung
 Series,Serie
 Series List for this Transaction,Serienliste für diese Transaktion
 Series Updated,Aktualisiert Serie
@@ -2771,7 +2770,7 @@
 Settings for Accounts,Einstellungen für Konten
 Settings for Buying Module,Einstellungen für Einkaufsmodul
 Settings for HR Module,Einstellungen für das HR -Modul
-Settings for Selling Module,Einstellungen für das Verkaufsmodul
+Settings for Selling Module,Einstellungen für das Vertriebsmodul
 "Settings to extract Job Applicants from a mailbox e.g. ""jobs@example.com""","Einstellungen, um Bewerber aus einem Postfach, z.B. ""jobs@example.com"", zu extrahieren."
 Setup,Setup
 Setup Already Complete!!,Bereits Komplett -Setup !
@@ -2779,9 +2778,9 @@
 Setup SMS gateway settings,Setup-SMS-Gateway-Einstellungen
 Setup Series,Setup-Reihenfolge
 Setup Wizard,Setup-Assistenten
-Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup- Eingangsserver für Jobs E-Mail -ID . (z. B. jobs@example.com )
-Setup incoming server for sales email id. (e.g. sales@example.com),Setup- Eingangsserver für den Vertrieb E-Mail -ID . (z. B. sales@example.com )
-Setup incoming server for support email id. (e.g. support@example.com),Setup- Eingangsserver für die Unterstützung E-Mail -ID . (z. B. support@example.com )
+Setup incoming server for jobs email id. (e.g. jobs@example.com),Posteingangsserver für Jobs E-Mail-Adresse einrichten. (z.B. jobs@example.com)
+Setup incoming server for sales email id. (e.g. sales@example.com),Posteingangsserver für den Vertrieb E-Mail-Adresse einrichten. (z.B. sales@example.com)
+Setup incoming server for support email id. (e.g. support@example.com),Posteingangsserver für die Support E-Mail-Adresse einrichten. (z.B. support@example.com)
 Share,Freigeben
 Share With,Freigeben für
 Shareholders Funds,Aktionäre Fonds
@@ -2798,7 +2797,7 @@
 Shopping Cart,Warenkorb
 Short biography for website and other publications.,Kurzbiographie für die Website und andere Publikationen.
 "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Details zu ""Auf Lager"" oder ""Nicht auf Lager"" entsprechend des in diesem Warenlager verfügbaren Bestands anzeigen."
-"Show / Hide features like Serial Nos, POS etc.","Funktionen wie Seriennummern, POS , etc. anzeigen / ausblenden"
+"Show / Hide features like Serial Nos, POS etc.","Funktionen wie Seriennummern, POS, etc. anzeigen / ausblenden"
 Show In Website,Auf der Webseite anzeigen
 Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
 Show in Website,Auf der Webseite anzeigen
@@ -2810,7 +2809,7 @@
 Signature to be appended at the end of every email,"Signatur, die am Ende jeder E-Mail angehängt werden soll"
 Single,Einzeln
 Single unit of an Item.,Einzeleinheit eines Artikels.
-Sit tight while your system is being setup. This may take a few moments.,"Sitzen fest , während Ihr System wird Setup . Dies kann einige Zeit dauern."
+Sit tight while your system is being setup. This may take a few moments.,"Bitte warten Sie, während Ihr System eingerichtet wird. Dies kann einige Zeit dauern."
 Slideshow,Diaschau
 Soap & Detergent,Soap & Reinigungsmittel
 Software,Software
@@ -2832,22 +2831,22 @@
 "Specify a list of Territories, for which, this Shipping Rule is valid","Geben Sie eine Liste der Regionen an, für die diese Versandregel gilt"
 "Specify a list of Territories, for which, this Taxes Master is valid","Geben Sie eine Liste der Regionen an, für die dieser Steuerstamm gilt"
 Specify conditions to calculate shipping amount,Geben Sie die Bedingungen zur Berechnung der Versandkosten an
-"Specify the operations, operating cost and give a unique Operation no to your operations.","Geben Sie die Vorgänge , Betriebskosten und geben einen einzigartigen Betrieb nicht für Ihren Betrieb ."
+"Specify the operations, operating cost and give a unique Operation no to your operations.","Geben Sie die Vorgänge, Betriebskosten an und geben einen einzigartige Betriebs-Nr für Ihren Betrieb an."
 Split Delivery Note into packages.,Lieferschein in Pakete aufteilen.
 Sports,Sport
-Sr,Sr
+Sr,Serie
 Standard,Standard
 Standard Buying,Standard- Einkaufsführer
 Standard Reports,Standardberichte
-Standard Selling,Standard- Selling
+Standard Selling,Standard-Vertrieb
 "Standard Terms and Conditions that can be added to Sales and Purchases.Examples:1. Validity of the offer.1. Payment Terms (In Advance, On Credit, part advance etc).1. What is extra (or payable by the Customer).1. Safety / usage warning.1. Warranty if any.1. Returns Policy.1. Terms of shipping, if applicable.1. Ways of addressing disputes, indemnity, liability, etc.1. Address and Contact of your Company.","Standard Terms and Conditions that can be added to Sales and Purchases.Examples:1. Validity of the offer.1. Payment Terms (In Advance, On Credit, part advance etc).1. What is extra (or payable by the Customer).1. Safety / usage warning.1. Warranty if any.1. Returns Policy.1. Terms of shipping, if applicable.1. Ways of addressing disputes, indemnity, liability, etc.1. Address and Contact of your Company."
-Standard contract terms for Sales or Purchase.,Standard Vertragsbedingungen für den Verkauf oder Kauf .
+Standard contract terms for Sales or Purchase.,Standard Vertragsbedingungen für den Verkauf oder Kauf.
 "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.10. Add or Deduct: Whether you want to add or deduct the tax.","Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.10. Add or Deduct: Whether you want to add or deduct the tax."
 "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers."
 Start,Start
 Start Date,Startdatum
 Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
-Start date of current order's period,Start date of current order's period
+Start date of current order's period,Startdatum der aktuellen Bestellperiode
 Start date should be less than end date for Item {0},Startdatum sollte weniger als Enddatum für Artikel {0}
 State,Land
 Statement of Account,Kontoauszug
@@ -2857,7 +2856,7 @@
 Status of {0} {1} is now {2},Status {0} {1} ist jetzt {2}
 Status updated to {0},Status aktualisiert {0}
 Statutory info and other general information about your Supplier,Gesetzliche und andere allgemeine Informationen über Ihren Lieferanten
-Stay Updated,Bleiben Aktualisiert
+Stay Updated,Bleiben Sie auf dem neuesten Stand
 Stock,Lagerbestand
 Stock Adjustment,Auf Einstellung
 Stock Adjustment Account,Bestandskorrektur-Konto
@@ -2865,16 +2864,16 @@
 Stock Analytics,Bestandsanalyse
 Stock Assets,Auf Assets
 Stock Balance,Bestandsbilanz
-Stock Entries already created for Production Order ,Stock Entries already created for Production Order 
-Stock Entry,Bestandseintrag
+Stock Entries already created for Production Order ,Lagerzugänge sind für Fertigungsauftrag bereits angelegt worden
+Stock Entry,Lagerzugang
 Stock Entry Detail,Bestandseintragsdetail
 Stock Expenses,Auf Kosten
 Stock Frozen Upto,Bestand eingefroren bis
-Stock Item,Stock Item
-Stock Ledger,Bestands-Hauptkonto
-Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts
-Stock Ledger Entry,Bestands-Hauptkonto Eintrag
-Stock Ledger entries balances updated,Auf BucheinträgeSalden aktualisiert
+Stock Item,Lagerartikel
+Stock Ledger,Lagerbuch
+Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts, Lagerbuch-Einträge und Hauptbuch-Einträge werden durch den Eingangslieferschein erstellt
+Stock Ledger Entry,Lagerbuch-Eintrag
+Stock Ledger entries balances updated,Lagerbuch-Einträge wurden aktualisiert
 Stock Level,Bestandsebene
 Stock Liabilities,Auf Verbindlichkeiten
 Stock Projected Qty,Auf Projizierte Menge
@@ -2883,7 +2882,7 @@
 Stock Reconcilation Data,Auf Versöhnung Daten
 Stock Reconcilation Template,Auf Versöhnung Vorlage
 Stock Reconciliation,Bestandsabgleich
-"Stock Reconciliation can be used to update the stock on a particular date, usually as per physical inventory.","Auf Versöhnung kann verwendet werden, um die Aktie zu einem bestimmten Zeitpunkt zu aktualisieren , in der Regel nach Inventur werden."
+"Stock Reconciliation can be used to update the stock on a particular date, usually as per physical inventory.","Lagerbewertung kann verwendet werden um das Lager auf einem bestimmten Zeitpunkt zu aktualisieren, in der Regel ist das nach der Inventur."
 Stock Settings,Bestandseinstellungen
 Stock UOM,Bestands-ME
 Stock UOM Replace Utility,Dienstprogramm zum Ersetzen der Bestands-ME
@@ -2892,7 +2891,7 @@
 Stock Value,Bestandswert
 Stock Value Difference,Wertdifferenz Bestand
 Stock balances updated,Auf Salden aktualisiert
-Stock cannot be updated against Delivery Note {0},Auf kann nicht gegen Lieferschein aktualisiert werden {0}
+Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 Stock entries exist against warehouse {0} cannot re-assign or modify 'Master Name',Auf Einträge vorhanden sind gegen Lager {0} kann nicht neu zuweisen oder ändern 'Master -Name'
 Stock transactions before {0} are frozen,Aktiengeschäfte vor {0} werden eingefroren
 Stock: ,Bestand:
@@ -2900,17 +2899,17 @@
 Stop Birthday Reminders,Stop- Geburtstagserinnerungen
 Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage zu machen."
 Stopped,Angehalten
-Stopped order cannot be cancelled. Unstop to cancel.,"Gestoppt Auftrag kann nicht abgebrochen werden. Aufmachen , um abzubrechen."
+Stopped order cannot be cancelled. Unstop to cancel.,"angehaltener Auftrag kann nicht abgebrochen werden. Erst diesen Fortsetzen, um dann abzubrechen zu können."
 Stores,Shops
 Stub,Stummel
 Sub Assemblies,Unterbaugruppen
 "Sub-currency. For e.g. ""Cent""","Unterwährung. Zum Beispiel ""Cent"""
 Subcontract,Zulieferer
-Subcontracted,Subcontracted
+Subcontracted,Weiterbeauftragt
 Subject,Betreff
 Submit Salary Slip,Gehaltsabrechnung absenden
 Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien absenden
-Submit this Production Order for further processing.,Senden Sie dieses Fertigungsauftrag für die weitere Verarbeitung .
+Submit this Production Order for further processing.,Speichern Sie diesen Fertigungsauftrag für die weitere Verarbeitung ab.
 Submitted,Abgesendet/Eingereicht
 Subsidiary,Tochtergesellschaft
 Successful: ,Erfolgreich:
@@ -2925,7 +2924,7 @@
 Supplier Address,Lieferantenadresse
 Supplier Addresses and Contacts,Lieferant Adressen und Kontakte
 Supplier Details,Lieferantendetails
-Supplier Intro,Lieferanten Einführung
+Supplier Intro,Lieferant Intro
 Supplier Invoice Date,Lieferantenrechnungsdatum
 Supplier Invoice No,Lieferantenrechnungsnr.
 Supplier Name,Lieferantenname
@@ -2938,11 +2937,11 @@
 Supplier Type / Supplier,Lieferant Typ / Lieferant
 Supplier Type master.,Lieferant Typ Master.
 Supplier Warehouse,Lieferantenlager
-Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager obligatorisch für Unteraufträge vergeben Kaufbeleg
+Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Eingangslieferschein aus Unteraufträgen
 Supplier database.,Lieferantendatenbank
 Supplier master.,Lieferantenvorlage.
 Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
-Supplier warehouse where you have issued raw materials for sub - contracting,Lager für Beistellungen an Zulieferer
+Supplier warehouse where you have issued raw materials for sub - contracting,"Lieferantenlager, wo Sie Rohstoffe für Zulieferer ausgegeben haben."
 Supplier-Wise Sales Analytics,HerstellerverkaufsWise Analytics
 Support,Support
 Support Analtyics,Support-Analyse
@@ -2956,10 +2955,10 @@
 Support queries from customers.,Support-Anfragen von Kunden.
 Symbol,Symbol
 Sync Support Mails,Sync Unterstützungs E-Mails
-Sync with Dropbox,Mit Dropbox synchronisieren
-Sync with Google Drive,Mit Google Drive synchronisieren
+Sync with Dropbox,Mit Dropbox synchronisieren
+Sync with Google Drive,Mit Google Drive synchronisieren
 System,System
-System Balance,System Balance
+System Balance,System Bilanz
 System Manager,System Verantwortlicher
 System Settings,Systemeinstellungen
 "System User (login) ID. If set, it will become default for all HR forms.","Systembenutzer-ID (Anmeldung) Wenn gesetzt, wird sie standardmäßig für alle HR-Formulare verwendet."
@@ -2979,20 +2978,20 @@
 Target On,Ziel Auf
 Target Qty,Zielmenge
 Target Warehouse,Zielwarenlager
-Target warehouse in row {0} must be same as Production Order,Ziel-Warehouse in Zeile {0} muss gleiche wie Fertigungsauftrag
-Target warehouse is mandatory for row {0},Ziel-Warehouse ist für Zeile {0}
+Target warehouse in row {0} must be same as Production Order,Ziel-Lager in Zeile {0} muss dem Fertigungsauftrag entsprechen
+Target warehouse is mandatory for row {0},Ziel-Lager ist für Zeile {0}
 Task,Aufgabe
 Task Details,Aufgabendetails
 Tasks,Aufgaben
 Tax,Steuer
 Tax Amount After Discount Amount,Steuerbetrag nach Rabatt Betrag
 Tax Assets,Steueransprüche
-Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Bewertungstag "" oder "" Bewertung und Total ' als alle Einzelteile sind nicht auf Lager gehalten werden"
+Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Verbindlichkeit"" oder ""Verbindlichkeit und Summe"", da alle Artikel keine Lagerartikel sind"
 Tax Rate,Steuersatz
 Tax and other salary deductions.,Steuer und sonstige Gehaltsabzüge
 Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges,Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges
-Tax template for buying transactions.,Tax -Vorlage für Kauf -Transaktionen.
-Tax template for selling transactions.,Tax -Vorlage für Verkaufsgeschäfte .
+Tax template for buying transactions.,Steuer-Vorlage für Einkaufs-Transaktionen.
+Tax template for selling transactions.,Steuer-Vorlage für Vertriebs-Transaktionen.
 Taxes,Steuer
 Taxes and Charges,Steuern und Abgaben
 Taxes and Charges Added,Steuern und Abgaben hinzugefügt
@@ -3000,14 +2999,14 @@
 Taxes and Charges Calculation,Berechnung der Steuern und Abgaben
 Taxes and Charges Deducted,Steuern und Abgaben abgezogen
 Taxes and Charges Deducted (Company Currency),Steuern und Abgaben abgezogen (Unternehmenswährung)
-Taxes and Charges Total,Steuern und Abgaben Gesamt
+Taxes and Charges Total,Steuern und Abgaben Gesamt1
 Taxes and Charges Total (Company Currency),Steuern und Abgaben Gesamt (Unternehmenswährung)
 Technology,Technologie
 Telecommunications,Telekommunikation
 Telephone Expenses,Telefonkosten
 Television,Fernsehen
 Template,Vorlage
-Template for performance appraisals.,Vorlage für Leistungsbeurteilungen .
+Template for performance appraisals.,Vorlage für Leistungsbeurteilungen.
 Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag.
 Temporary Accounts (Assets),Temporäre Accounts ( Assets)
 Temporary Accounts (Liabilities),Temporäre Konten ( Passiva)
@@ -3028,46 +3027,46 @@
 Territory Target Variance Item Group-Wise,Territory ZielabweichungsartikelgruppeWise -
 Territory Targets,Ziele der Region
 Test,Test
-Test Email Id,E-Mail-ID testen
+Test Email Id,E-Mail-Adresse testen
 Test the Newsletter,Newsletter testen
 The BOM which will be replaced,"Die Stückliste, die ersetzt wird"
-The First User: You,Der erste Benutzer : Sie
+The First User: You,Der erste Benutzer: Sie selbst!
 "The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","Der Artikel, der das Paket darstellt. Bei diesem Artikel muss ""Ist Lagerartikel"" als ""Nein"" und ""Ist Verkaufsartikel"" als ""Ja"" gekennzeichnet sein"
-The Organization,Die Organisation
-"The account head under Liability, in which Profit/Loss will be booked","Das Konto, Kopf unter Haftung , in der Gewinn / Verlust wird gebucht werden"
+The Organization,Die Firma
+"The account head under Liability, in which Profit/Loss will be booked","Das Hauptkonto unter Verbindlichkeit, in das Gewinn/Verlust verbucht werden"
 The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Sie wird beim Einreichen erzeugt."
 The date on which recurring invoice will be stop,"Das Datum, an dem die wiederkehrende Rechnung angehalten wird"
-The date on which recurring order will be stop,The date on which recurring order will be stop
+The date on which recurring order will be stop,Das Datum an dem die sich Wiederholende Bestellung endet
 "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ","Der Tag des Monats, an dem auto Rechnung zB 05, 28 usw. generiert werden"
-"The day of the month on which auto order will be generated e.g. 05, 28 etc ","The day of the month on which auto order will be generated e.g. 05, 28 etc "
-The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Der Tag (e) , auf dem Sie sich bewerben für Urlaub sind Ferien. Sie müssen nicht, um Urlaub ."
+"The day of the month on which auto order will be generated e.g. 05, 28 etc ","Der Tag im Monat, an dem die Bestellung erzeugt wird (z.B: 05, 27, etc)"
+The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Tag(e), auf die Sie Urlaub beantragen, sind Feiertage. Hierfür müssen Sie keinen Urlaub beantragen."
 The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
-The first user will become the System Manager (you can change that later).,"Der erste Benutzer wird der System-Manager (du , dass später ändern können ) ."
+The first user will become the System Manager (you can change that later).,Der erste Benutzer wird der System-Manager (Sie können das später noch ändern).
 The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Gewicht des Verpackungsmaterials (Für den Ausdruck)
 The name of your company for which you are setting up this system.,"Der Name der Firma, für die Sie die Einrichtung dieses Systems."
 The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (automatisch als Summe der einzelnen Nettogewichte berechnet)
 The new BOM after replacement,Die neue Stückliste nach dem Austausch
 The rate at which Bill Currency is converted into company's base currency,"Der Kurs, mit dem die Rechnungswährung in die Basiswährung des Unternehmens umgerechnet wird"
-The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für Tracking alle wiederkehrenden Rechnungen. Es basiert auf einreichen generiert.
+The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Speichern generiert.
 "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann Preisregeln werden auf Basis von Kunden gefiltert, Kundengruppe, Territory, Lieferant, Lieferant Typ, Kampagne, Vertriebspartner usw."
 There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
-"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Es kann nur einen Versand Regel sein Zustand mit 0 oder Blindwert für "" auf den Wert"""
+"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Es kann nur eine Versandregel mit dem Wert 0 oder Leerwert für ""zu Wert"" geben"
 There is not enough leave balance for Leave Type {0},Es ist nicht genügend Urlaubsbilanz für Leave Typ {0}
 There is nothing to edit.,Es gibt nichts zu bearbeiten.
-There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten . Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht ."
-There were errors.,Es gab Fehler .
-This Currency is disabled. Enable to use in transactions,"Diese Währung ist deaktiviert . Aktivieren, um Transaktionen in"
-This Leave Application is pending approval. Only the Leave Apporver can update status.,Dieser Urlaubsantrag ist bis zur Genehmigung . Nur das Datum Apporver können Status zu aktualisieren.
+There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten. Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht."
+There were errors.,Es sind Fehler aufgetreten.
+This Currency is disabled. Enable to use in transactions,"Diese Währung ist deaktiviert. Aktivieren, um Transaktionen in"
+This Leave Application is pending approval. Only the Leave Apporver can update status.,Dieser Urlaubsantrag wartet auf Genehmigung. Nur Urlaubsbewilliger können den Status aktualisieren.
 This Time Log Batch has been billed.,Dieser Zeitprotokollstapel wurde abgerechnet.
 This Time Log Batch has been cancelled.,Dieser Zeitprotokollstapel wurde abgebrochen.
 This Time Log conflicts with {0},This Time Log Konflikt mit {0}
 This format is used if country specific format is not found,"Dieses Format wird verwendet, wenn länderspezifischen Format wird nicht gefunden"
 This is a root account and cannot be edited.,Dies ist ein Root-Account und können nicht bearbeitet werden.
-This is a root customer group and cannot be edited.,Dies ist eine Wurzel Kundengruppe und können nicht editiert werden .
-This is a root item group and cannot be edited.,Dies ist ein Stammelement -Gruppe und können nicht editiert werden .
-This is a root sales person and cannot be edited.,Dies ist ein Root- Verkäufer und können nicht editiert werden .
-This is a root territory and cannot be edited.,Dies ist ein Root- Gebiet und können nicht bearbeitet werden.
-This is an example website auto-generated from ERPNext,Dies ist ein Beispiel -Website von ERPNext automatisch generiert
+This is a root customer group and cannot be edited.,Dies ist eine Stamm Kundengruppe und kann nicht editiert werden.
+This is a root item group and cannot be edited.,Dies ist ein Stammelement-Gruppe und kann nicht editiert.
+This is a root sales person and cannot be edited.,Dies ist ein Stamm-Verkäufer und kann daher nicht editiert werden.
+This is a root territory and cannot be edited.,Dies ist ein Stammgebiet und diese können nicht bearbeitet werden.
+This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Website, von ERPNext automatisch generiert"
 This is the number of the last created transaction with this prefix,Dies ist die Nummer der letzten erstellten Transaktion mit diesem Präfix
 This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Tool hilft Ihnen, die Menge und die Bewertung von Bestand im System zu aktualisieren oder zu ändern. Sie wird in der Regel verwendet, um die Systemwerte und den aktuellen Bestand Ihrer Warenlager zu synchronisieren."
 This will be used for setting rule in HR module,Dies wird für die Festlegung der Regel im HR-Modul verwendet
@@ -3077,19 +3076,19 @@
 Time Log Batch,Zeitprotokollstapel
 Time Log Batch Detail,Zeitprotokollstapel-Detail
 Time Log Batch Details,Zeitprotokollstapel-Details
-Time Log Batch {0} must be 'Submitted',"Zeit Log Batch {0} muss "" Eingereicht "" werden"
+Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""eingereicht"" werden"
 Time Log Status must be Submitted.,Status des Zeitprotokolls muss 'Eingereicht/Abgesendet' sein
 Time Log for tasks.,Zeitprotokoll für Aufgaben.
 Time Log is not billable,Zeitprotokoll ist nicht abrechenbar
-Time Log {0} must be 'Submitted',"Anmelden Zeit {0} muss "" Eingereicht "" werden"
+Time Log {0} must be 'Submitted',"Zeiotprotokoll {0} muss ""eingereicht"" werden"
 Time Zone,Zeitzone
 Time Zones,Zeitzonen
 Time and Budget,Zeit und Budget
-Time at which items were delivered from warehouse,"Zeitpunkt, zu dem Gegenstände aus dem Lager geliefert wurden"
+Time at which items were delivered from warehouse,"Zeitpunkt, zu dem Artikel aus dem Lager geliefert wurden"
 Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 Title,Titel
-Titles for print templates e.g. Proforma Invoice.,Titel für Druckvorlagen z. B. Proforma-Rechnung .
-To,An
+Titles for print templates e.g. Proforma Invoice.,Titel für Druckvorlagen z.B. Proforma-Rechnung.
+To,bis
 To Currency,In Währung
 To Date,Bis dato
 To Date should be same as From Date for Half Day leave,Bis Datum sollten gleiche wie von Datum für Halbtagesurlaubsein
@@ -3101,7 +3100,7 @@
 To Time,Bis Uhrzeit
 To Value,Bis Wert
 To Warehouse,An Warenlager
-"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Um geordneten Knoten hinzufügen , erkunden Baum und klicken Sie auf den Knoten , unter dem Sie mehrere Knoten hinzufügen möchten."
+"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Um Unterelemente hinzuzufügen, klicken Sie im Baum auf das Element, unter dem Sie weitere Elemente hinzufügen möchten."
 "To assign this issue, use the ""Assign"" button in the sidebar.","Um dieses Problem zu zuzuweisen, verwenden Sie die Schaltfläche ""Zuweisen"" auf der Seitenleiste."
 To create a Bank Account,Um ein Bankkonto zu erstellen
 To create a Tax Account,Um ein Steuerkonto erstellen
@@ -3110,15 +3109,15 @@
 To enable <b>Point of Sale</b> features,Um Funktionen der <b>Verkaufsstelle</b> zu aktivieren
 To enable <b>Point of Sale</b> view,Um <b> Point of Sale </ b> Ansicht aktivieren
 To get Item Group in details table,So rufen sie eine Artikelgruppe in die Detailtabelle ab
-"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuer in Zeile enthalten {0} in Artikel Rate , Steuern in Reihen {1} müssen ebenfalls enthalten sein"
+"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Um Steuern im Artikelpreis in Zeile {0} einzubeziehen müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein
 "To merge, following properties must be same for both items","Um mischen können, müssen folgende Eigenschaften für beide Produkte sein"
 "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Um Pricing Regel in einer bestimmten Transaktion nicht zu, sollten alle geltenden Preisregeln deaktiviert zu sein."
-"To set this Fiscal Year as Default, click on 'Set as Default'","Zu diesem Geschäftsjahr als Standard festzulegen, klicken Sie auf "" Als Standard festlegen """
+"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, klicken Sie auf ""als Standard festlegen"""
 To track any installation or commissioning related work after sales,So verfolgen Sie eine Installation oder eine mit Kommissionierung verbundene Arbeit nach dem Verkauf
-"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Um Markennamen in der folgenden Dokumente Lieferschein , Gelegenheit, Materialanforderung , Punkt , Bestellung , Einkauf Gutschein , Käufer Beleg, Angebot, Verkaufsrechnung , Vertriebsstückliste, Kundenauftrag, Seriennummer verfolgen"
+"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Um Markennamen in der folgenden Dokumente zu verfolgen: Lieferschein, Chance, Materialanforderung, Artikel, Lieferatenauftrag, Einkaufsgutschein, Käufer Beleg, Angebot, Ausgangsrechnung, Verkaufsstückliste, Kundenauftrag, Seriennummer"
 To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"So verfolgen Sie Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern. Diese Funktion kann auch verwendet werden, um die Garantieangaben des Produkts zu verfolgen."
 To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,So verfolgen Sie Artikel in Einkaufs-und Verkaufsdokumenten mit Stapelnummern<b>Bevorzugte Branche: Chemikalien usw.</b>
-To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,So verfolgen Sie Artikel über den Barcode. Durch das Scannen des Artikel-Barcodes können Sie ihn in den Lieferschein und die Rechnung aufnehmen.
+To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,So verfolgen Sie Artikel über den Barcode. Durch das Scannen des Artikel-Barcodes können Sie ihn in den Lieferschein und die Ausgangsrechnung aufnehmen.
 Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie es mit einem Tabellenkalkulationsprogramm.
 Tools,Extras
 Total,Gesamt
@@ -3127,7 +3126,7 @@
 Total Amount,Gesamtbetrag
 Total Amount To Pay,Fälliger Gesamtbetrag
 Total Amount in Words,Gesamtbetrag in Worten
-Total Billing This Year: ,Insgesamt Billing Dieses Jahr:
+Total Billing This Year: ,Insgesamt Billing ieses Jahr:
 Total Characters,Insgesamt Charaktere
 Total Claimed Amount,Summe des geforderten Betrags
 Total Commission,Gesamtbetrag Kommission
@@ -3161,13 +3160,13 @@
 Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials,Gesamtbewertungs für hergestellte oder umgepackt Artikel (s) kann nicht kleiner als die Gesamt Bewertung der Rohstoffe sein
 Total weightage assigned should be 100%. It is {0},Insgesamt Gewichtung zugeordnet sollte 100 % sein. Es ist {0}
 Totals,Summen
-Track Leads by Industry Type.,Spur führt nach Branche Typ .
+Track Leads by Industry Type.,Verfolge Interessenten nach Branchentyp.
 Track separate Income and Expense for product verticals or divisions.,Einnahmen und Ausgaben für Produktbereiche oder Abteilungen separat verfolgen.
-Track this Delivery Note against any Project,Diesen Lieferschein für jedes Projekt nachverfolgen
-Track this Sales Order against any Project,Diesen Kundenauftrag für jedes Projekt nachverfolgen
+Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
+Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
 Transaction,Transaktion
 Transaction Date,Transaktionsdatum
-Transaction not allowed against stopped Production Order {0},Transaktion nicht gegen gestoppt Fertigungsauftrag erlaubt {0}
+Transaction not allowed against stopped Production Order {0},Transaktion nicht gegen angehaltenen Fertigungsauftrag {0} erlaubt
 Transfer,Übertragung
 Transfer Material,Transfermaterial
 Transfer Raw Materials,Übertragen Rohstoffe
@@ -3179,9 +3178,9 @@
 Travel,Reise
 Travel Expenses,Reisekosten
 Tree Type,Baum- Typ
-Tree of Item Groups.,Baum der Artikelgruppen .
-Tree of finanial Cost Centers.,Baum des finanial Kostenstellen .
-Tree of finanial accounts.,Baum des finanial Konten.
+Tree of Item Groups.,Baum der Artikelgruppen.
+Tree of finanial Cost Centers.,Baum der Finanz-Kostenstellen.
+Tree of finanial accounts.,Baum der Finanz-Konten.
 Trial Balance,Allgemeine Kontenbilanz
 Tuesday,Dienstag
 Type,Typ
@@ -3189,20 +3188,20 @@
 "Type of leaves like casual, sick etc.","Grund für Beurlaubung, wie Urlaub, krank usw."
 Types of Expense Claim.,Spesenabrechnungstypen
 Types of activities for Time Sheets,Art der Aktivität für Tätigkeitsnachweis
-"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (permanent , Vertrag, Praktikanten etc.)."
+"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (dauerhaft, Vertrag, Praktikanten etc.)."
 UOM Conversion Detail,ME-Umrechnung Detail
 UOM Conversion Details,ME-Umrechnung Details
 UOM Conversion Factor,ME-Umrechnungsfaktor
-UOM Conversion factor is required in row {0},Verpackung Umrechnungsfaktor wird in der Zeile erforderlich {0}
-UOM Name,ME-Namen
-UOM coversion factor required for UOM: {0} in Item: {1},Verpackung coverFaktor für Verpackung benötigt: {0} in Item: {1}
+UOM Conversion factor is required in row {0},ME-Umrechnungsfaktor ist erforderlich in der Zeile {0}
+UOM Name,ME-Name
+UOM coversion factor required for UOM: {0} in Item: {1},ME-Umrechnungsfaktor ist erforderlich für ME: {0} bei Artikel: {1}
 Under AMC,Unter AMC
 Under Graduate,Schulabgänger
 Under Warranty,Unter Garantie
 Unit,Einheit
-Unit of Measure,Maßeinheit
-Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} hat mehr als einmal in Umrechnungsfaktor Tabelle eingetragen
-"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Maßeinheit für diesen Artikel (z.B. Kg, Einheit, Nein, Paar)."
+Unit of Measure,Mengeneimheit
+Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Mengeneinheit für diesen Artikel (z.B. Kg, Stück, Pack, Paar)."
 Units/Hour,Einheiten/Stunde
 Units/Shifts,Einheiten/Schichten
 Unpaid,Unbezahlt
@@ -3210,8 +3209,8 @@
 Unscheduled,Außerplanmäßig
 Unsecured Loans,Unbesicherte Kredite
 Unstop,aufmachen
-Unstop Material Request,Unstop -Material anfordern
-Unstop Purchase Order,Unstop Bestellung
+Unstop Material Request,Materialanforderung fortsetzen
+Unstop Purchase Order,Lieferatenauftrag fortsetzen
 Unsubscribed,Abgemeldet
 Update,Aktualisierung
 Update Clearance Date,Tilgungsdatum aktualisieren
@@ -3221,18 +3220,18 @@
 Update Series Number,Seriennummer aktualisieren
 Update Stock,Lagerbestand aktualisieren
 Update additional costs to calculate landed cost of items,Aktualisieren Sie Zusatzkosten um die Einstandskosten des Artikels zu kalkulieren
-Update bank payment dates with journals.,Aktualisierung der Konten mit Hilfe der Journaleinträge
-Update clearance date of Journal Entries marked as 'Bank Entry',"Update- Clearance Datum der Journaleinträge als ""Bank Gutscheine 'gekennzeichnet"
+Update bank payment dates with journals.,Aktualisieren Sie die Zahlungstermine anhand der Journale.
+Update clearance date of Journal Entries marked as 'Bank Vouchers',"Update- Clearance Datum der Journaleinträge als ""Bank Gutscheine 'gekennzeichnet"
 Updated,Aktualisiert
-Updated Birthday Reminders,Geburtstagserinnerungen aktualisiert
+Updated Birthday Reminders,Aktualisiert Geburtstagserinnerungen
 Upload Attendance,Teilnahme hochladen
 Upload Backups to Dropbox,Backups in Dropbox hochladen
 Upload Backups to Google Drive,Backups auf Google Drive hochladen
 Upload HTML,Upload-HTML
-Upload a .csv file with two columns: the old name and the new name. Max 500 rows.,"Laden Sie eine CSV-Datei mit zwei Spalten hoch: In der einen der alte, in der anderen der neue Name. Höchstens 500 Zeilen."
-Upload attendance from a .csv file,Teilnahme aus  einer CSV-Datei hochladen
+Upload a .csv file with two columns: the old name and the new name. Max 500 rows.,"Laden Sie eine CSV-Datei mit zwei Spalten hoch: In der einen der alte, in der anderen der neue Name. Maximal 500 Zeilen."
+Upload attendance from a .csv file,Anwesenheiten aus einer CSV-Datei hochladen
 Upload stock balance via csv.,Bestandsbilanz über CSV hochladen
-Upload your letter head and logo - you can edit them later.,Laden Sie Ihr Briefkopf und Logo - Sie können sie später zu bearbeiten.
+Upload your letter head and logo - you can edit them later.,Laden Sie Ihren Briefkopf und Ihr Logo hoch - Sie können diese auch später noch bearbeiten.
 Upper Income,Oberes Einkommen
 Urgent,Dringend
 Use Multi-Level BOM,Mehrstufige Stückliste verwenden
@@ -3242,7 +3241,7 @@
 User ID,Benutzerkennung
 User ID not set for Employee {0},Benutzer-ID nicht für Mitarbeiter eingestellt {0}
 User Name,Benutzername
-User Name or Support Password missing. Please enter and try again.,Benutzername oder Passwort -Unterstützung fehlt. Bitte geben Sie und versuchen Sie es erneut .
+User Name or Support Password missing. Please enter and try again.,Benutzername oder Passwort fehlt. Bitte geben Sie diese ein und versuchen Sie es erneut.
 User Remark,Benutzerbemerkung
 User Remark will be added to Auto Remark,Benutzerbemerkung wird der automatischen Bemerkung hinzugefügt
 User Remarks is mandatory,Benutzer Bemerkungen ist obligatorisch
@@ -3272,7 +3271,7 @@
 Vehicle No,Fahrzeug Nr.
 Venture Capital,Risikokapital
 Verified By,Geprüft durch
-View Details,View Details
+View Details,Details anschauen
 View Ledger,Ansicht Ledger
 View Now,Jetzt ansehen
 Visit report for maintenance call.,Besuchsbericht für Wartungsabruf.
@@ -3283,41 +3282,41 @@
 Voucher No,Gutscheinnr.
 Voucher Type,Gutscheintyp
 Voucher Type and Date,Art und Datum des Gutscheins
-Walk In,Hereinspazieren
+Walk In,Laufkundschaft
 Warehouse,Warenlager
 Warehouse Contact Info,Kontaktinformation Warenlager
 Warehouse Detail,Detail Warenlager
 Warehouse Name,Warenlagername
 Warehouse and Reference,Warenlager und Referenz
-Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kann nicht gelöscht werden, da Aktienbuch Eintrag für diese Lager gibt."
-Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kann nur über Lizenz Entry / Lieferschein / Kaufbeleg geändert werden
+Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Lagerbuch-Einträge für dieses Lager gibt."
+Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerzugang / Lieferschein / Eingangslieferschein geändert werden
 Warehouse cannot be changed for Serial No.,Warehouse kann nicht für Seriennummer geändert werden
 Warehouse is mandatory for stock Item {0} in row {1},Warehouse ist für Lager Artikel {0} in Zeile {1}
-Warehouse is missing in Purchase Order,Warehouse ist in der Bestellung fehlen
-Warehouse not found in the system,Warehouse im System nicht gefunden
-Warehouse required for stock Item {0},Lagerhaus Lager Artikel erforderlich {0}
-Warehouse where you are maintaining stock of rejected items,"Warenlager, in dem Sie Bestand oder abgelehnte Artikel lagern"
-Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kann nicht gelöscht werden, Menge für Artikel existiert {1}"
-Warehouse {0} does not belong to company {1},Warehouse {0} ist nicht gehören Unternehmen {1}
-Warehouse {0} does not exist,Warehouse {0} existiert nicht
+Warehouse is missing in Purchase Order,Angabe des Lagers fehlt in dem Lieferatenauftrag
+Warehouse not found in the system,Lager im System nicht gefunden
+Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+Warehouse where you are maintaining stock of rejected items,"Lager, in dem Sie Bestand abgelehnter Artikel führen"
+Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kann nicht gelöscht werden, da noch ein Bestand für Artikel {1} existiert"
+Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Unternehmen {1}
+Warehouse {0} does not exist,Lager {0} existiert nicht
 Warehouse {0}: Company is mandatory,Warehouse {0}: Unternehmen ist obligatorisch
-Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Eltern-Konto {1} nicht Bolong an die Firma {2}
+Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Ursprungskonto {1} gehört nicht zu Unternehmen {2}
 Warehouse-Wise Stock Balance,Warenlagerweise Bestandsbilanz
 Warehouse-wise Item Reorder,Warenlagerweise Artikelaufzeichnung
 Warehouses,Warenlager
-Warehouses.,Gewerberäume .
+Warehouses.,Warenlager.
 Warn,Warnen
 Warning: Leave application contains following block dates,Achtung: Die Urlaubsanwendung enthält die folgenden gesperrten Daten
 Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Material Gewünschte Menge weniger als Mindestbestellmengeist
-Warning: Sales Order {0} already exists against same Purchase Order number,Warnung: Sales Order {0} gegen gleiche Auftragsnummer ist bereits vorhanden
+Warning: Sales Order {0} already exists against same Purchase Order number,Warnung: Kundenauftrag {0} existiert bereits für die gleiche Lieferatenauftragsnummer
 Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System wird nicht zu überprüfen, da überhöhte Betrag für Artikel {0} in {1} Null"
 Warranty / AMC Details,Garantie / AMC-Details
 Warranty / AMC Status,Garantie / AMC-Status
 Warranty Expiry Date,Garantieablaufdatum
 Warranty Period (Days),Gewährleistungsfrist
 Warranty Period (in days),Garantiezeitraum (in Tagen)
-We buy this Item,Wir kaufen Artikel
-We sell this Item,Wir verkaufen Artikel
+We buy this Item,Wir kaufen diesen Artikel
+We sell this Item,Wir verkaufen diesen Artikel
 Website,Website
 Website Description,Website-Beschreibung
 Website Item Group,Webseite-Artikelgruppe
@@ -3328,21 +3327,21 @@
 Wednesday,Mittwoch
 Weekly,Wöchentlich
 Weekly Off,Wöchentlich frei
-Weight UOM,Gewicht je ME
-"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Das Gewicht wird erwähnt, \ nBitte erwähnen "" Gewicht Verpackung "" zu"
+Weight UOM,Gewicht ME
+"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewichtsangabe wird angegeben,\nBitte geben Sie das Gewicht pro Mengeneinheit (Gewicht ME) ebenfalls an"
 Weightage,Gewichtung
 Weightage (%),Gewichtung (%)
 Welcome,Willkommen
-Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Willkommen auf ERPNext . In den nächsten Minuten werden wir Ihnen dabei helfen ihr Konto zu erstellen.Bitte geben Sie hierbei so viele Informationen wie möglich ein, dass spart Ihnen bei der späteren Verwendung eine Menge Zeit. Viel Erfolg!"
-Welcome to ERPNext. Please select your language to begin the Setup Wizard.,"Willkommen auf ERPNext . Bitte wählen Sie Ihre Sprache aus, um den Setup-Assistenten zu starten."
-What does it do?,Was macht sie?
+Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Willkommen auf ERPNext. In den nächsten Minuten werden wir Ihnen helfen, Ihr ERPNext Konto einzurichten. Versuchen Sie soviel wie möglich auszufüllen, auch wenn es etwas länger dauert. Es wird Ihnen eine später Menge Zeit sparen. Viel Erfolg!"
+Welcome to ERPNext. Please select your language to begin the Setup Wizard.,"Willkommen bei ERPNext. Bitte wählen Sie Ihre Sprache, um den Setup-Assistenten zu starten."
+What does it do?,Unternehmenszweck?
 "When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der geprüften Transaktionen den Status ""Abgesendet/Eingereicht"" hat, wird automatisch eine Popup-E-Mail geöffnet, damit die Transaktion als Anhang per E-Mail an den zugeordneten ""Kontakt"" dieser Transaktion gesendet werden kann.  Der Benutzer kann diese E-Mail absenden oder nicht."
-"When submitted, the system creates difference entries to set the given stock and valuation on this date.","Wenn vorgelegt , erstellt das System Unterschied Einträge, um die Lager -und Bewertungs gegeben an diesem Tag eingestellt ."
+"When submitted, the system creates difference entries to set the given stock and valuation on this date.","Wenn eingereicht wird, erstellt das System Differenz-Einträge anhand der Bestände und Wertw an diesem Tag."
 Where items are stored.,Wo Artikel gelagert werden.
 Where manufacturing operations are carried out.,Wo Herstellungsvorgänge durchgeführt werden.
 Widowed,Verwaist
 Will be calculated automatically when you enter the details,"Wird automatisch berechnet, wenn Sie die Daten eingeben"
-Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, nachdem die Verkaufsrechnung eingereicht wird."
+Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, nachdem die Ausgangsrechnung eingereicht wird."
 Will be updated when batched.,"Wird aktualisiert, wenn Stapel erstellt werden."
 Will be updated when billed.,"Wird aktualisiert, wenn in Rechnung gestellt."
 Wire Transfer,Überweisung
@@ -3356,31 +3355,31 @@
 Working Days,Arbeitstage
 Workstation,Arbeitsstation
 Workstation Name,Name der Arbeitsstation
-Write Off Account,"Abschreiben, Konto"
-Write Off Amount,"Abschreiben, Betrag"
-Write Off Amount <=,"Abschreiben, Betrag <="
+Write Off Account,"Abschreibung, Konto"
+Write Off Amount,"Abschreibung, Betrag"
+Write Off Amount <=,"Abschreibung, Betrag <="
 Write Off Based On,Abschreiben basiert auf
-Write Off Cost Center,"Abschreiben, Kostenstelle"
+Write Off Cost Center,"Abschreibung, Kostenstelle"
 Write Off Outstanding Amount,"Abschreiben, ausstehender Betrag"
-Write Off Entry,"Abschreiben, Gutschein"
+Write Off Voucher,"Abschreiben, Gutschein"
 Wrong Template: Unable to find head row.,Falsche Vorlage: Kopfzeile nicht gefunden
 Year,Jahr
 Year Closed,Jahr geschlossen
-Year End Date,Jahr Endedatum
+Year End Date,Geschäftsjahr Ende
 Year Name,Name des Jahrs
-Year Start Date,Jahr Startdatum
+Year Start Date,Geschäftsjahr Beginn
 Year of Passing,Jahr des Übergangs
 Yearly,Jährlich
 Yes,Ja
-You are not authorized to add or update entries before {0},"Sie haben nicht die Berechtigung Einträge hinzuzufügen oder zu aktualisieren, bevor {0}"
-You are not authorized to set Frozen value,Sie haben nicht die Berechtigung eingefrorene Werte einzustellen
-You are the Expense Approver for this record. Please Update the 'Status' and Save,Sie sind der Kosten Genehmiger für diesen Datensatz . Bitte aktualisieren Sie den 'Status' und dann abspeichern
-You are the Leave Approver for this record. Please Update the 'Status' and Save,Sie sind der Abwesenheits Genehmiger für diesen Datensatz .  Bitte aktualisieren Sie den 'Status' und dann abspeichern
+You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Einträge vor {0} hinzuzufügen oder zu aktualisieren
+You are not authorized to set Frozen value,Sie haben keine Berechtigung eingefrorene Werte zu setzen
+You are the Expense Approver for this record. Please Update the 'Status' and Save,Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den 'Status' und dann speichern Sie diesen ab
+You are the Leave Approver for this record. Please Update the 'Status' and Save,Sie sind der Abwesenheitsbewilliger für diesen Datensatz. Bitte aktualisieren Sie den 'Status' und dann speichern Sie diesen ab
 You can enter any date manually,Sie können jedes Datum manuell eingeben
 You can enter the minimum quantity of this item to be ordered.,"Sie können die Mindestmenge des Artikels eingeben, der bestellt werden soll."
-You can not change rate if BOM mentioned agianst any item,"Sie können Rate nicht ändern, wenn BOM agianst jeden Artikel erwähnt"
-You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Sie können nicht sowohl Lieferschein Nein und Sales Invoice Nr. Bitte geben Sie eine beliebige .
-You can not enter current voucher in 'Against Journal Entry' column,"Sie können keine aktuellen Gutschein in ""Gegen Blatt Gutschein -Spalte"
+You can not change rate if BOM mentioned agianst any item,Sie können den Tarif nicht ändern solange die Stückliste Artikel enthält
+You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Sie können nicht sowohl die Lieferschein-Nr. als auch die Ausgangsrechnungs-Nr. angeben. Bitte geben Sie nur eine von Beiden an.
+You can not enter current voucher in 'Against Journal Voucher' column,"Sie können den aktuellen Beleg nicht in ""zu Buchungsbeleg-Spalte erfassen"
 You can set Default Bank Account in Company master,Sie können Standard- Bank-Konto in Firmen Master eingestellt
 You can start by selecting backup frequency and granting access for sync,Sie können durch Auswahl Backup- Frequenz und den Zugang für die Gewährung Sync starten
 You can submit this Stock Reconciliation.,Sie können diese Vektor Versöhnung vorzulegen.
@@ -3388,7 +3387,7 @@
 You cannot credit and debit same account at the same time,Sie können keine Kredit-und Debit gleiche Konto in der gleichen Zeit
 You have entered duplicate items. Please rectify and try again.,Sie haben doppelte Elemente eingetragen. Bitte korrigieren und versuchen Sie es erneut .
 You may need to update: {0},Sie müssen möglicherweise folgendes aktualisieren: {0}
-You must Save the form before proceeding,"Sie müssen das Formular , bevor Sie speichern"
+You must Save the form before proceeding,Sie müssen das Formular speichern um fortzufahren 
 Your Customer's TAX registration numbers (if applicable) or any general information,Steuernummern Ihres Kunden (falls zutreffend) oder allgemeine Informationen
 Your Customers,Ihre Kunden
 Your Login Id,Ihre Login-ID
@@ -3399,18 +3398,18 @@
 Your financial year ends on,Ihr Geschäftsjahr endet am
 Your sales person who will contact the customer in future,"Ihr Vertriebsmitarbeiter, der den Kunden in Zukunft kontaktiert"
 Your sales person will get a reminder on this date to contact the customer,"Ihr Vertriebsmitarbeiter erhält an diesem Datum eine Erinnerung, den Kunden zu kontaktieren"
-Your setup is complete. Refreshing...,Ihre Einrichtung ist abgeschlossen. Aktualisiere ...
+Your setup is complete. Refreshing...,die Einrichtung ist abgeschlossen. Aktualisiere...
 Your support email id - must be a valid email - this is where your emails will come!,Ihre Support-E-Mail-ID - muss eine gültige E-Mail sein. An diese Adresse erhalten Sie Ihre E-Mails!
 [Error],[Error]
 [Select],[Select ]
 `Freeze Stocks Older Than` should be smaller than %d days.,`Frost Stocks Älter als ` sollte kleiner als% d Tage.
 and,und
 are not allowed.,sind nicht erlaubt.
-assigned by,zugeordnet von
+assigned by,zugewiesen von
 cannot be greater than 100,darf nicht größer als 100 sein
 "e.g. ""Build tools for builders""","z.B. ""Build -Tools für Bauherren """
 "e.g. ""MC""","z.B. ""MC"""
-"e.g. ""My Company LLC""","z.B. "" My Company LLC"""
+"e.g. ""My Company LLC""","z.B. ""My Company LLC"""
 e.g. 5,z.B. 5
 "e.g. Bank, Cash, Credit Card","z.B. Bank, Bargeld, Kreditkarte"
 "e.g. Kg, Unit, Nos, m","z.B. Kg, Einheit, Nr, m"
@@ -3418,24 +3417,24 @@
 eg. Cheque Number,z. B. Schecknummer
 example: Next Day Shipping,Beispiel: Versand am nächsten Tag
 fold,
-hidden,hidden
+hidden,versteckt
 hours,
 lft,li
-old_parent,old_parent
+old_parent,vorheriges Element
 rgt,Rt
 subject,Betreff
 to,bis
 website page link,Website-Link
 {0} '{1}' not in Fiscal Year {2},{0} ' {1}' nicht im Geschäftsjahr {2}
-{0} Credit limit {1} crossed,{0} Credit limit {1} crossed
+{0} Credit limit {1} crossed,{0} Kreidlinie überschritte {1}
 {0} Serial Numbers required for Item {0}. Only {0} provided.,{0} Seriennummern für Artikel erforderlich {0}. Nur {0} ist.
 {0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budget für Konto {1} gegen Kostenstelle {2} wird von {3} überschreiten
 {0} can not be negative,{0} kann nicht negativ sein
 {0} created,{0} erstellt
-{0} days from {1},{0} days from {1}
+{0} days from {1}, {0} Tage von {1} ab
 {0} does not belong to Company {1},{0} ist nicht auf Unternehmen gehören {1}
 {0} entered twice in Item Tax,{0} trat zweimal in Artikel Tax
-{0} is an invalid email address in 'Notification \					Email Address',{0} is an invalid email address in 'Notification \					Email Address'
+{0} is an invalid email address in 'Notification \					Email Address',{0} ist eine ungültige E-Mail-Adresse in 'Mitteilung E-Mail-Adresse'
 {0} is mandatory,{0} ist obligatorisch
 {0} is mandatory for Item {1},{0} Artikel ist obligatorisch für {1}
 {0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist obligatorisch. Vielleicht Devisenwechsel Datensatz nicht für {1} bis {2} erstellt.
@@ -3443,69 +3442,21 @@
 {0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
 {0} is not a valid Leave Approver. Removing row #{1}.,{0} ist kein gültiges Datum Genehmiger. Entfernen Folge # {1}.
 {0} is not a valid email id,{0} ist keine gültige E-Mail -ID
-{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt der Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser , damit die Änderungen wirksam werden."
+{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt der Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden."
 {0} is required,{0} ist erforderlich
 {0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein Gekaufte oder Subunternehmer vergebene Artikel in Zeile {1}
 {0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss {1} reduziert werden, oder sollten Sie Überlauftoleranz zu erhöhen"
-{0} must have role 'Leave Approver',"{0} muss Rolle "" Genehmiger Leave ' haben"
+{0} must have role 'Leave Approver',"{0} muss die Rolle ""Abwesenheitsgenehmiger"" haben"
 {0} valid serial nos for Item {1},{0} gültige Seriennummernfür Artikel {1}
 {0} {1} against Bill {2} dated {3},{0} {1} gegen Bill {2} {3} vom
 {0} {1} against Invoice {2},{0} {1} gegen Rechnung {2}
-{0} {1} has already been submitted,{0} {1} wurde bereits eingereicht
-{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert . Bitte aktualisieren.
+{0} {1} has already been submitted,{0} {1} wurde bereits eingereich
+{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
 {0} {1} is not submitted,{0} {1} nicht vorgelegt
 {0} {1} must be submitted,{0} {1} muss vorgelegt werden
 {0} {1} not in any Fiscal Year,{0} {1} nicht in jedem Geschäftsjahr
-{0} {1} status is 'Stopped',"{0} {1} Status "" Stopped """
-{0} {1} status is Stopped,{0} {1} Status beendet
-{0} {1} status is Unstopped,{0} {1} Status unstopped
+{0} {1} status is 'Stopped',"{0} {1} hat den Status ""angehalten"""
+{0} {1} status is Stopped,{0} {1} hat den Status angehalten
+{0} {1} status is Unstopped,{0} {1} hat den Status fortgesetzt
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist obligatorisch für Artikel {2}
 {0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs Details-Tabelle gefunden
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Hinzufügen / Bearbeiten </ a>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Hinzufügen / Bearbeiten </ a>"
-Billed,Abgerechnet
-Company,Unternehmen
-Currency is required for Price List {0},Die Währung ist für Preisliste erforderlich {0}
-Default Customer Group,Standardkundengruppe
-Default Territory,Standardregion
-Default settings for Shopping Cart,Standardeinstellungen für Einkaufswagen
-Delivered,Geliefert
-Enable Shopping Cart,Einkaufswagen aktivieren
-Go ahead and add something to your cart.,Gehen Sie voran und fügen Sie etwas in Ihren Warenkorb.
-Hey! Go ahead and add an address,Hallo! Gehen Sie voran und fügen Sie eine Adresse
-Invalid Billing Address,Ungültige Rechnungsadresse
-Invalid Shipping Address,Falsche Lieferadresse
-Missing Currency Exchange Rates for {0},Fehlende Wechselkurse für {0}
-Name is required,Name ist erforderlich
-Not Allowed,Nicht erlaubt
-Paid,bezahlt
-Partially Billed,teilweise Angekündigt
-Partially Delivered,teilweise Lieferung
-Please specify a Price List which is valid for Territory,"Legen Sie eine Preisliste fest, die für die Region gültig ist"
-Please specify currency in Company,Geben Sie die Währung im Unternehmen an
-Please write something,Bitte schreiben Sie etwas
-Please write something in subject and message!,Bitte schreiben Sie etwas in Betreff und die Nachricht !
-Price List,Preisliste
-Price List not configured.,Preisliste nicht konfiguriert.
-Quotation Series,Angebotsserie
-Shipping Rule,Versandregel
-Shopping Cart,Einkaufswagen
-Shopping Cart Price List,Einkaufswagen Preisliste
-Shopping Cart Price Lists,Einkaufswagen Preislisten
-Shopping Cart Settings,Einkaufswageneinstellungen
-Shopping Cart Shipping Rule,Einkaufswagen-Versandregel
-Shopping Cart Shipping Rules,Einkaufswagen-Versandregeln
-Shopping Cart Taxes and Charges Master,Einkaufswagen-Steuern und Abgabenstamm
-Shopping Cart Taxes and Charges Masters,Einkaufswagen-Steuern und Abgabenstämme
-Something went wrong!,Etwas ist schiefgelaufen!
-Something went wrong.,Es gab ein Problem.
-Tax Master,Steuerstamm
-To Pay,To Pay
-Updated,Aktualisiert
-Website Manager,
-You are not allowed to reply to this ticket.,"Sie sind nicht berechtigt, auf diesem Ticket antworten ."
-You need to be logged in to view your cart.,"Sie müssen angemeldet sein, um Ihren Warenkorb zu sehen."
-You need to enable Shopping Cart,Sie benötigen den Einkaufswagen zu ermöglichen
-{0} cannot be purchased using Shopping Cart,{0} kann nicht mit Einkaufswagen erworben werden
-{0} is required,{0} ist erforderlich
-{0} {1} has a common territory {2},{0} {1} hat einen gemeinsamen Territorium {2}
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index cf8af0b..b2be7d0 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -56,49 +56,49 @@
 Account Details,Στοιχεία Λογαριασμού
 Account Head,Επικεφαλής λογαριασμού
 Account Name,Όνομα λογαριασμού
-Account Type,Είδος Λογαριασμού
+Account Type,Τύπος Λογαριασμού
 "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Το υπόλοιπο του λογαριασμού είναι ήδη πιστωτικό, δεν επιτρέπεται να ρυθμίσετε το «Υπόλοιπο πρέπει να είναι χρεωστικό»"
-"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού ήδη χρεωστικό, δεν μπορείτε να ρυθμίσετε το 'Υπόλοιπο πρέπει να είναι ως Δάνειο »"
+"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ρυθμίσετε το 'Υπόλοιπο πρέπει να είναι' ως 'Πιστωτικό' "
 Account for the warehouse (Perpetual Inventory) will be created under this Account.,Λογαριασμός για την αποθήκη ( Perpetual Απογραφή ) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
 Account head {0} created,Κεφάλι Λογαριασμός {0} δημιουργήθηκε
 Account must be a balance sheet account,Ο λογαριασμός πρέπει να είναι λογαριασμός του ισολογισμού
 Account with child nodes cannot be converted to ledger,Λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
-Account with existing transaction can not be converted to group.,Ο λογαριασμός με τις υπάρχουσες συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα .
-Account with existing transaction can not be deleted,Ο λογαριασμός με τις υπάρχουσες συναλλαγή δεν μπορεί να διαγραφεί
-Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με τις υπάρχουσες συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
-Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι μια ομάδα
+Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα .
+Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
+Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
+Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
 Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη Εταιρεία {1}
 Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
 Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 Account {0} has been entered more than once for fiscal year {1},Ο λογαριασμός {0} έχει εισαχθεί περισσότερες από μία φορά για το οικονομικό έτος {1}
 Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
-Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργό
-Account {0} is not valid,Ο λογαριασμός {0} δεν είναι έγκυρη
+Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργός
+Account {0} is not valid,Ο λογαριασμός {0} δεν είναι έγκυρος
 Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου « Παγίων » ως σημείο {1} είναι ένα περιουσιακό στοιχείο Στοιχείο
 Account {0}: Parent account {1} can not be a ledger,Ο λογαριασμός {0}: Μητρική λογαριασμό {1} δεν μπορεί να είναι ένα καθολικό
 Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: Μητρική λογαριασμό {1} δεν ανήκει στην εταιρεία: {2}
 Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: Μητρική λογαριασμό {1} δεν υπάρχει
 Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: Δεν μπορεί η ίδια να εκχωρήσει ως μητρική λογαριασμού
 Account: {0} can only be updated via \					Stock Transactions,Λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω \ Χρηματιστηριακές Συναλλαγές Μετοχών
-Accountant,λογιστής
+Accountant,Λογιστής
 Accounting,Λογιστική
 "Accounting Entries can be made against leaf nodes, called","Λογιστικές εγγραφές μπορούν να γίνουν με κόμβους , που ονομάζεται"
 "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Λογιστική εγγραφή παγώσει μέχρι την ημερομηνία αυτή, κανείς δεν μπορεί να κάνει / τροποποιήσετε την είσοδο, εκτός από τον ρόλο που καθορίζεται παρακάτω."
 Accounting journal entries.,Λογιστικές εγγραφές περιοδικό.
 Accounts,Λογαριασμοί
-Accounts Browser,λογαριασμοί Browser
-Accounts Frozen Upto,Λογαριασμοί Κατεψυγμένα Μέχρι
-Accounts Payable,Λογαριασμοί πληρωτέοι
+Accounts Browser,Περιηγητής Λογαριασμων
+Accounts Frozen Upto,Παγωμένοι Λογαριασμοί Μέχρι
+Accounts Payable,Λογαριασμοί Πληρωτέοι
 Accounts Receivable,Απαιτήσεις από Πελάτες
 Accounts Settings,Λογαριασμοί Ρυθμίσεις
 Active,Ενεργός
 Active: Will extract emails from ,Active: Θα εξαγάγετε μηνύματα ηλεκτρονικού ταχυδρομείου από
 Activity,Δραστηριότητα
-Activity Log,Σύνδεση Δραστηριότητα
+Activity Log,Αρχείο-Καταγραφή Δραστηριότητας
 Activity Log:,Είσοδος Δραστηριότητα :
 Activity Type,Τύπος δραστηριότητας
 Actual,Πραγματικός
-Actual Budget,Πραγματικό προϋπολογισμό
+Actual Budget,Πραγματικός προϋπολογισμό
 Actual Completion Date,Πραγματική Ημερομηνία Ολοκλήρωσης
 Actual Date,Πραγματική Ημερομηνία
 Actual End Date,Πραγματική Ημερομηνία Λήξης
@@ -111,11 +111,11 @@
 Actual Quantity,Πραγματική ποσότητα
 Actual Start Date,Πραγματική ημερομηνία έναρξης
 Add,Προσθήκη
-Add / Edit Taxes and Charges,Προσθήκη / Επεξεργασία Φόροι και τέλη
+Add / Edit Taxes and Charges,Προσθήκη / Επεξεργασία Φόρων και τέλών
 Add Child,Προσθήκη παιδιών
 Add Serial No,Προσθήκη Αύξων αριθμός
-Add Taxes,Προσθήκη Φόροι
-Add Taxes and Charges,Προσθήκη Φόροι και τέλη
+Add Taxes,Προσθήκη Φόρων
+Add Taxes and Charges,Προσθήκη Φόρων και Τελών
 Add or Deduct,Προσθήκη ή να αφαιρέσει
 Add rows to set annual budgets on Accounts.,Προσθέστε γραμμές να θέσουν ετήσιους προϋπολογισμούς σε λογαριασμούς.
 Add to Cart,Προσθήκη στο Καλάθι
@@ -125,22 +125,22 @@
 Address & Contact,Διεύθυνση &amp; Επικοινωνία
 Address & Contacts,Διεύθυνση &amp; Επικοινωνία
 Address Desc,Διεύθυνση ΦΘΕ
-Address Details,Λεπτομέρειες Διεύθυνση
+Address Details,Λεπτομέρειες Διεύθυνσης
 Address HTML,Διεύθυνση HTML
 Address Line 1,Διεύθυνση 1
-Address Line 2,Γραμμή διεύθυνσης 2
+Address Line 2,Γραμμή Διεύθυνσης 2
 Address Template,Διεύθυνση Πρότυπο
 Address Title,Τίτλος Διεύθυνση
-Address Title is mandatory.,Διεύθυνση τίτλου είναι υποχρεωτική .
-Address Type,Πληκτρολογήστε τη διεύθυνση
+Address Title is mandatory.,Ο τίτλος της Διεύθυνσης είναι υποχρεωτικός.
+Address Type,Τύπος Διεύθυνσης
 Address master.,Διεύθυνση πλοιάρχου .
-Administrative Expenses,έξοδα διοικήσεως
+Administrative Expenses,Έξοδα Διοικήσεως
 Administrative Officer,Διοικητικός Λειτουργός
-Advance Amount,Ποσό Advance
+Advance Amount,Ποσό Προκαταβολής
 Advance amount,Ποσό Advance
 Advances,Προκαταβολές
 Advertisement,Διαφήμιση
-Advertising,διαφήμιση
+Advertising,Διαφήμιση
 Aerospace,Aerospace
 After Sale Installations,Μετά Εγκαταστάσεις Πώληση
 Against,Κατά
@@ -214,13 +214,13 @@
 Amount,Ποσό
 Amount (Company Currency),Ποσό (νόμισμα της Εταιρείας)
 Amount Paid,Ποσό Αμειβόμενος
-Amount to Bill,Χρεώσιμο Ποσό
+Amount to Bill,Ποσό Χρέωσης
 An Customer exists with same name,Υπάρχει  πελάτης με το ίδιο όνομα
 "An Item Group exists with same name, please change the item name or rename the item group","Ένα σημείο της ομάδας υπάρχει με το ίδιο όνομα , μπορείτε να αλλάξετε το όνομα του στοιχείου ή να μετονομάσετε την ομάδα στοιχείου"
 "An item exists with same name ({0}), please change the item group name or rename the item","Ένα στοιχείο υπάρχει με το ίδιο όνομα ( {0} ) , παρακαλούμε να αλλάξετε το όνομα της ομάδας στοιχείου ή να μετονομάσετε το στοιχείο"
-Analyst,αναλυτής
-Annual,ετήσιος
-Another Period Closing Entry {0} has been made after {1},Μια άλλη Έναρξη Περιόδου Κλείσιμο {0} έχει γίνει μετά από {1}
+Analyst,Αναλυτής
+Annual,Ετήσιος
+Another Period Closing Entry {0} has been made after {1},Μια ακόμη εισαγωγή Κλεισίματος Περιόδου {0} έχει γίνει μετά από {1}
 Another Salary Structure {0} is active for employee {0}. Please make its status 'Inactive' to proceed.,Μια άλλη δομή Μισθός είναι {0} ενεργό για εργαζόμενο {0} . Παρακαλώ κάνετε το καθεστώς της « Ανενεργός » για να προχωρήσετε .
 "Any other comments, noteworthy effort that should go in the records.","Οποιαδήποτε άλλα σχόλια, αξιοσημείωτη προσπάθεια που θα πρέπει να πάει στα αρχεία."
 Apparel & Accessories,Ένδυση & Αξεσουάρ
@@ -232,20 +232,20 @@
 Applicable To (Employee),Που ισχύουν για (Υπάλληλος)
 Applicable To (Role),Που ισχύουν για (Ρόλος)
 Applicable To (User),Που ισχύουν για (User)
-Applicant Name,Όνομα Αιτών
-Applicant for a Job.,Αίτηση εργασίας.
+Applicant Name,Όνομα Αιτούντα
+Applicant for a Job.,Αίτηση για εργασία
 Application of Funds (Assets),Εφαρμογή των Ταμείων ( Ενεργητικό )
-Applications for leave.,Οι αιτήσεις για τη χορήγηση άδειας.
+Applications for leave.,Αιτήσεις για χορήγηση άδειας.
 Applies to Company,Ισχύει για την Εταιρεία
 Apply On,Εφαρμόστε την
 Appraisal,Εκτίμηση
 Appraisal Goal,Goal Αξιολόγηση
-Appraisal Goals,Στόχοι Αξιολόγηση
-Appraisal Template,Πρότυπο Αξιολόγηση
-Appraisal Template Goal,Αξιολόγηση Goal Template
-Appraisal Template Title,Αξιολόγηση Τίτλος Template
+Appraisal Goals,Στόχοι Αξιολόγησης
+Appraisal Template,Πρότυπο Αξιολόγησης
+Appraisal Template Goal,Στόχος Προτύπου Αξιολόγησης
+Appraisal Template Title,Τίτλος Προτύπου Αξιολόγησης
 Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε υπάλληλου {1} στο συγκεκριμένο εύρος ημερομηνιών
-Apprentice,τσιράκι
+Apprentice,Μαθητευόμενος
 Approval Status,Κατάσταση έγκρισης
 Approval Status must be 'Approved' or 'Rejected',Κατάσταση έγκρισης πρέπει να « Εγκρίθηκε » ή « Rejected »
 Approved,Εγκρίθηκε
@@ -265,10 +265,10 @@
 Associate,Συνεργάτης
 Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις πωλήσεις ή την αγορά
 Atleast one warehouse is mandatory,"Τουλάχιστον, μια αποθήκη είναι υποχρεωτική"
-Attach Image,Συνδέστε Image
-Attach Letterhead,Συνδέστε επιστολόχαρτο
-Attach Logo,Συνδέστε Logo
-Attach Your Picture,Προσαρμόστε την εικόνα σας
+Attach Image,Επισύναψη Εικόνας
+Attach Letterhead,Επισύναψη επιστολόχαρτου
+Attach Logo,Επισύναψη Logo
+Attach Your Picture,Επισύναψη της εικόνα σας
 Attendance,Παρουσία
 Attendance Date,Ημερομηνία Συμμετοχής
 Attendance Details,Λεπτομέρειες Συμμετοχής
@@ -281,20 +281,20 @@
 Authorization Control,Έλεγχος Εξουσιοδότησης
 Authorization Rule,Κανόνας Εξουσιοδότησης
 Auto Accounting For Stock Settings,Auto Λογιστικά Για Ρυθμίσεις Χρηματιστήριο
-Auto Material Request,Αυτόματη Αίτηση Υλικό
+Auto Material Request,Αυτόματη Αίτηση Υλικού
 Auto-raise Material Request if quantity goes below re-order level in a warehouse,Auto-raise Αίτηση Υλικό εάν η ποσότητα πέσει κάτω εκ νέου για το επίπεδο σε μια αποθήκη
-Automatically compose message on submission of transactions.,Αυτόματη συνθέτουν το μήνυμα για την υποβολή των συναλλαγών .
+Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box
 Automatically extract Leads from a mail box e.g.,"Αυτόματη εξαγωγή οδηγεί από ένα κουτί αλληλογραφίας , π.χ."
-Automatically updated via Stock Entry of type Manufacture/Repack,Αυτόματη ενημέρωση μέσω είσοδο στα αποθέματα Κατασκευή Τύπος / Repack
+Automatically updated via Stock Entry of type Manufacture/Repack,Αυτόματη ενημέρωση με την είσοδο αποθεμάτων Κατασκευή Τύπος / Repack
 Automotive,Αυτοκίνητο
-Autoreply when a new mail is received,Autoreply όταν λαμβάνονται νέα μηνύματα
+Autoreply when a new mail is received,Αυτόματη απάντηση όταν λαμβάνονται νέα μηνύματα
 Available,Διαθέσιμος
-Available Qty at Warehouse,Διαθέσιμο Ποσότητα στην Αποθήκη
-Available Stock for Packing Items,Διαθέσιμο Διαθέσιμο για είδη συσκευασίας
+Available Qty at Warehouse,Διαθέσιμη Ποσότητα στην Αποθήκη
+Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Διατίθεται σε BOM , Δελτίο Αποστολής , Τιμολόγιο Αγοράς , Παραγωγής Τάξης, Παραγγελία Αγοράς, Αγορά Παραλαβή , Πωλήσεις Τιμολόγιο , Πωλήσεις Τάξης , Stock Έναρξη , φύλλο κατανομής χρόνου"
 Average Age,Μέσος όρος ηλικίας
-Average Commission Rate,Μέση Τιμή Επιτροπής
+Average Commission Rate,Μέσος συντελεστής προμήθειας
 Average Discount,Μέση έκπτωση
 Awesome Products,Awesome Προϊόντα
 Awesome Services,Awesome Υπηρεσίες
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 1528ffa..89dcb4c 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -31,7 +31,7 @@
 1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,"1 moneda = [?] Fracción  Por ejemplo, 1 USD = 100 Cent"
 1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código del artículo sabia cliente y para efectuar búsquedas en ellos en función de su uso de código de esta opción
 "<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer grupo""> Añadir / Editar < / a>"
-"<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Añadir / Editar < / a>"
+"<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item grupo""> Añadir / Editar < / a>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Añadir / Editar < / a>"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> defecto plantilla </ h4>  <p> Usos <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja plantillas </ a> y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible </ p>  <pre> <code> {{}} address_line1 <br>  {% if address_line2%} {{}} address_line2 <br> { endif% -%}  {{city}} <br>  {% if estado%} {{Estado}} {% endif <br> -%}  {% if%} pincode PIN: {{pincode}} {% endif <br> -%}  {{país}} <br>  {% if%} de teléfono Teléfono: {{phone}} {<br> endif% -%}  {% if%} fax Fax: {{fax}} {% endif <br> -%}  {% if%} email_ID Email: {{}} email_ID <br> ; {% endif -%}  </ code> </ pre>"
 A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe un Grupo de Clientes con el mismo nombre, por favor cambie el nombre del Cliente o cambie el nombre del Grupo de Clientes"
@@ -146,25 +146,25 @@
 Against,Contra
 Against Account,Contra Cuenta
 Against Bill {0} dated {1},Contra Factura {0} de fecha {1}
-Against Docname,contra docName
-Against Doctype,contra Doctype
-Against Document Detail No,Contra Detalle documento n
+Against Docname,Contra Docname
+Against Doctype,Contra Doctype
+Against Document Detail No,Contra número de detalle del documento
 Against Document No,Contra el Documento No
 Against Expense Account,Contra la Cuenta de Gastos
 Against Income Account,Contra la Cuenta de Utilidad
-Against Journal Entry,Contra Comprobante de Diario
-Against Journal Entry {0} does not have any unmatched {1} entry,Contra Comprobante de Diario {0} aún no tiene {1} entrada asignada
+Against Journal Voucher,Contra Comprobante de Diario
+Against Journal Voucher {0} does not have any unmatched {1} entry,Contra Comprobante de Diario {0} aún no tiene {1} entrada asignada
 Against Purchase Invoice,Contra la Factura de Compra
 Against Sales Invoice,Contra la Factura de Venta
 Against Sales Order,Contra la Orden de Venta
 Against Voucher,Contra Comprobante
 Against Voucher Type,Contra Comprobante Tipo
 Ageing Based On,Envejecimiento Basado En
-Ageing Date is mandatory for opening entry,Envejecimiento Fecha es obligatorio para la apertura de la entrada
+Ageing Date is mandatory for opening entry,Fecha de antigüedad es obligatoria para la  entrada de apertura
 Ageing date is mandatory for opening entry,Fecha Envejecer es obligatorio para la apertura de la entrada
 Agent,Agente
-Aging Date,Fecha Envejecimiento
-Aging Date is mandatory for opening entry,El envejecimiento de la fecha es obligatoria para la apertura de la entrada
+Aging Date,Fecha de antigüedad
+Aging Date is mandatory for opening entry,La fecha de antigüedad es obligatoria para la apertura de la entrada
 Agriculture,Agricultura
 Airline,Línea Aérea
 All Addresses.,Todas las Direcciones .
@@ -182,8 +182,8 @@
 All Supplier Contact,Todos Contactos de Proveedores
 All Supplier Types,Todos los Tipos de proveedores
 All Territories,Todos los Territorios
-"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos los Campos relacionados a exportaciones como moneda , tasa de conversión , el total de exportaciones, total general de las exportaciones , etc están disponibles en la nota de entrega , Punto de venta , cotización , factura de venta , órdenes de venta , etc"
-"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos los ámbitos relacionados con la importación como la moneda , tasa de conversión , el total de las importaciones , la importación total de grand etc están disponibles en recibo de compra , proveedor de cotización , factura de compra , orden de compra , etc"
+"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos los campos relacionados tales como divisa, tasa de conversión, el total de exportaciones, total general de las exportaciones, etc están disponibles en la nota de entrega, Punto de venta, cotización, factura de venta, órdenes de venta, etc."
+"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos los campos tales como la divisa, tasa de conversión, el total de las importaciones, la importación total general etc están disponibles en recibo de compra, cotización de proveedor, factura de compra, orden de compra, etc"
 All items have already been invoiced,Todos los artículos que ya se han facturado
 All these items have already been invoiced,Todos estos elementos ya fueron facturados
 Allocate,Asignar
@@ -193,10 +193,10 @@
 Allocated Budget,Presupuesto Asignado
 Allocated amount,cantidad asignada
 Allocated amount can not be negative,Monto asignado no puede ser negativo
-Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe en unadusted
+Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 Allow Bill of Materials,Permitir lista de materiales
-Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,"Permita que la lista de materiales debe ser ""Sí"" . Debido a que una o varias listas de materiales activos presentes para este artículo"
-Allow Children,Permitir Niños
+Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,"Permitir lista de materiales debe ser ""Sí"". Debido a que una o varias listas de materiales activas presentes para este artículo"
+Allow Children,Permitir hijos
 Allow Dropbox Access,Permitir Acceso a Dropbox
 Allow Google Drive Access,Permitir Acceso a Google Drive
 Allow Negative Balance,Permitir Saldo Negativo
@@ -204,7 +204,7 @@
 Allow Production Order,Permitir Orden de Producción
 Allow User,Permitir al usuario
 Allow Users,Permitir que los usuarios
-Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes para aprobar solicitudes Dejar de días de bloque.
+Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
 Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 Allowance Percent,Porcentaje de Asignación
 Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
@@ -212,7 +212,7 @@
 Allowed Role to Edit Entries Before Frozen Date,Permitir al Rol editar las entradas antes de la Fecha de Cierre
 Amended From,Modificado Desde
 Amount,Cantidad
-Amount (Company Currency),Importe ( Compañía de divisas )
+Amount (Company Currency),Importe (Moneda de la Empresa)
 Amount Paid,Total Pagado
 Amount to Bill,Monto a Facturar
 An Customer exists with same name,Existe un cliente con el mismo nombre
@@ -251,15 +251,15 @@
 Approved,Aprobado
 Approver,aprobador
 Approving Role,Aprobar Rol
-Approving Role cannot be same as role the rule is Applicable To,Aprobar rol no puede ser igual que el papel de la regla es aplicable a
+Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
 Approving User,Aprobar Usuario
-Approving User cannot be same as user the rule is Applicable To,Aprobar usuario no puede ser igual que el usuario que la regla es aplicable a
+Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 Are you sure you want to STOP ,¿Esta seguro de que quiere DETENER?
 Are you sure you want to UNSTOP ,¿Esta seguro de que quiere CONTINUAR?
 Arrear Amount,Monto Mora
-"As Production Order can be made for this item, it must be a stock item.","Como orden de producción puede hacerse por este concepto , debe ser un elemento de serie ."
+"As Production Order can be made for this item, it must be a stock item.","Como puede hacerse Orden de Producción  por este concepto , debe ser un elemento con existencias."
 As per Stock UOM,Según Stock UOM
-"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Como hay transacciones de acciones existentes para este artículo , no se puede cambiar los valores de ""no tiene de serie ',' Is Stock Punto "" y "" Método de valoración '"
+"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Como hay transacciones de acciones existentes para este artículo , no se pueden cambiar los valores de ""Tiene Númer de Serie ','Artículo en stock"" y "" Método de valoración '"
 Asset,Activo
 Assistant,Asistente
 Associate,Asociado
@@ -298,9 +298,9 @@
 Average Discount,Descuento Promedio
 Awesome Products,Productos Increíbles 
 Awesome Services,Servicios Impresionantes 
-BOM Detail No,Detalle BOM No
+BOM Detail No,Número de Detalle en la Lista de Materiales
 BOM Explosion Item,BOM Explosion Artículo
-BOM Item,BOM artículo
+BOM Item,Artículo de la Lista de Materiales
 BOM No,BOM No
 BOM No. for a Finished Good Item,BOM N º de producto terminado artículo
 BOM Operation,BOM Operación
@@ -335,7 +335,7 @@
 Bank Reconciliation,Conciliación Bancaria
 Bank Reconciliation Detail,Detalle de Conciliación Bancaria
 Bank Reconciliation Statement,Declaración de Conciliación Bancaria
-Bank Entry,Banco de Vales
+Bank Voucher,Banco de Vales
 Bank/Cash Balance,Banco / Balance de Caja
 Banking,Banca
 Barcode,Código de Barras
@@ -345,7 +345,7 @@
 Basic Info,Información Básica
 Basic Information,Datos Básicos
 Basic Rate,Tasa Básica
-Basic Rate (Company Currency),Basic Rate ( Compañía de divisas )
+Basic Rate (Company Currency),Tarifa Base ( Divisa de la Compañía )
 Batch,Lote
 Batch (lot) of an Item.,Batch (lote ) de un elemento .
 Batch Finished Date,Fecha de terminacion de lote
@@ -355,7 +355,7 @@
 Batch Time Logs for billing.,Registros de tiempo de lotes para la facturación .
 Batch-Wise Balance History,Batch- Wise Historial de saldo
 Batched for Billing,Lotes para facturar
-Better Prospects,Mejores Prospectos
+Better Prospects,Mejores Perspectivas
 Bill Date,Fecha de Factura
 Bill No,Factura No
 Bill No {0} already booked in Purchase Invoice {1},Número de Factura {0} ya está reservado en Factura de Compra {1}
@@ -368,17 +368,17 @@
 Billed Amt,Imp Facturado
 Billing,Facturación
 Billing Address,Dirección de Facturación
-Billing Address Name,Dirección de Facturación Nombre
+Billing Address Name,Nombre de la Dirección de Facturación
 Billing Status,Estado de Facturación
-Bills raised by Suppliers.,Bills planteadas por los proveedores.
-Bills raised to Customers.,Bills planteadas a los clientes.
+Bills raised by Suppliers.,Facturas presentadas por los Proveedores.
+Bills raised to Customers.,Facturas presentadas a los Clientes.
 Bin,Papelera
 Bio,Bio
 Biotechnology,Biotecnología
 Birthday,Cumpleaños
 Block Date,Bloquear Fecha
 Block Days,Bloquear Días
-Block leave applications by department.,Bloquee aplicaciones de permiso por departamento.
+Block leave applications by department.,Bloquee solicitudes de vacaciones por departamento.
 Blog Post,Entrada en el Blog
 Blog Subscriber,Suscriptor del Blog
 Blood Group,Grupos Sanguíneos
@@ -390,7 +390,7 @@
 Brand master.,Marca Maestra
 Brands,Marcas
 Breakdown,Desglose
-Broadcasting,Radiodifusión
+Broadcasting,Difusión
 Brokerage,Brokerage
 Budget,Presupuesto
 Budget Allocated,Presupuesto asignado
@@ -470,7 +470,7 @@
 Case No. cannot be 0,Nº de Caso no puede ser 0
 Cash,Efectivo
 Cash In Hand,Efectivo Disponible
-Cash Entry,Comprobante de Efectivo
+Cash Voucher,Comprobante de Efectivo
 Cash or Bank Account is mandatory for making payment entry,Cuenta de Efectivo o Cuenta Bancaria es obligatoria para hacer una entrada de pago
 Cash/Bank Account,Cuenta de Caja / Banco
 Casual Leave,Permiso Temporal
@@ -597,7 +597,7 @@
 Contacts,Contactos
 Content,Contenido
 Content Type,Tipo de Contenido
-Contra Entry,Contra Entry
+Contra Voucher,Contra Voucher
 Contract,Contrato
 Contract End Date,Fecha Fin de Contrato
 Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
@@ -628,7 +628,7 @@
 Country Name,Nombre del país
 Country wise default Address Templates,Plantillas País sabia dirección predeterminada
 "Country, Timezone and Currency","País , Zona Horaria y Moneda"
-Create Bank Entry for the total salary paid for the above selected criteria,Cree Banco Vale para el salario total pagado por los criterios seleccionados anteriormente
+Create Bank Voucher for the total salary paid for the above selected criteria,Cree Banco Vale para el salario total pagado por los criterios seleccionados anteriormente
 Create Customer,Crear cliente
 Create Material Requests,Crear Solicitudes de Material
 Create New,Crear Nuevo
@@ -650,7 +650,7 @@
 Credit,Crédito
 Credit Amt,crédito Amt
 Credit Card,Tarjeta de Crédito
-Credit Card Entry,Vale la tarjeta de crédito
+Credit Card Voucher,Vale la tarjeta de crédito
 Credit Controller,Credit Controller
 Credit Days,Días de Crédito
 Credit Limit,Límite de Crédito
@@ -812,8 +812,8 @@
 Depreciation,depreciación
 Description,Descripción
 Description HTML,Descripción HTML
-Designation,designación
-Designer,diseñador
+Designation,Puesto
+Designer,Diseñador
 Detailed Breakup of the totals,Breakup detallada de los totales
 Details,Detalles
 Difference (Dr - Cr),Diferencia ( Db - Cr)
@@ -824,7 +824,7 @@
 Direct Income,Ingreso Directo
 Disable,Inhabilitar
 Disable Rounded Total,Desactivar Total Redondeado
-Disabled,discapacitado
+Disabled,Deshabilitado
 Discount  %,Descuento%
 Discount %,Descuento%
 Discount (%),Descuento (% )
@@ -921,10 +921,10 @@
 Employee Information,Información del Empleado
 Employee Internal Work History,Historial de trabajo interno del Empleado
 Employee Internal Work Historys,Empleado trabajo interno historys
-Employee Leave Approver,Empleado Dejar aprobador
+Employee Leave Approver,Supervisor de Vacaciones del Empleado
 Employee Leave Balance,Dejar Empleado Equilibrio
-Employee Name,Nombre del empleado
-Employee Number,Número del empleado
+Employee Name,Nombre del Empleado
+Employee Number,Número del Empleado
 Employee Records to be created by,Registros de empleados a ser creados por
 Employee Settings,Configuración del Empleado
 Employee Type,Tipo de Empleado
@@ -964,7 +964,7 @@
 Entries,Entradas
 Entries against ,Contrapartida
 Entries are not allowed against this Fiscal Year if the year is closed.,"Las entradas contra de este año fiscal no están permitidas, si el ejercicio está cerrado."
-Equity,equidad
+Equity,Equidad
 Error: {0} > {1},Error: {0} > {1}
 Estimated Material Cost,Coste estimado del material
 "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
@@ -982,7 +982,7 @@
 Excise Duty Edu Cess 2,Impuestos Especiales Edu Cess 2
 Excise Duty SHE Cess 1,Impuestos Especiales SHE Cess 1
 Excise Page Number,Número Impuestos Especiales Página
-Excise Entry,vale de Impuestos Especiales
+Excise Voucher,vale de Impuestos Especiales
 Execution,ejecución
 Executive Search,Búsqueda de Ejecutivos
 Exemption Limit,Límite de Exención
@@ -1330,7 +1330,7 @@
 Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Factura Periodo Del Período y Factura Para las fechas obligatorias para la factura recurrente
 Invoice Period To,Período Factura Para
 Invoice Type,Tipo de Factura
-Invoice/Journal Entry Details,Detalles de Factura / Comprobante de Diario
+Invoice/Journal Voucher Details,Detalles de Factura / Comprobante de Diario
 Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
 Is Active,Está Activo
 Is Advance,Es Avance
@@ -1460,11 +1460,11 @@
 Jobs Email Settings,Trabajos Email
 Journal Entries,entradas de diario
 Journal Entry,Entrada de diario
-Journal Entry,Comprobante de Diario
-Journal Entry Account,Detalle del Asiento de Diario
-Journal Entry Account No,Detalle del Asiento de Diario No
-Journal Entry {0} does not have account {1} or already matched,Comprobante de Diario {0} no tiene cuenta {1} o ya emparejado
-Journal Entries {0} are un-linked,Asientos de Diario {0} no están vinculados.
+Journal Voucher,Comprobante de Diario
+Journal Voucher Detail,Detalle del Asiento de Diario
+Journal Voucher Detail No,Detalle del Asiento de Diario No
+Journal Voucher {0} does not have account {1} or already matched,Comprobante de Diario {0} no tiene cuenta {1} o ya emparejado
+Journal Vouchers {0} are un-linked,Asientos de Diario {0} no están vinculados.
 Keep a track of communication related to this enquiry which will help for future reference.,Mantenga un registro de la comunicación en relación con esta consulta que ayudará para futuras consultas.
 Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
 Key Performance Area,Área Clave de Rendimiento
@@ -1495,13 +1495,13 @@
 Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Tiempo de Entrega en Días de la Iniciativa es el número de días en que se espera que este el artículo en su almacén. Este día es usado en la Solicitud de Materiales cuando se selecciona este elemento.
 Lead Type,Tipo de Iniciativa
 Lead must be set if Opportunity is made from Lead,La iniciativa se debe establecer si la oportunidad está hecha de plomo
-Leave Allocation,Deja Asignación
-Leave Allocation Tool,Deja Herramienta de Asignación
-Leave Application,Deja Aplicación
-Leave Approver,Deja aprobador
-Leave Approvers,Deja aprobadores
-Leave Balance Before Application,Deja Saldo antes de la aplicación
-Leave Block List,Deja Lista de bloqueo
+Leave Allocation,Asignación de Vacaciones
+Leave Allocation Tool,Herramienta de Asignación de Vacaciones
+Leave Application,Solicitud de Vacaciones
+Leave Approver,Supervisor de Vacaciones
+Leave Approvers,Supervisores de Vacaciones
+Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
+Leave Block List,Lista de Bloqueo de Vacaciones
 Leave Block List Allow,Deja Lista de bloqueo Permitir
 Leave Block List Allowed,Deja Lista de bloqueo animales
 Leave Block List Date,Deja Lista de bloqueo Fecha
@@ -1514,9 +1514,9 @@
 Leave Type,Deja Tipo
 Leave Type Name,Deja Tipo Nombre
 Leave Without Pay,Licencia sin sueldo
-Leave application has been approved.,Solicitud de autorización haya sido aprobada.
-Leave application has been rejected.,Solicitud de autorización ha sido rechazada.
-Leave approver must be one of {0},Deja aprobador debe ser uno de {0}
+Leave application has been approved.,La solicitud de vacaciones ha sido aprobada.
+Leave application has been rejected.,La solicitud de vacaciones ha sido rechazada.
+Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
 Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas
 Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
 Leave blank if considered for all designations,Dejar en blanco si se considera para todas las designaciones
@@ -1573,13 +1573,13 @@
 Maintenance Time,Tiempo de mantenimiento
 Maintenance Type,Tipo de Mantenimiento
 Maintenance Visit,Visita de Mantenimiento
-Maintenance Visit Purpose,Mantenimiento Visita Propósito
+Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mantenimiento Visita {0} debe ser cancelado antes de cancelar el pedido de ventas
 Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la serie n {0}
 Major/Optional Subjects,Principales / Asignaturas optativas
 Make ,Hacer
 Make Accounting Entry For Every Stock Movement,Hacer asiento contable para cada movimiento de acciones
-Make Bank Entry,Hacer Banco Voucher
+Make Bank Voucher,Hacer Banco Voucher
 Make Credit Note,Hacer Nota de Crédito
 Make Debit Note,Haga Nota de Débito
 Make Delivery,Hacer Entrega
@@ -1592,7 +1592,7 @@
 Make Maintenance Visit,Hacer mantenimiento Visita
 Make Packing Slip,Hacer lista de empaque
 Make Payment,Realizar Pago
-Make Payment Entry,Hacer Entrada Pago
+Make Payment Entry,Hacer Entrada de Pago
 Make Purchase Invoice,Hacer factura de compra
 Make Purchase Order,Hacer Orden de Compra
 Make Purchase Receipt,Hacer recibo de compra
@@ -1604,10 +1604,10 @@
 Make Time Log Batch,Haga la hora de lotes sesión
 Male,Masculino
 Manage Customer Group Tree.,Gestione Grupo de Clientes Tree.
-Manage Sales Partners.,Administrar Puntos de ventas.
+Manage Sales Partners.,Administrar Puntos de venta.
 Manage Sales Person Tree.,Gestione Sales Person árbol .
 Manage Territory Tree.,Gestione Territorio Tree.
-Manage cost of operations,Gestione costo de las operaciones
+Manage cost of operations,Gestione el costo de las operaciones
 Management,Gerencia
 Manager,Gerente
 "Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Obligatorio si Stock Item es "" Sí"" . También el almacén por defecto en que la cantidad reservada se establece a partir de órdenes de venta ."
@@ -1619,13 +1619,13 @@
 Manufacturer,Fabricante
 Manufacturer Part Number,Número de Pieza del Fabricante
 Manufacturing,Fabricación
-Manufacturing Quantity,Fabricación Cantidad
-Manufacturing Quantity is mandatory,Fabricación Cantidad es obligatorio
+Manufacturing Quantity,Cantidad a Fabricar
+Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
 Margin,Margen
 Marital Status,Estado Civil
 Market Segment,Sector de Mercado
-Marketing,Mercadeo
-Marketing Expenses,gastos de comercialización
+Marketing,Marketing
+Marketing Expenses,Gastos de Comercialización
 Married,Casado
 Mass Mailing,Correo Masivo
 Master Name,Maestro Nombre
@@ -1633,15 +1633,15 @@
 Master Type,Type Master
 Masters,Maestros
 Match non-linked Invoices and Payments.,Coinciden con las facturas y pagos no vinculados.
-Material Issue,material Issue
+Material Issue,Incidencia de Material
 Material Receipt,Recepción de Materiales
 Material Request,Solicitud de Material
 Material Request Detail No,Material de Información de la petición No
 Material Request For Warehouse,Solicitud de material para el almacén
-Material Request Item,Material de Solicitud de artículos
-Material Request Items,Material de elementos de solicitud
-Material Request No,No. de Solicitud de Material
-Material Request Type,Material de Solicitud Tipo
+Material Request Item,Elemento de la Solicitud de Material
+Material Request Items,Elementos de la Solicitud de Material
+Material Request No,Nº de Solicitud de Material
+Material Request Type,Tipo de Solicitud de Material
 Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
 Material Request used to make this Stock Entry,Solicitud de material utilizado para hacer esta entrada Stock
 Material Request {0} is cancelled or stopped,Solicitud de material {0} se cancela o se detiene
@@ -1652,9 +1652,9 @@
 Materials,Materiales
 Materials Required (Exploded),Materiales necesarios ( despiece )
 Max 5 characters,Máximo 5 caracteres
-Max Days Leave Allowed,Número máximo de días de baja por mascotas
+Max Days Leave Allowed,Número máximo de días de baja permitidos
 Max Discount (%),Descuento Máximo (%)
-Max Qty,Max Und
+Max Qty,Cantidad Máxima
 Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
 Maximum Amount,Importe máximo
 Maximum allowed credit is {0} days after posting date,Crédito máximo permitido es {0} días después de la fecha de publicar
@@ -1683,7 +1683,7 @@
 Misc Details,Otros Detalles
 Miscellaneous Expenses,Gastos Varios
 Miscelleneous,Varios
-Mobile No,Móvil No
+Mobile No,Nº Móvil
 Mobile No.,Número Móvil
 Mode of Payment,Modo de Pago
 Modern,Moderno
@@ -1890,7 +1890,7 @@
 Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
 Overhead,Gastos Generales
 Overheads,Gastos Generales
-Overlapping conditions found between:,La superposición de condiciones encontradas entre :
+Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
 Overview,Visión de Conjunto
 Owned,Propiedad
 Owner,Propietario
@@ -1911,11 +1911,11 @@
 "
 Package Items,"Contenido del Paquete
 "
-Package Weight Details,Peso del paquete Detalles
+Package Weight Details,Peso Detallado del Paquete
 Packed Item,Artículo Empacado
-Packed quantity must equal quantity for Item {0} in row {1},Embalado cantidad debe ser igual a la cantidad de elemento {0} en la fila {1}
-Packing Details,Detalles del embalaje
-Packing List,Lista de embalaje
+Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elmento {0} en la fila {1}
+Packing Details,Detalles del paquete
+Packing List,Lista de Envío
 Packing Slip,El resbalón de embalaje
 Packing Slip Item,Packing Slip artículo
 Packing Slip Items,Albarán Artículos
@@ -1927,38 +1927,38 @@
 Pair,Par
 Parameter,Parámetro
 Parent Account,Cuenta Primaria
-Parent Cost Center,Centro de Costo de Padres
-Parent Customer Group,Padres Grupo de Clientes
-Parent Detail docname,DocNombre Detalle de Padres
-Parent Item,Artículo Padre
-Parent Item Group,Grupo de Padres del artículo
-Parent Item {0} must be not Stock Item and must be a Sales Item,Artículo Padre {0} debe estar Stock punto y debe ser un elemento de Ventas
-Parent Party Type,Tipo Partido Padres
-Parent Sales Person,Sales Person Padres
-Parent Territory,Territorio de Padres
-Parent Website Page,Sitio web Padres Page
-Parent Website Route,Padres Website Ruta
-Parenttype,ParentType
-Part-time,Medio Tiempo
-Partially Completed,Completó Parcialmente
-Partly Billed,Parcialmente Anunciado
+Parent Cost Center,Centro de Costo Principal
+Parent Customer Group,Grupo de Clientes Principal
+Parent Detail docname,Detalle Principal docname
+Parent Item,Artículo Principal
+Parent Item Group,Grupo Principal de Artículos
+Parent Item {0} must be not Stock Item and must be a Sales Item,El Artículo Principal {0} no debe ser un elemento en Stock y debe ser un Artículo para Venta
+Parent Party Type,Tipo de Partida Principal
+Parent Sales Person,Contacto Principal de Ventas
+Parent Territory,Territorio Principal
+Parent Website Page,Página Web Principal
+Parent Website Route,Ruta del Website Principal
+Parenttype,Parenttype
+Part-time,Tiempo Parcial
+Partially Completed,Parcialmente Completado
+Partly Billed,Parcialmente Facturado
 Partly Delivered,Parcialmente Entregado
-Partner Target Detail,Detalle Target Socio
-Partner Type,Tipos de Socios
+Partner Target Detail,Detalle del Socio Objetivo
+Partner Type,Tipo de Socio
 Partner's Website,Sitio Web del Socio
 Party,Parte
-Party Account,Cuenta Party
-Party Type,Tipo del partido
-Party Type Name,Tipo del partido Nombre
+Party Account,Cuenta de la Partida
+Party Type,Tipo de Partida
+Party Type Name,Nombre del Tipo de Partida
 Passive,Pasivo
 Passport Number,Número de pasaporte
 Password,Contraseña
-Pay To / Recd From,Pagar a / Recd Desde
+Pay To / Recd From,Pagar a / Recibido de
 Payable,Pagadero
 Payables,Cuentas por Pagar
-Payables Group,Deudas Grupo
+Payables Group,Grupo de Deudas
 Payment Days,Días de Pago
-Payment Due Date,Pago Fecha de Vencimiento
+Payment Due Date,Fecha de Vencimiento del Pago
 Payment Period Based On Invoice Date,Período de pago basado en Fecha de la factura
 Payment Reconciliation,Reconciliación Pago
 Payment Reconciliation Invoice,Factura Reconciliación Pago
@@ -1966,11 +1966,11 @@
 Payment Reconciliation Payment,Reconciliación Pago Pago
 Payment Reconciliation Payments,Pagos conciliación de pagos
 Payment Type,Tipo de Pago
-Payment cannot be made for empty cart,El pago no se puede hacer para el carro vacío
-Payment of salary for the month {0} and year {1},El pago del salario correspondiente al mes {0} y {1} años
+Payment cannot be made for empty cart,No se puede realizar un pago con el caro vacío
+Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 Payments,Pagos
 Payments Made,Pagos Realizados
-Payments Received,Los pagos recibidos
+Payments Received,Pagos recibidos
 Payments made during the digest period,Los pagos efectuados durante el período de digestión
 Payments received during the digest period,Los pagos recibidos durante el período de digestión
 Payroll Settings,Configuración de Nómina
@@ -2000,7 +2000,7 @@
 Phone,Teléfono
 Phone No,Teléfono No
 Piecework,trabajo a destajo
-Pincode,pincode
+Pincode,Código PIN
 Place of Issue,Lugar de emisión
 Plan for maintenance visits.,Plan para las visitas de mantenimiento .
 Planned Qty,Cantidad Planificada
@@ -2155,7 +2155,7 @@
 Print Heading,Imprimir Rubro
 Print Without Amount,Imprimir sin Importe
 Print and Stationary,Impresión y Papelería
-Printing and Branding,Prensa y Branding
+Printing and Branding,Impresión y Marcas
 Priority,Prioridad
 Private Equity,Private Equity
 Privilege Leave,Privilege Dejar
@@ -2297,19 +2297,19 @@
 Raise Material Request when stock reaches re-order level,Levante Solicitud de material cuando la acción alcanza el nivel de re- orden
 Raised By,Raised By
 Raised By (Email),Raised By (Email )
-Random,azar
-Range,alcance
-Rate,velocidad
+Random,Aleatorio
+Range,Rango
+Rate,Tarifa
 Rate ,Velocidad
-Rate (%),Cambio (% )
+Rate (%),Tarifa (% )
 Rate (Company Currency),Tarifa ( Compañía de divisas )
 Rate Of Materials Based On,Cambio de materiales basados ​​en
-Rate and Amount,Ritmo y la cuantía
-Rate at which Customer Currency is converted to customer's base currency,Velocidad a la que la Moneda se convierte a la moneda base del cliente
+Rate and Amount,Tasa y Cantidad
+Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
 Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
-Rate at which customer's currency is converted to company's base currency,Velocidad a la que la moneda de los clientes se convierte en la moneda base de la compañía
-Rate at which supplier's currency is converted to company's base currency,Velocidad a la que la moneda de proveedor se convierte en la moneda base de la compañía
+Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
+Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
 Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
 Raw Material,materia prima
 Raw Material Item Code,Materia Prima Código del artículo
@@ -2441,7 +2441,7 @@
 Retail,venta al por menor
 Retail & Wholesale,Venta al por menor y al por mayor
 Retailer,detallista
-Review Date,Fecha de revisión
+Review Date,Fecha de Revisión
 Rgt,Rgt
 Role Allowed to edit frozen stock,Papel animales de editar stock congelado
 Role that is allowed to submit transactions that exceed credit limits set.,Papel que se permite presentar las transacciones que excedan los límites de crédito establecidos .
@@ -2454,7 +2454,7 @@
 Rounded Total,Total Redondeado
 Rounded Total (Company Currency),Total redondeado ( Compañía de divisas )
 Row # ,Fila #
-Row # {0}: ,Row # {0}: 
+Row # {0}: ,Fila # {0}:
 Row #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,Fila # {0}: Cantidad ordenada no puede menos que mínima cantidad de pedido de material (definido en maestro de artículos).
 Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No para la serie de artículos {1}"
 Row {0}: Account does not match with \						Purchase Invoice Credit To account,Fila {0}: Cuenta no coincide con \ Compra Factura de Crédito Para tener en cuenta
@@ -2692,7 +2692,7 @@
 Shipping Rule Condition,Regla Condición inicial
 Shipping Rule Conditions,Regla envío Condiciones
 Shipping Rule Label,Regla Etiqueta de envío
-Shop,tienda
+Shop,Tienda
 Shopping Cart,Cesta de la compra
 Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
 "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
@@ -2745,15 +2745,15 @@
 Static Parameters,Parámetros estáticos
 Status,estado
 Status must be one of {0},Estado debe ser uno de {0}
-Status of {0} {1} is now {2},Situación de {0} {1} {2} es ahora
+Status of {0} {1} is now {2},Situación de {0} {1} { 2 es ahora }
 Status updated to {0},Estado actualizado a {0}
 Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
 Stay Updated,Manténgase actualizado
-Stock,valores
-Stock Adjustment,Stock de Ajuste
-Stock Adjustment Account,Cuenta de Ajuste
-Stock Ageing,Stock Envejecimiento
-Stock Analytics,Analytics archivo
+Stock,Existencias
+Stock Adjustment,Ajuste de existencias
+Stock Adjustment Account,Cuenta de Ajuste de existencias
+Stock Ageing,Envejecimiento de existencias
+Stock Analytics,Análisis de existencias
 Stock Assets,Activos de archivo
 Stock Balance,Stock de balance
 Stock Entries already created for Production Order ,Stock Entries already created for Production Order 
@@ -2939,9 +2939,9 @@
 There were errors.,Hubo errores .
 This Currency is disabled. Enable to use in transactions,Esta moneda está desactivado . Habilitar el uso en las transacciones
 This Leave Application is pending approval. Only the Leave Apporver can update status.,Esta solicitud de autorización está pendiente de aprobación . Sólo el Dejar Apporver puede actualizar el estado .
-This Time Log Batch has been billed.,Este lote Hora de registro se ha facturado .
-This Time Log Batch has been cancelled.,Este lote Hora de registro ha sido cancelado .
-This Time Log conflicts with {0},This Time Entrar en conflicto con {0}
+This Time Log Batch has been billed.,Este Grupo de Horas Registradas se ha facturado.
+This Time Log Batch has been cancelled.,Este Grupo de Horas Registradas se ha facturado.
+This Time Log conflicts with {0},Este Registro de Horas entra en conflicto con {0}
 This format is used if country specific format is not found,Este formato se utiliza si no se encuentra en formato específico del país
 This is a root account and cannot be edited.,Esta es una cuenta de la raíz y no se puede editar .
 This is a root customer group and cannot be edited.,Se trata de un grupo de clientes de la raíz y no se puede editar .
@@ -2954,13 +2954,13 @@
 Thread HTML,HTML Tema
 Thursday,Jueves
 Time Log,Hora de registro
-Time Log Batch,Lote Hora de registro
-Time Log Batch Detail,Detalle de lotes Hora de registro
-Time Log Batch Details,Tiempo de registro incluye el detalle de lotes
-Time Log Batch {0} must be 'Submitted',Lote Hora de registro {0} debe ser ' Enviado '
-Time Log Status must be Submitted.,Hora de registro de estado debe ser presentada.
+Time Log Batch,Grupo de Horas Registradas
+Time Log Batch Detail,Detalle de Grupo de Horas Registradas
+Time Log Batch Details,Detalle de Grupo de Horas Registradas
+Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
+Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'.
 Time Log for tasks.,Hora de registro para las tareas.
-Time Log is not billable,Hora de registro no es facturable
+Time Log is not billable,Registro de Horas no es Facturable
 Time Log {0} must be 'Submitted',Hora de registro {0} debe ser ' Enviado '
 Time Zone,Huso Horario
 Time Zones,Husos horarios
@@ -3101,7 +3101,7 @@
 Update Series Number,Actualización de los números de serie
 Update Stock,Actualización de Stock
 Update bank payment dates with journals.,Actualización de las fechas de pago del banco con las revistas .
-Update clearance date of Journal Entries marked as 'Bank Entry',Fecha de despacho de actualización de entradas de diario marcado como ' Banco vales '
+Update clearance date of Journal Entries marked as 'Bank Vouchers',Fecha de despacho de actualización de entradas de diario marcado como ' Banco vales '
 Updated,actualizado
 Updated Birthday Reminders,Actualizado Birthday Reminders
 Upload Attendance,Subir Asistencia
@@ -3160,7 +3160,7 @@
 Voucher No,vale No
 Voucher Type,Tipo de Vales
 Voucher Type and Date,Tipo Bono y Fecha
-Walk In,Walk In
+Walk In,Entrar
 Warehouse,Almacén
 Warehouse Contact Info,Información de Contacto del Almacén 
 Warehouse Detail,Detalle de almacenes
@@ -3183,7 +3183,7 @@
 Warehouse-wise Item Reorder,- Almacén sabio artículo reorden
 Warehouses,Almacenes
 Warehouses.,Almacenes.
-Warn,advertir
+Warn,Advertir
 Warning: Leave application contains following block dates,Advertencia: Deja de aplicación contiene las fechas siguientes bloques
 Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: material solicitado Cantidad mínima es inferior a RS Online
 Warning: Sales Order {0} already exists against same Purchase Order number,Advertencia: Pedido de cliente {0} ya existe contra el mismo número de orden de compra
@@ -3203,31 +3203,31 @@
 Website Warehouse,Almacén Web
 Wednesday,Miércoles
 Weekly,Semanal
-Weekly Off,Semanal Off
+Weekly Off,Semanal Desactivado
 Weight UOM,Peso UOM
 "Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso se ha mencionado, \ nPor favor, menciona "" Peso UOM "" demasiado"
-Weightage,weightage
+Weightage,Coeficiente de Ponderación
 Weightage (%),Coeficiente de ponderación (% )
 Welcome,Bienvenido
-Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Bienvenido a ERPNext . En los próximos minutos vamos a ayudarle a configurar su cuenta ERPNext . Trate de llenar toda la información que usted tiene , incluso si se necesita un poco más de tiempo ahora. Esto le ahorrará mucho tiempo después. ¡Buena suerte!"
+Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Bienvenido a ERPNext . En los próximos minutos vamos a ayudarle a configurar su cuenta ERPNext . Trate de completar toda la información de la que disponga , incluso si ahora tiene que invertir un poco más de tiempo. Esto le ahorrará trabajo después. ¡Buena suerte!"
 Welcome to ERPNext. Please select your language to begin the Setup Wizard.,Bienvenido a ERPNext . Por favor seleccione su idioma para iniciar el asistente de configuración.
 What does it do?,¿Qué hace?
-"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones controladas son "" Enviado "" , un e-mail emergente abre automáticamente al enviar un email a la asociada "" Contacto"" en esa transacción , la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
+"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , un e-mail emergente abre automáticamente al enviar un email a la asociada "" Contacto"" en esa transacción , la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 "When submitted, the system creates difference entries to set the given stock and valuation on this date.","Cuando presentado , el sistema crea asientos de diferencia para definir las acciones y la valoración dada en esta fecha."
 Where items are stored.,¿Dónde se almacenan los artículos .
-Where manufacturing operations are carried out.,Cuando las operaciones de elaboración se lleven a cabo .
+Where manufacturing operations are carried out.,Cuando las operaciones de fabricación se lleven a cabo .
 Widowed,Viudo
-Will be calculated automatically when you enter the details,Se calcularán automáticamente cuando entras en los detalles
+Will be calculated automatically when you enter the details,Se calcularán automáticamente cuando entre en los detalles
 Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera sometida .
-Will be updated when batched.,Se actualizará cuando por lotes.
-Will be updated when billed.,Se actualizará cuando se facturan .
+Will be updated when batched.,Se actualizará al agruparse.
+Will be updated when billed.,Se actualizará cuando se facture.
 Wire Transfer,Transferencia Bancaria
 With Operations,Con operaciones
 With Period Closing Entry,Con la entrada del período de cierre
-Work Details,Detalles de trabajo
+Work Details,Detalles del trabajo
 Work Done,trabajo realizado
 Work In Progress,Trabajos en curso
-Work-in-Progress Warehouse,Trabajos en Progreso Almacén
+Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
 Work-in-Progress Warehouse is required before Submit,Se requiere un trabajo - en - progreso almacén antes Presentar
 Working,laboral
 Working Days,Días de trabajo
@@ -3239,7 +3239,7 @@
 Write Off Based On,Escribe apagado basado en
 Write Off Cost Center,Escribe Off Center Costo
 Write Off Outstanding Amount,Escribe Off Monto Pendiente
-Write Off Entry,Escribe Off Voucher
+Write Off Voucher,Escribe Off Voucher
 Wrong Template: Unable to find head row.,Plantilla incorrecto : no se puede encontrar la fila cabeza.
 Year,Año
 Year Closed,Año Cerrado
@@ -3252,14 +3252,14 @@
 You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
 You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el aprobador de gastos para este registro. Actualice el 'Estado' y Guarde
-You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el aprobador Dejar para este registro. Actualice el 'Estado' y Save
+You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el aprobador de dejar para este registro. Actualice el 'Estado' y Guarde
 You can enter any date manually,Puede introducir cualquier fecha manualmente
 You can enter the minimum quantity of this item to be ordered.,Puede introducir la cantidad mínima que se puede pedir de este artículo.
-You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si BOM mencionó agianst cualquier artículo
-You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,No se puede introducir tanto Entrega Nota No y Factura No. Por favor ingrese cualquiera .
-You can not enter current voucher in 'Against Journal Entry' column,Usted no puede entrar bono actual en ' Contra Diario Vale ' columna
+You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si BOM es mencionado contra cualquier artículo
+You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,No se puede introducir tanto Entrega Nota No. y Factura No. Por favor ingrese cualquiera .
+You can not enter current voucher in 'Against Journal Voucher' column,Usted no puede introducir el bono actual en la columna 'Contra Vale Diario'
 You can set Default Bank Account in Company master,Puede configurar cuenta bancaria por defecto en el maestro de la empresa
-You can start by selecting backup frequency and granting access for sync,Puedes empezar por seleccionar la frecuencia de copia de seguridad y la concesión de acceso para la sincronización
+You can start by selecting backup frequency and granting access for sync,Puede empezar por seleccionar la frecuencia de copia de seguridad y conceder acceso para sincronizar
 You can submit this Stock Reconciliation.,Puede enviar este Stock Reconciliación.
 You can update either Quantity or Valuation Rate or both.,"Puede actualizar la Cantidad, el Valor, o ambos."
 You cannot credit and debit same account at the same time,No se puede anotar en el crédito y débito de una cuenta al mismo tiempo
@@ -3334,49 +3334,3 @@
 {0} {1} status is Unstopped,{0} {1} Estado es destapados
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costo es obligatorio para el punto {2}
 {0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en la factura Detalles mesa
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer grupo""> Añadir / Editar < / a>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Añadir / Editar < / a>"
-Billed,Anunciado
-Company,Empresa
-Currency is required for Price List {0},Se requiere de divisas para el precio de lista {0}
-Default Customer Group,Grupo predeterminado Cliente
-Default Territory,Territorio predeterminado
-Delivered,liberado
-Enable Shopping Cart,Habilitar Compras
-Go ahead and add something to your cart.,Seguir adelante y añadir algo a su carrito.
-Hey! Go ahead and add an address,¡Hey! Seguir adelante y añadir una dirección
-Invalid Billing Address,No válida dirección de facturación
-Invalid Shipping Address,Dirección no válida de envío
-Missing Currency Exchange Rates for {0},Missing Tipo de Cambio para {0}
-Name is required,El nombre es necesario
-Not Allowed,No se permite
-Paid,pagado
-Partially Billed,Parcialmente Anunciado
-Partially Delivered,Parcialmente Entregado
-Please specify a Price List which is valid for Territory,"Por favor, especifique una lista de precios que es válido para el territorio"
-Please specify currency in Company,"Por favor, especifique la moneda en la empresa"
-Please write something,"Por favor, escribir algo"
-Please write something in subject and message!,"Por favor, escriba algo en asunto y el mensaje !"
-Price List,Lista de Precios
-Price List not configured.,Lista de precios no está configurado.
-Quotation Series,Serie Cotización
-Shipping Rule,Regla de envío
-Shopping Cart,Cesta de la compra
-Shopping Cart Price List,Cesta de la compra Precio de lista
-Shopping Cart Price Lists,Compras Listas de precios
-Shopping Cart Settings,Compras Ajustes
-Shopping Cart Shipping Rule,Compras Regla de envío
-Shopping Cart Shipping Rules,Compras Reglas de Envío
-Shopping Cart Taxes and Charges Master,Compras Impuestos y Cargos Maestro
-Shopping Cart Taxes and Charges Masters,Carrito impuestos y las cargas Masters
-Something went wrong!,¡Algo salió mal!
-Something went wrong.,Algo salió mal.
-Tax Master,Maestro de Impuestos
-To Pay,Pagar
-Updated,actualizado
-You are not allowed to reply to this ticket.,No se le permite responder a este boleto.
-You need to be logged in to view your cart.,Tienes que estar registrado para ver su carrito.
-You need to enable Shopping Cart,Necesita habilitar Compras
-{0} cannot be purchased using Shopping Cart,{0} no puede ser comprado usando Compras
-{0} is required,{0} es necesario
-{0} {1} has a common territory {2},{0} {1} tiene un territorio común {2}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index a5d065f..cb19e26 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -116,7 +116,7 @@
 Add Child,Ajouter un enfant
 Add Serial No,Ajouter Numéro de série
 Add Taxes,Ajouter impôts
-Add Taxes and Charges,Ajouter impôts et charges
+Add Taxes and Charges,Ajouter Taxes et frais
 Add or Deduct,Ajouter ou déduire
 Add rows to set annual budgets on Accounts.,Ajoutez des lignes pour établir des budgets annuels sur des comptes.
 Add to Cart,Ajouter au panier
@@ -153,8 +153,8 @@
 Against Document No,Contre le document n °
 Against Expense Account,Contre compte de dépenses
 Against Income Account,Contre compte le revenu
-Against Journal Entry,Contre Bon Journal
-Against Journal Entry {0} does not have any unmatched {1} entry,Contre Journal Bon {0} n'a pas encore inégalée {1} entrée
+Against Journal Voucher,Contre Bon Journal
+Against Journal Voucher {0} does not have any unmatched {1} entry,Contre Journal Bon {0} n'a pas encore inégalée {1} entrée
 Against Purchase Invoice,Contre facture d&#39;achat
 Against Sales Invoice,Contre facture de vente
 Against Sales Order,Contre Commande
@@ -164,7 +164,7 @@
 Ageing Date is mandatory for opening entry,Titres de modèles d'impression par exemple Facture pro forma.
 Ageing date is mandatory for opening entry,Date vieillissement est obligatoire pour l'ouverture de l'entrée
 Agent,Agent
-Aging Date,Vieillissement Date
+Aging Date,date de vieillissement
 Aging Date is mandatory for opening entry,"Client requis pour ' Customerwise Discount """
 Agriculture,agriculture
 Airline,compagnie aérienne
@@ -186,7 +186,7 @@
 "All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Tous les champs liés à l'exportation comme monnaie , taux de conversion , l'exportation totale , l'exportation totale grandiose etc sont disponibles dans la note de livraison , POS , offre , facture de vente , Sales Order etc"
 "All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Tous les champs importation connexes comme monnaie , taux de conversion , totale d'importation , importation grande etc totale sont disponibles en Achat réception , Fournisseur d'offre , facture d'achat , bon de commande , etc"
 All items have already been invoiced,Tous les articles ont déjà été facturés
-All these items have already been invoiced,Tous les articles ont déjà été facturés
+All these items have already been invoiced,Tous ces articles ont déjà été facturés
 Allocate,Allouer
 Allocate leaves for a period.,Compte temporaire ( actif)
 Allocate leaves for the year.,Allouer des feuilles de l&#39;année.
@@ -255,8 +255,8 @@
 Approving Role cannot be same as role the rule is Applicable To,Vous ne pouvez pas sélectionner le type de charge comme « Sur la ligne précédente Montant » ou « Le précédent Row totale » pour la première rangée
 Approving User,Approuver l&#39;utilisateur
 Approving User cannot be same as user the rule is Applicable To,Approuver l'utilisateur ne peut pas être identique à l'utilisateur la règle est applicable aux
-Are you sure you want to STOP ,Are you sure you want to STOP 
-Are you sure you want to UNSTOP ,Are you sure you want to UNSTOP 
+Are you sure you want to STOP ,Etes-vous sûr de vouloir arrêter
+Are you sure you want to UNSTOP ,Etes-vous sûr de vouloir annuler l'arrêt
 Arrear Amount,Montant échu
 "As Production Order can be made for this item, it must be a stock item.","Comme ordre de fabrication peut être faite de cet élément, il doit être un article en stock ."
 As per Stock UOM,Selon Stock UDM
@@ -336,7 +336,7 @@
 Bank Reconciliation,Rapprochement bancaire
 Bank Reconciliation Detail,Détail du rapprochement bancaire
 Bank Reconciliation Statement,Énoncé de rapprochement bancaire
-Bank Entry,Coupon de la banque
+Bank Voucher,Coupon de la banque
 Bank/Cash Balance,Solde de la banque / trésorerie
 Banking,Bancaire
 Barcode,Barcode
@@ -371,8 +371,8 @@
 Billing Address,Adresse de facturation
 Billing Address Name,Nom de l'adresse de facturation
 Billing Status,Statut de la facturation
-Bills raised by Suppliers.,Factures soulevé par les fournisseurs.
-Bills raised to Customers.,Factures aux clients soulevé.
+Bills raised by Suppliers.,Factures reçues des fournisseurs.
+Bills raised to Customers.,Factures émises aux clients.
 Bin,Boîte
 Bio,Bio
 Biotechnology,biotechnologie
@@ -471,7 +471,7 @@
 Case No. cannot be 0,Cas n ° ne peut pas être 0
 Cash,Espèces
 Cash In Hand,Votre exercice social commence le
-Cash Entry,Bon trésorerie
+Cash Voucher,Bon trésorerie
 Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
 Cash/Bank Account,Trésorerie / Compte bancaire
 Casual Leave,Règles d'application des prix et de ristournes .
@@ -595,7 +595,7 @@
 Contacts,S'il vous plaît entrer la quantité pour l'article {0}
 Content,Teneur
 Content Type,Type de contenu
-Contra Entry,Bon Contra
+Contra Voucher,Bon Contra
 Contract,contrat
 Contract End Date,Date de fin du contrat
 Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
@@ -626,7 +626,7 @@
 Country Name,Nom Pays
 Country wise default Address Templates,Modèles pays sage d'adresses par défaut
 "Country, Timezone and Currency","Pays , Fuseau horaire et devise"
-Create Bank Entry for the total salary paid for the above selected criteria,Créer Chèques de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnées
+Create Bank Voucher for the total salary paid for the above selected criteria,Créer Chèques de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnées
 Create Customer,créer clientèle
 Create Material Requests,Créer des demandes de matériel
 Create New,créer un nouveau
@@ -648,7 +648,7 @@
 Credit,Crédit
 Credit Amt,Crédit Amt
 Credit Card,Carte de crédit
-Credit Card Entry,Bon de carte de crédit
+Credit Card Voucher,Bon de carte de crédit
 Credit Controller,Credit Controller
 Credit Days,Jours de crédit
 Credit Limit,Limite de crédit
@@ -980,7 +980,7 @@
 Excise Duty Edu Cess 2,Droits d'accise Edu Cess 2
 Excise Duty SHE Cess 1,Droits d'accise ELLE Cess 1
 Excise Page Number,Numéro de page d&#39;accise
-Excise Entry,Bon d&#39;accise
+Excise Voucher,Bon d&#39;accise
 Execution,exécution
 Executive Search,Executive Search
 Exemption Limit,Limite d&#39;exemption
@@ -1029,20 +1029,20 @@
 Family Background,Antécédents familiaux
 Fax,Fax
 Features Setup,Features Setup
-Feed,Nourrir
+Feed,Flux
 Feed Type,Type de flux
-Feedback,Réaction
-Female,Féminin
+Feedback,Commentaire
+Female,Femme
 Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
 "Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Champ disponible dans la note de livraison, devis, facture de vente, Sales Order"
 Files Folder ID,Les fichiers d&#39;identification des dossiers
 Fill the form and save it,Remplissez le formulaire et l'enregistrer
 Filter based on customer,Filtre basé sur le client
-Filter based on item,Filtre basé sur le point
+Filter based on item,Filtre basé sur l'article
 Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une même opération
 Financial Analytics,Financial Analytics
 Financial Services,services financiers
-Financial Year End Date,paire
+Financial Year End Date,Date de fin de l'exercice financier
 Financial Year Start Date,Les paramètres par défaut pour la vente de transactions .
 Finished Goods,Produits finis
 First Name,Prénom
@@ -1051,11 +1051,11 @@
 Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Exercice Date de début et de fin d'exercice la date sont réglées dans l'année fiscale {0}
 Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart.,Exercice date de début et de fin d'exercice date ne peut être plus d'un an d'intervalle.
 Fiscal Year Start Date should not be greater than Fiscal Year End Date,Exercice Date de début ne doit pas être supérieure à fin d'exercice Date de
-Fixed Asset,des immobilisations
+Fixed Asset,Actifs immobilisés
 Fixed Assets,Facteur de conversion est requis
 Follow via Email,Suivez par e-mail
 "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",Le tableau suivant indique les valeurs si les articles sont en sous - traitance. Ces valeurs seront extraites de la maîtrise de la «Bill of Materials&quot; de sous - traitance articles.
-Food,prix
+Food,Alimentation
 "Food, Beverage & Tobacco","Alimentation , boissons et tabac"
 "For 'Sales BOM' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pour les articles ""ventes de nomenclature», Entrepôt, N ° de série et de lot n ° sera considéré comme de la table la «Liste d'emballage. Si Entrepôt et lot n ° sont les mêmes pour tous les articles d'emballage pour tout article 'Sales nomenclature », ces valeurs peuvent être entrées dans le tableau principal de l'article, les valeurs seront copiés sur« Liste d'emballage »table."
 For Company,Pour l&#39;entreprise
@@ -1076,7 +1076,7 @@
 Fraction,Fraction
 Fraction Units,Unités fraction
 Freeze Stock Entries,Congeler entrées en stocks
-Freeze Stocks Older Than [Days],Vous ne pouvez pas entrer bon actuelle dans «Contre Journal Entry ' colonne
+Freeze Stocks Older Than [Days],Vous ne pouvez pas entrer bon actuelle dans «Contre Journal Voucher ' colonne
 Freight and Forwarding Charges,Fret et d'envoi en sus
 Friday,Vendredi
 From,À partir de
@@ -1084,7 +1084,7 @@
 From Company,De Company
 From Currency,De Monnaie
 From Currency and To Currency cannot be same,De leur monnaie et à devises ne peut pas être la même
-From Customer,De clientèle
+From Customer,Du client
 From Customer Issue,De émission à la clientèle
 From Date,Partir de la date
 From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
@@ -1123,7 +1123,7 @@
 Gantt chart of all tasks.,Diagramme de Gantt de toutes les tâches.
 Gender,Sexe
 General,Général
-General Ledger,General Ledger
+General Ledger,Grand livre général
 Generate Description HTML,Générer HTML Description
 Generate Material Requests (MRP) and Production Orders.,Lieu à des demandes de matériel (MRP) et de la procédure de production.
 Generate Salary Slips,Générer les bulletins de salaire
@@ -1146,14 +1146,14 @@
 Get Unreconciled Entries,Obtenez non rapprochés entrées
 Get Weekly Off Dates,Obtenez hebdomadaires Dates Off
 "Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.","Obtenez taux d&#39;évaluation et le stock disponible à la source / cible d&#39;entrepôt sur l&#39;affichage mentionné de date-heure. Si sérialisé article, s&#39;il vous plaît appuyez sur cette touche après avoir entré numéros de série."
-Global Defaults,Par défaut mondiaux
+Global Defaults,Par défaut globaux
 Global POS Setting {0} already created for company {1},Monter : {0}
 Global Settings,Paramètres globaux
 "Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type ""Bank""",Aller au groupe approprié (habituellement utilisation des fonds > Actif à court terme > Comptes bancaires et créer un nouveau compte Ledger ( en cliquant sur Ajouter un enfant ) de type «Banque»
 "Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Aller au groupe approprié (généralement source de fonds > Passif à court terme > Impôts et taxes et créer un nouveau compte Ledger ( en cliquant sur Ajouter un enfant ) de type « impôt» et ne mentionnent le taux de l'impôt.
 Goal,Objectif
 Goals,Objectifs
-Goods received from Suppliers.,Les marchandises reçues de fournisseurs.
+Goods received from Suppliers.,Marchandises reçues des fournisseurs.
 Google Drive,Google Drive
 Google Drive Access Allowed,Google Drive accès autorisé
 Government,Si différente de l'adresse du client
@@ -1181,7 +1181,7 @@
 Half Day,Demi-journée
 Half Yearly,La moitié annuel
 Half-yearly,Semestriel
-Happy Birthday!,Joyeux anniversaire!
+Happy Birthday!,Joyeux anniversaire !
 Hardware,Sales Person cible Variance article Groupe Sage
 Has Batch No,A lot no
 Has Child Node,A Node enfant
@@ -1205,11 +1205,11 @@
 Holiday List Name,Nom de la liste de vacances
 Holiday master.,Débit doit être égal à crédit . La différence est {0}
 Holidays,Fêtes
-Home,Maison
+Home,Accueil
 Host,Hôte
 "Host, Email and Password required if emails are to be pulled","D&#39;accueil, e-mail et mot de passe requis si les courriels sont d&#39;être tiré"
-Hour,{0} ' {1}' pas l'Exercice {2}
-Hour Rate,Taux heure
+Hour,heure
+Hour Rate,Taux horraire
 Hour Rate Labour,Travail heure Tarif
 Hours,Heures
 How Pricing Rule is applied?,Comment Prix règle est appliquée?
@@ -1328,7 +1328,7 @@
 Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Période facture et la période de facturation Pour les dates obligatoires pour la facture récurrente
 Invoice Period To,Période facture Pour
 Invoice Type,Type de facture
-Invoice/Journal Entry Details,Facture / Journal Chèques Détails
+Invoice/Journal Voucher Details,Facture / Journal Chèques Détails
 Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
 Is Active,Est active
 Is Advance,Est-Advance
@@ -1452,17 +1452,17 @@
 Itemwise Recommended Reorder Level,Itemwise recommandée SEUIL DE COMMANDE
 Job Applicant,Demandeur d&#39;emploi
 Job Opening,Offre d&#39;emploi
-Job Profile,Droits et taxes
-Job Title,Titre d&#39;emploi
+Job Profile,Profil d'emploi
+Job Title,Titre de l'emploi
 "Job profile, qualifications required etc.",Non authroized depuis {0} dépasse les limites
 Jobs Email Settings,Paramètres de messagerie Emploi
 Journal Entries,Journal Entries
-Journal Entry,Journal Entry
-Journal Entry,Bon Journal
-Journal Entry Account,Détail pièce de journal
-Journal Entry Account No,Détail Bon Journal No
-Journal Entry {0} does not have account {1} or already matched,Journal Bon {0} n'a pas encore compte {1} ou déjà identifié
-Journal Entries {0} are un-linked,Date de livraison prévue ne peut pas être avant ventes Date de commande
+Journal Entry,Journal d'écriture
+Journal Voucher,Bon Journal
+Journal Voucher Detail,Détail pièce de journal
+Journal Voucher Detail No,Détail Bon Journal No
+Journal Voucher {0} does not have account {1} or already matched,Journal Bon {0} n'a pas encore compte {1} ou déjà identifié
+Journal Vouchers {0} are un-linked,Date de livraison prévue ne peut pas être avant ventes Date de commande
 Keep a track of communication related to this enquiry which will help for future reference.,Gardez une trace de la communication liée à cette enquête qui aidera pour référence future.
 Keep it web friendly 900px (w) by 100px (h),Gardez web 900px amical ( w) par 100px ( h )
 Key Performance Area,Section de performance clé
@@ -1575,9 +1575,9 @@
 Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
 Maintenance start date can not be before delivery date for Serial No {0},Entretien date de début ne peut pas être avant la date de livraison pour série n ° {0}
 Major/Optional Subjects,Sujets principaux / en option
-Make ,Make 
+Make ,Faire
 Make Accounting Entry For Every Stock Movement,Faites Entrée Comptabilité Pour chaque mouvement Stock
-Make Bank Entry,Assurez-Bon Banque
+Make Bank Voucher,Assurez-Bon Banque
 Make Credit Note,Assurez Note de crédit
 Make Debit Note,Assurez- notes de débit
 Make Delivery,Assurez- livraison
@@ -1759,7 +1759,7 @@
 Newsletter has already been sent,Entrepôt requis pour stock Article {0}
 "Newsletters to contacts, leads.","Bulletins aux contacts, prospects."
 Newspaper Publishers,Éditeurs de journaux
-Next,Nombre purchse de commande requis pour objet {0}
+Next,Suivant
 Next Contact By,Suivant Par
 Next Contact Date,Date Contact Suivant
 Next Date,Date suivante
@@ -2125,19 +2125,19 @@
 Present,Présent
 Prevdoc DocType,Prevdoc DocType
 Prevdoc Doctype,Prevdoc Doctype
-Preview,dépenses diverses
-Previous,Sérialisé article {0} ne peut pas être mis à jour Stock réconciliation
+Preview,Aperçu
+Previous,Précedent
 Previous Work Experience,L&#39;expérience de travail antérieure
 Price,Profil de l'organisation
 Price / Discount,Utilisateur Notes est obligatoire
-Price List,Liste des Prix
+Price List,Liste des prix
 Price List Currency,Devise Prix
 Price List Currency not selected,Liste des Prix devise sélectionné
 Price List Exchange Rate,Taux de change Prix de liste
 Price List Name,Nom Liste des Prix
 Price List Rate,Prix ​​Liste des Prix
 Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
-Price List master.,{0} n'appartient pas à la Société {1}
+Price List master.,Liste de prix principale.
 Price List must be applicable for Buying or Selling,Compte {0} doit être SAMES comme crédit du compte dans la facture d'achat en ligne {0}
 Price List not selected,Barcode valide ou N ° de série
 Price List {0} is disabled,Série {0} déjà utilisé dans {1}
@@ -2156,23 +2156,23 @@
 Private Equity,Private Equity
 Privilege Leave,Point {0} doit être fonction Point
 Probation,probation
-Process Payroll,Paie processus
+Process Payroll,processus de paye
 Produced,produit
 Produced Quantity,Quantité produite
 Product Enquiry,Demande d&#39;information produit
-Production,production
+Production,Production
 Production Order,Ordre de fabrication
 Production Order status is {0},Feuilles alloué avec succès pour {0}
 Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
 Production Order {0} must be submitted,Client / Nom plomb
-Production Orders,ordres de fabrication
+Production Orders,Ordres de fabrication
 Production Orders in Progress,Les commandes de produits en cours
 Production Plan Item,Élément du plan de production
 Production Plan Items,Éléments du plan de production
 Production Plan Sales Order,Plan de Production Ventes Ordre
 Production Plan Sales Orders,Vente Plan d&#39;ordres de production
 Production Planning Tool,Outil de planification de la production
-Products,Point {0} n'existe pas dans {1} {2}
+Products,Produits
 "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Les produits seront triés par poids-âge dans les recherches par défaut. Plus le poids-âge, plus le produit apparaîtra dans la liste."
 Professional Tax,Taxe Professionnelle
 Profit and Loss,Pertes et profits
@@ -2189,7 +2189,7 @@
 Project Value,Valeur du projet
 Project activity / task.,Activité de projet / tâche.
 Project master.,Projet de master.
-Project will get saved and will be searchable with project name given,Projet seront sauvegardés et sera consultable avec le nom de projet donné
+Project will get saved and will be searchable with project name given,Projet sera sauvegardé et sera consultable avec le nom de projet donné
 Project wise Stock Tracking,Projet sage Stock Tracking
 Project-wise data is not available for Quotation,alloué avec succès
 Projected,Projection
@@ -2201,16 +2201,16 @@
 Provide email id registered in company,Fournir id e-mail enregistrée dans la société
 Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
 Public,Public
-Published on website at: {0},Publié sur le site Web au: {0}
+Published on website at: {0},Publié sur le site Web le: {0}
 Publishing,édition
 Pull sales orders (pending to deliver) based on the above criteria,Tirez les ordres de vente (en attendant de livrer) sur la base des critères ci-dessus
-Purchase,Acheter
+Purchase,Achat
 Purchase / Manufacture Details,Achat / Fabrication Détails
 Purchase Analytics,Les analyses des achats
-Purchase Common,Achat commune
-Purchase Details,Conditions de souscription
+Purchase Common,Achat commun
+Purchase Details,Détails de l'achat
 Purchase Discounts,Rabais sur l&#39;achat
-Purchase Invoice,Achetez facture
+Purchase Invoice,Facture achat
 Purchase Invoice Advance,Paiement à l&#39;avance Facture
 Purchase Invoice Advances,Achat progrès facture
 Purchase Invoice Item,Achat d&#39;article de facture
@@ -2258,20 +2258,20 @@
 Qty to Deliver,Quantité à livrer
 Qty to Order,Quantité à commander
 Qty to Receive,Quantité à recevoir
-Qty to Transfer,Quantité de Transfert
+Qty to Transfer,Qté à Transférer
 Qualification,Qualification
 Quality,Qualité
 Quality Inspection,Inspection de la Qualité
 Quality Inspection Parameters,Paramètres inspection de la qualité
 Quality Inspection Reading,Lecture d&#39;inspection de la qualité
 Quality Inspection Readings,Lectures inspection de la qualité
-Quality Inspection required for Item {0},Navigateur des ventes
+Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
 Quality Management,Gestion de la qualité
 Quantity,Quantité
 Quantity Requested for Purchase,Quantité demandée pour l&#39;achat
 Quantity and Rate,Quantité et taux
 Quantity and Warehouse,Quantité et entrepôt
-Quantity cannot be a fraction in row {0},accueil
+Quantity cannot be a fraction in row {0},Quantité ne peut pas être une fraction de la rangée
 Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieur à {1}
 Quantity in row {0} ({1}) must be same as manufactured quantity {2},Entrepôt ne peut pas être supprimé car il existe entrée stock registre pour cet entrepôt .
 Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
@@ -2288,7 +2288,7 @@
 Quotation Trends,Devis Tendances
 Quotation {0} is cancelled,Devis {0} est annulée
 Quotation {0} not of type {1},Activer / désactiver les monnaies .
-Quotations received from Suppliers.,Citations reçues des fournisseurs.
+Quotations received from Suppliers.,Devis reçus des fournisseurs.
 Quotes to Leads or Customers.,Citations à prospects ou clients.
 Raise Material Request when stock reaches re-order level,Soulever demande de matériel lorsque le stock atteint le niveau de réapprovisionnement
 Raised By,Raised By
@@ -2382,7 +2382,7 @@
 Remark,Remarque
 Remarks,Remarques
 Remarks Custom,Remarques sur commande
-Rename,rebaptiser
+Rename,Renommer
 Rename Log,Renommez identifiez-vous
 Rename Tool,Outils de renommage
 Rent Cost,louer coût
@@ -2450,7 +2450,7 @@
 Rounded Total,Totale arrondie
 Rounded Total (Company Currency),Totale arrondie (Société Monnaie)
 Row # ,Row #
-Row # {0}: ,Row # {0}: 
+Row # {0}: ,Ligne # {0}: 
 Row #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,Ligne # {0}: quantité Commandé ne peut pas moins que l'ordre minimum quantité de produit (défini dans le maître de l'article).
 Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier Pas de série pour objet {1}
 Row {0}: Account does not match with \						Purchase Invoice Credit To account,Ligne {0}: compte ne correspond pas à \ Facture d'achat crédit du compte
@@ -2654,7 +2654,7 @@
 Service Tax,Service Tax
 Services,Services
 Set,Série est obligatoire
-"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Des valeurs par défaut comme la Compagnie , devise , année financière en cours , etc"
+"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Valeurs par défaut comme : societé , devise , année financière en cours , etc"
 Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Point du Groupe sages budgets sur ce territoire. Vous pouvez également inclure la saisonnalité en réglant la distribution.
 Set Status as Available,Définir l'état comme disponible
 Set as Default,Définir par défaut
@@ -2667,7 +2667,7 @@
 Settings,Réglages
 Settings for HR Module,Utilisateur {0} est désactivé
 "Settings to extract Job Applicants from a mailbox e.g. ""jobs@example.com""",Paramètres pour extraire demandeurs d&#39;emploi à partir d&#39;une boîte aux lettres par exemple &quot;jobs@example.com&quot;
-Setup,Installation
+Setup,Configuration
 Setup Already Complete!!,Configuration déjà complet !
 Setup Complete,installation terminée
 Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
@@ -2693,7 +2693,7 @@
 Short biography for website and other publications.,Courte biographie pour le site Web et d&#39;autres publications.
 "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Voir &quot;En stock&quot; ou &quot;Pas en stock» basée sur le stock disponible dans cet entrepôt.
 "Show / Hide features like Serial Nos, POS etc.",commercial
-Show In Website,Afficher dans un site Web
+Show In Website,Afficher dans le site Web
 Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
 Show in Website,Afficher dans Site Web
 Show rows with zero values,Afficher lignes avec des valeurs nulles
@@ -2752,7 +2752,7 @@
 Stock Analytics,Analytics stock
 Stock Assets,payable
 Stock Balance,Solde Stock
-Stock Entries already created for Production Order ,Stock Entries already created for Production Order 
+Stock Entries already created for Production Order ,Entrées stock déjà créés pour ordre de fabrication
 Stock Entry,Entrée Stock
 Stock Entry Detail,Détail d&#39;entrée Stock
 Stock Expenses,Facteur de conversion de l'unité de mesure par défaut doit être de 1 à la ligne {0}
@@ -3056,7 +3056,7 @@
 Tree Type,Type d' arbre
 Tree of Item Groups.,Arbre de groupes des ouvrages .
 Tree of finanial Cost Centers.,Il ne faut pas mettre à jour les entrées de plus que {0}
-Tree of finanial accounts.,Titres à {0} doivent être annulées avant d'annuler cette commande client
+Tree of finanial accounts.,Arborescence des comptes financiers.
 Trial Balance,Balance
 Tuesday,Mardi
 Type,Type
@@ -3097,7 +3097,7 @@
 Update Series Number,Numéro de série mise à jour
 Update Stock,Mise à jour Stock
 Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
-Update clearance date of Journal Entries marked as 'Bank Entry',Date d'autorisation de mise à jour des entrées de journal marqué comme « Banque Bons »
+Update clearance date of Journal Entries marked as 'Bank Vouchers',Date d'autorisation de mise à jour des entrées de journal marqué comme « Banque Bons »
 Updated,Mise à jour
 Updated Birthday Reminders,Mise à jour anniversaire rappels
 Upload Attendance,Téléchargez Participation
@@ -3113,7 +3113,7 @@
 Use Multi-Level BOM,Utilisez Multi-Level BOM
 Use SSL,Utiliser SSL
 Used for Production Plan,Utilisé pour plan de production
-User,Utilisateur
+User,Utilisateurs
 User ID,ID utilisateur
 User ID not set for Employee {0},ID utilisateur non défini pour les employés {0}
 User Name,Nom d&#39;utilisateur
@@ -3204,7 +3204,7 @@
 "Weight is mentioned,\nPlease mention ""Weight UOM"" too","Le poids est indiqué , \ nVeuillez mentionne "" Poids Emballage « trop"
 Weightage,Weightage
 Weightage (%),Weightage (%)
-Welcome,Taux (% )
+Welcome,Bienvenue
 Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Bienvenue à ERPNext . Au cours des prochaines minutes, nous allons vous aider à configurer votre compte ERPNext . Essayez de remplir autant d'informations que vous avez même si cela prend un peu plus longtemps . Elle vous fera économiser beaucoup de temps plus tard . Bonne chance !"
 Welcome to ERPNext. Please select your language to begin the Setup Wizard.,Tête de compte {0} créé
 What does it do?,Que faut-il faire ?
@@ -3235,7 +3235,7 @@
 Write Off Based On,Ecrire Off Basé sur
 Write Off Cost Center,Ecrire Off Centre de coûts
 Write Off Outstanding Amount,Ecrire Off Encours
-Write Off Entry,Ecrire Off Bon
+Write Off Voucher,Ecrire Off Bon
 Wrong Template: Unable to find head row.,Modèle tort: ​​Impossible de trouver la ligne de tête.
 Year,Année
 Year Closed,L'année est fermée
@@ -3253,15 +3253,15 @@
 You can enter the minimum quantity of this item to be ordered.,Vous pouvez entrer la quantité minimale de cet élément à commander.
 You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Vous ne pouvez pas entrer à la fois bon de livraison et la facture de vente n ° n ° S'il vous plaît entrer personne.
-You can not enter current voucher in 'Against Journal Entry' column,"D'autres comptes peuvent être faites dans les groupes , mais les entrées peuvent être faites contre Ledger"
+You can not enter current voucher in 'Against Journal Voucher' column,"D'autres comptes peuvent être faites dans les groupes , mais les entrées peuvent être faites contre Ledger"
 You can set Default Bank Account in Company master,Articles en attente {0} mise à jour
 You can start by selecting backup frequency and granting access for sync,Vous pouvez commencer par sélectionner la fréquence de sauvegarde et d'accorder l'accès pour la synchronisation
 You can submit this Stock Reconciliation.,Vous pouvez soumettre cette Stock réconciliation .
 You can update either Quantity or Valuation Rate or both.,Vous pouvez mettre à jour soit Quantité ou l'évaluation des taux ou les deux.
 You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
 You have entered duplicate items. Please rectify and try again.,Vous avez entré les doublons . S'il vous plaît corriger et essayer à nouveau.
-You may need to update: {0},Vous devez mettre à jour : {0}
-You must Save the form before proceeding,produits impressionnants
+You may need to update: {0},Vous devrez peut-être mettre à jour : {0}
+You must Save the form before proceeding,Vous devez sauvegarder le formulaire avant de continuer
 Your Customer's TAX registration numbers (if applicable) or any general information,Votre Client numéros d&#39;immatriculation fiscale (le cas échéant) ou toute autre information générale
 Your Customers,vos clients
 Your Login Id,Votre ID de connexion
@@ -3330,49 +3330,3 @@
 {0} {1} status is Unstopped,Vous ne pouvez pas reporter le numéro de rangée supérieure ou égale à numéro de la ligne actuelle pour ce type de charge
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
 {0}: {1} not found in Invoice Details table,{0}: {1} ne trouve pas dans la table Détails de la facture
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Ajouter / Modifier < / a>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Ajouter / Modifier < / a>"
-Billed,Facturé
-Company,Entreprise
-Currency is required for Price List {0},{0} est obligatoire
-Default Customer Group,Groupe de clients par défaut
-Default Territory,Territoire défaut
-Delivered,Livré
-Enable Shopping Cart,Activer Panier
-Go ahead and add something to your cart.,Allez-y et ajouter quelque chose à votre panier.
-Hey! Go ahead and add an address,Hé ! Allez-y et ajoutez une adresse
-Invalid Billing Address,"Pour exécuter un test ajouter le nom du module dans la route après '{0}' . Par exemple, {1}"
-Invalid Shipping Address,effondrement
-Missing Currency Exchange Rates for {0},Vider le cache
-Name is required,Le nom est obligatoire
-Not Allowed,"Groupe ajoutée, rafraîchissant ..."
-Paid,payé
-Partially Billed,partiellement Facturé
-Partially Delivered,Livré partiellement
-Please specify a Price List which is valid for Territory,S&#39;il vous plaît spécifier une liste de prix qui est valable pour le territoire
-Please specify currency in Company,S&#39;il vous plaît préciser la devise dans la société
-Please write something,S'il vous plaît écrire quelque chose
-Please write something in subject and message!,S'il vous plaît écrire quelque chose dans le thème et le message !
-Price List,Liste des Prix
-Price List not configured.,Liste des prix non configuré.
-Quotation Series,Série de devis
-Shipping Rule,Livraison règle
-Shopping Cart,Panier
-Shopping Cart Price List,Panier Liste des prix
-Shopping Cart Price Lists,Panier Liste des prix
-Shopping Cart Settings,Panier Paramètres
-Shopping Cart Shipping Rule,Panier Livraison règle
-Shopping Cart Shipping Rules,Panier Règles d&#39;expédition
-Shopping Cart Taxes and Charges Master,Panier taxes et redevances Maître
-Shopping Cart Taxes and Charges Masters,Panier Taxes et frais de maîtrise
-Something went wrong!,Quelque chose s'est mal passé!
-Something went wrong.,Une erreur est survenue.
-Tax Master,Maître d&#39;impôt
-To Pay,à payer
-Updated,Mise à jour
-You are not allowed to reply to this ticket.,Vous n'êtes pas autorisé à répondre à ce billet .
-You need to be logged in to view your cart.,Vous devez être connecté pour voir votre panier.
-You need to enable Shopping Cart,Poster n'existe pas . S'il vous plaît ajoutez poste !
-{0} cannot be purchased using Shopping Cart,Envoyer permanence {0} ?
-{0} is required,{0} ne peut pas être acheté en utilisant Panier
-{0} {1} has a common territory {2},Alternative lien de téléchargement
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 58ac6b2..40efada 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -34,34 +34,34 @@
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Dodaj / Uredi < />"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Dodaj / Uredi < />"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> zadani predložak </ h4>  <p> Koristi <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja templating </> i sva polja adresa ( uključujući Custom Fields ako postoje) će biti dostupan </ p>  <pre> <code> {{address_line1}} <br>  {% ako address_line2%} {{}} address_line2 <br> { endif% -%}  {{grad}} <br>  {% ako je državna%} {{}} Država <br> {% endif -%}  {% ako pincode%} PIN: {{pincode}} <br> {% endif -%}  {{country}} <br>  {% ako je telefon%} Telefon: {{telefonski}} <br> { endif% -%}  {% ako fax%} Fax: {{fax}} <br> {% endif -%}  {% ako email_id%} E: {{email_id}} <br> ; {% endif -%}  </ code> </ pre>"
-A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kupac Grupa postoji s istim imenom molimo promijenite ime kupca ili preimenovati grupi kupaca
-A Customer exists with same name,Kupac postoji s istim imenom
-A Lead with this email id should exist,Olovo s ovom e-mail id trebala postojati
-A Product or Service,Proizvoda ili usluga
-A Supplier exists with same name,Dobavljač postoji s istim imenom
-A symbol for this currency. For e.g. $,Simbol za ovu valutu. Za npr. $
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim imenom postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
+A Customer exists with same name,Kupac sa istim imenom već postoji
+A Lead with this email id should exist,Kontakt sa ovim e-mailom bi trebao postojati
+A Product or Service,Proizvod ili usluga
+A Supplier exists with same name,Dobavljač sa istim imenom već postoji
+A symbol for this currency. For e.g. $,Simbol za ovu valutu. Kao npr. $
 AMC Expiry Date,AMC Datum isteka
-Abbr,Abbr
+Abbr,Kratica
 Abbreviation cannot have more than 5 characters,Kratica ne može imati više od 5 znakova
-Above Value,Iznad Vrijednost
+Above Value,Iznad vrijednosti
 Absent,Odsutan
 Acceptance Criteria,Kriterij prihvaćanja
-Accepted,Primljen
-Accepted + Rejected Qty must be equal to Received quantity for Item {0},Prihvaćeno + Odbijen Kol mora biti jednaka količini primio za točku {0}
-Accepted Quantity,Prihvaćeno Količina
-Accepted Warehouse,Prihvaćeno galerija
-Account,račun
-Account Balance,Stanje računa
-Account Created: {0},Račun Objavljeno : {0}
-Account Details,Account Details
-Account Head,Račun voditelj
+Accepted,Prihvaćeno
+Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini artikla {0}
+Accepted Quantity,Prihvaćena količina
+Accepted Warehouse,Prihvaćeno skladište
+Account,Račun
+Account Balance,Bilanca računa
+Account Created: {0},Račun stvoren: {0}
+Account Details,Detalji računa
+Account Head,Zaglavlje računa
 Account Name,Naziv računa
 Account Type,Vrsta računa
 "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( Perpetual inventar) stvorit će se na temelju ovog računa .
-Account head {0} created,Glava račun {0} stvorio
-Account must be a balance sheet account,Račun mora biti računabilance
+Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( neprestani inventar) stvorit će se na temelju ovog računa .
+Account head {0} created,Zaglavlje računa {0} stvoreno
+Account must be a balance sheet account,Račun mora biti račun bilance
 Account with child nodes cannot be converted to ledger,Račun za dijete čvorova ne može pretvoriti u knjizi
 Account with existing transaction can not be converted to group.,Račun s postojećim transakcije ne može pretvoriti u skupinu .
 Account with existing transaction can not be deleted,Račun s postojećim transakcije ne može izbrisati
@@ -122,18 +122,18 @@
 Add to calendar on this date,Dodaj u kalendar ovog datuma
 Add/Remove Recipients,Dodaj / Ukloni primatelja
 Address,Adresa
-Address & Contact,Adresa &amp; Kontakt
+Address & Contact,Adresa i kontakt
 Address & Contacts,Adresa i kontakti
 Address Desc,Adresa Desc
-Address Details,Adresa Detalji
+Address Details,Adresa - detalji
 Address HTML,Adresa HTML
 Address Line 1,Adresa Linija 1
 Address Line 2,Adresa Linija 2
-Address Template,Adresa Predložak
-Address Title,Adresa Naslov
+Address Template,Predložak adrese
+Address Title,Adresa - naslov
 Address Title is mandatory.,Adresa Naslov je obavezno .
 Address Type,Adresa Tip
-Address master.,Adresa majstor .
+Address master.,Adresa master
 Administrative Expenses,Administrativni troškovi
 Administrative Officer,Administrativni službenik
 Advance Amount,Predujam Iznos
@@ -212,8 +212,8 @@
 Allowed Role to Edit Entries Before Frozen Date,Dopuštenih uloga za uređivanje upise Prije Frozen Datum
 Amended From,Izmijenjena Od
 Amount,Iznos
-Amount (Company Currency),Iznos (Društvo valuta)
-Amount Paid,Iznos plaćen
+Amount (Company Currency),Iznos (valuta tvrtke)
+Amount Paid,Plaćeni iznos
 Amount to Bill,Iznositi Billa
 An Customer exists with same name,Kupac postoji s istim imenom
 "An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
@@ -288,14 +288,14 @@
 Automatically extract Leads from a mail box e.g.,Automatski ekstrakt vodi iz mail box pr
 Automatically updated via Stock Entry of type Manufacture/Repack,Automatski ažurira putem burze Unos tipa Proizvodnja / prepakirati
 Automotive,automobilski
-Autoreply when a new mail is received,Automatski kad nova pošta je dobila
-Available,dostupan
-Available Qty at Warehouse,Dostupno Kol na galeriju
-Available Stock for Packing Items,Dostupno Stock za pakiranje artikle
+Autoreply when a new mail is received,Automatski odgovori kad kada stigne nova pošta
+Available,Dostupno
+Available Qty at Warehouse,Dostupna količina na skladištu
+Available Stock for Packing Items,Raspoloživo stanje za pakirane artikle
 "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupan u sastavnice , Dostavnica, prilikom kupnje proizvoda, proizvodnje narudžbi, narudžbenica , Račun kupnje , prodaje fakture , prodajnog naloga , Stock ulaska, timesheet"
 Average Age,Prosječna starost
 Average Commission Rate,Prosječna stopa komisija
-Average Discount,Prosječna Popust
+Average Discount,Prosječni popust
 Awesome Products,strašan Proizvodi
 Awesome Services,strašan Usluge
 BOM Detail No,BOM Detalj Ne
@@ -578,15 +578,15 @@
 Consumable cost per hour,Potrošni cijena po satu
 Consumed Qty,Potrošeno Kol
 Consumer Products,Consumer Products
-Contact,Kontaktirati
+Contact,Kontakt
 Contact Control,Kontaktirajte kontrolu
 Contact Desc,Kontakt ukratko
 Contact Details,Kontakt podaci
-Contact Email,Kontakt e
+Contact Email,Kontakt email
 Contact HTML,Kontakt HTML
 Contact Info,Kontakt Informacije
-Contact Mobile No,Kontaktirajte Mobile Nema
-Contact Name,Kontakt Naziv
+Contact Mobile No,Kontak GSM
+Contact Name,Kontakt ime
 Contact No.,Kontakt broj
 Contact Person,Kontakt osoba
 Contact Type,Vrsta kontakta
@@ -676,7 +676,7 @@
 Customer (Receivable) Account,Kupac (Potraživanja) račun
 Customer / Item Name,Kupac / Stavka Ime
 Customer / Lead Address,Kupac / Olovo Adresa
-Customer / Lead Name,Kupac / Olovo Ime
+Customer / Lead Name,Kupac / Ime osobe
 Customer > Customer Group > Territory,Kupac> Korisnička Group> Regija
 Customer Account Head,Kupac račun Head
 Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
@@ -712,168 +712,168 @@
 Customize,Prilagodite
 Customize the Notification,Prilagodite Obavijest
 Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Prilagodite uvodni tekst koji ide kao dio tog e-maila. Svaka transakcija ima zaseban uvodni tekst.
-DN Detail,DN Detalj
+DN Detail,DN detalj
 Daily,Svakodnevno
 Daily Time Log Summary,Dnevno vrijeme Log Profila
-Database Folder ID,Baza mapa ID
+Database Folder ID,Direktorij podatkovne baze ID
 Database of potential customers.,Baza potencijalnih kupaca.
 Date,Datum
-Date Format,Datum Format
+Date Format,Oblik datuma
 Date Of Retirement,Datum odlaska u mirovinu
-Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veća od dana ulaska u
+Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 Date is repeated,Datum se ponavlja
 Date of Birth,Datum rođenja
 Date of Issue,Datum izdavanja
-Date of Joining,Datum Ulazak
-Date of Joining must be greater than Date of Birth,Datum Ulazak mora biti veći od datuma rođenja
-Date on which lorry started from supplier warehouse,Datum na koji je kamion počeo od dobavljača skladištu
-Date on which lorry started from your warehouse,Datum na koji je kamion počeo iz skladišta
-Dates,Termini
-Days Since Last Order,Dana od posljednjeg reda
-Days for which Holidays are blocked for this department.,Dani za koje Praznici su blokirane za ovaj odjel.
+Date of Joining,Datum pristupa
+Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+Date on which lorry started from supplier warehouse,Datum kojeg je kamion krenuo sa dobavljačeva skladišta
+Date on which lorry started from your warehouse,Datum kojeg je kamion otišao sa Vašeg skladišta
+Dates,Datumi
+Days Since Last Order,Dana od posljednje narudžbe
+Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
 Dealer,Trgovac
 Debit,Zaduženje
-Debit Amt,Rashodi Amt
-Debit Note,Rashodi Napomena
+Debit Amt,Rashod Amt
+Debit Note,Rashodi - napomena
 Debit To,Rashodi za
-Debit and Credit not equal for this voucher. Difference is {0}.,Debitne i kreditne nije jednak za ovaj vaučer . Razlika je {0} .
+Debit and Credit not equal for this voucher. Difference is {0}.,Rashodi i kreditiranje nisu jednaki za ovog jamca. Razlika je {0} .
 Deduct,Odbiti
 Deduction,Odbitak
-Deduction Type,Odbitak Tip
-Deduction1,Deduction1
+Deduction Type,Tip odbitka
+Deduction1,Odbitak 1
 Deductions,Odbici
-Default,Zadani
+Default,Zadano
 Default Account,Zadani račun
-Default Address Template cannot be deleted,Default Adresa Predložak se ne može izbrisati
+Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 Default Amount,Zadani iznos
 Default BOM,Zadani BOM
-Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadani banka / Novčani račun će se automatski ažuriraju u POS računu, kada je ovaj mod odabran."
+Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 Default Bank Account,Zadani bankovni račun
-Default Buying Cost Center,Default Kupnja troška
-Default Buying Price List,Default Kupnja Cjenik
-Default Cash Account,Default Novac račun
-Default Company,Zadani Tvrtka
-Default Currency,Zadani valuta
-Default Customer Group,Zadani Korisnik Grupa
-Default Expense Account,Zadani Rashodi račun
-Default Income Account,Zadani Prihodi račun
-Default Item Group,Zadani artikla Grupa
-Default Price List,Zadani Cjenik
-Default Purchase Account in which cost of the item will be debited.,Zadani Kupnja računa na koji trošak stavke će biti terećen.
-Default Selling Cost Center,Default prodaja troška
-Default Settings,Tvorničke postavke
-Default Source Warehouse,Zadani Izvor galerija
-Default Stock UOM,Zadani kataloški UOM
-Default Supplier,Default Dobavljač
-Default Supplier Type,Zadani Dobavljač Tip
-Default Target Warehouse,Zadani Ciljana galerija
-Default Territory,Zadani Regija
-Default Unit of Measure,Zadani Jedinica mjere
-"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Default Jedinica mjere ne mogu se mijenjati izravno, jer ste već napravili neku transakciju (e) s drugim UOM . Za promjenu zadanog UOM , koristite ' UOM zamijeni Utility ' alat pod burzi modula ."
-Default Valuation Method,Zadani metoda vrednovanja
-Default Warehouse,Default Warehouse
-Default Warehouse is mandatory for stock Item.,Default skladišta obvezan je za dionice točke .
-Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove .
-Default settings for buying transactions.,Zadane postavke za kupnju transakcije .
-Default settings for selling transactions.,Zadane postavke za prodaju transakcije .
-Default settings for stock transactions.,Zadane postavke za burzovne transakcije .
-Defense,odbrana
+Default Buying Cost Center,Zadani trošak kupnje
+Default Buying Price List,Zadani cjenik kupnje
+Default Cash Account,Zadani novčani račun
+Default Company,Zadana tvrtka
+Default Currency,Zadana valuta
+Default Customer Group,Zadana grupa korisnika
+Default Expense Account,Zadani račun rashoda
+Default Income Account,Zadani račun prihoda
+Default Item Group,Zadana grupa artikala
+Default Price List,Zadani cjenik
+Default Purchase Account in which cost of the item will be debited.,Zadani račun kupnje - na koji će trošak artikla biti terećen.
+Default Selling Cost Center,Zadani trošak prodaje
+Default Settings,Zadane postavke
+Default Source Warehouse,Zadano izvorno skladište
+Default Stock UOM,Zadana kataloška mjerna jedinica
+Default Supplier,Glavni dobavljač
+Default Supplier Type,Zadani tip dobavljača
+Default Target Warehouse,Centralno skladište
+Default Territory,Zadani teritorij
+Default Unit of Measure,Zadana mjerna jedinica
+"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Zadana mjerna jedinica ne može se mijenjati izravno, jer ste već napravili neku transakciju sa drugom mjernom jedinicom. Za promjenu zadane mjerne jedinice, koristite 'Alat za mijenjanje mjernih jedinica' alat preko Stock modula."
+Default Valuation Method,Zadana metoda vrednovanja
+Default Warehouse,Glavno skladište
+Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za zalihu artikala.
+Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
+Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
+Default settings for selling transactions.,Zadane postavke za transakciju prodaje.
+Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
+Defense,Obrana
 "Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Odredite proračun za ovu troška. Da biste postavili proračuna akciju, vidi <a href=""#!List/Company"">Tvrtka Master</a>"
-Del,Del
+Del,Izbr
 Delete,Izbrisati
-Delete {0} {1}?,Brisanje {0} {1} ?
-Delivered,Isporučena
-Delivered Items To Be Billed,Isporučena Proizvodi se naplaćuje
-Delivered Qty,Isporučena Kol
-Delivered Serial No {0} cannot be deleted,Isporučuje Serial Ne {0} se ne može izbrisati
-Delivery Date,Dostava Datum
-Delivery Details,Detalji o isporuci
-Delivery Document No,Dostava Dokument br
-Delivery Document Type,Dostava Document Type
-Delivery Note,Obavještenje o primanji pošiljke
+Delete {0} {1}?,Izbrisati {0} {1} ?
+Delivered,Isporučeno
+Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
+Delivered Qty,Isporučena količina
+Delivered Serial No {0} cannot be deleted,Isporučeni serijski broj {0} se ne može izbrisati
+Delivery Date,Datum isporuke
+Delivery Details,Detalji isporuke
+Delivery Document No,Dokument isporuke br
+Delivery Document Type,Dokument isporuke - tip
+Delivery Note,Otpremnica
 Delivery Note Item,Otpremnica artikla
-Delivery Note Items,Način Napomena Stavke
-Delivery Note Message,Otpremnica Poruka
-Delivery Note No,Dostava Napomena Ne
-Delivery Note Required,Dostava Napomena Obavezno
-Delivery Note Trends,Otpremnici trendovi
-Delivery Note {0} is not submitted,Dostava Napomena {0} nije podnesen
-Delivery Note {0} must not be submitted,Dostava Napomena {0} ne smije biti podnesen
-Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dostava Bilješke {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+Delivery Note Items,Otpremnica artikala
+Delivery Note Message,Otpremnica - poruka
+Delivery Note No,Otpremnica br
+Delivery Note Required,Potrebna je otpremnica
+Delivery Note Trends,Trendovi otpremnica
+Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 Delivery Status,Status isporuke
 Delivery Time,Vrijeme isporuke
-Delivery To,Dostava na
-Department,Odsjek
-Department Stores,robne kuće
-Depends on LWP,Ovisi o lwp
-Depreciation,deprecijacija
+Delivery To,Dostava za
+Department,Odjel
+Department Stores,Robne kuće
+Depends on LWP,Ovisi o LWP
+Depreciation,Amortizacija
 Description,Opis
-Description HTML,Opis HTML
+Description HTML,HTML opis
 Designation,Oznaka
-Designer,dizajner
+Designer,Imenovatelj
 Detailed Breakup of the totals,Detaljni raspada ukupnim
 Details,Detalji
 Difference (Dr - Cr),Razlika ( dr. - Cr )
-Difference Account,Razlika račun
+Difference Account,Račun razlike
 "Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti' odgovornosti ' vrsta računa , jer to Stock Pomirenje jeulazni otvor"
-Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite UOM za stavke će dovesti do pogrešne (ukupno) Neto vrijednost težine. Uvjerite se da je neto težina svake stavke u istom UOM .
-Direct Expenses,izravni troškovi
-Direct Income,Izravna dohodak
-Disable,onesposobiti
-Disable Rounded Total,Bez Zaobljeni Ukupno
-Disabled,Onesposobljen
+Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice artikala će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog artikla u istoj mjernoj jedinici.
+Direct Expenses,Izravni troškovi
+Direct Income,Izravni dohodak
+Disable,Ugasiti
+Disable Rounded Total,Ugasiti zaokruženi iznos
+Disabled,Ugašeno
 Discount  %,Popust%
 Discount %,Popust%
 Discount (%),Popust (%)
-Discount Amount,Popust Iznos
-"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust Polja će biti dostupan u narudžbenice, Otkup primitka, Otkup fakturu"
-Discount Percentage,Popust Postotak
-Discount Percentage can be applied either against a Price List or for all Price List.,Popust Postotak se može primijeniti prema cjeniku ili za sve cjeniku.
+Discount Amount,Iznos popusta
+"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust polja će biti dostupna u narudžbenici, primci i računu kupnje"
+Discount Percentage,Postotak popusta
+Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
 Discount must be less than 100,Popust mora biti manji od 100
 Discount(%),Popust (%)
-Dispatch,otpremanje
-Display all the individual items delivered with the main items,Prikaži sve pojedinačne stavke isporučuju s glavnim stavkama
-Distribute transport overhead across items.,Podijeliti prijevoz pretek preko stavke.
+Dispatch,Otpremanje
+Display all the individual items delivered with the main items,Prikaži sve pojedinačne artikle isporučene sa glavnim artiklima
+Distribute transport overhead across items.,Podijeliti cijenu prijevoza prema artiklima.
 Distribution,Distribucija
-Distribution Id,Distribucija Id
-Distribution Name,Distribucija Ime
+Distribution Id,ID distribucije
+Distribution Name,Naziv distribucije
 Distributor,Distributer
 Divorced,Rastavljen
-Do Not Contact,Ne Kontaktiraj
-Do not show any symbol like $ etc next to currencies.,Ne pokazuju nikakav simbol kao $ itd uz valutama.
-Do really want to unstop production order: ,Do really want to unstop production order: 
-Do you really want to STOP ,Do you really want to STOP 
-Do you really want to STOP this Material Request?,Da li stvarno želite prestati s ovom materijalnom zahtjev ?
-Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista da podnesu sve plaće slip za mjesec {0} i godina {1}
-Do you really want to UNSTOP ,Do you really want to UNSTOP 
-Do you really want to UNSTOP this Material Request?,Da li stvarno želite otpušiti ovaj materijal zahtjev ?
-Do you really want to stop production order: ,Do you really want to stop production order: 
-Doc Name,Doc Ime
-Doc Type,Doc Tip
-Document Description,Dokument Opis
-Document Type,Document Type
+Do Not Contact,Ne kontaktirati
+Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
+Do really want to unstop production order: ,Želite li ponovno pokrenuti proizvodnju:
+Do you really want to STOP ,Želite li stvarno stati
+Do you really want to STOP this Material Request?,Želite li stvarno stopirati ovaj zahtjev za materijalom?
+Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
+Do you really want to UNSTOP ,Želite li zaista pokrenuti
+Do you really want to UNSTOP this Material Request?,Želite li stvarno ponovno pokrenuti ovaj zahtjev za materijalom?
+Do you really want to stop production order: ,Želite li stvarno prekinuti proizvodnju:
+Doc Name,Doc ime
+Doc Type,Doc tip
+Document Description,Opis dokumenta
+Document Type,Tip dokumenta
 Documents,Dokumenti
 Domain,Domena
-Don't send Employee Birthday Reminders,Ne šaljite zaposlenika podsjetnici na rođendan
-Download Materials Required,Preuzmite Materijali za
-Download Reconcilation Data,Preuzmite Reconcilation podatke
+Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
+Download Materials Required,Preuzmite - Potrebni materijali
+Download Reconcilation Data,Preuzmite Rekoncilijacijske podatke
 Download Template,Preuzmite predložak
-Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim inventara statusa
+Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
 "Download the Template, fill appropriate data and attach the modified file.","Preuzmite predložak , ispunite odgovarajuće podatke i priložite izmijenjenu datoteku ."
 "Download the Template, fill appropriate data and attach the modified file.All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložite izmijenjenu datoteku. Svi datumi i kombinacija zaposlenika u odabranom razdoblju će doći u predlošku, s postojećim izostancima"
-Draft,Skica
+Draft,Nepotvrđeno
 Dropbox,Dropbox
-Dropbox Access Allowed,Dropbox Pristup dopuštenih
-Dropbox Access Key,Dropbox Pristupna tipka
-Dropbox Access Secret,Dropbox Pristup Secret
+Dropbox Access Allowed,Dozvoljen pristup Dropboxu
+Dropbox Access Key,Dropbox pristupni ključ
+Dropbox Access Secret,Dropbox tajni pristup
 Due Date,Datum dospijeća
-Due Date cannot be after {0},Krajnji rok ne može biti poslije {0}
-Due Date cannot be before Posting Date,Krajnji rok ne može biti prije Postanja Date
-Duplicate Entry. Please check Authorization Rule {0},Udvostručavanje unos . Molimo provjerite autorizacije Pravilo {0}
-Duplicate Serial No entered for Item {0},Udvostručavanje Serial Ne ušao za točku {0}
-Duplicate entry,Udvostručavanje unos
-Duplicate row {0} with same {1},Duplikat red {0} sa isto {1}
-Duties and Taxes,Carine i poreza
+Due Date cannot be after {0},Datum dospijeća ne može biti poslije {0}
+Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+Duplicate Entry. Please check Authorization Rule {0},Dupli unos. Provjerite pravila za autorizaciju {0}
+Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za artikal {0}
+Duplicate entry,Dupli unos
+Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
+Duties and Taxes,Carine i porezi
 ERPNext Setup,ERPNext Setup
 Earliest,Najstarije
 Earnest Money,kapara
@@ -885,7 +885,7 @@
 Edu. Cess on Excise,Edu. Posebni porez na trošarine
 Edu. Cess on Service Tax,Edu. Posebni porez na porez na uslugu
 Edu. Cess on TDS,Edu. Posebni porez na TDS
-Education,obrazovanje
+Education,Obrazovanje
 Educational Qualification,Obrazovne kvalifikacije
 Educational Qualification Details,Obrazovni Pojedinosti kvalifikacije
 Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
@@ -893,9 +893,9 @@
 Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
 Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
 Electrical,Električna
-Electricity Cost,struja cost
-Electricity cost per hour,Struja cijena po satu
-Electronics,elektronika
+Electricity Cost,Troškovi struje
+Electricity cost per hour,Troškovi struje po satu
+Electronics,Elektronika
 Email,E-mail
 Email Digest,E-pošta
 Email Digest Settings,E-pošta Postavke
@@ -903,11 +903,11 @@
 Email Id,E-mail ID
 "Email Id where a job applicant will email e.g. ""jobs@example.com""",E-mail Id gdje posao zahtjeva će e-mail npr. &quot;jobs@example.com&quot;
 Email Notifications,E-mail obavijesti
-Email Sent?,E-mail poslan?
-"Email id must be unique, already exists for {0}","Id Email mora biti jedinstven , već postoji za {0}"
+Email Sent?,Je li e-mail poslan?
+"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
 Email ids separated by commas.,E-mail ids odvojene zarezima.
 "Email settings to extract Leads from sales email id e.g. ""sales@example.com""",E-mail postavke za izdvajanje vodi od prodaje email id npr. &quot;sales@example.com&quot;
-Emergency Contact,Hitna Kontakt
+Emergency Contact,Hitni kontakt
 Emergency Contact Details,Hitna Kontaktni podaci
 Emergency Phone,Hitna Telefon
 Employee,Zaposlenik
@@ -1157,11 +1157,11 @@
 Google Drive Access Allowed,Google Drive Pristup dopuštenih
 Government,vlada
 Graduate,Diplomski
-Grand Total,Sveukupno
-Grand Total (Company Currency),Sveukupno (Društvo valuta)
+Grand Total,Ukupno za platiti
+Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 "Grid ""","Grid """
 Grocery,Trgovina
-Gross Margin %,Bruto marža%
+Gross Margin %,Bruto marža %
 Gross Margin Value,Bruto marža vrijednost
 Gross Pay,Bruto plaće
 Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
@@ -1258,8 +1258,8 @@
 In Process,U procesu
 In Qty,u kol
 In Value,u vrijednosti
-In Words,U riječi
-In Words (Company Currency),U riječi (Društvo valuta)
+In Words,Riječima
+In Words (Company Currency),Riječima (valuta tvrtke)
 In Words (Export) will be visible once you save the Delivery Note.,U riječi (izvoz) će biti vidljiv nakon što spremite otpremnici.
 In Words will be visible once you save the Delivery Note.,U riječi će biti vidljiv nakon što spremite otpremnici.
 In Words will be visible once you save the Purchase Invoice.,U riječi će biti vidljiv nakon što spremite ulazne fakture.
@@ -1353,7 +1353,7 @@
 Issue Details,Issue Detalji
 Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
 It can also be used to create opening stock entries and to fix stock value.,Također se može koristiti za stvaranje početne vrijednosti unose i popraviti stock vrijednost .
-Item,stavka
+Item,Artikl
 Item Advanced,Stavka Napredna
 Item Barcode,Stavka Barkod
 Item Batch Nos,Stavka Batch Nos
@@ -1703,47 +1703,47 @@
 Music,glazba
 Must be Whole Number,Mora biti cijeli broj
 Name,Ime
-Name and Description,Naziv i opis
-Name and Employee ID,Ime i zaposlenika ID
-"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Ime novog računa . Napomena : Molimo vas da ne stvaraju račune za kupce i dobavljače , oni se automatski stvara od klijenata i dobavljača majstora"
-Name of person or organization that this address belongs to.,Ime osobe ili organizacije koje ova adresa pripada.
+Name and Description,Ime i opis
+Name and Employee ID,Ime i ID zaposlenika
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Ime novog računa. Napomena: Molimo Vas da ne stvarate račune za kupce i dobavljače, oni se automatski stvaraju od postojećih klijenata i dobavljača"
+Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
 Name of the Budget Distribution,Ime distribucije proračuna
 Naming Series,Imenovanje serije
-Negative Quantity is not allowed,Negativna Količina nije dopušteno
+Negative Quantity is not allowed,Negativna količina nije dopuštena
 Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativna Stock Error ( {6} ) za točke {0} u skladište {1} na {2} {3} u {4} {5}
-Negative Valuation Rate is not allowed,Negativna stopa Vrednovanje nije dopušteno
-Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4},Negativna bilanca u batch {0} za točku {1} na skladište {2} na {3} {4}
-Net Pay,Neto Pay
-Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (u riječima) će biti vidljiv nakon što spremite plaće Slip.
+Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4},Negativna bilanca u batch {0} za artikl {1} na skladište {2} na {3} {4}
+Net Pay,Neto plaća
+Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 Net Profit / Loss,Neto dobit / gubitak
-Net Total,Neto Ukupno
+Net Total,Osnovica
 Net Total (Company Currency),Neto Ukupno (Društvo valuta)
 Net Weight,Neto težina
-Net Weight UOM,Težina UOM
-Net Weight of each Item,Težina svake stavke
+Net Weight UOM,Težina mjerna jedinica
+Net Weight of each Item,Težina svakog artikla
 Net pay cannot be negative,Neto plaća ne može biti negativna
 Never,Nikad
-New ,New 
+New ,Novi
 New Account,Novi račun
-New Account Name,Novi naziv računa
+New Account Name,Naziv novog računa
 New BOM,Novi BOM
 New Communications,Novi komunikacije
 New Company,Nova tvrtka
-New Cost Center,Novi troška
+New Cost Center,Novi trošak
 New Cost Center Name,Novi troška Naziv
-New Delivery Notes,Novi otpremnice
-New Enquiries,Novi Upiti
-New Leads,Nova vodi
+New Delivery Notes,Nove otpremnice
+New Enquiries,Novi upiti
+New Leads,Novi potencijalni kupci
 New Leave Application,Novi dopust Primjena
 New Leaves Allocated,Novi Leaves Dodijeljeni
 New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 New Material Requests,Novi materijal Zahtjevi
 New Projects,Novi projekti
-New Purchase Orders,Novi narudžbenice
-New Purchase Receipts,Novi Kupnja Primici
-New Quotations,Novi Citati
-New Sales Orders,Nove narudžbe
-New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi Serial No ne mogu imati skladište . Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
+New Purchase Orders,Novi narudžbenice kupnje
+New Purchase Receipts,Novi primke kupnje
+New Quotations,Nove ponude
+New Sales Orders,Nove narudžbenice
+New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 New Stock Entries,Novi Stock upisi
 New Stock UOM,Novi kataloški UOM
 New Stock UOM is required,Novi Stock UOM je potrebno
@@ -1906,20 +1906,20 @@
 PR Detail,PR Detalj
 Package Item Details,Paket Stavka Detalji
 Package Items,Paket Proizvodi
-Package Weight Details,Paket Težina Detalji
+Package Weight Details,Težina paketa - detalji
 Packed Item,Dostava Napomena Pakiranje artikla
 Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
-Packing Details,Pakiranje Detalji
-Packing List,Pakiranje Popis
+Packing Details,Detalji pakiranja
+Packing List,Popis pakiranja
 Packing Slip,Odreskom
 Packing Slip Item,Odreskom predmet
 Packing Slip Items,Odreskom artikle
 Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 Page Break,Prijelom stranice
-Page Name,Stranica Ime
+Page Name,Ime stranice
 Paid Amount,Plaćeni iznos
 Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
-Pair,par
+Pair,Par
 Parameter,Parametar
 Parent Account,Roditelj račun
 Parent Cost Center,Roditelj troška
@@ -1945,11 +1945,11 @@
 Party Account,Party račun
 Party Type,Party Tip
 Party Type Name,Party Vrsta Naziv
-Passive,Pasivan
+Passive,Pasiva
 Passport Number,Putovnica Broj
-Password,Lozinka
+Password,Zaporka
 Pay To / Recd From,Platiti Da / RecD Od
-Payable,plativ
+Payable,Plativ
 Payables,Obveze
 Payables Group,Obveze Grupa
 Payment Days,Plaćanja Dana
@@ -1995,7 +1995,7 @@
 Phone,Telefon
 Phone No,Telefonski broj
 Piecework,rad plaćen na akord
-Pincode,Pincode
+Pincode,Poštanski broj
 Place of Issue,Mjesto izdavanja
 Plan for maintenance visits.,Plan održavanja posjeta.
 Planned Qty,Planirani Kol
@@ -2127,7 +2127,7 @@
 Preview,Pregled
 Previous,prijašnji
 Previous Work Experience,Radnog iskustva
-Price,cijena
+Price,Cijena
 Price / Discount,Cijena / Popust
 Price List,Cjenik
 Price List Currency,Cjenik valuta
@@ -2259,8 +2259,8 @@
 Qty to Receive,Količina za primanje
 Qty to Transfer,Količina za prijenos
 Qualification,Kvalifikacija
-Quality,Kvalitet
-Quality Inspection,Provera kvaliteta
+Quality,Kvaliteta
+Quality Inspection,Provjera kvalitete
 Quality Inspection Parameters,Inspekcija kvalitete Parametri
 Quality Inspection Reading,Kvaliteta Inspekcija čitanje
 Quality Inspection Readings,Inspekcija kvalitete Čitanja
@@ -2278,23 +2278,23 @@
 Quarter,Četvrtina
 Quarterly,Tromjesečni
 Quick Help,Brza pomoć
-Quotation,Citat
-Quotation Item,Citat artikla
-Quotation Items,Kotaciji Proizvodi
-Quotation Lost Reason,Citat Izgubili razlog
-Quotation Message,Citat Poruka
+Quotation,Ponuda
+Quotation Item,Artikl iz ponude
+Quotation Items,Artikli iz ponude
+Quotation Lost Reason,Razlog nerealizirane ponude
+Quotation Message,Ponuda - poruka
 Quotation To,Ponuda za
-Quotation Trends,Citati trendovi
-Quotation {0} is cancelled,Kotacija {0} je otkazan
-Quotation {0} not of type {1},Kotacija {0} nije tipa {1}
-Quotations received from Suppliers.,Citati dobio od dobavljače.
+Quotation Trends,Trendovi ponude
+Quotation {0} is cancelled,Ponuda {0} je otkazana
+Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 Quotes to Leads or Customers.,Citati na vodi ili kupaca.
 Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 Raised By,Povišena Do
 Raised By (Email),Povišena Do (e)
 Random,Slučajan
 Range,Domet
-Rate,Stopa
+Rate,VPC
 Rate ,Stopa
 Rate (%),Stopa ( % )
 Rate (Company Currency),Ocijeni (Društvo valuta)
@@ -2446,7 +2446,7 @@
 Root cannot be edited.,Korijen ne može se mijenjati .
 Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
 Rounded Off,zaokružen
-Rounded Total,Zaobljeni Ukupno
+Rounded Total,Zaokruženi iznos
 Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
 Row # ,Redak #
 Row # {0}: ,Row # {0}: 
@@ -2478,7 +2478,7 @@
 SO Date,SO Datum
 SO Pending Qty,SO čekanju Kol
 SO Qty,SO Kol
-Salary,Plata
+Salary,Plaća
 Salary Information,Plaća informacije
 Salary Manager,Plaća Manager
 Salary Mode,Plaća način
@@ -2493,59 +2493,59 @@
 Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati ​​i odbitka.
 Salary components.,Plaća komponente.
 Salary template master.,Plaća predložak majstor .
-Sales,Prodajni
-Sales Analytics,Prodaja Analitika
+Sales,Prodaja
+Sales Analytics,Prodajna analitika
 Sales BOM,Prodaja BOM
 Sales BOM Help,Prodaja BOM Pomoć
 Sales BOM Item,Prodaja BOM artikla
 Sales BOM Items,Prodaja BOM Proizvodi
 Sales Browser,prodaja preglednik
-Sales Details,Prodaja Detalji
-Sales Discounts,Prodaja Popusti
-Sales Email Settings,Prodaja Postavke e-pošte
+Sales Details,Prodajni detalji
+Sales Discounts,Prodajni popusti
+Sales Email Settings,Prodajne email postavke
 Sales Expenses,Prodajni troškovi
-Sales Extras,Prodaja Dodaci
+Sales Extras,Prodajni dodaci
 Sales Funnel,prodaja dimnjak
-Sales Invoice,Prodaja fakture
-Sales Invoice Advance,Prodaja Račun Predujam
-Sales Invoice Item,Prodaja Račun artikla
-Sales Invoice Items,Prodaja stavke računa
-Sales Invoice Message,Prodaja Račun Poruka
-Sales Invoice No,Prodaja Račun br
-Sales Invoice Trends,Prodaja Račun trendovi
-Sales Invoice {0} has already been submitted,Prodaja Račun {0} već je poslan
+Sales Invoice,Prodajni račun
+Sales Invoice Advance,Predujam prodajnog računa
+Sales Invoice Item,Prodajni artikal
+Sales Invoice Items,Prodajni artikli
+Sales Invoice Message,Poruka prodajnog  računa
+Sales Invoice No,Prodajni račun br
+Sales Invoice Trends,Trendovi prodajnih računa
+Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
-Sales Order,Prodajnog naloga
-Sales Order Date,Prodaja Datum narudžbe
-Sales Order Item,Prodajnog naloga artikla
-Sales Order Items,Prodaja Narudžbe Proizvodi
-Sales Order Message,Prodajnog naloga Poruka
-Sales Order No,Prodajnog naloga Ne
+Sales Order,Narudžba kupca
+Sales Order Date,Datum narudžbe (kupca)
+Sales Order Item,Naručeni artikal - prodaja
+Sales Order Items,Naručeni artikli - prodaja
+Sales Order Message,Poruka narudžbe kupca
+Sales Order No,Broj narudžbe kupca
 Sales Order Required,Prodajnog naloga Obvezno
 Sales Order Trends,Prodajnog naloga trendovi
 Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 Sales Order {0} is stopped,Prodajnog naloga {0} je zaustavljen
-Sales Partner,Prodaja partner
+Sales Partner,Prodajni partner
 Sales Partner Name,Prodaja Ime partnera
 Sales Partner Target,Prodaja partner Target
 Sales Partners Commission,Prodaja Partneri komisija
-Sales Person,Prodaja Osoba
-Sales Person Name,Prodaja Osoba Ime
+Sales Person,Prodajna osoba
+Sales Person Name,Ime prodajne osobe
 Sales Person Target Variance Item Group-Wise,Prodaja Osoba Target varijance artikla Group - Wise
 Sales Person Targets,Prodaje osobi Mete
 Sales Person-wise Transaction Summary,Prodaja Osobne mudar Transakcija Sažetak
 Sales Register,Prodaja Registracija
-Sales Return,Prodaje Povratak
+Sales Return,Povrat robe
 Sales Returned,prodaja Vraćeno
 Sales Taxes and Charges,Prodaja Porezi i naknade
 Sales Taxes and Charges Master,Prodaja Porezi i naknade Master
 Sales Team,Prodaja Team
 Sales Team Details,Prodaja Team Detalji
 Sales Team1,Prodaja Team1
-Sales and Purchase,Prodaja i kupnja
-Sales campaigns.,Prodaja kampanje .
+Sales and Purchase,Prodaje i kupnje
+Sales campaigns.,Prodajne kampanje.
 Salutation,Pozdrav
 Sample Size,Veličina uzorka
 Sanctioned Amount,Iznos kažnjeni
@@ -2574,37 +2574,37 @@
 "Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Odaberite &quot;Da&quot; ako ova stavka predstavlja neki posao poput treninga, projektiranje, konzalting i sl."
 "Select ""Yes"" if you are maintaining stock of this item in your Inventory.",Odaberite &quot;Da&quot; ako ste održavanju zaliha ove točke u vašem inventaru.
 "Select ""Yes"" if you supply raw materials to your supplier to manufacture this item.",Odaberite &quot;Da&quot; ako opskrbu sirovina na svoj dobavljača za proizvodnju ovu stavku.
-Select Brand...,Odaberite Marka ...
+Select Brand...,Odaberite brend ...
 Select Budget Distribution to unevenly distribute targets across months.,Odaberite Budget distribuciju neravnomjerno raspodijeliti ciljeve diljem mjeseci.
 "Select Budget Distribution, if you want to track based on seasonality.","Odaberite Budget Distribution, ako želite pratiti na temelju sezonalnosti."
 Select Company...,Odaberite tvrtku ...
 Select DocType,Odaberite DOCTYPE
-Select Fiscal Year...,Odaberite Fiskalna godina ...
-Select Items,Odaberite stavke
+Select Fiscal Year...,Odaberite fiskalnu godinu ...
+Select Items,Odaberite artikle
 Select Project...,Odaberite projekt ...
-Select Purchase Receipts,Odaberite Kupnja priznanica
-Select Sales Orders,Odaberite narudžbe
-Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz koje želite stvoriti radne naloge.
+Select Purchase Receipts,Odaberite primku
+Select Sales Orders,Odaberite narudžbe kupca
+Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
 Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
-Select Transaction,Odaberite transakcija
-Select Warehouse...,Odaberite Warehouse ...
-Select Your Language,Odaberite svoj jezik
+Select Transaction,Odaberite transakciju
+Select Warehouse...,Odaberite skladište ...
+Select Your Language,Odaberite jezik
 Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
-Select company name first.,Odaberite naziv tvrtke prvi.
+Select company name first.,Prvo odaberite naziv tvrtke.
 Select template from which you want to get the Goals,Odaberite predložak s kojeg želite dobiti ciljeva
 Select the Employee for whom you are creating the Appraisal.,Odaberite zaposlenika za koga se stvara procjene.
 Select the period when the invoice will be generated automatically,Odaberite razdoblje kada faktura će biti generiran automatski
 Select the relevant company name if you have multiple companies,Odaberite odgovarajući naziv tvrtke ako imate više tvrtki
 Select the relevant company name if you have multiple companies.,Odaberite odgovarajući naziv tvrtke ako imate više tvrtki.
-Select who you want to send this newsletter to,Odaberite koji želite poslati ovu newsletter
-Select your home country and check the timezone and currency.,Odaberite svoju domovinu i provjerite zonu i valutu .
+Select who you want to send this newsletter to,Odaberite kome želite poslati ovaj bilten
+Select your home country and check the timezone and currency.,Odaberite zemlju i provjerite zonu i valutu.
 "Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Odabir &quot;Da&quot; omogućit će ovu stavku da se pojavi u narudžbenice, Otkup primitka."
 "Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Odabir &quot;Da&quot; omogućit će ovaj predmet shvatiti u prodajni nalog, otpremnici"
 "Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.",Odabir &quot;Da&quot; će vam omogućiti da stvorite Bill materijala pokazuje sirovina i operativne troškove nastale za proizvodnju ovu stavku.
 "Selecting ""Yes"" will allow you to make a Production Order for this item.",Odabir &quot;Da&quot; će vam omogućiti da napravite proizvodnom nalogu za tu stavku.
 "Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 Selling,Prodaja
-Selling Settings,Prodaja postavki
+Selling Settings,Postavke prodaje
 "Selling must be checked, if Applicable For is selected as {0}","Prodaje se mora provjeriti, ako je primjenjivo za odabrano kao {0}"
 Send,Poslati
 Send Autoreply,Pošalji Automatski
@@ -2725,7 +2725,7 @@
 "Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 Split Delivery Note into packages.,Split otpremnici u paketima.
 Sports,sportovi
-Sr,Sr
+Sr,Br
 Standard,Standard
 Standard Buying,Standardna kupnju
 Standard Reports,Standardni Izvješća
@@ -2848,7 +2848,7 @@
 TDS (Interest),TDS (kamate)
 TDS (Rent),TDS (Rent)
 TDS (Salary),TDS (plaće)
-Target  Amount,Ciljana Iznos
+Target  Amount,Ciljani iznos
 Target Detail,Ciljana Detalj
 Target Details,Ciljane Detalji
 Target Details1,Ciljana Details1
@@ -2870,7 +2870,7 @@
 Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges,Porezna detalj stol preuzeta iz točke majstora kao string i pohranjene u ovom području. Koristi se za poreze i troškove
 Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
-Taxable,Oporeziva
+Taxable,Oporezivo
 Taxes,Porezi
 Taxes and Charges,Porezi i naknade
 Taxes and Charges Added,Porezi i naknade Dodano
@@ -2883,7 +2883,7 @@
 Technology,tehnologija
 Telecommunications,telekomunikacija
 Telephone Expenses,Telefonski troškovi
-Television,televizija
+Television,Televizija
 Template,Predložak
 Template for performance appraisals.,Predložak za ocjene rada .
 Template of terms or contract.,Predložak termina ili ugovor.
@@ -3281,8 +3281,8 @@
 assigned by,dodjeljuje
 cannot be greater than 100,ne može biti veća od 100
 "e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
-"e.g. ""MC""","na primjer "" MC """
-"e.g. ""My Company LLC""","na primjer "" Moja tvrtka LLC """
+"e.g. ""MC""","na primjer ""MC"""
+"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
 e.g. 5,na primjer 5
 "e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
 "e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index a346a63..465c28a 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -34,11 +34,11 @@
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Add / Edit </ a>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Tambah / Edit </ a>"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> default Template </ h4>  <p> Menggunakan <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja template </ a> dan semua bidang Address ( termasuk Custom Fields jika ada) akan tersedia </ p>  <pre> <code> {{}} address_line1 <br>  {% jika% address_line2} {{}} address_line2 <br> { endif% -%}  {{kota}} <br>  {% jika negara%} {{negara}} <br> {% endif -%}  {% jika pincode%} PIN: {{}} pincode <br> {% endif -%}  {{negara}} <br>  {% jika telepon%} Telepon: {{ponsel}} {<br> endif% -%}  {% jika faks%} Fax: {{}} fax <br> {% endif -%}  {% jika email_id%} Email: {{}} email_id <br> ; {% endif -%}  </ code> </ pre>"
-A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Sebuah Kelompok Pelanggan ada dengan nama yang sama, silakan mengubah nama Nasabah atau mengubah nama Grup Pelanggan"
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Pelanggan sudah ada dengan nama yang sama, silakan mengubah nama Pelanggan atau mengubah nama Grup Pelanggan"
 A Customer exists with same name,Nasabah ada dengan nama yang sama
 A Lead with this email id should exist,Sebuah Lead dengan id email ini harus ada
 A Product or Service,Produk atau Jasa
-A Supplier exists with same name,Pemasok dengan nama yang sama sudah terdaftar
+A Supplier exists with same name,Pemasok dengan nama yang sama sudah ada
 A symbol for this currency. For e.g. $,Simbol untuk mata uang ini. Contoh $
 AMC Expiry Date,AMC Tanggal Berakhir
 Abbr,Singkatan
@@ -47,7 +47,7 @@
 Absent,Absen
 Acceptance Criteria,Kriteria Penerimaan
 Accepted,Diterima
-Accepted + Rejected Qty must be equal to Received quantity for Item {0},Diterima Ditolak + Qty harus sama dengan jumlah yang diterima untuk Item {0}
+Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
 Accepted Quantity,Kuantitas Diterima
 Accepted Warehouse,Gudang Diterima
 Account,Akun
@@ -57,16 +57,16 @@
 Account Head,Akun Kepala
 Account Name,Nama Akun
 Account Type,Jenis Account
-"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah ada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
-"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
-Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini.
+"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
+"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
+Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akun untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini.
 Account head {0} created,Kepala akun {0} telah dibuat
-Account must be a balance sheet account,Rekening harus menjadi akun neraca
-Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku
+Account must be a balance sheet account,Akun harus menjadi akun neraca
+Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
 Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
 Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
-Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku
-Account {0} cannot be a Group,Akun {0} tidak dapat berupa Kelompok
+Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
+Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
 Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
 Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
 Account {0} does not exist,Akun {0} tidak ada
@@ -74,25 +74,25 @@
 Account {0} is frozen,Akun {0} dibekukan
 Account {0} is inactive,Akun {0} tidak aktif
 Account {0} is not valid,Akun {0} tidak valid
-Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' sebagai Barang {1} adalah sebuah Aset Barang
-Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Parent {1} tidak dapat berupa buku besar
-Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Parent {1} bukan milik perusahaan: {2}
-Account {0}: Parent account {1} does not exist,Akun {0}: akun Parent {1} tidak ada
-Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkan dirinya sebagai rekening induk
-Account: {0} can only be updated via \					Stock Transactions,Account: {0} hanya dapat diperbarui melalui \ Transaksi Bursa
+Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Barang {1} adalah merupakan sebuah Aset Tetap
+Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
+Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
+Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
+Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
+Account: {0} can only be updated via \					Stock Transactions,Account: {0} hanya dapat diperbarui melalui \ Transaksi Stok
 Accountant,Akuntan
 Accounting,Akuntansi
 "Accounting Entries can be made against leaf nodes, called","Entri Akuntansi dapat dilakukan terhadap node daun, yang disebut"
-"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Entri Akuntansi beku up to date ini, tak seorang pun bisa melakukan / memodifikasi entri kecuali peran ditentukan di bawah ini."
-Accounting journal entries.,Jurnal akuntansi.
-Accounts,Rekening
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
+Accounting journal entries.,Pencatatan Jurnal akuntansi.
+Accounts,Akun / Rekening
 Accounts Browser,Account Browser
-Accounts Frozen Upto,Account Frozen Upto
+Accounts Frozen Upto,Akun dibekukan sampai dengan
 Accounts Payable,Hutang
 Accounts Receivable,Piutang
-Accounts Settings,Account Settings
+Accounts Settings,Pengaturan Akun
 Active,Aktif
-Active: Will extract emails from ,Active: Will extract emails from 
+Active: Will extract emails from ,Aktif: Akan mengambil email dari
 Activity,Aktivitas
 Activity Log,Log Aktivitas
 Activity Log:,Log Aktivitas:
@@ -101,111 +101,113 @@
 Actual Budget,Anggaran Aktual
 Actual Completion Date,Tanggal Penyelesaian Aktual
 Actual Date,Tanggal Aktual
-Actual End Date,Tanggal Akhir Realisasi
+Actual End Date,Tanggal Akhir Aktual
 Actual Invoice Date,Tanggal Faktur Aktual
-Actual Posting Date,Sebenarnya Posting Tanggal
-Actual Qty,Qty Aktual
-Actual Qty (at source/target),Qty Aktual (di sumber/target)
-Actual Qty After Transaction,Qty Aktual Setelah Transaksi
-Actual Qty: Quantity available in the warehouse.,Jumlah yang sebenarnya: Kuantitas yang tersedia di gudang.
+Actual Posting Date,Tanggal Posting Aktual
+Actual Qty,Jumlah Aktual
+Actual Qty (at source/target),Jumlah Aktual (di sumber/target)
+Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
+Actual Qty: Quantity available in the warehouse.,Jumlah Aktual: Kuantitas yang tersedia di gudang.
 Actual Quantity,Kuantitas Aktual
 Actual Start Date,Tanggal Mulai Aktual
 Add,Tambahkan
 Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 Add Child,Tambah Anak
-Add Serial No,Tambahkan Serial No
+Add Serial No,Tambahkan Nomor Serial
 Add Taxes,Tambahkan Pajak
 Add Taxes and Charges,Tambahkan Pajak dan Biaya
-Add or Deduct,Tambah atau Dikurangi
-Add rows to set annual budgets on Accounts.,Tambahkan baris untuk mengatur anggaran tahunan Accounts.
-Add to Cart,Add to Cart
+Add or Deduct,Penambahan atau Pengurangan
+Add rows to set annual budgets on Accounts.,Tambahkan baris untuk mengatur akun anggaran tahunan.
+Add to Cart,Tambahkan ke Keranjang Belanja
 Add to calendar on this date,Tambahkan ke kalender pada tanggal ini
 Add/Remove Recipients,Tambah / Hapus Penerima
 Address,Alamat
-Address & Contact,Alamat Kontak
+Address & Contact,Alamat & Kontak
 Address & Contacts,Alamat & Kontak
-Address Desc,Alamat Penj
+Address Desc,Deskripsi Alamat 
 Address Details,Alamat Detail
 Address HTML,Alamat HTML
 Address Line 1,Alamat Baris 1
 Address Line 2,Alamat Baris 2
 Address Template,Template Alamat
 Address Title,Alamat Judul
-Address Title is mandatory.,Alamat Judul adalah wajib.
-Address Type,Alamat Type
+Address Title is mandatory.,"Wajib masukan Judul Alamat.
+"
+Address Type,Tipe Alamat
 Address master.,Alamat utama.
 Administrative Expenses,Beban Administrasi
 Administrative Officer,Petugas Administrasi
-Advance Amount,Jumlah muka
+Advance Amount,Jumlah Uang Muka
 Advance amount,Jumlah muka
 Advances,Uang Muka
 Advertisement,iklan
 Advertising,Pengiklanan
 Aerospace,Aerospace
-After Sale Installations,Setelah Sale Instalasi
+After Sale Installations,Pemasangan setelah Penjualan
 Against,Terhadap
-Against Account,Terhadap Rekening
-Against Bill {0} dated {1},Melawan Bill {0} tanggal {1}
-Against Docname,Melawan Docname
+Against Account,Terhadap Akun
+Against Bill {0} dated {1},Terhadap Bill {0} tanggal {1}
+Against Docname,Terhadap Docname
 Against Doctype,Terhadap Doctype
-Against Document Detail No,Terhadap Dokumen Detil ada
-Against Document No,Melawan Dokumen Tidak
-Against Expense Account,Terhadap Beban Akun
-Against Income Account,Terhadap Akun Penghasilan
-Against Journal Entry,Melawan Journal Entry
-Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak memiliki tertandingi {1} entri
-Against Purchase Invoice,Terhadap Purchase Invoice
+Against Document Detail No,Terhadap Detail Dokumen No.
+Against Document No,"Melawan Dokumen No.
+"
+Against Expense Account,Terhadap Akun Biaya
+Against Income Account,Terhadap Akun Pendapatan
+Against Journal Voucher,Terhadap Voucher Journal
+Against Journal Voucher {0} does not have any unmatched {1} entry,Terhadap Journal Voucher {0} tidak memiliki {1} perbedaan pencatatan
+Against Purchase Invoice,Terhadap Faktur Pembelian
 Against Sales Invoice,Terhadap Faktur Penjualan
-Against Sales Order,Terhadap Sales Order
-Against Voucher,Melawan Voucher
-Against Voucher Type,Terhadap Voucher Type
-Ageing Based On,Penuaan Berdasarkan
-Ageing Date is mandatory for opening entry,Penuaan Tanggal adalah wajib untuk membuka entri
+Against Sales Order,Terhadap Order Penjualan
+Against Voucher,Terhadap Voucher
+Against Voucher Type,Terhadap Tipe Voucher
+Ageing Based On,Umur Berdasarkan
+Ageing Date is mandatory for opening entry,Periodisasi Tanggal adalah wajib untuk membuka entri
 Ageing date is mandatory for opening entry,Penuaan saat ini adalah wajib untuk membuka entri
 Agent,Agen
 Aging Date,Penuaan Tanggal
 Aging Date is mandatory for opening entry,Penuaan Tanggal adalah wajib untuk membuka entri
-Agriculture,Agriculture
-Airline,Perusahaan penerbangan
-All Addresses.,Semua Addresses.
+Agriculture,Pertanian
+Airline,Maskapai Penerbangan
+All Addresses.,Semua Alamat
 All Contact,Semua Kontak
-All Contacts.,All Contacts.
+All Contacts.,Semua Kontak.
 All Customer Contact,Semua Kontak Pelanggan
 All Customer Groups,Semua Grup Pelanggan
 All Day,Semua Hari
 All Employee (Active),Semua Karyawan (Active)
-All Item Groups,Semua Barang Grup
-All Lead (Open),Semua Timbal (Open)
+All Item Groups,Semua Grup Barang/Item
+All Lead (Open),Semua Prospektus (Open)
 All Products or Services.,Semua Produk atau Jasa.
-All Sales Partner Contact,Semua Penjualan Partner Kontak
-All Sales Person,Semua Penjualan Orang
-All Supplier Contact,Semua Pemasok Kontak
-All Supplier Types,Semua Jenis Pemasok
-All Territories,Semua Territories
-"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Semua bidang ekspor terkait seperti mata uang, tingkat konversi, jumlah ekspor, total ekspor dll besar tersedia dalam Pengiriman Catatan, POS, Quotation, Faktur Penjualan, Sales Order dll"
-"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Semua bidang impor terkait seperti mata uang, tingkat konversi, jumlah impor, impor besar jumlah dll tersedia dalam Penerimaan Pembelian, Supplier Quotation, Purchase Invoice, Purchase Order dll"
-All items have already been invoiced,Semua item telah ditagih
+All Sales Partner Contact,Kontak Semua Partner Penjualan
+All Sales Person,Semua Salesperson
+All Supplier Contact,Kontak semua pemasok
+All Supplier Types,Semua Jenis pemasok
+All Territories,Semua Wilayah
+"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Semua data berkaitan dengan ekspor seperti mata uang, nilai tukar, total ekspor, nilai total ekspor dll. terdapat di Nota Pengiriman, POS, Penawaran Quotation, Fatkur Penjualan, Order Penjualan, dll."
+"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Semua data berkaitan dengan impor seperti mata uang, nilai tukar, total ekspor, nilai total ekspor dll. terdapat di Nota Pengiriman, POS, Penawaran Quotation, Fatkur Penjualan, Order Penjualan, dll."
+All items have already been invoiced,Semua Barang telah tertagih
 All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
-Allocate,Menyediakan
-Allocate leaves for a period.,Mengalokasikan daun untuk suatu periode.
-Allocate leaves for the year.,Mengalokasikan daun untuk tahun ini.
-Allocated Amount,Dialokasikan Jumlah
-Allocated Budget,Anggaran Dialokasikan
+Allocate,Alokasi
+Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
+Allocate leaves for the year.,Alokasi cuti untuk tahun ini.
+Allocated Amount,Jumlah alokasi
+Allocated Budget,Alokasi Anggaran
 Allocated amount,Jumlah yang dialokasikan
-Allocated amount can not be negative,Jumlah yang dialokasikan tidak dapat negatif
-Allocated amount can not greater than unadusted amount,Jumlah yang dialokasikan tidak bisa lebih besar dari jumlah unadusted
-Allow Bill of Materials,Biarkan Bill of Material
-Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,Biarkan Bill of Material harus 'Ya'. Karena satu atau banyak BOMs aktif hadir untuk item ini
-Allow Children,Biarkan Anak-anak
+Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
+Allocated amount can not greater than unadusted amount,Jumlah yang dialokasikan tidak boleh lebih besar dari sisa jumlah 
+Allow Bill of Materials,Izinkan untuk Bill of Material
+Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,Izinkan untuk Bill of Material harus 'Ya'. karena ada satu atau lebih BOM aktif untuk item barang ini.
+Allow Children,Izinkan Anak Akun
 Allow Dropbox Access,Izinkan Dropbox Access
 Allow Google Drive Access,Izinkan Google Drive Access
-Allow Negative Balance,Biarkan Saldo Negatif
+Allow Negative Balance,Izinkan Saldo Negatif
 Allow Negative Stock,Izinkan Bursa Negatif
 Allow Production Order,Izinkan Pesanan Produksi
 Allow User,Izinkan Pengguna
 Allow Users,Izinkan Pengguna
-Allow the following users to approve Leave Applications for block days.,Memungkinkan pengguna berikut untuk menyetujui Leave Aplikasi untuk blok hari.
-Allow user to edit Price List Rate in transactions,Memungkinkan pengguna untuk mengedit Daftar Harga Tingkat dalam transaksi
+Allow the following users to approve Leave Applications for block days.,Izinkan pengguna ini untuk menyetujui aplikasi izin cuti untuk hari yang terpilih(blocked).
+Allow user to edit Price List Rate in transactions,Izinkan user/pengguna untuk mengubah rate daftar harga di dalam transaksi
 Allowance Percent,Penyisihan Persen
 Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
 Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
@@ -298,33 +300,33 @@
 Average Discount,Rata-rata Diskon
 Awesome Products,Mengagumkan Produk
 Awesome Services,Layanan yang mengagumkan
-BOM Detail No,BOM Detil ada
+BOM Detail No,No. Rincian BOM
 BOM Explosion Item,BOM Ledakan Barang
-BOM Item,BOM Barang
-BOM No,BOM ada
-BOM No. for a Finished Good Item,BOM No untuk jadi baik Barang
-BOM Operation,BOM Operasi
-BOM Operations,BOM Operasi
-BOM Replace Tool,BOM Ganti Alat
-BOM number is required for manufactured Item {0} in row {1},Nomor BOM diperlukan untuk diproduksi Barang {0} berturut-turut {1}
-BOM number not allowed for non-manufactured Item {0} in row {1},Nomor BOM tidak diperbolehkan untuk non-manufaktur Barang {0} berturut-turut {1}
-BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak dapat orang tua atau anak dari {2}
+BOM Item,Komponen BOM
+BOM No,No. BOM
+BOM No. for a Finished Good Item,No. BOM untuk Barang Jadi
+BOM Operation,BOM Operation
+BOM Operations,BOM Operations
+BOM Replace Tool,BOM Replace Tool
+BOM number is required for manufactured Item {0} in row {1},Nomor BOM diperlukan untuk Barang Produksi {0} berturut-turut {1}
+BOM number not allowed for non-manufactured Item {0} in row {1},Nomor BOM tidak diperbolehkan untuk Barang non-manufaktur {0} berturut-turut {1}
+BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
 BOM replaced,BOM diganti
-BOM {0} for Item {1} in row {2} is inactive or not submitted,BOM {0} untuk Item {1} berturut-turut {2} tidak aktif atau tidak disampaikan
-BOM {0} is not active or not submitted,BOM {0} tidak aktif atau tidak disampaikan
-BOM {0} is not submitted or inactive BOM for Item {1},BOM {0} bukan disampaikan atau tidak aktif BOM untuk Item {1}
+BOM {0} for Item {1} in row {2} is inactive or not submitted,BOM {0} untuk Item {1} berturut-turut {2} tidak aktif atau tidak tersubmit
+BOM {0} is not active or not submitted,BOM {0} tidak aktif atau tidak tersubmit
+BOM {0} is not submitted or inactive BOM for Item {1},BOM {0} tidak tersubmit atau BOM tidak aktif untuk Item {1}
 Backup Manager,Backup Manager
 Backup Right Now,Backup Right Now
 Backups will be uploaded to,Backup akan di-upload ke
 Balance Qty,Balance Qty
 Balance Sheet,Neraca
-Balance Value,Saldo Nilai
+Balance Value,Nilai Saldo
 Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 Balance must be,Balance harus
 "Balances of Accounts of type ""Bank"" or ""Cash""","Saldo Rekening jenis ""Bank"" atau ""Cash"""
 Bank,Bank
-Bank / Cash Account,Bank / Kas Rekening
-Bank A/C No.,Bank A / C No
+Bank / Cash Account,Bank / Rekening Kas
+Bank A/C No.,Rekening Bank No.
 Bank Account,Bank Account/Rekening Bank
 Bank Account No.,Rekening Bank No
 Bank Accounts,Rekening Bank
@@ -332,10 +334,10 @@
 Bank Draft,Bank Draft
 Bank Name,Nama Bank
 Bank Overdraft Account,Cerukan Bank Akun
-Bank Reconciliation,5. Bank Reconciliation (Rekonsiliasi Bank)
-Bank Reconciliation Detail,Rekonsiliasi Bank Detil
-Bank Reconciliation Statement,Pernyataan Bank Rekonsiliasi
-Bank Entry,Bank Entry
+Bank Reconciliation,Rekonsiliasi Bank
+Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
+Bank Reconciliation Statement,Pernyataan Rekonsiliasi Bank
+Bank Voucher,Bank Voucher
 Bank/Cash Balance,Bank / Cash Balance
 Banking,Perbankan
 Barcode,barcode
@@ -344,13 +346,13 @@
 Basic,Dasar
 Basic Info,Info Dasar
 Basic Information,Informasi Dasar
-Basic Rate,Tingkat Dasar
-Basic Rate (Company Currency),Tingkat Dasar (Perusahaan Mata Uang)
-Batch,Sejumlah
+Basic Rate,Harga Dasar
+Basic Rate (Company Currency),Harga Dasar (Dalam Mata Uang Lokal)
+Batch,Batch
 Batch (lot) of an Item.,Batch (banyak) dari Item.
 Batch Finished Date,Batch Selesai Tanggal
 Batch ID,Batch ID
-Batch No,Ada Batch
+Batch No,No. Batch
 Batch Started Date,Batch Dimulai Tanggal
 Batch Time Logs for billing.,Batch Sisa log untuk penagihan.
 Batch-Wise Balance History,Batch-Wise Balance Sejarah
@@ -362,53 +364,53 @@
 Bill of Material,Bill of Material
 Bill of Material to be considered for manufacturing,Bill of Material untuk dipertimbangkan untuk manufaktur
 Bill of Materials (BOM),Bill of Material (BOM)
-Billable,Ditagih
+Billable,Dapat ditagih
 Billed,Ditagih
-Billed Amount,Ditagih Jumlah
-Billed Amt,Ditagih Amt
+Billed Amount,Jumlah Tagihan
+Billed Amt,Jumlah tagihan
 Billing,Penagihan
 Billing Address,Alamat Penagihan
-Billing Address Name,Alamat Penagihan Nama
+Billing Address Name,Nama Alamat Penagihan
 Billing Status,Status Penagihan
 Bills raised by Suppliers.,Bills diajukan oleh Pemasok.
-Bills raised to Customers.,Bills diangkat ke Pelanggan.
-Bin,Bin
+Bills raised to Customers.,Bills diajukan ke Pelanggan.
+Bin,Tong Sampah
 Bio,Bio
 Biotechnology,Bioteknologi
 Birthday,Ulang tahun
-Block Date,Blok Tanggal
-Block Days,Block Hari
-Block leave applications by department.,Memblokir aplikasi cuti oleh departemen.
+Block Date,Blokir Tanggal
+Block Days,Blokir Hari
+Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
 Blog Post,Posting Blog
 Blog Subscriber,Blog Subscriber
-Blood Group,Kelompok darah
-Both Warehouse must belong to same Company,Kedua Gudang harus milik Perusahaan yang sama
+Blood Group,Golongan darah
+Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
 Box,Kotak
 Branch,Cabang
 Brand,Merek
 Brand Name,Merek Nama
 Brand master.,Master merek.
 Brands,Merek
-Breakdown,Kerusakan
+Breakdown,Rincian
 Broadcasting,Penyiaran
-Brokerage,Perdagangan perantara
+Brokerage,Memperantarai
 Budget,Anggaran belanja
 Budget Allocated,Anggaran Dialokasikan
-Budget Detail,Anggaran Detil
-Budget Details,Rincian Anggaran
+Budget Detail,Rincian Anggaran
+Budget Details,Rincian-rincian Anggaran
 Budget Distribution,Distribusi anggaran
-Budget Distribution Detail,Detil Distribusi Anggaran
-Budget Distribution Details,Rincian Distribusi Anggaran
-Budget Variance Report,Varians Anggaran Laporan
-Budget cannot be set for Group Cost Centers,Anggaran tidak dapat ditetapkan untuk Biaya Pusat Grup
+Budget Distribution Detail,Rincian Distribusi Anggaran
+Budget Distribution Details,Rincian-rincian Distribusi Anggaran
+Budget Variance Report,Laporan Perbedaan Anggaran
+Budget cannot be set for Group Cost Centers,Anggaran tidak dapat ditetapkan untuk Cost Centernya Grup
 Build Report,Buat Laporan
 Bundle items at time of sale.,Bundel item pada saat penjualan.
 Business Development Manager,Business Development Manager
 Buying,Pembelian
-Buying & Selling,Jual Beli &
-Buying Amount,Membeli Jumlah
-Buying Settings,Membeli Pengaturan
-"Buying must be checked, if Applicable For is selected as {0}","Membeli harus diperiksa, jika Berlaku Untuk dipilih sebagai {0}"
+Buying & Selling,Pembelian & Penjualan
+Buying Amount,Jumlah Pembelian
+Buying Settings,Setting Pembelian
+"Buying must be checked, if Applicable For is selected as {0}","Membeli harus dicentang, jika ""Berlaku Untuk"" dipilih sebagai {0}"
 C-Form,C-Form
 C-Form Applicable,C-Form Berlaku
 C-Form Invoice Detail,C-Form Faktur Detil
@@ -422,21 +424,21 @@
 CENVAT Service Tax Cess 2,Cenvat Pelayanan Pajak Cess 2
 Calculate Based On,Hitung Berbasis On
 Calculate Total Score,Hitung Total Skor
-Calendar Events,Kalender Acara
+Calendar Events,Acara
 Call,Panggilan
 Calls,Panggilan
-Campaign,Kampanye
-Campaign Name,Nama Kampanye
-Campaign Name is required,Nama Kampanye diperlukan
-Campaign Naming By,Kampanye Penamaan Dengan
-Campaign-.####,Kampanye-.# # # #
+Campaign,Promosi
+Campaign Name,Nama Promosi
+Campaign Name is required,Nama Promosi diperlukan
+Campaign Naming By,Penamaan Promosi dengan
+Campaign-.####,Promosi-.# # # #
 Can be approved by {0},Dapat disetujui oleh {0}
-"Can not filter based on Account, if grouped by Account","Tidak dapat menyaring berdasarkan Account, jika dikelompokkan berdasarkan Rekening"
-"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat menyaring berdasarkan Voucher Tidak, jika dikelompokkan berdasarkan Voucher"
+"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
+"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
 Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Dapat merujuk baris hanya jika jenis biaya adalah 'On Sebelumnya Row Jumlah' atau 'Sebelumnya Row Jumlah'
-Cancel Material Visit {0} before cancelling this Customer Issue,Batal Bahan Visit {0} sebelum membatalkan ini Issue Pelanggan
+Cancel Material Visit {0} before cancelling this Customer Issue,Batalkan Kunjungan {0} sebelum membatalkan Keluhan Pelanggan
 Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Kunjungan Material {0} sebelum membatalkan ini Maintenance Visit
-Cancelled,Cancelled
+Cancelled,Dibatalkan
 Cancelling this Stock Reconciliation will nullify its effect.,Membatalkan ini Stock Rekonsiliasi akan meniadakan efeknya.
 Cannot Cancel Opportunity as Quotation Exists,Tidak bisa Batal Peluang sebagai Quotation Exists
 Cannot approve leave as you are not authorized to approve leaves on Block Dates,Tidak dapat menyetujui cuti karena Anda tidak berwenang untuk menyetujui daun di Blok Dates
@@ -470,7 +472,7 @@
 Case No. cannot be 0,Kasus No tidak bisa 0
 Cash,kas
 Cash In Hand,Cash In Hand
-Cash Entry,Voucher Cash
+Cash Voucher,Voucher Cash
 Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
 Cash/Bank Account,Rekening Kas / Bank
 Casual Leave,Santai Cuti
@@ -594,7 +596,7 @@
 Contacts,Kontak
 Content,Isi Halaman
 Content Type,Content Type
-Contra Entry,Contra Entry
+Contra Voucher,Contra Voucher
 Contract,Kontrak
 Contract End Date,Tanggal Kontrak End
 Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
@@ -625,7 +627,7 @@
 Country Name,Nama Negara
 Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
 "Country, Timezone and Currency","Country, Timezone dan Mata Uang"
-Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk gaji total yang dibayarkan untuk kriteria pilihan di atas
+Create Bank Voucher for the total salary paid for the above selected criteria,Buat Bank Voucher untuk gaji total yang dibayarkan untuk kriteria pilihan di atas
 Create Customer,Buat Pelanggan
 Create Material Requests,Buat Permintaan Material
 Create New,Buat New
@@ -647,7 +649,7 @@
 Credit,Piutang
 Credit Amt,Kredit Jumlah Yang
 Credit Card,Kartu Kredit
-Credit Card Entry,Voucher Kartu Kredit
+Credit Card Voucher,Voucher Kartu Kredit
 Credit Controller,Kontroler Kredit
 Credit Days,Hari Kredit
 Credit Limit,Batas Kredit
@@ -979,7 +981,7 @@
 Excise Duty Edu Cess 2,Cukai Edu Cess 2
 Excise Duty SHE Cess 1,Cukai SHE Cess 1
 Excise Page Number,Jumlah Cukai Halaman
-Excise Entry,Voucher Cukai
+Excise Voucher,Voucher Cukai
 Execution,Eksekusi
 Executive Search,Pencarian eksekutif
 Exemption Limit,Batas Pembebasan
@@ -1327,7 +1329,7 @@
 Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Faktur Periode Dari dan Faktur Period Untuk tanggal wajib untuk berulang faktur
 Invoice Period To,Periode Faktur Untuk
 Invoice Type,Invoice Type
-Invoice/Journal Entry Details,Invoice / Journal Entry Account
+Invoice/Journal Voucher Details,Invoice / Journal Voucher Detail
 Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
 Is Active,Aktif
 Is Advance,Apakah Muka
@@ -1457,11 +1459,11 @@
 Jobs Email Settings,Pengaturan Jobs Email
 Journal Entries,Entries Journal
 Journal Entry,Jurnal Entri
-Journal Entry,Journal Entry
-Journal Entry Account,Journal Entry Detil
-Journal Entry Account No,Journal Entry Detil ada
-Journal Entry {0} does not have account {1} or already matched,Journal Entry {0} tidak memiliki akun {1} atau sudah cocok
-Journal Entries {0} are un-linked,Journal Entry {0} yang un-linked
+Journal Voucher,Journal Voucher
+Journal Voucher Detail,Journal Voucher Detil
+Journal Voucher Detail No,Journal Voucher Detil ada
+Journal Voucher {0} does not have account {1} or already matched,Journal Voucher {0} tidak memiliki akun {1} atau sudah cocok
+Journal Vouchers {0} are un-linked,Journal Voucher {0} yang un-linked
 Keep a track of communication related to this enquiry which will help for future reference.,Menyimpan melacak komunikasi yang berkaitan dengan penyelidikan ini yang akan membantu untuk referensi di masa mendatang.
 Keep it web friendly 900px (w) by 100px (h),Simpan web 900px ramah (w) oleh 100px (h)
 Key Performance Area,Key Bidang Kinerja
@@ -1576,7 +1578,7 @@
 Major/Optional Subjects,Mayor / Opsional Subjek
 Make ,Make 
 Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Gerakan Stock
-Make Bank Entry,Membuat Bank Entry
+Make Bank Voucher,Membuat Bank Voucher
 Make Credit Note,Membuat Nota Kredit
 Make Debit Note,Membuat Debit Note
 Make Delivery,Membuat Pengiriman
@@ -3096,7 +3098,7 @@
 Update Series Number,Pembaruan Series Number
 Update Stock,Perbarui Stock
 Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
-Update clearance date of Journal Entries marked as 'Bank Entry',Tanggal pembaruan clearance Entries Journal ditandai sebagai 'Bank Entry'
+Update clearance date of Journal Entries marked as 'Bank Vouchers',Tanggal pembaruan clearance Entries Journal ditandai sebagai 'Bank Voucher'
 Updated,Diperbarui
 Updated Birthday Reminders,Diperbarui Ulang Tahun Pengingat
 Upload Attendance,Upload Kehadiran
@@ -3234,25 +3236,25 @@
 Write Off Based On,Menulis Off Berbasis On
 Write Off Cost Center,Menulis Off Biaya Pusat
 Write Off Outstanding Amount,Menulis Off Jumlah Outstanding
-Write Off Entry,Menulis Off Voucher
+Write Off Voucher,Menulis Off Voucher
 Wrong Template: Unable to find head row.,Template yang salah: Tidak dapat menemukan baris kepala.
 Year,Tahun
 Year Closed,Tahun Ditutup
 Year End Date,Tanggal Akhir Tahun
-Year Name,Tahun Nama
-Year Start Date,Tahun Tanggal Mulai
+Year Name,Nama Tahun
+Year Start Date,Tanggal Mulai Tahun
 Year of Passing,Tahun Passing
 Yearly,Tahunan
 Yes,Ya
 You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
-You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai Beku
-You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk catatan ini. Silakan Update 'Status' dan Simpan
-You are the Leave Approver for this record. Please Update the 'Status' and Save,Anda adalah Leave Approver untuk catatan ini. Silakan Update 'Status' dan Simpan
-You can enter any date manually,Anda dapat memasukkan setiap tanggal secara manual
+You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
+You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk record ini. Silakan Update 'Status' dan Simpan
+You are the Leave Approver for this record. Please Update the 'Status' and Save,Anda adalah Leave Approver untuk record ini. Silakan Update 'Status' dan Simpan
+You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
 You can enter the minimum quantity of this item to be ordered.,Anda dapat memasukkan jumlah minimum dari item ini yang akan dipesan.
 You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah tingkat jika BOM disebutkan agianst item
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Anda tidak dapat memasukkan kedua Delivery Note ada dan Faktur Penjualan No Masukkan salah satu.
-You can not enter current voucher in 'Against Journal Entry' column,Anda tidak bisa masuk voucher saat ini di 'Melawan Journal Entry' kolom
+You can not enter current voucher in 'Against Journal Voucher' column,Anda tidak bisa masuk voucher saat ini di 'Melawan Journal Voucher' kolom
 You can set Default Bank Account in Company master,Anda dapat mengatur default Bank Account menguasai Perusahaan
 You can start by selecting backup frequency and granting access for sync,Anda dapat memulai dengan memilih frekuensi backup dan memberikan akses untuk sinkronisasi
 You can submit this Stock Reconciliation.,Anda bisa mengirimkan ini Stock Rekonsiliasi.
@@ -3329,49 +3331,3 @@
 {0} {1} status is Unstopped,{0} {1} status unstopped
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Biaya Pusat adalah wajib untuk Item {2}
 {0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam Faktur Rincian table
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Add / Edit </ a>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Tambah / Edit </ a>"
-Billed,Ditagih
-Company,Perusahaan
-Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
-Default Customer Group,Bawaan Pelanggan Grup
-Default Territory,Wilayah standar
-Delivered,Disampaikan
-Enable Shopping Cart,Aktifkan Keranjang Belanja
-Go ahead and add something to your cart.,Pergi ke depan dan menambahkan sesuatu ke keranjang Anda.
-Hey! Go ahead and add an address,Hei! Pergi ke depan dan menambahkan alamat
-Invalid Billing Address,Alamat Penagihan valid
-Invalid Shipping Address,Alamat Pengiriman valid
-Missing Currency Exchange Rates for {0},Hilang Kurs mata uang Tarif untuk {0}
-Name is required,Nama dibutuhkan
-Not Allowed,Tidak Diizinkan
-Paid,Terbayar
-Partially Billed,Sebagian Ditagih
-Partially Delivered,Sebagian Disampaikan
-Please specify a Price List which is valid for Territory,Tentukan Daftar Harga yang berlaku untuk Wilayah
-Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
-Please write something,Silahkan menulis sesuatu
-Please write something in subject and message!,Silahkan menulis sesuatu dalam subjek dan pesan!
-Price List,Daftar Harga
-Price List not configured.,Daftar Harga belum dikonfigurasi.
-Quotation Series,Quotation Series
-Shipping Rule,Aturan Pengiriman
-Shopping Cart,Daftar Belanja
-Shopping Cart Price List,Daftar Belanja Daftar Harga
-Shopping Cart Price Lists,Daftar Harga Daftar Belanja
-Shopping Cart Settings,Pengaturan Keranjang Belanja
-Shopping Cart Shipping Rule,Belanja Pengiriman Rule
-Shopping Cart Shipping Rules,Daftar Belanja Pengiriman Aturan
-Shopping Cart Taxes and Charges Master,Pajak Keranjang Belanja dan Biaya Guru
-Shopping Cart Taxes and Charges Masters,Daftar Belanja Pajak dan Biaya Masters
-Something went wrong!,Ada yang tidak beres!
-Something went wrong.,Ada Sesuatu yang tidak beres.
-Tax Master,Guru Pajak
-To Pay,Untuk Bayar
-Updated,Diperbarui
-You are not allowed to reply to this ticket.,Anda tidak diizinkan untuk membalas tiket ini.
-You need to be logged in to view your cart.,Anda harus login untuk melihat keranjang Anda.
-You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
-{0} cannot be purchased using Shopping Cart,{0} tidak dapat dibeli dengan menggunakan Keranjang Belanja
-{0} is required,{0} diperlukan
-{0} {1} has a common territory {2},{0} {1} memiliki wilayah umum {2}
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
new file mode 100644
index 0000000..332fcd3
--- /dev/null
+++ b/erpnext/translations/is.csv
@@ -0,0 +1,3757 @@
+" (Half Day)"," (Hálfan dag)"
+" and year: "," og ár: "
+""" does not exists",""" er ekki til"
+"%  Delivered","%  Afhent"
+"% Amount Billed","% Upphæð reikningsfærð"
+"% Billed","% Reikningsfært"
+"% Completed","% Lokið"
+"% Delivered","% Afhent"
+"% Installed","% Uppsett"
+"% Milestones Achieved","% Áföngum náð"
+"% Milestones Completed","% Áföngum lokið"
+"% Received","% Móttekið"
+"% Tasks Completed","% Verkefnum lokið"
+"% of materials billed against this Purchase Order.","% of materials billed against this Purchase Order."
+"% of materials billed against this Sales Order","% of materials billed against this Sales Order"
+"% of materials delivered against this Delivery Note","% of materials delivered against this Delivery Note"
+"% of materials delivered against this Sales Order","% of materials delivered against this Sales Order"
+"% of materials ordered against this Material Request","% of materials ordered against this Material Request"
+"% of materials received against this Purchase Order","% of materials received against this Purchase Order"
+"'Actual Start Date' can not be greater than 'Actual End Date'","'Actual Start Date' can not be greater than 'Actual End Date'"
+"'Based On' and 'Group By' can not be same","'Based On' and 'Group By' can not be same"
+"'Days Since Last Order' must be greater than or equal to zero","'Days Since Last Order' must be greater than or equal to zero"
+"'Entries' cannot be empty","'Entries' cannot be empty"
+"'Expected Start Date' can not be greater than 'Expected End Date'","'Expected Start Date' can not be greater than 'Expected End Date'"
+"'From Date' is required","'Upphafsdagur' er krafist"
+"'From Date' must be after 'To Date'","'Upphafsdagur' verður að vera nýrri en 'Lokadagur'"
+"'Has Serial No' can not be 'Yes' for non-stock item","'Has Serial No' can not be 'Yes' for non-stock item"
+"'Notification Email Addresses' not specified for recurring %s","'Notification Email Addresses' not specified for recurring %s"
+"'Profit and Loss' type account {0} not allowed in Opening Entry","'Profit and Loss' type account {0} not allowed in Opening Entry"
+"'To Case No.' cannot be less than 'From Case No.'","'To Case No.' cannot be less than 'From Case No.'"
+"'To Date' is required","'Lokadagur' er krafist"
+"'Update Stock' for Sales Invoice {0} must be set","'Update Stock' for Sales Invoice {0} must be set"
+"* Will be calculated in the transaction.","* Will be calculated in the transaction."
+"**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**","**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**"
+"**Currency** Master","**Currency** Master"
+"**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.","**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**."
+"1 Currency = [?] Fraction
+For e.g. 1 USD = 100 Cent","1 Currency = [?] Fraction
+For e.g. 1 USD = 100 Cent"
+"1. To maintain the customer wise item code and to make them searchable based on their code use this option","1. To maintain the customer wise item code and to make them searchable based on their code use this option"
+"90-Above","90-Above"
+"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group"">Add / Edit</a>"
+"<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group"">Add / Edit</a>"
+"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory"">Add / Edit</a>"
+"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>"
+"A Customer Group exists with same name please change the Customer name or rename the Customer Group","A Customer Group exists with same name please change the Customer name or rename the Customer Group"
+"A Customer exists with same name","Viðskiptavinur til með sama nafni"
+"A Lead with this email id should exist","Ábending með kenni netfangs ætti að vera til"
+"A Product or Service","Vara eða þjónusta"
+"A Product or a Service that is bought, sold or kept in stock.","Vara eða þjónustu sem er keypt, seld eða haldið á lager."
+"A Supplier exists with same name","Birgir til með sama nafni"
+"A condition for a Shipping Rule","Skilyrði fyrir reglu vöruflutninga"
+"A logical Warehouse against which stock entries are made.","A logical Warehouse against which stock entries are made."
+"A symbol for this currency. For e.g. $","Tákn fyrir þennan gjaldmiðil. For e.g. $"
+"A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.","Þriðja aðila dreifingaraðili / söluaðili / umboðsaðili umboðslauna / hlutdeildarfélag / endurseljandi sem selur fyrirtækjum vörur fyrir þóknun."
+"A user with ""Expense Approver"" role","A user with ""Expense Approver"" role"
+"AMC Expiry Date","AMC Expiry Date"
+"Abbr","Abbr"
+"Abbreviation cannot have more than 5 characters","Skammstöfun má ekki hafa fleiri en 5 stafi"
+"Above Value","Umfram gildi"
+"Absent","Fjarverandi"
+"Acceptance Criteria","Viðtökuskilyrði"
+"Accepted","Samþykkt"
+"Accepted + Rejected Qty must be equal to Received quantity for Item {0}","Samþykkt + Hafnað magn skulu vera jöfn mótteknu magni fyrir lið {0}"
+"Accepted Quantity","Samþykkt magn"
+"Accepted Warehouse","Samþykkt vörugeymsla"
+"Account","Reikningur"
+"Account Balance","Reikningsstaða"
+"Account Created: {0}","Reikningur stofnaður: {0}"
+"Account Details","Reiknings upplýsingar"
+"Account Group","Reikninga hópur"
+"Account Head","Account Head"
+"Account Name","Reikningsnafn"
+"Account Type","Rekningsgerð"
+"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
+"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
+"Account for the warehouse (Perpetual Inventory) will be created under this Account.","Account for the warehouse (Perpetual Inventory) will be created under this Account."
+"Account head {0} created","Account head {0} created"
+"Account must be a balance sheet account","Account must be a balance sheet account"
+"Account with child nodes cannot be converted to ledger","Account with child nodes cannot be converted to ledger"
+"Account with existing transaction can not be converted to group.","Account with existing transaction can not be converted to group."
+"Account with existing transaction can not be deleted","Account with existing transaction can not be deleted"
+"Account with existing transaction cannot be converted to ledger","Account with existing transaction cannot be converted to ledger"
+"Account {0} cannot be a Group","Account {0} cannot be a Group"
+"Account {0} does not belong to Company {1}","Account {0} does not belong to Company {1}"
+"Account {0} does not belong to company: {1}","Account {0} does not belong to company: {1}"
+"Account {0} does not exist","Account {0} does not exist"
+"Account {0} does not exists","Account {0} does not exists"
+"Account {0} has been entered more than once for fiscal year {1}","Account {0} has been entered more than once for fiscal year {1}"
+"Account {0} is frozen","Account {0} is frozen"
+"Account {0} is inactive","Account {0} is inactive"
+"Account {0} is not valid","Account {0} is not valid"
+"Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item","Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item"
+"Account {0}: Parent account {1} can not be a ledger","Account {0}: Parent account {1} can not be a ledger"
+"Account {0}: Parent account {1} does not belong to company: {2}","Account {0}: Parent account {1} does not belong to company: {2}"
+"Account {0}: Parent account {1} does not exist","Account {0}: Parent account {1} does not exist"
+"Account {0}: You can not assign itself as parent account","Account {0}: You can not assign itself as parent account"
+"Account: {0} can only be updated via Stock Transactions","Account: {0} can only be updated via Stock Transactions"
+"Accountant","Bókari"
+"Accounting","Bókhald"
+"Accounting Entries can be made against leaf nodes, called","Accounting Entries can be made against leaf nodes, called"
+"Accounting Entry for Stock","Accounting Entry for Stock"
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Accounting entry frozen up to this date, nobody can do / modify entry except role specified below."
+"Accounting journal entries.","Accounting journal entries."
+"Accounts","Reikningar"
+"Accounts Browser","Accounts Browser"
+"Accounts Frozen Upto","Accounts Frozen Upto"
+"Accounts Manager","Accounts Manager"
+"Accounts Payable","Viðskiptaskuldir"
+"Accounts Receivable","Viðskiptakröfur"
+"Accounts Settings","Accounts Settings"
+"Accounts User","Accounts User"
+"Achieved","Achieved"
+"Active","Virkt"
+"Active: Will extract emails from ","Active: Will extract emails from "
+"Activity","Aðgerðir"
+"Activity Log","Activity Log"
+"Activity Log:","Activity Log:"
+"Activity Type","Activity Type"
+"Actual","Actual"
+"Actual Budget","Actual Budget"
+"Actual Completion Date","Actual Completion Date"
+"Actual Date","Actual Date"
+"Actual End Date","Actual End Date"
+"Actual Invoice Date","Actual Invoice Date"
+"Actual Posting Date","Raundagsetning bókunar"
+"Actual Qty","Raunmagn"
+"Actual Qty (at source/target)","Raunmagn (við upptök/markmið)"
+"Actual Qty After Transaction","Raunmagn eftir færslu"
+"Actual Qty is mandatory","Raunmagn er bindandi"
+"Actual Qty: Quantity available in the warehouse.","Raunmagn: Magn í boði á lager."
+"Actual Quantity","Raunmagn"
+"Actual Start Date","Actual Start Date"
+"Add","Add"
+"Add / Edit Prices","Add / Edit Prices"
+"Add / Edit Taxes and Charges","Add / Edit Taxes and Charges"
+"Add Child","Add Child"
+"Add Serial No","Add Serial No"
+"Add Taxes","Add Taxes"
+"Add or Deduct","Add or Deduct"
+"Add rows to set annual budgets on Accounts.","Add rows to set annual budgets on Accounts."
+"Add to Cart","Add to Cart"
+"Add to calendar on this date","Add to calendar on this date"
+"Add/Remove Recipients","Add/Remove Recipients"
+"Address","Address"
+"Address & Contact","Address & Contact"
+"Address & Contacts","Address & Contacts"
+"Address Desc","Address Desc"
+"Address Details","Address Details"
+"Address HTML","Address HTML"
+"Address Line 1","Address Line 1"
+"Address Line 2","Address Line 2"
+"Address Template","Address Template"
+"Address Title","Address Title"
+"Address Title is mandatory.","Address Title is mandatory."
+"Address Type","Address Type"
+"Address master.","Address master."
+"Administrative Expenses","Stjórnunarkostnaður"
+"Administrative Officer","Administrative Officer"
+"Administrator","Stjórnandi"
+"Advance Amount","Heildarupphæð"
+"Advance Paid","Advance Paid"
+"Advance amount","Advance amount"
+"Advance paid against {0} {1} cannot be greater \
+					than Grand Total {2}","Advance paid against {0} {1} cannot be greater \
+					than Grand Total {2}"
+"Advances","Advances"
+"Advertisement","Advertisement"
+"Advertising","Advertising"
+"Aerospace","Aerospace"
+"After Sale Installations","After Sale Installations"
+"Against","Against"
+"Against Account","Á móti reikning"
+"Against Docname","Á móti nafni skjals"
+"Against Doctype","Á móti gerð skjals"
+"Against Document Detail No","Á móti upplýsinganúmeri skjals"
+"Against Document No","Á móti skjalanúmeri"
+"Against Expense Account","Á móti kostnaðarreikningi"
+"Against Income Account","Á móti tekjureikningi"
+"Against Invoice","Á móti reikningi"
+"Against Invoice Posting Date","Á móti bókunardagsetningu"
+"Against Journal Voucher","Á móti færslu í færslubók"
+"Against Journal Voucher {0} does not have any unmatched {1} entry","Á móti færslu í færslubók {0} hefur ekki samsvarandi {1} færslu"
+"Against Journal Voucher {0} is already adjusted against some other voucher","Á móti færslu í færslubók {0} er þegar tengd við aðra færslu"
+"Against Purchase Invoice","Á móti innkaupareikningi"
+"Against Purchase Order","Á móti innkaupapöntun"
+"Against Sales Invoice","Á móti sölureikningi"
+"Against Sales Order","Á móti sölupöntun"
+"Against Supplier Invoice {0} dated {1}","Á móti reikningi frá birgja {0} dagsettum {1}"
+"Against Voucher","Á móti fylgiskjali"
+"Against Voucher No","Á móti fylgiskjali nr"
+"Against Voucher Type","Á móti gerð fylgiskjals"
+"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Voucher","Á móti gerð fylgiskjals verður að vera eitt af innkaupapöntun, innkaupareikningi eða færslu í færslubók"
+"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Voucher","Á móti gerð fylgiskjals verður að vera eitt af sölupöntun, sölureikningi eða færslu í færslubók"
+"Age","Aldur"
+"Ageing Based On","Ageing Based On"
+"Ageing Date is mandatory for opening entry","Ageing Date is mandatory for opening entry"
+"Ageing date is mandatory for opening entry","Ageing date is mandatory for opening entry"
+"Agent","Umboðsmaður"
+"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.
+
+Note: BOM = Bill of Materials","Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.
+
+Note: BOM = Bill of Materials"
+"Aging Date","Aging Date"
+"Aging Date is mandatory for opening entry","Aging Date is mandatory for opening entry"
+"Agriculture","Landbúnaður"
+"Airline","Flugfélag"
+"All","Allt"
+"All Addresses.","Öll heimilisföng."
+"All Contact","Allir tengiliðir"
+"All Contacts.","Allir tengiliðir"
+"All Customer Contact","All Customer Contact"
+"All Customer Groups","All Customer Groups"
+"All Day","Allan daginn"
+"All Employee (Active)","Allir starfsmenn (virkir)"
+"All Item Groups","All Item Groups"
+"All Lead (Open)","Allar ábendingar (opnar)"
+"All Products or Services.","Allar vörur eða þjónusta."
+"All Sales Partner Contact","All Sales Partner Contact"
+"All Sales Person","All Sales Person"
+"All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.","All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets."
+"All Supplier Contact","All Supplier Contact"
+"All Supplier Types","All Supplier Types"
+"All Territories","All Territories"
+"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc."
+"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc."
+"All items have already been invoiced","Allt hefur nú þegar verið reikningsfært"
+"All these items have already been invoiced","Allt þetta hér hefur nú þegar verið reiknisfært"
+"Allocate","Úthluta"
+"Allocate leaves for a period.","Úthluta fríum á tímabil."
+"Allocate leaves for the year.","Úthluta fríum á árið."
+"Allocated","Úthlutað"
+"Allocated Amount","Úthlutuð fjárhæð"
+"Allocated Budget","Úthlutuð kostnaðaráætlun"
+"Allocated amount","Úthlutuð fjárhæð"
+"Allocated amount can not be negative","Úthlutuð fjárhæð getur ekki verið neikvæð"
+"Allocated amount can not greater than unadusted amount","Allocated amount can not greater than unadusted amount"
+"Allow Bill of Materials","Allow Bill of Materials"
+"Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item","Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item"
+"Allow Children","Allow Children"
+"Allow Dropbox Access","Allow Dropbox Access"
+"Allow Google Drive Access","Allow Google Drive Access"
+"Allow Negative Balance","Allow Negative Balance"
+"Allow Negative Stock","Leyfa neikvæðar birgðir"
+"Allow Production Order","Leyfa framleiðslupöntun"
+"Allow User","Leyfa notanda"
+"Allow Users","Leyfa notendur"
+"Allow the following users to approve Leave Applications for block days.","Allow the following users to approve Leave Applications for block days."
+"Allow user to edit Price List Rate in transactions","Allow user to edit Price List Rate in transactions"
+"Allowance Percent","Allowance Percent"
+"Allowance for over-{0} crossed for Item {1}","Allowance for over-{0} crossed for Item {1}"
+"Allowance for over-{0} crossed for Item {1}.","Allowance for over-{0} crossed for Item {1}."
+"Allowed Role to Edit Entries Before Frozen Date","Allowed Role to Edit Entries Before Frozen Date"
+"Amended From","Amended From"
+"Amount","Upphæð"
+"Amount (Company Currency)","Amount (Company Currency)"
+"Amount Paid","Upphæð greidd"
+"Amount to Bill","Amount to Bill"
+"Amounts not reflected in bank","Amounts not reflected in bank"
+"Amounts not reflected in system","Amounts not reflected in system"
+"Amt","Amt"
+"An Customer exists with same name","Viðskiptavinur til með sama nafni"
+"An Item Group exists with same name, please change the item name or rename the item group","An Item Group exists with same name, please change the item name or rename the item group"
+"An item exists with same name ({0}), please change the item group name or rename the item","An item exists with same name ({0}), please change the item group name or rename the item"
+"Analyst","Greinir"
+"Annual","Árlegur"
+"Another Period Closing Entry {0} has been made after {1}","Another Period Closing Entry {0} has been made after {1}"
+"Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.","Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed."
+"Any other comments, noteworthy effort that should go in the records.","Any other comments, noteworthy effort that should go in the records."
+"Apparel & Accessories","Fatnaður & Aukabúnaður"
+"Applicability","Gildi"
+"Applicable Charges","Gildandi gjöld"
+"Applicable For","Gilda fyrir"
+"Applicable Holiday List","Gildandi listi fyrir fríið"
+"Applicable Territory","Gildandi svæði"
+"Applicable To (Designation)","Applicable To (Designation)"
+"Applicable To (Employee)","Applicable To (Employee)"
+"Applicable To (Role)","Applicable To (Role)"
+"Applicable To (User)","Applicable To (User)"
+"Applicant Name","Nafn umsækjanda"
+"Applicant for a Job","Umsækjandi um vinnu"
+"Applicant for a Job.","Umsækjandi um vinnu."
+"Application of Funds (Assets)","Eignir"
+"Applications for leave.","Umsókn um leyfi."
+"Applies to Company","Gildir um fyrirtæki"
+"Apply / Approve Leaves","Apply / Approve Leaves"
+"Apply On","Apply On"
+"Appraisal","Appraisal"
+"Appraisal Goal","Appraisal Goal"
+"Appraisal Goals","Appraisal Goals"
+"Appraisal Template","Appraisal Template"
+"Appraisal Template Goal","Appraisal Template Goal"
+"Appraisal Template Title","Appraisal Template Title"
+"Appraisal {0} created for Employee {1} in the given date range","Appraisal {0} created for Employee {1} in the given date range"
+"Apprentice","Apprentice"
+"Approval Status","Staða samþykkis"
+"Approval Status must be 'Approved' or 'Rejected'","Staða samþykkis verður að vera 'Samþykkt' eða 'Hafnað'"
+"Approved","Samþykkt"
+"Approver","Samþykkjandi"
+"Approving Role","Approving Role"
+"Approving Role cannot be same as role the rule is Applicable To","Approving Role cannot be same as role the rule is Applicable To"
+"Approving User","Approving User"
+"Approving User cannot be same as user the rule is Applicable To","Approving User cannot be same as user the rule is Applicable To"
+"Are you sure you want to STOP ","Are you sure you want to STOP "
+"Are you sure you want to UNSTOP ","Are you sure you want to UNSTOP "
+"Arrear Amount","Arrear Amount"
+"As Production Order can be made for this item, it must be a stock item.","As Production Order can be made for this item, it must be a stock item."
+"As per Stock UOM","As per Stock UOM"
+"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'"
+"Asset","Eign"
+"Assistant","Aðstoðarmaður"
+"Associate","Samstarfsmaður"
+"Atleast one of the Selling or Buying must be selected","Atleast one of the Selling or Buying must be selected"
+"Atleast one warehouse is mandatory","Atleast one warehouse is mandatory"
+"Attach Image","Hengja við mynd"
+"Attach Letterhead","Hengja við bréfshausinn"
+"Attach Logo","Hengdu við logo"
+"Attach Your Picture","Hengdu við myndina þína"
+"Attendance","Aðsókn"
+"Attendance Date","Attendance Date"
+"Attendance Details","Attendance Details"
+"Attendance From Date","Attendance From Date"
+"Attendance From Date and Attendance To Date is mandatory","Attendance From Date and Attendance To Date is mandatory"
+"Attendance To Date","Attendance To Date"
+"Attendance can not be marked for future dates","Attendance can not be marked for future dates"
+"Attendance for employee {0} is already marked","Attendance for employee {0} is already marked"
+"Attendance record.","Attendance record."
+"Auditor","Auditor"
+"Authorization Control","Authorization Control"
+"Authorization Rule","Authorization Rule"
+"Auto Accounting For Stock Settings","Auto Accounting For Stock Settings"
+"Auto Material Request","Auto Material Request"
+"Auto-raise Material Request if quantity goes below re-order level in a warehouse","Auto-raise Material Request if quantity goes below re-order level in a warehouse"
+"Automatically compose message on submission of transactions.","Automatically compose message on submission of transactions."
+"Automatically updated via Stock Entry of type Manufacture or Repack","Automatically updated via Stock Entry of type Manufacture or Repack"
+"Automotive","Automotive"
+"Autoreply when a new mail is received","Autoreply when a new mail is received"
+"Available","Available"
+"Available Qty at Warehouse","Available Qty at Warehouse"
+"Available Stock for Packing Items","Available Stock for Packing Items"
+"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet"
+"Average Age","Average Age"
+"Average Commission Rate","Average Commission Rate"
+"Average Discount","Average Discount"
+"Avg Daily Outgoing","Avg Daily Outgoing"
+"Avg. Buying Rate","Avg. Buying Rate"
+"Awesome Products","Meirihàttar vörur"
+"Awesome Services","Meirihàttar þjónusta"
+"BOM Detail No","BOM Detail No"
+"BOM Explosion Item","BOM Explosion Item"
+"BOM Item","BOM Item"
+"BOM No","BOM No"
+"BOM No. for a Finished Good Item","BOM No. for a Finished Good Item"
+"BOM Operation","BOM Operation"
+"BOM Operations","BOM Operations"
+"BOM Rate","BOM Rate"
+"BOM Replace Tool","BOM Replace Tool"
+"BOM number is required for manufactured Item {0} in row {1}","BOM number is required for manufactured Item {0} in row {1}"
+"BOM number not allowed for non-manufactured Item {0} in row {1}","BOM number not allowed for non-manufactured Item {0} in row {1}"
+"BOM recursion: {0} cannot be parent or child of {2}","BOM recursion: {0} cannot be parent or child of {2}"
+"BOM replaced","BOM replaced"
+"BOM {0} for Item {1} in row {2} is inactive or not submitted","BOM {0} for Item {1} in row {2} is inactive or not submitted"
+"BOM {0} is not active or not submitted","BOM {0} is not active or not submitted"
+"BOM {0} is not submitted or inactive BOM for Item {1}","BOM {0} is not submitted or inactive BOM for Item {1}"
+"Backup Manager","Afritunarstjóri"
+"Backup Right Now","Afrita núna"
+"Backups will be uploaded to","Backups will be uploaded to"
+"Balance","Balance"
+"Balance Qty","Balance Qty"
+"Balance Sheet","Efnahagsreikningur"
+"Balance Value","Balance Value"
+"Balance for Account {0} must always be {1}","Balance for Account {0} must always be {1}"
+"Balance must be","Balance must be"
+"Balances of Accounts of type ""Bank"" or ""Cash""","Balances of Accounts of type ""Bank"" or ""Cash"""
+"Bank","Bank"
+"Bank / Cash Account","Bank / Cash Account"
+"Bank A/C No.","Bank A/C No."
+"Bank Account","Bank Account"
+"Bank Account No.","Bank Account No."
+"Bank Accounts","Bankareikningar"
+"Bank Clearance Summary","Bank Clearance Summary"
+"Bank Draft","Bank Draft"
+"Bank Name","Bank Name"
+"Bank Overdraft Account","Yfirdráttarreikningur"
+"Bank Reconciliation","Bank Reconciliation"
+"Bank Reconciliation Detail","Bank Reconciliation Detail"
+"Bank Reconciliation Statement","Bank Reconciliation Statement"
+"Bank Voucher","Bank Voucher"
+"Bank/Cash Balance","Bank/Cash Balance"
+"Banking","Banking"
+"Barcode","Barcode"
+"Barcode {0} already used in Item {1}","Barcode {0} already used in Item {1}"
+"Based On","Based On"
+"Basic","Basic"
+"Basic Info","Basic Info"
+"Basic Information","Basic Information"
+"Basic Rate","Basic Rate"
+"Basic Rate (Company Currency)","Basic Rate (Company Currency)"
+"Batch","Batch"
+"Batch (lot) of an Item.","Batch (lot) of an Item."
+"Batch Finished Date","Batch Finished Date"
+"Batch ID","Batch ID"
+"Batch No","Batch No"
+"Batch Started Date","Batch Started Date"
+"Batch Time Logs for Billing.","Batch Time Logs for Billing."
+"Batch Time Logs for billing.","Batch Time Logs for billing."
+"Batch-Wise Balance History","Batch-Wise Balance History"
+"Batched for Billing","Batched for Billing"
+"Better Prospects","Better Prospects"
+"Bill Date","Bill Date"
+"Bill No","Bill No"
+"Bill of Material","Bill of Material"
+"Bill of Material to be considered for manufacturing","Bill of Material to be considered for manufacturing"
+"Bill of Materials (BOM)","Bill of Materials (BOM)"
+"Billable","Billable"
+"Billed","Billed"
+"Billed Amount","Billed Amount"
+"Billed Amt","Billed Amt"
+"Billing","Billing"
+"Billing (Sales Invoice)","Billing (Sales Invoice)"
+"Billing Address","Billing Address"
+"Billing Address Name","Billing Address Name"
+"Billing Status","Billing Status"
+"Bills raised by Suppliers.","Bills raised by Suppliers."
+"Bills raised to Customers.","Bills raised to Customers."
+"Bin","Bin"
+"Bio","Bio"
+"Biotechnology","Biotechnology"
+"Birthday","Birthday"
+"Block Date","Block Date"
+"Block Days","Block Days"
+"Block Holidays on important days.","Block Holidays on important days."
+"Block leave applications by department.","Block leave applications by department."
+"Blog Post","Blog Post"
+"Blog Subscriber","Blog Subscriber"
+"Blood Group","Blood Group"
+"Both Warehouse must belong to same Company","Both Warehouse must belong to same Company"
+"Box","Box"
+"Branch","Branch"
+"Brand","Brand"
+"Brand Name","Brand Name"
+"Brand master.","Brand master."
+"Brands","Brands"
+"Breakdown","Breakdown"
+"Broadcasting","Broadcasting"
+"Brokerage","Brokerage"
+"Budget","Budget"
+"Budget Allocated","Budget Allocated"
+"Budget Detail","Budget Detail"
+"Budget Details","Budget Details"
+"Budget Distribution","Budget Distribution"
+"Budget Distribution Detail","Budget Distribution Detail"
+"Budget Distribution Details","Budget Distribution Details"
+"Budget Variance Report","Budget Variance Report"
+"Budget cannot be set for Group Cost Centers","Budget cannot be set for Group Cost Centers"
+"Build Report","Build Report"
+"Bundle items at time of sale.","Bundle items at time of sale."
+"Business Development Manager","Business Development Manager"
+"Buyer of Goods and Services.","Buyer of Goods and Services."
+"Buying","Innkaup"
+"Buying & Selling","Buying & Selling"
+"Buying Amount","Buying Amount"
+"Buying Settings","Buying Settings"
+"Buying must be checked, if Applicable For is selected as {0}","Buying must be checked, if Applicable For is selected as {0}"
+"C-Form","C-Form"
+"C-Form Applicable","C-Form Applicable"
+"C-Form Invoice Detail","C-Form Invoice Detail"
+"C-Form No","C-Form No"
+"C-Form records","C-Form records"
+"CENVAT Capital Goods","CENVAT Capital Goods"
+"CENVAT Edu Cess","CENVAT Edu Cess"
+"CENVAT SHE Cess","CENVAT SHE Cess"
+"CENVAT Service Tax","CENVAT Service Tax"
+"CENVAT Service Tax Cess 1","CENVAT Service Tax Cess 1"
+"CENVAT Service Tax Cess 2","CENVAT Service Tax Cess 2"
+"Calculate Based On","Calculate Based On"
+"Calculate Total Score","Calculate Total Score"
+"Calendar Events","Calendar Events"
+"Call","Call"
+"Calls","Calls"
+"Campaign","Campaign"
+"Campaign Name","Campaign Name"
+"Campaign Name is required","Campaign Name is required"
+"Campaign Naming By","Campaign Naming By"
+"Campaign-.####","Campaign-.####"
+"Can be approved by {0}","Can be approved by {0}"
+"Can not filter based on Account, if grouped by Account","Can not filter based on Account, if grouped by Account"
+"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
+"Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'","Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
+"Cancel Material Visit {0} before cancelling this Customer Issue","Cancel Material Visit {0} before cancelling this Customer Issue"
+"Cancel Material Visits {0} before cancelling this Maintenance Visit","Cancel Material Visits {0} before cancelling this Maintenance Visit"
+"Cancelled","Hætt við"
+"Cancelling this Stock Reconciliation will nullify its effect.","Cancelling this Stock Reconciliation will nullify its effect."
+"Cannot Cancel Opportunity as Quotation Exists","Cannot Cancel Opportunity as Quotation Exists"
+"Cannot approve leave as you are not authorized to approve leaves on Block Dates","Cannot approve leave as you are not authorized to approve leaves on Block Dates"
+"Cannot cancel because Employee {0} is already approved for {1}","Cannot cancel because Employee {0} is already approved for {1}"
+"Cannot cancel because submitted Stock Entry {0} exists","Cannot cancel because submitted Stock Entry {0} exists"
+"Cannot carry forward {0}","Cannot carry forward {0}"
+"Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.","Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
+"Cannot convert Cost Center to ledger as it has child nodes","Cannot convert Cost Center to ledger as it has child nodes"
+"Cannot covert to Group because Master Type or Account Type is selected.","Cannot covert to Group because Master Type or Account Type is selected."
+"Cannot deactive or cancle BOM as it is linked with other BOMs","Cannot deactive or cancle BOM as it is linked with other BOMs"
+"Cannot declare as lost, because Quotation has been made.","Cannot declare as lost, because Quotation has been made."
+"Cannot deduct when category is for 'Valuation' or 'Valuation and Total'","Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"
+"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","Cannot delete Serial No {0} in stock. First remove from stock, then delete."
+"Cannot directly set amount. For 'Actual' charge type, use the rate field","Cannot directly set amount. For 'Actual' charge type, use the rate field"
+"Cannot overbill for Item {0} in row {0} more than {1}. To allow overbilling, please set in Stock Settings","Cannot overbill for Item {0} in row {0} more than {1}. To allow overbilling, please set in Stock Settings"
+"Cannot produce more Item {0} than Sales Order quantity {1}","Cannot produce more Item {0} than Sales Order quantity {1}"
+"Cannot refer row number greater than or equal to current row number for this Charge type","Cannot refer row number greater than or equal to current row number for this Charge type"
+"Cannot return more than {0} for Item {1}","Cannot return more than {0} for Item {1}"
+"Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row","Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
+"Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total","Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total"
+"Cannot set as Lost as Sales Order is made.","Cannot set as Lost as Sales Order is made."
+"Cannot set authorization on basis of Discount for {0}","Cannot set authorization on basis of Discount for {0}"
+"Capacity","Capacity"
+"Capacity Units","Capacity Units"
+"Capital Account","Eigið fé"
+"Capital Equipments","Fjárfestingarvara"
+"Carry Forward","Carry Forward"
+"Carry Forwarded Leaves","Carry Forwarded Leaves"
+"Case No(s) already in use. Try from Case No {0}","Case No(s) already in use. Try from Case No {0}"
+"Case No. cannot be 0","Case No. cannot be 0"
+"Cash","Reiðufé"
+"Cash In Hand","Handbært fé"
+"Cash Voucher","Færsla fyrir reiðufé"
+"Cash or Bank Account is mandatory for making payment entry","Reiðufé eða bankareikningur er nauðsynlegur til að gera greiðslu færslu "
+"Cash/Bank Account","Reiðufé/Bankareikningur"
+"Casual Leave","Óformlegt leyfi"
+"Cell Number","Farsímanúmer"
+"Change Abbreviation","Breyta skammstöfun"
+"Change UOM for an Item.","Breyta mælieiningu (UOM) fyrir hlut."
+"Change the starting / current sequence number of an existing series.","Change the starting / current sequence number of an existing series."
+"Channel Partner","Samstarfsaðili"
+"Charge of type 'Actual' in row {0} cannot be included in Item Rate","Charge of type 'Actual' in row {0} cannot be included in Item Rate"
+"Chargeable","Gjaldfærsluhæfur"
+"Charges are updated in Purchase Receipt against each item","Charges are updated in Purchase Receipt against each item"
+"Charges will be distributed proportionately based on item amount","Charges will be distributed proportionately based on item amount"
+"Charity and Donations","Góðgerðarstarfsemi og gjafir"
+"Chart Name","Chart Name"
+"Chart of Accounts","Bókhaldslykill"
+"Chart of Cost Centers","Chart of Cost Centers"
+"Check how the newsletter looks in an email by sending it to your email.","Check how the newsletter looks in an email by sending it to your email."
+"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Check if recurring invoice, uncheck to stop recurring or put proper End Date"
+"Check if recurring order, uncheck to stop recurring or put proper End Date","Check if recurring order, uncheck to stop recurring or put proper End Date"
+"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible."
+"Check if you want to send salary slip in mail to each employee while submitting salary slip","Check if you want to send salary slip in mail to each employee while submitting salary slip"
+"Check this if you want to force the user to select a series before saving. There will be no default if you check this.","Check this if you want to force the user to select a series before saving. There will be no default if you check this."
+"Check this if you want to show in website","Check this if you want to show in website"
+"Check this to disallow fractions. (for Nos)","Check this to disallow fractions. (for Nos)"
+"Check this to pull emails from your mailbox","Check this to pull emails from your mailbox"
+"Check to activate","Hakaðu við til að virkja"
+"Check to make Shipping Address","Check to make Shipping Address"
+"Check to make primary address","Hakaðu við til að gera að aðal heimilisfangi"
+"Chemical","Chemical"
+"Cheque","Ávísun"
+"Cheque Date","Dagsetning ávísunar"
+"Cheque Number","Númer ávísunar"
+"Child account exists for this account. You can not delete this account.","Child account exists for this account. Þú getur ekki eytt þessum reikning."
+"City","Borg"
+"City/Town","Borg/Bær"
+"Claim Amount","Kröfuupphæð"
+"Claims for company expense.","Krafa fyrir kostnað."
+"Class / Percentage","Class / Percentage"
+"Classic","Classic"
+"Classification of Customers by region","Flokkun viðskiptavina eftir svæðum"
+"Clear Table","Hreinsa töflu"
+"Clearance Date","Clearance Date"
+"Clearance Date not mentioned","Clearance Date not mentioned"
+"Clearance date cannot be before check date in row {0}","Clearance date cannot be before check date in row {0}"
+"Click on 'Make Sales Invoice' button to create a new Sales Invoice.","Click on 'Make Sales Invoice' button to create a new Sales Invoice."
+"Click on a link to get options to expand get options ","Click on a link to get options to expand get options "
+"Client","Client"
+"Close","Loka"
+"Close Balance Sheet and book Profit or Loss.","Loka efnahagsreikningi og bóka hagnað eða tap."
+"Closed","Lokað"
+"Closing (Cr)","Closing (Cr)"
+"Closing (Dr)","Closing (Dr)"
+"Closing Account Head","Closing Account Head"
+"Closing Account {0} must be of type 'Liability'","Closing Account {0} must be of type 'Liability'"
+"Closing Date","Closing Date"
+"Closing Fiscal Year","Closing Fiscal Year"
+"CoA Help","CoA Help"
+"Code","Kóði"
+"Cold Calling","Cold Calling"
+"Color","Litur"
+"Column Break","Dálkaskil"
+"Column Break 1","Column Break 1"
+"Comma separated list of email addresses","Kommu aðgreindur listi af netföngum"
+"Comment","Athugasemd"
+"Comments","Athugasemdir"
+"Commercial","Commercial"
+"Commission","Þóknun"
+"Commission Rate","Hlutfall þóknunar"
+"Commission Rate (%)","Hlutfall þóknunar (%)"
+"Commission on Sales","Söluþóknun"
+"Commission rate cannot be greater than 100","Hlutfall þóknunar getur ekki orðið meira en 100"
+"Communication","Samskipti"
+"Communication HTML","HTML samskipti"
+"Communication History","Samskiptasaga"
+"Communication log.","Samskiptaferli."
+"Communications","Samskipti"
+"Company","Fyrirtæki"
+"Company (not Customer or Supplier) master.","Company (not Customer or Supplier) master."
+"Company Abbreviation","Skammstöfun fyrirtækis"
+"Company Details","Fyrirtækjaupplýsingar"
+"Company Email","Netfang fyrirtækis"
+"Company Email ID not found, hence mail not sent","Company Email ID not found, hence mail not sent"
+"Company Info","Fyrirtækjaupplýsingar"
+"Company Name","Nafn fyrirtækis"
+"Company Settings","Stillingar fyrirtækis"
+"Company is missing in warehouses {0}","Fyrirtæki vantar í vörugeymslu {0}"
+"Company is required","Fyrirtæki er krafist"
+"Company registration numbers for your reference. Example: VAT Registration Numbers etc.","Company registration numbers for your reference. Example: VAT Registration Numbers etc."
+"Company registration numbers for your reference. Tax numbers etc.","Company registration numbers for your reference. Tax numbers etc."
+"Company, Month and Fiscal Year is mandatory","Company, Month and Fiscal Year is mandatory"
+"Compensatory Off","Compensatory Off"
+"Complete","Lokið"
+"Complete Setup","Ljúka uppsetningu"
+"Completed","Lokið"
+"Completed Production Orders","Framleiðslupöntunum sem er lokið"
+"Completed Qty","Magn sem er lokið"
+"Completion Date","Lokadagsetning"
+"Completion Status","Completion Status"
+"Computer","Tölva"
+"Computers","Tölvubúnaður"
+"Confirmation Date","Dagsetning staðfestingar"
+"Confirmed orders from Customers.","Staðfestar pantanir frá viðskiptavinum."
+"Consider Tax or Charge for","Consider Tax or Charge for"
+"Considered as Opening Balance","Considered as Opening Balance"
+"Considered as an Opening Balance","Considered as an Opening Balance"
+"Consultant","Ráðgjafi"
+"Consulting","Ráðgjöf"
+"Consumable","Consumable"
+"Consumable Cost","Consumable Cost"
+"Consumable cost per hour","Consumable cost per hour"
+"Consumed","Consumed"
+"Consumed Amount","Consumed Amount"
+"Consumed Qty","Consumed Qty"
+"Consumer Products","Neytandavörur"
+"Contact","Tengiliður"
+"Contact Control","Stjórnun tengiliðar"
+"Contact Desc","Contact Desc"
+"Contact Details","Upplýsingar um tengilið"
+"Contact Email","Tengiliður neffang"
+"Contact HTML","Contact HTML"
+"Contact Info","Upplýsingar um tengilið"
+"Contact Mobile No","Farsímanúmer tengiliðs"
+"Contact Name","NAfn tengiliðs"
+"Contact No.","Nr tengiliðs."
+"Contact Person","Tengiliður"
+"Contact Type","Gerð tengiliðs"
+"Contact master.","Contact master."
+"Contacts","Tengiliðir"
+"Content","Innihald"
+"Content Type","Gerð innihalds"
+"Contra Voucher","Samningsfærsla"
+"Contract","Samningur"
+"Contract End Date","Lokadagur samnings"
+"Contract End Date must be greater than Date of Joining","Lokadagur samnings verður að vera nýrri en dagsetning skráningar"
+"Contribution %","Framlag %"
+"Contribution (%)","Framlag (%)"
+"Contribution Amount","Upphæð framlags"
+"Contribution to Net Total","Framlag til samtals nettó"
+"Conversion Factor","Umreiknistuðull"
+"Conversion Factor is required","Umreiknistuðuls er krafist"
+"Conversion factor cannot be in fractions","Umreiknistuðull getur ekki verið í broti"
+"Conversion factor for default Unit of Measure must be 1 in row {0}","Conversion factor for default Unit of Measure must be 1 in row {0}"
+"Conversion rate cannot be 0 or 1","Conversion rate cannot be 0 or 1"
+"Convert to Group","Convert to Group"
+"Convert to Ledger","Convert to Ledger"
+"Converted","Converted"
+"Copy From Item Group","Copy From Item Group"
+"Cosmetics","Cosmetics"
+"Cost Center","Cost Center"
+"Cost Center Details","Cost Center Details"
+"Cost Center For Item with Item Code '","Cost Center For Item with Item Code '"
+"Cost Center Name","Cost Center Name"
+"Cost Center is required for 'Profit and Loss' account {0}","Cost Center is required for 'Profit and Loss' account {0}"
+"Cost Center is required in row {0} in Taxes table for type {1}","Cost Center is required in row {0} in Taxes table for type {1}"
+"Cost Center with existing transactions can not be converted to group","Cost Center with existing transactions can not be converted to group"
+"Cost Center with existing transactions can not be converted to ledger","Cost Center with existing transactions can not be converted to ledger"
+"Cost Center {0} does not belong to Company {1}","Cost Center {0} does not belong to Company {1}"
+"Cost of Delivered Items","Cost of Delivered Items"
+"Cost of Goods Sold","Kostnaðarverð seldra vara"
+"Cost of Issued Items","Cost of Issued Items"
+"Cost of Purchased Items","Cost of Purchased Items"
+"Costing","Costing"
+"Country","Land"
+"Country Name","Nafn lands"
+"Country wise default Address Templates","Sjálfgefið landstengt heimilisfangasnið"
+"Country, Timezone and Currency","Land, tímabelti og Gjaldmiðill"
+"Cr","Cr"
+"Create Bank Voucher for the total salary paid for the above selected criteria","Stofna færslu í banka fyrir greidd heildarlaun með völdum viðmiðum að ofan"
+"Create Customer","Stofna viðskiptavin"
+"Create Material Requests","Create Material Requests"
+"Create New","Create New"
+"Create Opportunity","Create Opportunity"
+"Create Payment Entries against Orders or Invoices.","Create Payment Entries against Orders or Invoices."
+"Create Production Orders","Create Production Orders"
+"Create Quotation","Create Quotation"
+"Create Receiver List","Create Receiver List"
+"Create Salary Slip","Create Salary Slip"
+"Create Stock Ledger Entries when you submit a Sales Invoice","Create Stock Ledger Entries when you submit a Sales Invoice"
+"Create and Send Newsletters","Create and Send Newsletters"
+"Create and manage daily, weekly and monthly email digests.","Create and manage daily, weekly and monthly email digests."
+"Create rules to restrict transactions based on values.","Create rules to restrict transactions based on values."
+"Created By","Stofnað af"
+"Creates salary slip for above mentioned criteria.","Creates salary slip for above mentioned criteria."
+"Creation Date","Creation Date"
+"Creation Document No","Creation Document No"
+"Creation Document Type","Creation Document Type"
+"Creation Time","Creation Time"
+"Credentials","Credentials"
+"Credit","Credit"
+"Credit Amt","Credit Amt"
+"Credit Card","Credit Card"
+"Credit Card Voucher","Credit Card Voucher"
+"Credit Controller","Credit Controller"
+"Credit Days","Credit Days"
+"Credit Limit","Credit Limit"
+"Credit Note","Credit Note"
+"Credit To","Credit To"
+"Cross Listing of Item in multiple groups","Cross Listing of Item in multiple groups"
+"Currency","Currency"
+"Currency Exchange","Currency Exchange"
+"Currency Name","Currency Name"
+"Currency Settings","Currency Settings"
+"Currency and Price List","Currency and Price List"
+"Currency exchange rate master.","Currency exchange rate master."
+"Current Address","Current Address"
+"Current Address Is","Current Address Is"
+"Current Assets","Veltufjármunir"
+"Current BOM","Current BOM"
+"Current BOM and New BOM can not be same","Current BOM and New BOM can not be same"
+"Current Fiscal Year","Current Fiscal Year"
+"Current Liabilities","Skammtímaskuldir"
+"Current Stock","Núverandi birgðir"
+"Current Stock UOM","Current Stock UOM"
+"Current Value","Current Value"
+"Custom","Custom"
+"Custom Autoreply Message","Custom Autoreply Message"
+"Custom Message","Custom Message"
+"Customer","Viðskiptavinur"
+"Customer (Receivable) Account","Viðskiptavinur (kröfu) reikningur"
+"Customer / Item Name","Viðskiptavinur / Nafn hlutar"
+"Customer / Lead Address","Viðskiptavinur / Heimilisfang ábendingar"
+"Customer / Lead Name","Viðskiptavinur / Nafn ábendingar"
+"Customer > Customer Group > Territory","Viðskiptavinur > Viðskiptavinaflokkur > Svæði"
+"Customer Account","Viðskiptareikningur"
+"Customer Account Head","Customer Account Head"
+"Customer Acquisition and Loyalty","Customer Acquisition and Loyalty"
+"Customer Address","Customer Address"
+"Customer Addresses And Contacts","Customer Addresses And Contacts"
+"Customer Addresses and Contacts","Customer Addresses and Contacts"
+"Customer Code","Customer Code"
+"Customer Codes","Customer Codes"
+"Customer Details","Customer Details"
+"Customer Feedback","Customer Feedback"
+"Customer Group","Customer Group"
+"Customer Group / Customer","Customer Group / Customer"
+"Customer Group Name","Customer Group Name"
+"Customer Id","Customer Id"
+"Customer Intro","Customer Intro"
+"Customer Issue","Customer Issue"
+"Customer Issue against Serial No.","Customer Issue against Serial No."
+"Customer Name","Customer Name"
+"Customer Naming By","Customer Naming By"
+"Customer Service","Customer Service"
+"Customer database.","Customer database."
+"Customer is required","Customer is required"
+"Customer master.","Customer master."
+"Customer required for 'Customerwise Discount'","Customer required for 'Customerwise Discount'"
+"Customer {0} does not belong to project {1}","Customer {0} does not belong to project {1}"
+"Customer {0} does not exist","Customer {0} does not exist"
+"Customer's Item Code","Customer's Item Code"
+"Customer's Purchase Order Date","Customer's Purchase Order Date"
+"Customer's Purchase Order No","Customer's Purchase Order No"
+"Customer's Purchase Order Number","Customer's Purchase Order Number"
+"Customer's Vendor","Customer's Vendor"
+"Customers Not Buying Since Long Time","Customers Not Buying Since Long Time"
+"Customers Not Buying Since Long Time ","Customers Not Buying Since Long Time "
+"Customerwise Discount","Customerwise Discount"
+"Customize"," Sérsníða"
+"Customize the Notification","Sérsníða tilkynninguna"
+"Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.","Aðlaga inngangs texta sem fer sem hluti af tölvupóstinum. Hver viðskipti eru með sérstakan inngangs texta."
+"DN Detail","DN Detail"
+"Daily","Daglega"
+"Daily Time Log Summary","Daily Time Log Summary"
+"Database Folder ID","Database Folder ID"
+"Database of potential customers.","Database of potential customers."
+"Date","Dagsetning"
+"Date Format","Dagsetningarsnið"
+"Date Of Retirement","Dagsetning starfsloka"
+"Date Of Retirement must be greater than Date of Joining","Dagsetning starfsloka verður að vera nýrri en dagsetning skráningar"
+"Date is repeated","Dagsetningin er endurtekin"
+"Date of Birth","Fæðingardagur"
+"Date of Issue","Date of Issue"
+"Date of Joining","Dagsetning skráningar"
+"Date of Joining must be greater than Date of Birth","Dagsetning skráningar verður að vera nýrri en fæðingardagur"
+"Date on which lorry started from supplier warehouse","Þann dag sem vöruflutningabifreið byrjaði frá vörugeymslu birgja"
+"Date on which lorry started from your warehouse","Þann dag sem vöruflutningabifreið byrjaði frá eigin vörugeymslu"
+"Dates","Dagsetningar"
+"Days Since Last Order","Dagar frá síðustu pöntun"
+"Days for which Holidays are blocked for this department.","Dagar sem frídagar eru lokaðir fyrir þessa deild."
+"Dealer","Söluaðili"
+"Debit","Debet"
+"Debit Amt","Debet upphæð"
+"Debit Note","Debit Note"
+"Debit To","Debet á"
+"Debit and Credit not equal for this voucher. Difference is {0}.","Debet og kredit eru ekki jöfn fyrir þetta fylgiskjal. Mismunurinn er {0}."
+"Deduct","Draga frá"
+"Deduction","Frádráttur"
+"Deduction Type","Gerð frádráttar"
+"Deduction1","Frádráttur1"
+"Deductions","Frádrættir"
+"Default","Sjálfgefið"
+"Default Account","Sjálfgefinn reikningur"
+"Default Address Template cannot be deleted","Sjálfgefið heimilisfangasnið er ekki hægt að eyða"
+"Default Amount","Sjálfgefin upphæð"
+"Default BOM","Sjálfgefinn efnislisti"
+"Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.","Sjálfgefinn banki / Sjóðreikningur verður sjálfkrafa uppfærður í verslunarkerfi (POS) reikning þegar þessi háttur er valinn."
+"Default Bank Account","Sjálfgefinn bankareikningur"
+"Default Buying Cost Center","Default Buying Cost Center"
+"Default Buying Price List","Sjálfgefinn innkaupaverðlisti"
+"Default Cash Account","Sjálfgefinn sjóðreikningur"
+"Default Company","Sjálfgefið fyrirtæki"
+"Default Cost Center","Default Cost Center"
+"Default Currency","Sjálfgefinn gjaldmiðill"
+"Default Customer Group","Sjálfgefinn viðskiptavinaflokkur"
+"Default Expense Account","Sjálfgefinn kostnaðarreikningur"
+"Default Income Account","Sjálfgefinn tekjureikningur"
+"Default Item Group","Default Item Group"
+"Default Price List","Sjálfgefinn verðlisti"
+"Default Purchase Account in which cost of the item will be debited.","Default Purchase Account in which cost of the item will be debited."
+"Default Selling Cost Center","Default Selling Cost Center"
+"Default Settings","Sjálfgefnar stillingar"
+"Default Source Warehouse","Sjálfgefið uppruna vörugeymslu"
+"Default Stock UOM","sjálfgefin birgðamælieining"
+"Default Supplier","Sjálfgefinn birgir"
+"Default Supplier Type","Sjálfgefin gerð birgja"
+"Default Target Warehouse","Default Target Warehouse"
+"Default Territory","Sjálfgefið svæði"
+"Default Unit of Measure","Sjálfgefin mælieining"
+"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module."
+"Default Valuation Method","Sjálfgefin verðmatsaðferð"
+"Default Warehouse","Sjálfgefin vörugeymsla"
+"Default Warehouse is mandatory for stock Item.","Default Warehouse is mandatory for stock Item."
+"Default settings for accounting transactions.","Default settings for accounting transactions."
+"Default settings for buying transactions.","Default settings for buying transactions."
+"Default settings for selling transactions.","Default settings for selling transactions."
+"Default settings for stock transactions.","Default settings for stock transactions."
+"Defense","Defense"
+"Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>"
+"Del","Eyða"
+"Delete","Eyða"
+"Delete {0} {1}?","Eyða {0} {1}?"
+"Delivered","Afhent"
+"Delivered Amount","Afhent upphæð"
+"Delivered Items To Be Billed","Afhent atriði til innheimtu"
+"Delivered Qty","Afhent magn"
+"Delivered Serial No {0} cannot be deleted","Afhent raðnúmer {0} ekki hægt að eyða"
+"Delivery Date","Afhendingardagsetning"
+"Delivery Details","Afhendingarupplýsingar"
+"Delivery Document No","Nr afhendingarskjals"
+"Delivery Document Type","Gerð afhendingarskjals"
+"Delivery Note","Afhendingarseðill"
+"Delivery Note Item","Atriði á afhendingarseðli"
+"Delivery Note Items","Atriði á afhendingarseðli"
+"Delivery Note Message","Skilaboð á afhendingarseðli"
+"Delivery Note No","Númer afhendingarseðils"
+"Delivery Note Required","Afhendingarseðils krafist"
+"Delivery Note Trends","Afhendingarseðilsþróun"
+"Delivery Note {0} is not submitted","Afheningarseðill {0} er ekki skilað"
+"Delivery Note {0} must not be submitted","Afhendingarseðill {0} má ekki skila"
+"Delivery Note/Sales Invoice","Afhedingarseðill/Sölureikningur"
+"Delivery Notes {0} must be cancelled before cancelling this Sales Order","Afhendingarseðlar {0} verður að fella niður áður en hægt er að fella niður sölupöntunina"
+"Delivery Status","Afhendingarstaða"
+"Delivery Time","Afheningartími"
+"Delivery To","Afhending til"
+"Department","Deild"
+"Department Stores","Stórverslanir"
+"Depends on LWP","Depends on LWP"
+"Depreciation","Afskriftir"
+"Description","Lýsing"
+"Description HTML","HTML lýsing"
+"Description of a Job Opening","Lýsing á lausu starfi"
+"Designation","Merking"
+"Designer","Hönnuður"
+"Detailed Breakup of the totals","Ítarlegar heildarniðurstöður"
+"Details","Upplýsingar"
+"Difference (Dr - Cr)","Mismunur (Dr - Cr)"
+"Difference Account","Difference Account"
+"Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry"
+"Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.","Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM."
+"Direct Expenses","Beinn kostnaður"
+"Direct Income","Beinar tekjur"
+"Disable","Gera óvirkt"
+"Disable Rounded Total","Gera óvirkt rúnnuð alls"
+"Disabled","Óvirkur"
+"Discount","Afsláttur"
+"Discount  %","Afsláttur  %"
+"Discount %","Afsláttur %"
+"Discount (%)","Afsláttur (%)"
+"Discount Amount","Afsláttarupphæð"
+"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice"
+"Discount Percentage","Afsláttarprósenta"
+"Discount Percentage can be applied either against a Price List or for all Price List.","Afsláttarprósenta er hægt að nota annaðhvort á verðlista eða fyrir alla verðlista."
+"Discount must be less than 100","Afsláttur verður að vera minni en 100"
+"Discount(%)","Afsláttur(%)"
+"Dispatch","Senda"
+"Display all the individual items delivered with the main items","Display all the individual items delivered with the main items"
+"Distinct unit of an Item","Distinct unit of an Item"
+"Distribution","Dreifing"
+"Distribution Id","Distribution Id"
+"Distribution Name","Dreifingarnafn"
+"Distributor","Dreifingaraðili "
+"Divorced","Fráskilinn"
+"Do Not Contact","Ekki hafa samband"
+"Do not show any symbol like $ etc next to currencies.","Ekki sýna tákn eins og $ o. s. frv. við hliðina á gjaldmiðlum."
+"Do really want to unstop production order: ","Do really want to unstop production order: "
+"Do you really want to STOP ","Viltu örugglega hætta "
+"Do you really want to STOP this Material Request?","Do you really want to STOP this Material Request?"
+"Do you really want to Submit all Salary Slip for month {0} and year {1}","Do you really want to Submit all Salary Slip for month {0} and year {1}"
+"Do you really want to UNSTOP ","Do you really want to UNSTOP "
+"Do you really want to UNSTOP this Material Request?","Do you really want to UNSTOP this Material Request?"
+"Do you really want to stop production order: ","Viltu hætta við framleiðslu pöntun: "
+"Doc Name","Nafn skjals"
+"Doc Type","Gerð skjals"
+"Document Description","Lýsing á skjali"
+"Document Type","Skjalagerð"
+"Documents","Skjöl"
+"Domain","Domain"
+"Don't send Employee Birthday Reminders","Don't send Employee Birthday Reminders"
+"Download Materials Required","Download Materials Required"
+"Download Reconcilation Data","Download Reconcilation Data"
+"Download Template","Sækja snið"
+"Download a report containing all raw materials with their latest inventory status","Download a report containing all raw materials with their latest inventory status"
+"Download the Template, fill appropriate data and attach the modified file.","Download the Template, fill appropriate data and attach the modified file."
+"Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records"
+"Dr","Dr"
+"Draft","Draft"
+"Dropbox","Dropbox"
+"Dropbox Access Allowed","Dropbox Access Allowed"
+"Dropbox Access Key","Dropbox Access Key"
+"Dropbox Access Secret","Dropbox Access Secret"
+"Due Date","Due Date"
+"Due Date cannot be after {0}","Due Date cannot be after {0}"
+"Due Date cannot be before Posting Date","Due Date cannot be before Posting Date"
+"Duplicate Entry. Please check Authorization Rule {0}","Duplicate Entry. Please check Authorization Rule {0}"
+"Duplicate Serial No entered for Item {0}","Duplicate Serial No entered for Item {0}"
+"Duplicate entry","Duplicate entry"
+"Duplicate row {0} with same {1}","Duplicate row {0} with same {1}"
+"Duties and Taxes","Virðisaukaskattur"
+"ERPNext Setup","ERPNext uppsetning"
+"Earliest","Earliest"
+"Earnest Money","Fyrirframgreiðslur"
+"Earning","Earning"
+"Earning & Deduction","Earning & Deduction"
+"Earning Type","Earning Type"
+"Earning1","Earning1"
+"Edit","Breyta"
+"Edu. Cess on Excise","Edu. Cess on Excise"
+"Edu. Cess on Service Tax","Edu. Cess on Service Tax"
+"Edu. Cess on TDS","Edu. Cess on TDS"
+"Education","Menntun"
+"Educational Qualification","Menntun og hæfi"
+"Educational Qualification Details","Menntun og hæfisupplýsingar"
+"Eg. smsgateway.com/api/send_sms.cgi","Eg. smsgateway.com/api/send_sms.cgi"
+"Either debit or credit amount is required for {0}","Either debit or credit amount is required for {0}"
+"Either target qty or target amount is mandatory","Either target qty or target amount is mandatory"
+"Either target qty or target amount is mandatory.","Either target qty or target amount is mandatory."
+"Electrical","Electrical"
+"Electricity Cost","Electricity Cost"
+"Electricity cost per hour","Electricity cost per hour"
+"Electronics","Electronics"
+"Email","Tölvupóstur"
+"Email Digest","Samantekt tölvupósts"
+"Email Digest Settings","Stillingar samantekt tölvupósts"
+"Email Digest: ","Samantekt tölvupósts: "
+"Email Id","Netfang"
+"Email Id where a job applicant will email e.g. ""jobs@example.com""","Netfang þar sem atvinnu umsækjandi sendir tölvupóst t.d. ""jobs@example.com"""
+"Email Notifications","Tölvupósts tilkynningar"
+"Email Sent?","Tölvupóstur sendur?"
+"Email Settings for Outgoing and Incoming Emails.","Tölvupósts stillingar fyrir sendan og móttekin tölvupóst."
+"Email id must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
+"Email ids separated by commas.","Netföng aðskilin með kommu."
+"Email settings for jobs email id ""jobs@example.com""","Email settings for jobs email id ""jobs@example.com"""
+"Email settings to extract Leads from sales email id e.g. ""sales@example.com""","Email settings to extract Leads from sales email id e.g. ""sales@example.com"""
+"Emergency Contact","Neyðartengiliður"
+"Emergency Contact Details","Upplýsingar um neyðartengilið"
+"Emergency Phone","Neyðarsímanúmer"
+"Employee","Starfsmaður"
+"Employee Birthday","Afmælisdagur starfsmanns"
+"Employee Details","Upplýsingar um starfsmann"
+"Employee Education","Starfsmenntun"
+"Employee External Work History","Employee External Work History"
+"Employee Information","Upplýsingar um starfsmann"
+"Employee Internal Work History","Employee Internal Work History"
+"Employee Internal Work Historys","Employee Internal Work Historys"
+"Employee Leave Approver","Employee Leave Approver"
+"Employee Leave Balance","Employee Leave Balance"
+"Employee Name","Nafn starfsmanns"
+"Employee Number","Númer starfsmanns"
+"Employee Records to be created by","Employee Records to be created by"
+"Employee Settings","Stillingar starfsmanns"
+"Employee Type","Gerð starfsmanns"
+"Employee can not be changed","Ekki hægt að breyta starfsmanni"
+"Employee designation (e.g. CEO, Director etc.).","Employee designation (e.g. CEO, Director etc.)."
+"Employee master.","Employee master."
+"Employee record is created using selected field. ","Employee record is created using selected field. "
+"Employee records.","Stafsmannafærslur."
+"Employee relieved on {0} must be set as 'Left'","Employee relieved on {0} must be set as 'Left'"
+"Employee {0} has already applied for {1} between {2} and {3}","Employee {0} has already applied for {1} between {2} and {3}"
+"Employee {0} is not active or does not exist","Employee {0} is not active or does not exist"
+"Employee {0} was on leave on {1}. Cannot mark attendance.","Employee {0} was on leave on {1}. Cannot mark attendance."
+"Employees Email Id","Employees Email Id"
+"Employment Details","Employment Details"
+"Employment Type","Employment Type"
+"Enable / disable currencies.","Enable / disable currencies."
+"Enabled","Enabled"
+"Encashment Date","Encashment Date"
+"End Date","End Date"
+"End Date can not be less than Start Date","End Date can not be less than Start Date"
+"End date of current invoice's period","End date of current invoice's period"
+"End date of current order's period","End date of current order's period"
+"End of Life","End of Life"
+"Energy","Energy"
+"Engineer","Engineer"
+"Enter Verification Code","Enter Verification Code"
+"Enter campaign name if the source of lead is campaign.","Enter campaign name if the source of lead is campaign."
+"Enter department to which this Contact belongs","Enter department to which this Contact belongs"
+"Enter designation of this Contact","Enter designation of this Contact"
+"Enter email id separated by commas, invoice will be mailed automatically on particular date","Enter email id separated by commas, invoice will be mailed automatically on particular date"
+"Enter email id separated by commas, order will be mailed automatically on particular date","Enter email id separated by commas, order will be mailed automatically on particular date"
+"Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.","Enter items and planned qty for which you want to raise production orders or download raw materials for analysis."
+"Enter name of campaign if source of enquiry is campaign","Enter name of campaign if source of enquiry is campaign"
+"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
+"Enter the company name under which Account Head will be created for this Supplier","Enter the company name under which Account Head will be created for this Supplier"
+"Enter url parameter for message","Enter url parameter for message"
+"Enter url parameter for receiver nos","Enter url parameter for receiver nos"
+"Entertainment & Leisure","Entertainment & Leisure"
+"Entertainment Expenses","Risna"
+"Entries","Entries"
+"Entries against ","Entries against "
+"Entries are not allowed against this Fiscal Year if the year is closed.","Entries are not allowed against this Fiscal Year if the year is closed."
+"Equity","Eigið fé"
+"Error: {0} > {1}","Error: {0} > {1}"
+"Estimated Material Cost","Estimated Material Cost"
+"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+"Everyone can read","Everyone can read"
+"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank."
+"Exchange Rate","Exchange Rate"
+"Excise Duty 10","Excise Duty 10"
+"Excise Duty 14","Excise Duty 14"
+"Excise Duty 4","Excise Duty 4"
+"Excise Duty 8","Excise Duty 8"
+"Excise Duty @ 10","Excise Duty @ 10"
+"Excise Duty @ 14","Excise Duty @ 14"
+"Excise Duty @ 4","Excise Duty @ 4"
+"Excise Duty @ 8","Excise Duty @ 8"
+"Excise Duty Edu Cess 2","Excise Duty Edu Cess 2"
+"Excise Duty SHE Cess 1","Excise Duty SHE Cess 1"
+"Excise Page Number","Excise Page Number"
+"Excise Voucher","Excise Voucher"
+"Execution","Execution"
+"Executive Search","Executive Search"
+"Exhibition","Exhibition"
+"Existing Customer","Existing Customer"
+"Exit","Exit"
+"Exit Interview Details","Exit Interview Details"
+"Expected","Expected"
+"Expected Completion Date can not be less than Project Start Date","Expected Completion Date can not be less than Project Start Date"
+"Expected Date cannot be before Material Request Date","Expected Date cannot be before Material Request Date"
+"Expected Delivery Date","Expected Delivery Date"
+"Expected Delivery Date cannot be before Purchase Order Date","Expected Delivery Date cannot be before Purchase Order Date"
+"Expected Delivery Date cannot be before Sales Order Date","Expected Delivery Date cannot be before Sales Order Date"
+"Expected End Date","Expected End Date"
+"Expected Start Date","Expected Start Date"
+"Expected balance as per bank","Expected balance as per bank"
+"Expense","Kostnaður"
+"Expense / Difference account ({0}) must be a 'Profit or Loss' account","Expense / Difference account ({0}) must be a 'Profit or Loss' account"
+"Expense Account","Expense Account"
+"Expense Account is mandatory","Expense Account is mandatory"
+"Expense Approver","Expense Approver"
+"Expense Claim","Expense Claim"
+"Expense Claim Approved","Expense Claim Approved"
+"Expense Claim Approved Message","Expense Claim Approved Message"
+"Expense Claim Detail","Expense Claim Detail"
+"Expense Claim Details","Expense Claim Details"
+"Expense Claim Rejected","Expense Claim Rejected"
+"Expense Claim Rejected Message","Expense Claim Rejected Message"
+"Expense Claim Type","Expense Claim Type"
+"Expense Claim has been approved.","Expense Claim has been approved."
+"Expense Claim has been rejected.","Expense Claim has been rejected."
+"Expense Claim is pending approval. Only the Expense Approver can update status.","Expense Claim is pending approval. Only the Expense Approver can update status."
+"Expense Date","Expense Date"
+"Expense Details","Expense Details"
+"Expense Head","Expense Head"
+"Expense account is mandatory for item {0}","Expense account is mandatory for item {0}"
+"Expense or Difference account is mandatory for Item {0} as it impacts overall stock value","Expense or Difference account is mandatory for Item {0} as it impacts overall stock value"
+"Expenses","Rekstrargjöld"
+"Expenses Booked","Bókfærð rekstrargjöld"
+"Expenses Included In Valuation","Kostnaður við birgðamat"
+"Expenses booked for the digest period","Expenses booked for the digest period"
+"Expired","Expired"
+"Expiry","Expiry"
+"Expiry Date","Expiry Date"
+"Exports","Exports"
+"External","External"
+"Extract Emails","Extract Emails"
+"FCFS Rate","FCFS Rate"
+"Failed: ","Failed: "
+"Family Background","Family Background"
+"Fax","Fax"
+"Features Setup","Features Setup"
+"Feed","Feed"
+"Feed Type","Feed Type"
+"Feedback","Feedback"
+"Female","Female"
+"Fetch exploded BOM (including sub-assemblies)","Fetch exploded BOM (including sub-assemblies)"
+"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Field available in Delivery Note, Quotation, Sales Invoice, Sales Order"
+"Files Folder ID","Files Folder ID"
+"Fill the form and save it","Fill the form and save it"
+"Filter based on customer","Filter based on customer"
+"Filter based on item","Filter based on item"
+"Financial / accounting year.","Financial / accounting year."
+"Financial Analytics","Fjárhagsgreiningar"
+"Financial Chart of Accounts. Imported from file.","Financial Chart of Accounts. Imported from file."
+"Financial Services","Financial Services"
+"Financial Year End Date","Financial Year End Date"
+"Financial Year Start Date","Financial Year Start Date"
+"Finished Goods","Fullunnar vörur"
+"First Name","First Name"
+"First Responded On","First Responded On"
+"Fiscal Year","Fiscal Year"
+"Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}","Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}"
+"Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart.","Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart."
+"Fiscal Year Start Date should not be greater than Fiscal Year End Date","Fiscal Year Start Date should not be greater than Fiscal Year End Date"
+"Fiscal Year {0} not found.","Fiscal Year {0} not found."
+"Fixed Asset","Fastafjármunir"
+"Fixed Assets","Fastafjármunir"
+"Fixed Cycle Cost","Fixed Cycle Cost"
+"Fold","Fold"
+"Follow via Email","Follow via Email"
+"Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.","Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items."
+"Food","Food"
+"Food, Beverage & Tobacco","Food, Beverage & Tobacco"
+"For 'Sales BOM' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Sales BOM' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
+"For Company","For Company"
+"For Employee","For Employee"
+"For Employee Name","For Employee Name"
+"For Price List","For Price List"
+"For Production","For Production"
+"For Reference Only.","For Reference Only."
+"For Sales Invoice","For Sales Invoice"
+"For Server Side Print Formats","For Server Side Print Formats"
+"For Supplier","For Supplier"
+"For Warehouse","For Warehouse"
+"For Warehouse is required before Submit","For Warehouse is required before Submit"
+"For e.g. 2012, 2012-13","For e.g. 2012, 2012-13"
+"For reference","For reference"
+"For reference only.","For reference only."
+"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+"For {0}, only credit entries can be linked against another debit entry","For {0}, only credit entries can be linked against another debit entry"
+"For {0}, only debit entries can be linked against another credit entry","For {0}, only debit entries can be linked against another credit entry"
+"Fraction","Fraction"
+"Fraction Units","Fraction Units"
+"Freeze Stock Entries","Freeze Stock Entries"
+"Freeze Stocks Older Than [Days]","Freeze Stocks Older Than [Days]"
+"Freight and Forwarding Charges","Burðargjöld"
+"Friday","Föstudagur"
+"From","Frá"
+"From Bill of Materials","From Bill of Materials"
+"From Company","From Company"
+"From Currency","From Currency"
+"From Currency and To Currency cannot be same","From Currency and To Currency cannot be same"
+"From Customer","From Customer"
+"From Customer Issue","From Customer Issue"
+"From Date","Upphafsdagur"
+"From Date cannot be greater than To Date","Upphfsdagur verður að vera nýrri en lokadagur"
+"From Date must be before To Date","From Date must be before To Date"
+"From Date should be within the Fiscal Year. Assuming From Date = {0}","From Date should be within the Fiscal Year. Assuming From Date = {0}"
+"From Datetime","From Datetime"
+"From Delivery Note","From Delivery Note"
+"From Employee","From Employee"
+"From Lead","From Lead"
+"From Maintenance Schedule","From Maintenance Schedule"
+"From Material Request","From Material Request"
+"From Opportunity","From Opportunity"
+"From Package No.","From Package No."
+"From Purchase Order","From Purchase Order"
+"From Purchase Receipt","From Purchase Receipt"
+"From Quotation","From Quotation"
+"From Sales Order","From Sales Order"
+"From Supplier Quotation","From Supplier Quotation"
+"From Time","From Time"
+"From Value","From Value"
+"From and To dates required","From and To dates required"
+"From value must be less than to value in row {0}","From value must be less than to value in row {0}"
+"Frozen","Frozen"
+"Frozen Accounts Modifier","Frozen Accounts Modifier"
+"Fulfilled","Fulfilled"
+"Full Name","Full Name"
+"Full-time","Full-time"
+"Fully Billed","Fully Billed"
+"Fully Completed","Fully Completed"
+"Fully Delivered","Fully Delivered"
+"Furniture and Fixture","Skrifstofuáhöld"
+"Further accounts can be made under Groups but entries can be made against Ledger","Further accounts can be made under Groups but entries can be made against Ledger"
+"Further accounts can be made under Groups, but entries can be made against Ledger","Further accounts can be made under Groups, but entries can be made against Ledger"
+"Further nodes can be only created under 'Group' type nodes","Further nodes can be only created under 'Group' type nodes"
+"GL Entry","GL Entry"
+"Gantt Chart","Gantt Chart"
+"Gantt chart of all tasks.","Gantt chart of all tasks."
+"Gender","Gender"
+"General","General"
+"General Ledger","Aðalbók"
+"General Settings","General Settings"
+"Generate Description HTML","Generate Description HTML"
+"Generate Material Requests (MRP) and Production Orders.","Generate Material Requests (MRP) and Production Orders."
+"Generate Salary Slips","Generate Salary Slips"
+"Generate Schedule","Generate Schedule"
+"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+"Generates HTML to include selected image in the description","Generates HTML to include selected image in the description"
+"Get Advances Paid","Get Advances Paid"
+"Get Advances Received","Get Advances Received"
+"Get Current Stock","Get Current Stock"
+"Get Items","Get Items"
+"Get Items From Purchase Receipts","Get Items From Purchase Receipts"
+"Get Items From Sales Orders","Get Items From Sales Orders"
+"Get Items from BOM","Get Items from BOM"
+"Get Last Purchase Rate","Get Last Purchase Rate"
+"Get Outstanding Invoices","Get Outstanding Invoices"
+"Get Outstanding Vouchers","Get Outstanding Vouchers"
+"Get Relevant Entries","Get Relevant Entries"
+"Get Sales Orders","Get Sales Orders"
+"Get Specification Details","Get Specification Details"
+"Get Stock and Rate","Get Stock and Rate"
+"Get Template","Get Template"
+"Get Terms and Conditions","Get Terms and Conditions"
+"Get Unreconciled Entries","Get Unreconciled Entries"
+"Get Weekly Off Dates","Get Weekly Off Dates"
+"Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.","Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos."
+"Global Defaults","Global Defaults"
+"Global POS Setting {0} already created for company {1}","Global POS Setting {0} already created for company {1}"
+"Global Settings","Altækar stillingar"
+"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type ""Bank""","Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type ""Bank"""
+"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate."
+"Goal","Goal"
+"Goals","Goals"
+"Goods received from Suppliers.","Goods received from Suppliers."
+"Google Drive","Google Drive"
+"Google Drive Access Allowed","Google Drive Access Allowed"
+"Government","Government"
+"Graduate","Graduate"
+"Grand Total","Grand Total"
+"Grand Total (Company Currency)","Grand Total (Company Currency)"
+"Grid ""","Grid """
+"Grocery","Grocery"
+"Gross Margin %","Gross Margin %"
+"Gross Margin Value","Gross Margin Value"
+"Gross Pay","Gross Pay"
+"Gross Pay + Arrear Amount +Encashment Amount - Total Deduction","Gross Pay + Arrear Amount +Encashment Amount - Total Deduction"
+"Gross Profit","Heildarhagnaður"
+"Gross Profit %","Heildarhagnaður %"
+"Gross Profit (%)","Heildarhagnaður % (%)"
+"Gross Weight","Heildarþyngd"
+"Gross Weight UOM","Heildarþyngd mælieiningar (UOM)"
+"Group","Group"
+"Group Node","Group Node"
+"Group by Account","Flokka eftir reikningi"
+"Group by Voucher","Flokka eftir fylgiskjali"
+"Group or Ledger","Group or Ledger"
+"Groups","Groups"
+"Guest","Guest"
+"HR Manager","HR Manager"
+"HR Settings","HR Settings"
+"HR User","HR User"
+"HTML / Banner that will show on the top of product list.","HTML / Banner that will show on the top of product list."
+"Half Day","Half Day"
+"Half Yearly","Half Yearly"
+"Half-yearly","Half-yearly"
+"Happy Birthday!","Happy Birthday!"
+"Hardware","Hardware"
+"Has Batch No","Has Batch No"
+"Has Child Node","Has Child Node"
+"Has Serial No","Has Serial No"
+"Head of Marketing and Sales","Head of Marketing and Sales"
+"Header","Header"
+"Heads (or groups) against which Accounting Entries are made and balances are maintained.","Heads (or groups) against which Accounting Entries are made and balances are maintained."
+"Health Care","Health Care"
+"Health Concerns","Health Concerns"
+"Health Details","Health Details"
+"Held On","Held On"
+"Help HTML","Help HTML"
+"Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")"
+"Here you can maintain family details like name and occupation of parent, spouse and children","Here you can maintain family details like name and occupation of parent, spouse and children"
+"Here you can maintain height, weight, allergies, medical concerns etc","Here you can maintain height, weight, allergies, medical concerns etc"
+"Hide Currency Symbol","Hide Currency Symbol"
+"High","High"
+"History In Company","History In Company"
+"Hold","Hold"
+"Holiday","Frí"
+"Holiday List","Listi yfir frí"
+"Holiday List Name","Nafn á lista yfir frí"
+"Holiday master.","Holiday master."
+"Holidays","Frídagar"
+"Home","Heim"
+"Host","Host"
+"Host, Email and Password required if emails are to be pulled","Host, Email and Password required if emails are to be pulled"
+"Hour","Klukkustund"
+"Hour Rate","Tímagjald"
+"Hour Rate Labour","Tímagjald vinna"
+"Hours","Klukkustundir"
+"How Pricing Rule is applied?","How Pricing Rule is applied?"
+"How frequently?","Hversu oft?"
+"How should this currency be formatted? If not set, will use system defaults","Hvernig ætti þessi gjaldmiðill að vera sniðinn? Ef ekki sett, mun nota sjálfgefna kerfisstillingu"
+"Human Resources","Mannauður"
+"Identification of the package for the delivery (for print)","Identification of the package for the delivery (for print)"
+"If Income or Expense","If Income or Expense"
+"If Monthly Budget Exceeded","If Monthly Budget Exceeded"
+"If Supplier Part Number exists for given Item, it gets stored here","If Supplier Part Number exists for given Item, it gets stored here"
+"If Yearly Budget Exceeded","If Yearly Budget Exceeded"
+"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material."
+"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day"
+"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
+"If different than customer address","If different than customer address"
+"If disable, 'Rounded Total' field will not be visible in any transaction","If disable, 'Rounded Total' field will not be visible in any transaction"
+"If enabled, the system will post accounting entries for inventory automatically.","If enabled, the system will post accounting entries for inventory automatically."
+"If more than one package of the same type (for print)","If more than one package of the same type (for print)"
+"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+"If no change in either Quantity or Valuation Rate, leave the cell blank.","If no change in either Quantity or Valuation Rate, leave the cell blank."
+"If not checked, the list will have to be added to each Department where it has to be applied.","If not checked, the list will have to be added to each Department where it has to be applied."
+"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+"If specified, send the newsletter using this email address","If specified, send the newsletter using this email address"
+"If the account is frozen, entries are allowed to restricted users.","If the account is frozen, entries are allowed to restricted users."
+"If this Account represents a Customer, Supplier or Employee, set it here.","If this Account represents a Customer, Supplier or Employee, set it here."
+"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+"If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt","If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt"
+"If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity","If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity"
+"If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.","If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below."
+"If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.","If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below."
+"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page"
+"If you involve in manufacturing activity. Enables Item 'Is Manufactured'","If you involve in manufacturing activity. Enables Item 'Is Manufactured'"
+"Ignore","Ignore"
+"Ignore Pricing Rule","Ignore Pricing Rule"
+"Ignored: ","Ignored: "
+"Image","Image"
+"Image View","Image View"
+"Implementation Partner","Implementation Partner"
+"Import Attendance","Import Attendance"
+"Import Failed!","Innsetning mistókst!"
+"Import Log","Import Log"
+"Import Successful!","Innsetning tókst!"
+"Imports","Imports"
+"In Hours","In Hours"
+"In Process","In Process"
+"In Qty","In Qty"
+"In Stock","In Stock"
+"In Words","In Words"
+"In Words (Company Currency)","In Words (Company Currency)"
+"In Words (Export) will be visible once you save the Delivery Note.","In Words (Export) will be visible once you save the Delivery Note."
+"In Words will be visible once you save the Delivery Note.","In Words will be visible once you save the Delivery Note."
+"In Words will be visible once you save the Purchase Invoice.","In Words will be visible once you save the Purchase Invoice."
+"In Words will be visible once you save the Purchase Order.","In Words will be visible once you save the Purchase Order."
+"In Words will be visible once you save the Purchase Receipt.","In Words will be visible once you save the Purchase Receipt."
+"In Words will be visible once you save the Quotation.","In Words will be visible once you save the Quotation."
+"In Words will be visible once you save the Sales Invoice.","In Words will be visible once you save the Sales Invoice."
+"In Words will be visible once you save the Sales Order.","In Words will be visible once you save the Sales Order."
+"Incentives","Incentives"
+"Include Reconciled Entries","Include Reconciled Entries"
+"Include holidays in Total no. of Working Days","Include holidays in Total no. of Working Days"
+"Income","Tekjur"
+"Income / Expense","Income / Expense"
+"Income Account","Income Account"
+"Income Booked","Income Booked"
+"Income Tax","Income Tax"
+"Income Year to Date","Income Year to Date"
+"Income booked for the digest period","Income booked for the digest period"
+"Incoming","Incoming"
+"Incoming Rate","Incoming Rate"
+"Incoming quality inspection.","Incoming quality inspection."
+"Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.","Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
+"Incorrect or Inactive BOM {0} for Item {1} at row {2}","Incorrect or Inactive BOM {0} for Item {1} at row {2}"
+"Indicates that the package is a part of this delivery (Only Draft)","Indicates that the package is a part of this delivery (Only Draft)"
+"Indirect Expenses","Annar rekstrarkostnaður"
+"Indirect Income","Aðrar tekjur"
+"Individual","Individual"
+"Industry","Industry"
+"Industry Type","Industry Type"
+"Inspected By","Inspected By"
+"Inspection Criteria","Inspection Criteria"
+"Inspection Required","Inspection Required"
+"Inspection Type","Inspection Type"
+"Installation Date","Installation Date"
+"Installation Note","Installation Note"
+"Installation Note Item","Installation Note Item"
+"Installation Note {0} has already been submitted","Installation Note {0} has already been submitted"
+"Installation Status","Installation Status"
+"Installation Time","Installation Time"
+"Installation date cannot be before delivery date for Item {0}","Installation date cannot be before delivery date for Item {0}"
+"Installation record for a Serial No.","Installation record for a Serial No."
+"Installed Qty","Installed Qty"
+"Instructions","Instructions"
+"Interested","Interested"
+"Intern","Intern"
+"Internal","Internal"
+"Internet Publishing","Internet Publishing"
+"Introduction","Introduction"
+"Invalid Barcode","Invalid Barcode"
+"Invalid Barcode or Serial No","Invalid Barcode or Serial No"
+"Invalid Mail Server. Please rectify and try again.","Invalid Mail Server. Please rectify and try again."
+"Invalid Master Name","Invalid Master Name"
+"Invalid User Name or Support Password. Please rectify and try again.","Invalid User Name or Support Password. Please rectify and try again."
+"Invalid quantity specified for item {0}. Quantity should be greater than 0.","Invalid quantity specified for item {0}. Quantity should be greater than 0."
+"Inventory","Inventory"
+"Inventory & Support","Inventory & Support"
+"Investment Banking","Investment Banking"
+"Investments","Fjárfestingar"
+"Invoice","Reikningur"
+"Invoice Date","Dagsetning reiknings"
+"Invoice Details","Reikningsupplýsingar"
+"Invoice No","Reikningsnúmer"
+"Invoice Number","Reikningsnúmer"
+"Invoice Type","Reikningsgerð"
+"Invoice/Journal Voucher Details","Invoice/Journal Voucher Details"
+"Invoiced Amount","Reikningsupphæð"
+"Invoiced Amount (Exculsive Tax)","Reikningsfærð upphæð (án skatts)"
+"Is Active","Er virkur"
+"Is Advance","Is Advance"
+"Is Cancelled","Er frestað"
+"Is Carry Forward","Is Carry Forward"
+"Is Default","Er sjálfgefið"
+"Is Encash","Is Encash"
+"Is Fixed Asset Item","Er fastafjármuna hlutur"
+"Is LWP","Is LWP"
+"Is Opening","Is Opening"
+"Is Opening Entry","Is Opening Entry"
+"Is POS","Is POS"
+"Is Primary Contact","Is Primary Contact"
+"Is Purchase Item","Is Purchase Item"
+"Is Recurring","Is Recurring"
+"Is Sales Item","Is Sales Item"
+"Is Service Item","Is Service Item"
+"Is Stock Item","Is Stock Item"
+"Is Sub Contracted Item","Is Sub Contracted Item"
+"Is Subcontracted","Is Subcontracted"
+"Is this Tax included in Basic Rate?","Is this Tax included in Basic Rate?"
+"Issue","Issue"
+"Issue Date","Issue Date"
+"Issue Details","Issue Details"
+"Issued Items Against Production Order","Issued Items Against Production Order"
+"It can also be used to create opening stock entries and to fix stock value.","It can also be used to create opening stock entries and to fix stock value."
+"Item","Item"
+"Item #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).","Item #{0}: Ordered qty can not less than item's minimum order qty (defined in item master)."
+"Item Advanced","Item Advanced"
+"Item Barcode","Item Barcode"
+"Item Batch Nos","Item Batch Nos"
+"Item Classification","Item Classification"
+"Item Code","Item Code"
+"Item Code > Item Group > Brand","Item Code > Item Group > Brand"
+"Item Code and Warehouse should already exist.","Item Code and Warehouse should already exist."
+"Item Code cannot be changed for Serial No.","Item Code cannot be changed for Serial No."
+"Item Code is mandatory because Item is not automatically numbered","Item Code is mandatory because Item is not automatically numbered"
+"Item Code required at Row No {0}","Item Code required at Row No {0}"
+"Item Customer Detail","Item Customer Detail"
+"Item Description","Item Description"
+"Item Desription","Item Desription"
+"Item Details","Item Details"
+"Item Group","Item Group"
+"Item Group Name","Item Group Name"
+"Item Group Tree","Item Group Tree"
+"Item Group not mentioned in item master for item {0}","Item Group not mentioned in item master for item {0}"
+"Item Groups in Details","Item Groups in Details"
+"Item Image (if not slideshow)","Item Image (if not slideshow)"
+"Item Name","Item Name"
+"Item Naming By","Item Naming By"
+"Item Price","Item Price"
+"Item Prices","Item Prices"
+"Item Quality Inspection Parameter","Item Quality Inspection Parameter"
+"Item Reorder","Item Reorder"
+"Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table","Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table"
+"Item Serial No","Item Serial No"
+"Item Serial Nos","Item Serial Nos"
+"Item Shortage Report","Item Shortage Report"
+"Item Supplier","Item Supplier"
+"Item Supplier Details","Item Supplier Details"
+"Item Tax","Item Tax"
+"Item Tax Amount","Item Tax Amount"
+"Item Tax Rate","Item Tax Rate"
+"Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable","Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable"
+"Item Tax1","Item Tax1"
+"Item To Manufacture","Item To Manufacture"
+"Item UOM","Item UOM"
+"Item Website Specification","Item Website Specification"
+"Item Website Specifications","Item Website Specifications"
+"Item Wise Tax Detail","Item Wise Tax Detail"
+"Item Wise Tax Detail ","Item Wise Tax Detail "
+"Item is required","Item is required"
+"Item is updated","Item is updated"
+"Item master.","Item master."
+"Item must be a purchase item, as it is present in one or many Active BOMs","Item must be a purchase item, as it is present in one or many Active BOMs"
+"Item must be added using 'Get Items from Purchase Receipts' button","Item must be added using 'Get Items from Purchase Receipts' button"
+"Item or Warehouse for row {0} does not match Material Request","Item or Warehouse for row {0} does not match Material Request"
+"Item table can not be blank","Item table can not be blank"
+"Item to be manufactured or repacked","Item to be manufactured or repacked"
+"Item valuation rate is recalculated considering landed cost voucher amount","Item valuation rate is recalculated considering landed cost voucher amount"
+"Item valuation updated","Item valuation updated"
+"Item will be saved by this name in the data base.","Item will be saved by this name in the data base."
+"Item {0} appears multiple times in Price List {1}","Item {0} appears multiple times in Price List {1}"
+"Item {0} does not exist","Item {0} does not exist"
+"Item {0} does not exist in the system or has expired","Item {0} does not exist in the system or has expired"
+"Item {0} does not exist in {1} {2}","Item {0} does not exist in {1} {2}"
+"Item {0} has already been returned","Item {0} has already been returned"
+"Item {0} has been entered multiple times against same operation","Item {0} has been entered multiple times against same operation"
+"Item {0} has been entered multiple times with same description or date","Item {0} has been entered multiple times with same description or date"
+"Item {0} has been entered multiple times with same description or date or warehouse","Item {0} has been entered multiple times with same description or date or warehouse"
+"Item {0} has been entered twice","Item {0} has been entered twice"
+"Item {0} has reached its end of life on {1}","Item {0} has reached its end of life on {1}"
+"Item {0} ignored since it is not a stock item","Item {0} ignored since it is not a stock item"
+"Item {0} is cancelled","Item {0} is cancelled"
+"Item {0} is not Purchase Item","Item {0} is not Purchase Item"
+"Item {0} is not a serialized Item","Item {0} is not a serialized Item"
+"Item {0} is not a stock Item","Item {0} is not a stock Item"
+"Item {0} is not active or end of life has been reached","Item {0} is not active or end of life has been reached"
+"Item {0} is not setup for Serial Nos. Check Item master","Item {0} is not setup for Serial Nos. Check Item master"
+"Item {0} is not setup for Serial Nos. Column must be blank","Item {0} is not setup for Serial Nos. Column must be blank"
+"Item {0} must be Sales Item","Item {0} must be Sales Item"
+"Item {0} must be Sales or Service Item in {1}","Item {0} must be Sales or Service Item in {1}"
+"Item {0} must be Service Item","Item {0} must be Service Item"
+"Item {0} must be a Purchase Item","Item {0} must be a Purchase Item"
+"Item {0} must be a Sales Item","Item {0} must be a Sales Item"
+"Item {0} must be a Service Item.","Item {0} must be a Service Item."
+"Item {0} must be a Sub-contracted Item","Item {0} must be a Sub-contracted Item"
+"Item {0} must be a stock Item","Item {0} must be a stock Item"
+"Item {0} must be manufactured or sub-contracted","Item {0} must be manufactured or sub-contracted"
+"Item {0} not found","Item {0} not found"
+"Item {0} with Serial No {1} is already installed","Item {0} with Serial No {1} is already installed"
+"Item {0} with same description entered twice","Item {0} with same description entered twice"
+"Item, Warranty, AMC (Annual Maintenance Contract) details will be automatically fetched when Serial Number is selected.","Item, Warranty, AMC (Annual Maintenance Contract) details will be automatically fetched when Serial Number is selected."
+"Item-wise Price List Rate","Item-wise Price List Rate"
+"Item-wise Purchase History","Item-wise Purchase History"
+"Item-wise Purchase Register","Item-wise Purchase Register"
+"Item-wise Sales History","Item-wise Sales History"
+"Item-wise Sales Register","Item-wise Sales Register"
+"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry"
+"Item: {0} not found in the system","Item: {0} not found in the system"
+"Items","Items"
+"Items To Be Requested","Items To Be Requested"
+"Items required","Items required"
+"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty"
+"Items which do not exist in Item master can also be entered on customer's request","Items which do not exist in Item master can also be entered on customer's request"
+"Itemwise Discount","Itemwise Discount"
+"Itemwise Recommended Reorder Level","Itemwise Recommended Reorder Level"
+"Job Applicant","Job Applicant"
+"Job Opening","Job Opening"
+"Job Profile","Job Profile"
+"Job Title","Job Title"
+"Job profile, qualifications required etc.","Job profile, qualifications required etc."
+"Jobs Email Settings","Jobs Email Settings"
+"Journal Entries","Journal Entries"
+"Journal Entry","Journal Entry"
+"Journal Voucher","Journal Voucher"
+"Journal Voucher Detail","Journal Voucher Detail"
+"Journal Voucher Detail No","Journal Voucher Detail No"
+"Journal Voucher {0} does not have account {1} or already matched against other voucher","Journal Voucher {0} does not have account {1} or already matched against other voucher"
+"Journal Voucher {0} is linked against Order {1}, hence it must be fetched as advance in Invoice as well.","Journal Voucher {0} is linked against Order {1}, hence it must be fetched as advance in Invoice as well."
+"Journal Vouchers {0} are un-linked","Journal Vouchers {0} are un-linked"
+"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+"Keep a track of communication related to this enquiry which will help for future reference.","Keep a track of communication related to this enquiry which will help for future reference."
+"Keep it web friendly 900px (w) by 100px (h)","Keep it web friendly 900px (w) by 100px (h)"
+"Key Performance Area","Key Performance Area"
+"Key Responsibility Area","Key Responsibility Area"
+"Kg","Kg"
+"LR Date","LR Date"
+"LR No","LR No"
+"Label","Label"
+"Landed Cost Help","Landed Cost Help"
+"Landed Cost Item","Landed Cost Item"
+"Landed Cost Purchase Receipt","Landed Cost Purchase Receipt"
+"Landed Cost Taxes and Charges","Landed Cost Taxes and Charges"
+"Landed Cost Voucher","Landed Cost Voucher"
+"Landed Cost Voucher Amount","Landed Cost Voucher Amount"
+"Language","Language"
+"Last Name","Eftirnafn"
+"Last Order Amount","Last Order Amount"
+"Last Purchase Rate","Last Purchase Rate"
+"Last Sales Order Date","Last Sales Order Date"
+"Latest","Latest"
+"Lead","Ábending"
+"Lead Details","Upplýsingar um ábendingu"
+"Lead Id","Kenni ábendingar"
+"Lead Name","Nafn ábendingar"
+"Lead Owner","Eigandi ábendingar"
+"Lead Source","Heimild ábendingarinnar"
+"Lead Status","Staða ábendingarinnar"
+"Lead Time Date","Afgreiðslutími dagsetning"
+"Lead Time Days","Afgreiðslutími dagar"
+"Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.","Afgreiðslutími dagar er fjöldi daga þangað til þessi hlutur er væntalegur í vöruhúsið. This days is fetched in Material Request when you select this item."
+"Lead Type","Gerð ábendingar"
+"Lead must be set if Opportunity is made from Lead","Ábending verður að vera stillt ef tækifæri er stofnað frá ábeningu"
+"Leave Allocation","Leave Allocation"
+"Leave Allocation Tool","Leave Allocation Tool"
+"Leave Application","Leave Application"
+"Leave Approver","Leave Approver"
+"Leave Approvers","Leave Approvers"
+"Leave Balance Before Application","Leave Balance Before Application"
+"Leave Block List","Leave Block List"
+"Leave Block List Allow","Leave Block List Allow"
+"Leave Block List Allowed","Leave Block List Allowed"
+"Leave Block List Date","Leave Block List Date"
+"Leave Block List Dates","Leave Block List Dates"
+"Leave Block List Name","Leave Block List Name"
+"Leave Blocked","Leave Blocked"
+"Leave Control Panel","Leave Control Panel"
+"Leave Encashed?","Leave Encashed?"
+"Leave Encashment Amount","Leave Encashment Amount"
+"Leave Type","Leave Type"
+"Leave Type Name","Leave Type Name"
+"Leave Without Pay","Leave Without Pay"
+"Leave application has been approved.","Leave application has been approved."
+"Leave application has been rejected.","Leave application has been rejected."
+"Leave approver must be one of {0}","Leave approver must be one of {0}"
+"Leave blank if considered for all branches","Leave blank if considered for all branches"
+"Leave blank if considered for all departments","Leave blank if considered for all departments"
+"Leave blank if considered for all designations","Leave blank if considered for all designations"
+"Leave blank if considered for all employee types","Leave blank if considered for all employee types"
+"Leave can be approved by users with Role, ""Leave Approver""","Leave can be approved by users with Role, ""Leave Approver"""
+"Leave of type {0} cannot be longer than {1}","Leave of type {0} cannot be longer than {1}"
+"Leaves Allocated Successfully for {0}","Leaves Allocated Successfully for {0}"
+"Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0}","Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0}"
+"Leaves must be allocated in multiples of 0.5","Leaves must be allocated in multiples of 0.5"
+"Ledger","Ledger"
+"Ledgers","Ledgers"
+"Left","Vinstri"
+"Legal","Legal"
+"Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.","Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+"Legal Expenses","Lögfræðikostnaður"
+"Letter Head","Bréfshaus"
+"Letter Heads for print templates.","Bréfshaus fyrir sniðmát prentunar."
+"Level","Stig"
+"Lft","Lft"
+"Liability","Skuld"
+"Link","Tengill"
+"List a few of your customers. They could be organizations or individuals.","List a few of your customers. They could be organizations or individuals."
+"List a few of your suppliers. They could be organizations or individuals.","List a few of your suppliers. They could be organizations or individuals."
+"List items that form the package.","List items that form the package."
+"List of users who can edit a particular Note","List of users who can edit a particular Note"
+"List this Item in multiple groups on the website.","List this Item in multiple groups on the website."
+"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."
+"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."
+"Loading...","Hleð inn..."
+"Loans (Liabilities)","Lán (skuldir)"
+"Loans and Advances (Assets)","Fyrirframgreiðslur"
+"Local","Local"
+"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log of Activities performed by users against Tasks that can be used for tracking time, billing."
+"Login","Innskrá"
+"Login with your new User ID","Login with your new User ID"
+"Logo","Logo"
+"Logo and Letter Heads","Logo and Letter Heads"
+"Lost","Lost"
+"Lost Reason","Lost Reason"
+"Low","Lágt"
+"Lower Income","Lower Income"
+"MTN Details","MTN Details"
+"Main","Main"
+"Main Reports","Helstu skýrslur"
+"Maintain Same Rate Throughout Sales Cycle","Maintain Same Rate Throughout Sales Cycle"
+"Maintain same rate throughout purchase cycle","Maintain same rate throughout purchase cycle"
+"Maintenance","Viðhald"
+"Maintenance Date","Viðhalds dagsetning"
+"Maintenance Details","Viðhaldsupplýsingar"
+"Maintenance Manager","Viðhaldsstjóri"
+"Maintenance Schedule","Viðhaldsáætlun"
+"Maintenance Schedule Detail","Upplýsingar um viðhaldsáætlun"
+"Maintenance Schedule Item","Atriði viðhaldsáætlunar"
+"Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule'","Viðhaldsáætlunin er ekki búin til fyrir öll atriðin. Vinsamlegast smelltu á 'Búa til áætlun'"
+"Maintenance Schedule {0} exists against {0}","Viðhaldsáætlun {0} er til staðar gegn {0}"
+"Maintenance Schedule {0} must be cancelled before cancelling this Sales Order","Viðhaldsáætlun {0} verður að fella niður áður en hægt er að fella niður sölupöntunina"
+"Maintenance Schedules","Viðhaldsáætlanir"
+"Maintenance Status","Viðhaldsstaða"
+"Maintenance Time","Viðhaldstími"
+"Maintenance Type","Viðhaldsgerð"
+"Maintenance User","Viðhalds notandi"
+"Maintenance Visit","Viðhalds heimsókn"
+"Maintenance Visit Purpose","Maintenance Visit Purpose"
+"Maintenance Visit {0} must be cancelled before cancelling this Sales Order","Maintenance Visit {0} must be cancelled before cancelling this Sales Order"
+"Maintenance start date can not be before delivery date for Serial No {0}","Maintenance start date can not be before delivery date for Serial No {0}"
+"Major/Optional Subjects","Major/Optional Subjects"
+"Make ","Búa til "
+"Make Accounting Entry For Every Stock Movement","Make Accounting Entry For Every Stock Movement"
+"Make Bank Voucher","Make Bank Voucher"
+"Make Credit Note","Make Credit Note"
+"Make Debit Note","Make Debit Note"
+"Make Delivery","Make Delivery"
+"Make Difference Entry","Make Difference Entry"
+"Make Excise Invoice","Make Excise Invoice"
+"Make Installation Note","Make Installation Note"
+"Make Invoice","Make Invoice"
+"Make Journal Voucher","Make Journal Voucher"
+"Make Maint. Schedule","Make Maint. Schedule"
+"Make Maint. Visit","Make Maint. Visit"
+"Make Maintenance Visit","Make Maintenance Visit"
+"Make Packing Slip","Make Packing Slip"
+"Make Payment","Make Payment"
+"Make Payment Entry","Make Payment Entry"
+"Make Purchase Invoice","Make Purchase Invoice"
+"Make Purchase Order","Make Purchase Order"
+"Make Purchase Receipt","Make Purchase Receipt"
+"Make Salary Slip","Make Salary Slip"
+"Make Salary Structure","Make Salary Structure"
+"Make Sales Invoice","Make Sales Invoice"
+"Make Sales Order","Make Sales Order"
+"Make Supplier Quotation","Make Supplier Quotation"
+"Make Time Log Batch","Make Time Log Batch"
+"Make new POS Setting","Make new POS Setting"
+"Male","Karl"
+"Manage Customer Group Tree.","Manage Customer Group Tree."
+"Manage Sales Partners.","Manage Sales Partners."
+"Manage Sales Person Tree.","Manage Sales Person Tree."
+"Manage Territory Tree.","Manage Territory Tree."
+"Manage cost of operations","Manage cost of operations"
+"Management","Management"
+"Manager","Manager"
+"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order."
+"Manufacture","Manufacture"
+"Manufacture against Sales Order","Manufacture against Sales Order"
+"Manufactured Item","Manufactured Item"
+"Manufactured Qty","Manufactured Qty"
+"Manufactured quantity will be updated in this warehouse","Manufactured quantity will be updated in this warehouse"
+"Manufactured quantity {0} cannot be greater than planned quanitity {1} in Production Order {2}","Manufactured quantity {0} cannot be greater than planned quanitity {1} in Production Order {2}"
+"Manufacturer","Manufacturer"
+"Manufacturer Part Number","Manufacturer Part Number"
+"Manufacturing","Framleiðsla"
+"Manufacturing Manager","Manufacturing Manager"
+"Manufacturing Quantity","Manufacturing Quantity"
+"Manufacturing Quantity is mandatory","Manufacturing Quantity is mandatory"
+"Manufacturing User","Manufacturing User"
+"Margin","Margin"
+"Marital Status","Marital Status"
+"Market Segment","Market Segment"
+"Marketing","Marketing"
+"Marketing Expenses","Markaðskostnaður"
+"Married","Married"
+"Mass Mailing","Mass Mailing"
+"Master Name","Master Name"
+"Master Name is mandatory if account type is Warehouse","Master Name is mandatory if account type is Warehouse"
+"Master Type","Master Type"
+"Masters","Masters"
+"Match non-linked Invoices and Payments.","Match non-linked Invoices and Payments."
+"Material Issue","Material Issue"
+"Material Manager","Material Manager"
+"Material Master Manager","Material Master Manager"
+"Material Receipt","Material Receipt"
+"Material Request","Material Request"
+"Material Request Detail No","Material Request Detail No"
+"Material Request For Warehouse","Material Request For Warehouse"
+"Material Request Item","Material Request Item"
+"Material Request Items","Material Request Items"
+"Material Request No","Material Request No"
+"Material Request Type","Material Request Type"
+"Material Request of maximum {0} can be made for Item {1} against Sales Order {2}","Material Request of maximum {0} can be made for Item {1} against Sales Order {2}"
+"Material Request used to make this Stock Entry","Material Request used to make this Stock Entry"
+"Material Request {0} is cancelled or stopped","Material Request {0} is cancelled or stopped"
+"Material Requests for which Supplier Quotations are not created","Material Requests for which Supplier Quotations are not created"
+"Material Requests {0} created","Material Requests {0} created"
+"Material Requirement","Material Requirement"
+"Material Transfer","Material Transfer"
+"Material User","Material User"
+"Materials","Materials"
+"Materials Required (Exploded)","Materials Required (Exploded)"
+"Max 5 characters","Max 5 characters"
+"Max Days Leave Allowed","Max Days Leave Allowed"
+"Max Discount (%)","Max Discount (%)"
+"Max Qty","Max Qty"
+"Max discount allowed for item: {0} is {1}%","Max discount allowed for item: {0} is {1}%"
+"Maximum Amount","Maximum Amount"
+"Maximum {0} rows allowed","Maximum {0} rows allowed"
+"Maxiumm discount for Item {0} is {1}%","Maxiumm discount for Item {0} is {1}%"
+"Medical","Medical"
+"Medium","Medium"
+"Merging is only possible if following properties are same in both records. Group or Ledger, Root Type, Company","Merging is only possible if following properties are same in both records. Group or Ledger, Root Type, Company"
+"Message","Skilaboð"
+"Message Parameter","Færibreyta skilaboða"
+"Message Sent","Skilaboð send"
+"Message updated","Skilaboð uppfærð"
+"Messages","Skilaboð"
+"Messages greater than 160 characters will be split into multiple messages","Skilaboðum með meira en 160 stöfum verður skipt upp í mörg skilaboð"
+"Middle Income","Millitekjur"
+"Milestone","Áfangi"
+"Milestone Date","Dagsetning áfanga"
+"Milestones","Áfangar"
+"Milestones will be added as Events in the Calendar","Áföngum verður bætt við atburði í dagatalinu"
+"Min Order Qty","Lágmarks magn pöntunar"
+"Min Qty","Lágmarks magn"
+"Min Qty can not be greater than Max Qty","Lágmarks magn getur ekki verið meira en hámarks magn"
+"Minimum Amount","Lágmarksfjárhæð"
+"Minimum Inventory Level","Lágmarks birgðastaða"
+"Minimum Order Qty","Lágmarks magn pöntunar"
+"Minute","Mínúta"
+"Misc Details","Ýmsar upplýsingar"
+"Miscellaneous Expenses","Ýmis gjöld"
+"Miscelleneous","Ýmislegt"
+"Mobile No","Farsímanúmer"
+"Mobile No.","Farsímanúmer."
+"Mode of Payment","Greiðsluháttur"
+"Modern","Nýtískulegur"
+"Monday","Mánudagur"
+"Month","Mánuður"
+"Monthly","Mánaðarlega"
+"Monthly Attendance Sheet","Mánaðarlegt mætingarblað"
+"Monthly Earning & Deduction","Mánaðarlegar tekjur & frádráttur"
+"Monthly Salary Register","Mánaðarleg launaskrá"
+"Monthly salary statement.","Mánaðarlegt launayfirlit."
+"More Details","Nánari upplýsingar"
+"More Info","Nánari upplýsingar"
+"Motion Picture & Video","Kvikmynd & myndband"
+"Moving Average","Hlaupandi meðaltal"
+"Moving Average Rate","Hraði hlaupandi meðaltals"
+"Mr","Mr"
+"Ms","Ms"
+"Multiple Item prices.","Multiple Item prices."
+"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Verð reglur: {0}"
+"Music","Tónlist"
+"Must be Whole Number","Verður að vera heil tala"
+"Name","Nafn"
+"Name and Description","Nafn og lýsing"
+"Name and Employee ID","Nafn og starfsmanna kenni"
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Nafn á nýja reikningnum. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master"
+"Name of person or organization that this address belongs to.","Name of person or organization that this address belongs to."
+"Name of the Budget Distribution","Name of the Budget Distribution"
+"Naming Series","Naming Series"
+"Negative Quantity is not allowed","Neikvætt magn er ekki leyft"
+"Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5}","Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5}"
+"Negative Valuation Rate is not allowed","Negative Valuation Rate is not allowed"
+"Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4}","Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4}"
+"Net Pay","Net Pay"
+"Net Pay (in words) will be visible once you save the Salary Slip.","Net Pay (in words) will be visible once you save the Salary Slip."
+"Net Profit / Loss","Net Profit / Loss"
+"Net Total","Net Total"
+"Net Total (Company Currency)","Net Total (Company Currency)"
+"Net Weight","Nettó þyngd"
+"Net Weight UOM","Net Weight UOM"
+"Net Weight of each Item","Net Weight of each Item"
+"Net pay cannot be negative","Net pay cannot be negative"
+"Never","Aldrei"
+"New Account","Nýr reikningur"
+"New Account Name","Nýtt reikningsnafn"
+"New BOM","New BOM"
+"New Communications","Ný samskipti"
+"New Company","Nýtt fyrirtæki"
+"New Cost Center","New Cost Center"
+"New Cost Center Name","New Cost Center Name"
+"New Customer Revenue","New Customer Revenue"
+"New Customers","New Customers"
+"New Delivery Notes","New Delivery Notes"
+"New Enquiries","Nýjar fyrirspurnir"
+"New Leads","New Leads"
+"New Leave Application","New Leave Application"
+"New Leaves Allocated","New Leaves Allocated"
+"New Leaves Allocated (In Days)","New Leaves Allocated (In Days)"
+"New Material Requests","New Material Requests"
+"New Projects","Ný verkefni"
+"New Purchase Orders","New Purchase Orders"
+"New Purchase Receipts","New Purchase Receipts"
+"New Quotations","New Quotations"
+"New Sales Orders","New Sales Orders"
+"New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt","New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
+"New Stock Entries","New Stock Entries"
+"New Stock UOM","New Stock UOM"
+"New Stock UOM is required","New Stock UOM is required"
+"New Stock UOM must be different from current stock UOM","New Stock UOM must be different from current stock UOM"
+"New Supplier Quotations","New Supplier Quotations"
+"New Support Tickets","New Support Tickets"
+"New UOM must NOT be of type Whole Number","New UOM must NOT be of type Whole Number"
+"New Workplace","New Workplace"
+"New {0}","New {0}"
+"New {0} Name","New {0} Name"
+"New {0}: #{1}","New {0}: #{1}"
+"Newsletter","Fréttabréf"
+"Newsletter Content","Innihald fréttabréfs"
+"Newsletter Status","Staða fréttabréfs"
+"Newsletter has already been sent","Fréttabréf hefur þegar verið sent"
+"Newsletters to contacts, leads.","Newsletters to contacts, leads."
+"Newspaper Publishers","Útgefendur dagblaðs"
+"Next","Næst"
+"Next Contact By","Next Contact By"
+"Next Contact Date","Næsti dagur til að hafa samband"
+"Next Date","Næsti dagur"
+"Next Recurring {0} will be created on {1}","Next Recurring {0} will be created on {1}"
+"Next email will be sent on:","Næsti tölvupóstur verður sendur á:"
+"No","Nei"
+"No Customer Accounts found.","Engir reikningar fyrir viðskiptavin fundust."
+"No Customer or Supplier Accounts found","Engir reikningar fyrir viðskiptavin eða birgja fundust"
+"No Data","Engin gögn"
+"No Item with Barcode {0}","No Item with Barcode {0}"
+"No Item with Serial No {0}","No Item with Serial No {0}"
+"No Items to pack","No Items to pack"
+"No Permission","No Permission"
+"No Production Orders created","No Production Orders created"
+"No Remarks","Engar athugasemdir"
+"No Supplier Accounts found. Supplier Accounts are identified based on 'Master Type' value in account record.","Engir reikningar fyrir birgja fundust. Supplier Accounts are identified based on 'Master Type' value in account record."
+"No Updates For","Engar uppfærslur fyrir"
+"No accounting entries for the following warehouses","Engar bókhaldsfærslur fyrir eftirfarandi vöruhús"
+"No addresses created","Engin heimilisföng stofnuð"
+"No contacts created","Engir tengiliðir stofnaðir"
+"No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.","No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template."
+"No default BOM exists for Item {0}","No default BOM exists for Item {0}"
+"No description given","Engin lýsing gefin"
+"No employee found","Enginn starfsmaður fannst"
+"No employee found!","Enginn starfsmaður fannst!"
+"No of Requested SMS","Fjöldi umbeðinna smáskilaboða (SMS)"
+"No of Sent SMS","Fjöldi sendra smáskilaboða ( SMS)"
+"No of Visits","Fjöldi heimsókna"
+"No permission","Engin réttindi"
+"No permission to use Payment Tool","Engin heimild til að nota greiðslu tól"
+"No record found","Ekkert fannst"
+"No records found in the Invoice table","No records found in the Invoice table"
+"No records found in the Payment table","No records found in the Payment table"
+"No salary slip found for month: ","No salary slip found for month: "
+"Non Profit","Non Profit"
+"Nos","Nos"
+"Not Active","Not Active"
+"Not Applicable","Not Applicable"
+"Not Available","Not Available"
+"Not Billed","Not Billed"
+"Not Delivered","Not Delivered"
+"Not In Stock","Not In Stock"
+"Not Sent","Not Sent"
+"Not Set","Not Set"
+"Not allowed to update stock transactions older than {0}","Not allowed to update stock transactions older than {0}"
+"Not authorized to edit frozen Account {0}","Not authorized to edit frozen Account {0}"
+"Not authroized since {0} exceeds limits","Not authroized since {0} exceeds limits"
+"Not permitted","Not permitted"
+"Note","Note"
+"Note User","Note User"
+"Note is a free page where users can share documents / notes","Note is a free page where users can share documents / notes"
+"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Note: Backups and files are not deleted from Dropbox, you will have to delete them manually."
+"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.","Note: Backups and files are not deleted from Google Drive, you will have to delete them manually."
+"Note: Due Date exceeds the allowed credit days by {0} day(s)","Note: Due Date exceeds the allowed credit days by {0} day(s)"
+"Note: Email will not be sent to disabled users","Note: Email will not be sent to disabled users"
+"Note: If payment is not made against any reference, make Journal Voucher manually.","Note: If payment is not made against any reference, make Journal Voucher manually."
+"Note: Item {0} entered multiple times","Note: Item {0} entered multiple times"
+"Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified","Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
+"Note: Reference Date {0} is after invoice due date {1}","Note: Reference Date {0} is after invoice due date {1}"
+"Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0","Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0"
+"Note: There is not enough leave balance for Leave Type {0}","Note: There is not enough leave balance for Leave Type {0}"
+"Note: This Cost Center is a Group. Cannot make accounting entries against groups.","Note: This Cost Center is a Group. Cannot make accounting entries against groups."
+"Note: {0}","Note: {0}"
+"Notes","Skýringar"
+"Notes:","Skýringar:"
+"Nothing to request","Nothing to request"
+"Notice (days)","Notice (days)"
+"Notification Control","Notification Control"
+"Notification Email Address","Notification Email Address"
+"Notify by Email on creation of automatic Material Request","Notify by Email on creation of automatic Material Request"
+"Number Format","Number Format"
+"Number of Order","Number of Order"
+"Offer Date","Offer Date"
+"Office","Office"
+"Office Equipments","Skrifstofuáhöld og tæki"
+"Office Maintenance Expenses","Viðhald húsnæðis"
+"Office Rent","Húsaleiga"
+"Old Parent","Old Parent"
+"On Net Total","On Net Total"
+"On Previous Row Amount","On Previous Row Amount"
+"On Previous Row Total","On Previous Row Total"
+"Online Auctions","Online Auctions"
+"Only Leave Applications with status 'Approved' can be submitted","Only Leave Applications with status 'Approved' can be submitted"
+"Only Serial Nos with status ""Available"" can be delivered.","Only Serial Nos with status ""Available"" can be delivered."
+"Only leaf nodes are allowed in transaction","Only leaf nodes are allowed in transaction"
+"Only the selected Leave Approver can submit this Leave Application","Only the selected Leave Approver can submit this Leave Application"
+"Open","Open"
+"Open Production Orders","Open Production Orders"
+"Open Tickets","Open Tickets"
+"Opening (Cr)","Opening (Cr)"
+"Opening (Dr)","Opening (Dr)"
+"Opening Date","Opening Date"
+"Opening Entry","Opening Entry"
+"Opening Qty","Opening Qty"
+"Opening Time","Opening Time"
+"Opening for a Job.","Opening for a Job."
+"Operating Cost","Operating Cost"
+"Operation Description","Operation Description"
+"Operation No","Operation No"
+"Operation Time (mins)","Operation Time (mins)"
+"Operation {0} is repeated in Operations Table","Operation {0} is repeated in Operations Table"
+"Operation {0} not present in Operations Table","Operation {0} not present in Operations Table"
+"Operations","Operations"
+"Opportunity","Opportunity"
+"Opportunity Date","Opportunity Date"
+"Opportunity From","Opportunity From"
+"Opportunity Item","Opportunity Item"
+"Opportunity Items","Opportunity Items"
+"Opportunity Lost","Opportunity Lost"
+"Opportunity Type","Opportunity Type"
+"Optional. This setting will be used to filter in various transactions.","Optional. This setting will be used to filter in various transactions."
+"Order Type","Order Type"
+"Order Type must be one of {0}","Order Type must be one of {0}"
+"Ordered","Ordered"
+"Ordered Items To Be Billed","Ordered Items To Be Billed"
+"Ordered Items To Be Delivered","Ordered Items To Be Delivered"
+"Ordered Qty","Ordered Qty"
+"Ordered Qty: Quantity ordered for purchase, but not received.","Ordered Qty: Quantity ordered for purchase, but not received."
+"Ordered Quantity","Ordered Quantity"
+"Orders released for production.","Orders released for production."
+"Organization Name","Organization Name"
+"Organization Profile","Organization Profile"
+"Organization branch master.","Organization branch master."
+"Organization unit (department) master.","Organization unit (department) master."
+"Other","Other"
+"Other Details","Other Details"
+"Others","Others"
+"Out Qty","Out Qty"
+"Out of AMC","Out of AMC"
+"Out of Warranty","Out of Warranty"
+"Outgoing","Outgoing"
+"Outstanding Amount","Outstanding Amount"
+"Outstanding for {0} cannot be less than zero ({1})","Outstanding for {0} cannot be less than zero ({1})"
+"Overdue","Overdue"
+"Overdue: ","Overdue: "
+"Overhead","Overhead"
+"Overheads","Overheads"
+"Overlapping conditions found between:","Overlapping conditions found between:"
+"Overview","Overview"
+"Owned","Owned"
+"Owner","Owner"
+"P L A - Cess Portion","P L A - Cess Portion"
+"PL or BS","PL or BS"
+"PO Date","PO Date"
+"PO No","PO No"
+"POP3 Mail Server","POP3 Mail Server"
+"POP3 Mail Settings","POP3 Mail Settings"
+"POP3 mail server (e.g. pop.gmail.com)","POP3 mail server (e.g. pop.gmail.com)"
+"POP3 server e.g. (pop.gmail.com)","POP3 server e.g. (pop.gmail.com)"
+"POS","Verslunarkerfi"
+"POS Setting","POS Setting"
+"POS Setting required to make POS Entry","POS Setting required to make POS Entry"
+"POS Setting {0} already created for user: {1} and company {2}","POS Setting {0} already created for user: {1} and company {2}"
+"POS View","POS View"
+"PR Detail","PR Detail"
+"Package Item Details","Package Item Details"
+"Package Items","Package Items"
+"Package Weight Details","Package Weight Details"
+"Packed Item","Packed Item"
+"Packed quantity must equal quantity for Item {0} in row {1}","Packed quantity must equal quantity for Item {0} in row {1}"
+"Packing Details","Packing Details"
+"Packing List","Packing List"
+"Packing Slip","Packing Slip"
+"Packing Slip Item","Packing Slip Item"
+"Packing Slip Items","Packing Slip Items"
+"Packing Slip(s) cancelled","Packing Slip(s) cancelled"
+"Page Break","Page Break"
+"Page Name","Page Name"
+"Paid","Paid"
+"Paid Amount","Paid Amount"
+"Paid amount + Write Off Amount can not be greater than Grand Total","Paid amount + Write Off Amount can not be greater than Grand Total"
+"Pair","Pair"
+"Parameter","Parameter"
+"Parent Account","Parent Account"
+"Parent Cost Center","Parent Cost Center"
+"Parent Customer Group","Parent Customer Group"
+"Parent Detail docname","Parent Detail docname"
+"Parent Item","Parent Item"
+"Parent Item Group","Parent Item Group"
+"Parent Item {0} must be not Stock Item and must be a Sales Item","Parent Item {0} must be not Stock Item and must be a Sales Item"
+"Parent Party Type","Parent Party Type"
+"Parent Sales Person","Parent Sales Person"
+"Parent Territory","Parent Territory"
+"Parent Website Route","Parent Website Route"
+"Parenttype","Parenttype"
+"Part-time","Part-time"
+"Partially Completed","Partially Completed"
+"Partly Billed","Partly Billed"
+"Partly Delivered","Partly Delivered"
+"Partner Target Detail","Partner Target Detail"
+"Partner Type","Partner Type"
+"Partner's Website","Partner's Website"
+"Party","Party"
+"Party Account","Party Account"
+"Party Details","Party Details"
+"Party Type","Party Type"
+"Party Type Name","Party Type Name"
+"Passive","Passive"
+"Passport Number","Passport Number"
+"Password","Password"
+"Pay To / Recd From","Pay To / Recd From"
+"Payable","Payable"
+"Payables","Payables"
+"Payables Group","Payables Group"
+"Payment Account","Payment Account"
+"Payment Amount","Payment Amount"
+"Payment Days","Payment Days"
+"Payment Due Date","Payment Due Date"
+"Payment Mode","Payment Mode"
+"Payment Pending","Payment Pending"
+"Payment Period Based On Invoice Date","Payment Period Based On Invoice Date"
+"Payment Received","Payment Received"
+"Payment Reconciliation","Payment Reconciliation"
+"Payment Reconciliation Invoice","Payment Reconciliation Invoice"
+"Payment Reconciliation Invoices","Payment Reconciliation Invoices"
+"Payment Reconciliation Payment","Payment Reconciliation Payment"
+"Payment Reconciliation Payments","Payment Reconciliation Payments"
+"Payment Tool","Payment Tool"
+"Payment Tool Detail","Payment Tool Detail"
+"Payment Tool Details","Payment Tool Details"
+"Payment Type","Payment Type"
+"Payment against {0} {1} cannot be greater \
+					than Outstanding Amount {2}","Payment against {0} {1} cannot be greater \
+					than Outstanding Amount {2}"
+"Payment cannot be made for empty cart","Payment cannot be made for empty cart"
+"Payment of salary for the month {0} and year {1}","Payment of salary for the month {0} and year {1}"
+"Payments","Payments"
+"Payments Made","Payments Made"
+"Payments Received","Payments Received"
+"Payments made during the digest period","Payments made during the digest period"
+"Payments received during the digest period","Payments received during the digest period"
+"Payroll Settings","Payroll Settings"
+"Pending","Pending"
+"Pending Amount","Pending Amount"
+"Pending Items {0} updated","Pending Items {0} updated"
+"Pending Review","Pending Review"
+"Pending SO Items For Purchase Request","Pending SO Items For Purchase Request"
+"Pension Funds","Pension Funds"
+"Percentage Allocation","Percentage Allocation"
+"Percentage Allocation should be equal to 100%","Percentage Allocation should be equal to 100%"
+"Percentage variation in quantity to be allowed while receiving or delivering this item.","Percentage variation in quantity to be allowed while receiving or delivering this item."
+"Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.","Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units."
+"Performance appraisal.","Performance appraisal."
+"Period","Period"
+"Period Closing Entry","Period Closing Entry"
+"Period Closing Voucher","Period Closing Voucher"
+"Period From and Period To dates mandatory for recurring %s","Period From and Period To dates mandatory for recurring %s"
+"Periodicity","Periodicity"
+"Permanent Address","Permanent Address"
+"Permanent Address Is","Permanent Address Is"
+"Permission","Permission"
+"Personal","Personal"
+"Personal Details","Personal Details"
+"Personal Email","Personal Email"
+"Pharmaceutical","Pharmaceutical"
+"Pharmaceuticals","Pharmaceuticals"
+"Phone","Sími"
+"Phone No","Phone No"
+"Piecework","Piecework"
+"Pincode","Pinn"
+"Place of Issue","Place of Issue"
+"Plan for maintenance visits.","Plan for maintenance visits."
+"Planned Qty","Planned Qty"
+"Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.","Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured."
+"Planned Quantity","Planned Quantity"
+"Planning","Planning"
+"Plant","Plant"
+"Plant and Machinery","Vélar, áhöld og tæki"
+"Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.","Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads."
+"Please Update SMS Settings","Please Update SMS Settings"
+"Please add expense voucher details","Please add expense voucher details"
+"Please add to Modes of Payment from Setup.","Please add to Modes of Payment from Setup."
+"Please click on 'Generate Schedule'","Vinsamlegast smelltu á 'Búa til áætlun'"
+"Please click on 'Generate Schedule' to fetch Serial No added for Item {0}","Please click on 'Generate Schedule' to fetch Serial No added for Item {0}"
+"Please click on 'Generate Schedule' to get schedule","Please click on 'Generate Schedule' to get schedule"
+"Please create Customer from Lead {0}","Please create Customer from Lead {0}"
+"Please create Salary Structure for employee {0}","Please create Salary Structure for employee {0}"
+"Please create new account from Chart of Accounts.","Please create new account from Chart of Accounts."
+"Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.","Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters."
+"Please enter 'Expected Delivery Date'","Please enter 'Expected Delivery Date'"
+"Please enter 'Is Subcontracted' as Yes or No","Please enter 'Is Subcontracted' as Yes or No"
+"Please enter 'Repeat on Day of Month' field value","Please enter 'Repeat on Day of Month' field value"
+"Please enter Account Receivable/Payable group in company master","Please enter Account Receivable/Payable group in company master"
+"Please enter Approving Role or Approving User","Please enter Approving Role or Approving User"
+"Please enter BOM for Item {0} at row {1}","Please enter BOM for Item {0} at row {1}"
+"Please enter Company","Please enter Company"
+"Please enter Cost Center","Please enter Cost Center"
+"Please enter Delivery Note No or Sales Invoice No to proceed","Please enter Delivery Note No or Sales Invoice No to proceed"
+"Please enter Employee Id of this sales parson","Please enter Employee Id of this sales parson"
+"Please enter Expense Account","Please enter Expense Account"
+"Please enter Item Code to get batch no","Please enter Item Code to get batch no"
+"Please enter Item Code.","Please enter Item Code."
+"Please enter Item first","Please enter Item first"
+"Please enter Maintaince Details first","Please enter Maintaince Details first"
+"Please enter Master Name once the account is created.","Please enter Master Name once the account is created."
+"Please enter Payment Amount in atleast one row","Please enter Payment Amount in atleast one row"
+"Please enter Planned Qty for Item {0} at row {1}","Please enter Planned Qty for Item {0} at row {1}"
+"Please enter Production Item first","Please enter Production Item first"
+"Please enter Purchase Receipt No to proceed","Please enter Purchase Receipt No to proceed"
+"Please enter Purchase Receipt first","Please enter Purchase Receipt first"
+"Please enter Purchase Receipts","Please enter Purchase Receipts"
+"Please enter Reference date","Please enter Reference date"
+"Please enter Taxes and Charges","Please enter Taxes and Charges"
+"Please enter Warehouse for which Material Request will be raised","Please enter Warehouse for which Material Request will be raised"
+"Please enter Write Off Account","Please enter Write Off Account"
+"Please enter atleast 1 invoice in the table","Please enter atleast 1 invoice in the table"
+"Please enter company first","Please enter company first"
+"Please enter company name first","Please enter company name first"
+"Please enter default Unit of Measure","Please enter default Unit of Measure"
+"Please enter default currency in Company Master","Please enter default currency in Company Master"
+"Please enter email address","Please enter email address"
+"Please enter item details","Please enter item details"
+"Please enter message before sending","Please enter message before sending"
+"Please enter parent account group for warehouse {0}","Please enter parent account group for warehouse {0}"
+"Please enter parent cost center","Please enter parent cost center"
+"Please enter quantity for Item {0}","Please enter quantity for Item {0}"
+"Please enter relieving date.","Please enter relieving date."
+"Please enter sales order in the above table","Please enter sales order in the above table"
+"Please enter the Against Vouchers manually","Please enter the Against Vouchers manually"
+"Please enter valid Company Email","Please enter valid Company Email"
+"Please enter valid Email Id","Please enter valid Email Id"
+"Please enter valid Personal Email","Please enter valid Personal Email"
+"Please enter valid mobile nos","Please enter valid mobile nos"
+"Please find attached {0} #{1}","Please find attached {0} #{1}"
+"Please install dropbox python module","Please install dropbox python module"
+"Please mention no of visits required","Please mention no of visits required"
+"Please pull items from Delivery Note","Please pull items from Delivery Note"
+"Please remove this Invoice {0} from C-Form {1}","Please remove this Invoice {0} from C-Form {1}"
+"Please save the Newsletter before sending","Please save the Newsletter before sending"
+"Please save the document before generating maintenance schedule","Please save the document before generating maintenance schedule"
+"Please see attachment","Please see attachment"
+"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row"
+"Please select Bank Account","Please select Bank Account"
+"Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year","Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year"
+"Please select Category first","Please select Category first"
+"Please select Charge Type first","Please select Charge Type first"
+"Please select Fiscal Year","Please select Fiscal Year"
+"Please select Group or Ledger value","Please select Group or Ledger value"
+"Please select Incharge Person's name","Please select Incharge Person's name"
+"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM"
+"Please select Price List","Please select Price List"
+"Please select Start Date and End Date for Item {0}","Please select Start Date and End Date for Item {0}"
+"Please select Time Logs.","Please select Time Logs."
+"Please select a csv file","Please select a csv file"
+"Please select a valid csv file with data","Please select a valid csv file with data"
+"Please select a value for {0} quotation_to {1}","Please select a value for {0} quotation_to {1}"
+"Please select an ""Image"" first","Please select an ""Image"" first"
+"Please select charge type first","Please select charge type first"
+"Please select company first","Please select company first"
+"Please select company first.","Please select company first."
+"Please select item code","Please select item code"
+"Please select month and year","Please select month and year"
+"Please select prefix first","Please select prefix first"
+"Please select the document type first","Please select the document type first"
+"Please select weekly off day","Please select weekly off day"
+"Please select {0}","Please select {0}"
+"Please select {0} first","Please select {0} first"
+"Please select {0} first.","Please select {0} first."
+"Please set Dropbox access keys in your site config","Please set Dropbox access keys in your site config"
+"Please set Google Drive access keys in {0}","Please set Google Drive access keys in {0}"
+"Please set User ID field in an Employee record to set Employee Role","Please set User ID field in an Employee record to set Employee Role"
+"Please set default Cash or Bank account in Mode of Payment {0}","Please set default Cash or Bank account in Mode of Payment {0}"
+"Please set default value {0} in Company {0}","Please set default value {0} in Company {0}"
+"Please set {0}","Please set {0}"
+"Please setup Employee Naming System in Human Resource > HR Settings","Please setup Employee Naming System in Human Resource > HR Settings"
+"Please setup numbering series for Attendance via Setup > Numbering Series","Please setup numbering series for Attendance via Setup > Numbering Series"
+"Please setup your POS Preferences","Please setup your POS Preferences"
+"Please setup your chart of accounts before you start Accounting Entries","Vinsamlegast settu upp bókhaldslykilinn áður en þú byrjar að færa bókhaldið"
+"Please specify","Vinsamlegast tilgreindu"
+"Please specify Company","Vinsamlegast tilgreindu fyrirtæki"
+"Please specify Company to proceed","Vinsamlegast tilgreindu fyrirtæki til að halda áfram"
+"Please specify Default Currency in Company Master and Global Defaults","Please specify Default Currency in Company Master and Global Defaults"
+"Please specify a","Vinsamlegast tilgreindu"
+"Please specify a valid 'From Case No.'","Please specify a valid 'From Case No.'"
+"Please specify a valid Row ID for {0} in row {1}","Please specify a valid Row ID for {0} in row {1}"
+"Please specify either Quantity or Valuation Rate or both","Please specify either Quantity or Valuation Rate or both"
+"Please submit to update Leave Balance.","Please submit to update Leave Balance."
+"Plot","Plot"
+"Point of Sale","Point of Sale"
+"Point-of-Sale Setting","Point-of-Sale Setting"
+"Post Graduate","Post Graduate"
+"Postal","Postal"
+"Postal Expenses","Burðargjöld"
+"Posting Date","Bókunardagsetning"
+"Posting Time","Bókunartími"
+"Posting date and posting time is mandatory","Bókunardagsetning og tími er skylda"
+"Posting timestamp must be after {0}","Tímastimpill bókunar verður að vera eftir {0}"
+"Potential Sales Deal","Potential Sales Deal"
+"Potential opportunities for selling.","Potential opportunities for selling."
+"Preferred Billing Address","Preferred Billing Address"
+"Preferred Shipping Address","Preferred Shipping Address"
+"Prefix","Prefix"
+"Present","Present"
+"Prevdoc DocType","Prevdoc DocType"
+"Prevdoc Doctype","Prevdoc Doctype"
+"Preview","Preview"
+"Previous","Previous"
+"Previous Work Experience","Previous Work Experience"
+"Price","Price"
+"Price / Discount","Price / Discount"
+"Price List","Price List"
+"Price List Currency","Price List Currency"
+"Price List Currency not selected","Price List Currency not selected"
+"Price List Exchange Rate","Price List Exchange Rate"
+"Price List Master","Price List Master"
+"Price List Name","Price List Name"
+"Price List Rate","Price List Rate"
+"Price List Rate (Company Currency)","Price List Rate (Company Currency)"
+"Price List master.","Price List master."
+"Price List must be applicable for Buying or Selling","Price List must be applicable for Buying or Selling"
+"Price List not selected","Price List not selected"
+"Price List {0} is disabled","Price List {0} is disabled"
+"Price or Discount","Price or Discount"
+"Pricing Rule","Pricing Rule"
+"Pricing Rule Help","Pricing Rule Help"
+"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+"Pricing Rules are further filtered based on quantity.","Pricing Rules are further filtered based on quantity."
+"Print Format Style","Print Format Style"
+"Print Heading","Print Heading"
+"Print Without Amount","Print Without Amount"
+"Print and Stationary","Prentun og pappír"
+"Printing and Branding","Prentun og vörumerki"
+"Priority","Forgangur"
+"Private","Einka"
+"Private Equity","Private Equity"
+"Privilege Leave","Privilege Leave"
+"Probation","Probation"
+"Process Payroll","Process Payroll"
+"Produced","Produced"
+"Produced Quantity","Produced Quantity"
+"Product Enquiry","Product Enquiry"
+"Production","Production"
+"Production Order","Production Order"
+"Production Order status is {0}","Production Order status is {0}"
+"Production Order {0} must be cancelled before cancelling this Sales Order","Production Order {0} must be cancelled before cancelling this Sales Order"
+"Production Order {0} must be submitted","Production Order {0} must be submitted"
+"Production Orders","Production Orders"
+"Production Orders in Progress","Production Orders in Progress"
+"Production Plan Item","Production Plan Item"
+"Production Plan Items","Production Plan Items"
+"Production Plan Sales Order","Production Plan Sales Order"
+"Production Plan Sales Orders","Production Plan Sales Orders"
+"Production Planning Tool","Production Planning Tool"
+"Production order number is mandatory for stock entry purpose manufacture","Production order number is mandatory for stock entry purpose manufacture"
+"Products","Products"
+"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list."
+"Professional Tax","Professional Tax"
+"Profit and Loss","Rekstur"
+"Profit and Loss Statement","Rekstrarreikningur"
+"Project","Project"
+"Project Costing","Project Costing"
+"Project Details","Project Details"
+"Project Id","Project Id"
+"Project Manager","Project Manager"
+"Project Milestone","Project Milestone"
+"Project Milestones","Project Milestones"
+"Project Name","Project Name"
+"Project Start Date","Project Start Date"
+"Project Status","Project Status"
+"Project Type","Project Type"
+"Project Value","Project Value"
+"Project activity / task.","Project activity / task."
+"Project master.","Project master."
+"Project will get saved and will be searchable with project name given","Project will get saved and will be searchable with project name given"
+"Project wise Stock Tracking","Project wise Stock Tracking"
+"Project wise Stock Tracking ","Project wise Stock Tracking "
+"Project-wise data is not available for Quotation","Project-wise data is not available for Quotation"
+"Projected","Projected"
+"Projected Qty","Projected Qty"
+"Projects","Verkefni"
+"Projects & System","Projects & System"
+"Projects Manager","Projects Manager"
+"Projects User","Projects User"
+"Prompt for Email on Submission of","Prompt for Email on Submission of"
+"Proposal Writing","Proposal Writing"
+"Provide email id registered in company","Provide email id registered in company"
+"Provisional Profit / Loss (Credit)","Provisional Profit / Loss (Credit)"
+"Public","Public"
+"Published on website at: {0}","Published on website at: {0}"
+"Publishing","Publishing"
+"Pull sales orders (pending to deliver) based on the above criteria","Pull sales orders (pending to deliver) based on the above criteria"
+"Purchase","Purchase"
+"Purchase / Manufacture Details","Purchase / Manufacture Details"
+"Purchase Analytics","Purchase Analytics"
+"Purchase Common","Purchase Common"
+"Purchase Details","Purchase Details"
+"Purchase Discounts","Purchase Discounts"
+"Purchase Invoice","Purchase Invoice"
+"Purchase Invoice Advance","Purchase Invoice Advance"
+"Purchase Invoice Advances","Purchase Invoice Advances"
+"Purchase Invoice Item","Purchase Invoice Item"
+"Purchase Invoice Trends","Purchase Invoice Trends"
+"Purchase Invoice {0} is already submitted","Purchase Invoice {0} is already submitted"
+"Purchase Item","Purchase Item"
+"Purchase Manager","Purchase Manager"
+"Purchase Master Manager","Purchase Master Manager"
+"Purchase Order","Innkaupapöntun"
+"Purchase Order Item","Purchase Order Item"
+"Purchase Order Item No","Purchase Order Item No"
+"Purchase Order Item Supplied","Purchase Order Item Supplied"
+"Purchase Order Items","Purchase Order Items"
+"Purchase Order Items Supplied","Purchase Order Items Supplied"
+"Purchase Order Items To Be Billed","Purchase Order Items To Be Billed"
+"Purchase Order Items To Be Received","Purchase Order Items To Be Received"
+"Purchase Order Message","Purchase Order Message"
+"Purchase Order Required","Purchase Order Required"
+"Purchase Order Trends","Purchase Order Trends"
+"Purchase Order number required for Item {0}","Purchase Order number required for Item {0}"
+"Purchase Order {0} is 'Stopped'","Purchase Order {0} is 'Stopped'"
+"Purchase Order {0} is not submitted","Purchase Order {0} is not submitted"
+"Purchase Orders given to Suppliers.","Purchase Orders given to Suppliers."
+"Purchase Price List","Purchase Price List"
+"Purchase Receipt","Purchase Receipt"
+"Purchase Receipt Item","Purchase Receipt Item"
+"Purchase Receipt Item Supplied","Purchase Receipt Item Supplied"
+"Purchase Receipt Item Supplieds","Purchase Receipt Item Supplieds"
+"Purchase Receipt Items","Purchase Receipt Items"
+"Purchase Receipt Message","Purchase Receipt Message"
+"Purchase Receipt No","Purchase Receipt No"
+"Purchase Receipt Required","Purchase Receipt Required"
+"Purchase Receipt Trends","Purchase Receipt Trends"
+"Purchase Receipt must be submitted","Purchase Receipt must be submitted"
+"Purchase Receipt number required for Item {0}","Purchase Receipt number required for Item {0}"
+"Purchase Receipt {0} is not submitted","Purchase Receipt {0} is not submitted"
+"Purchase Receipts","Purchase Receipts"
+"Purchase Register","Purchase Register"
+"Purchase Return","Purchase Return"
+"Purchase Returned","Purchase Returned"
+"Purchase Taxes and Charges","Purchase Taxes and Charges"
+"Purchase Taxes and Charges Master","Purchase Taxes and Charges Master"
+"Purchase User","Purchase User"
+"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list."
+"Purchse Order number required for Item {0}","Purchse Order number required for Item {0}"
+"Purpose","Tilgangur"
+"Purpose must be one of {0}","Tilgangurinn verður að vera einn af {0}"
+"QA Inspection","Gæðaeftirlit"
+"Qty","Magn"
+"Qty Consumed Per Unit","Magn notað per einingu"
+"Qty To Manufacture","Magn til framleiðslu"
+"Qty as per Stock UOM","Qty as per Stock UOM"
+"Qty to Deliver","Magn til afhendingar"
+"Qty to Order","Magn til að panta"
+"Qty to Receive","Magn til að taka á móti"
+"Qty to Transfer","Magn sem á að flytja"
+"Qualification","Flokkun"
+"Quality","Gæði"
+"Quality Inspection","Gæðaeftirlit"
+"Quality Inspection Parameters","Quality Inspection Parameters"
+"Quality Inspection Reading","Quality Inspection Reading"
+"Quality Inspection Readings","Quality Inspection Readings"
+"Quality Inspection required for Item {0}","Quality Inspection required for Item {0}"
+"Quality Management","Quality Management"
+"Quality Manager","Quality Manager"
+"Quantity","Quantity"
+"Quantity Requested for Purchase","Quantity Requested for Purchase"
+"Quantity and Rate","Quantity and Rate"
+"Quantity and Warehouse","Quantity and Warehouse"
+"Quantity cannot be a fraction in row {0}","Quantity cannot be a fraction in row {0}"
+"Quantity for Item {0} must be less than {1}","Quantity for Item {0} must be less than {1}"
+"Quantity in row {0} ({1}) must be same as manufactured quantity {2}","Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
+"Quantity of item obtained after manufacturing / repacking from given quantities of raw materials","Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
+"Quantity required for Item {0} in row {1}","Quantity required for Item {0} in row {1}"
+"Quarter","Quarter"
+"Quarterly","Quarterly"
+"Quick Help","Flýtihjálp"
+"Quotation","Kostnaðaráætlun"
+"Quotation Item","Quotation Item"
+"Quotation Items","Quotation Items"
+"Quotation Lost Reason","Quotation Lost Reason"
+"Quotation Message","Quotation Message"
+"Quotation To","Quotation To"
+"Quotation Trends","Quotation Trends"
+"Quotation {0} is cancelled","Quotation {0} is cancelled"
+"Quotation {0} not of type {1}","Quotation {0} not of type {1}"
+"Quotations received from Suppliers.","Quotations received from Suppliers."
+"Quotes to Leads or Customers.","Quotes to Leads or Customers."
+"Raise Material Request when stock reaches re-order level","Raise Material Request when stock reaches re-order level"
+"Raised By","Raised By"
+"Raised By (Email)","Raised By (Email)"
+"Random","Random"
+"Range","Range"
+"Rate","Rate"
+"Rate ","Rate "
+"Rate (%)","Rate (%)"
+"Rate (Company Currency)","Rate (Company Currency)"
+"Rate Of Materials Based On","Rate Of Materials Based On"
+"Rate and Amount","Rate and Amount"
+"Rate at which Customer Currency is converted to customer's base currency","Rate at which Customer Currency is converted to customer's base currency"
+"Rate at which Price list currency is converted to company's base currency","Rate at which Price list currency is converted to company's base currency"
+"Rate at which Price list currency is converted to customer's base currency","Rate at which Price list currency is converted to customer's base currency"
+"Rate at which customer's currency is converted to company's base currency","Rate at which customer's currency is converted to company's base currency"
+"Rate at which supplier's currency is converted to company's base currency","Rate at which supplier's currency is converted to company's base currency"
+"Rate at which this tax is applied","Rate at which this tax is applied"
+"Raw Material","Raw Material"
+"Raw Material Item Code","Raw Material Item Code"
+"Raw Materials Supplied","Raw Materials Supplied"
+"Raw Materials Supplied Cost","Raw Materials Supplied Cost"
+"Raw material cannot be same as main Item","Raw material cannot be same as main Item"
+"Re-Open Ticket","Re-Open Ticket"
+"Re-Order Level","Re-Order Level"
+"Re-Order Qty","Re-Order Qty"
+"Re-order","Re-order"
+"Re-order Level","Re-order Level"
+"Re-order Qty","Re-order Qty"
+"Read","Lesa"
+"Reading 1","Aflestur 1"
+"Reading 10","Aflestur 10"
+"Reading 2","Aflestur 2"
+"Reading 3","Aflestur 3"
+"Reading 4","Aflestur 4"
+"Reading 5","Aflestur 5"
+"Reading 6","Aflestur 6"
+"Reading 7","Aflestur 7"
+"Reading 8","Aflestur 8"
+"Reading 9","Aflestur 9"
+"Real Estate","Fasteign"
+"Reason","Ástæða"
+"Reason for Leaving","Ástæða fyrir brottför"
+"Reason for Resignation","Ástæða fyrir uppsögn"
+"Reason for losing","Ástæða fyrir tapi"
+"Recd Quantity","Recd Quantity"
+"Receivable","Receivable"
+"Receivable / Payable account will be identified based on the field Master Type","Receivable / Payable account will be identified based on the field Master Type"
+"Receivables","Receivables"
+"Receivables / Payables","Receivables / Payables"
+"Receivables Group","Receivables Group"
+"Received","Received"
+"Received Date","Received Date"
+"Received Items To Be Billed","Received Items To Be Billed"
+"Received Or Paid","Received Or Paid"
+"Received Qty","Received Qty"
+"Received and Accepted","Received and Accepted"
+"Receiver List","Receiver List"
+"Receiver List is empty. Please create Receiver List","Receiver List is empty. Please create Receiver List"
+"Receiver Parameter","Receiver Parameter"
+"Recipients","Recipients"
+"Reconcile","Reconcile"
+"Reconciliation Data","Reconciliation Data"
+"Reconciliation HTML","Reconciliation HTML"
+"Reconciliation JSON","Reconciliation JSON"
+"Record item movement.","Record item movement."
+"Recurring Id","Recurring Id"
+"Recurring Invoice","Recurring Invoice"
+"Recurring Order","Recurring Order"
+"Recurring Type","Recurring Type"
+"Reduce Deduction for Leave Without Pay (LWP)","Reduce Deduction for Leave Without Pay (LWP)"
+"Reduce Earning for Leave Without Pay (LWP)","Reduce Earning for Leave Without Pay (LWP)"
+"Ref","Ref"
+"Ref Code","Ref Code"
+"Ref Date","Ref Date"
+"Ref SQ","Ref SQ"
+"Reference","Reference"
+"Reference #{0} dated {1}","Reference #{0} dated {1}"
+"Reference Date","Reference Date"
+"Reference Name","Reference Name"
+"Reference No","Reference No"
+"Reference No & Reference Date is required for {0}","Reference No & Reference Date is required for {0}"
+"Reference No is mandatory if you entered Reference Date","Reference No is mandatory if you entered Reference Date"
+"Reference Number","Reference Number"
+"Reference Row #","Reference Row #"
+"Refresh","Endurnýja"
+"Registration Details","Skráningarupplýsingar"
+"Registration Info","Skráningarupplýsingar"
+"Rejected","Hafnað"
+"Rejected Quantity","Hafnað magn"
+"Rejected Serial No","Hafnað raðnúmer"
+"Rejected Warehouse","Höfnuð vöruhús"
+"Rejected Warehouse is mandatory against regected item","Rejected Warehouse is mandatory against regected item"
+"Relation","Vensl"
+"Relieving Date","Relieving Date"
+"Relieving Date must be greater than Date of Joining","Relieving Date must be greater than Date of Joining"
+"Remark","Athugasemd"
+"Remarks","Athugasemdir"
+"Remove item if charges is not applicable to that item","Remove item if charges is not applicable to that item"
+"Rename","Endurnefna"
+"Rename Log","Annáll fyrir endurnefningar"
+"Rename Tool","Tól til að endurnefna"
+"Rent Cost","Leiguverð"
+"Rent per hour","Leiga á klukkustund"
+"Rented","Leigt"
+"Reorder Level","Endurpöntunarstig"
+"Reorder Qty","Endurpöntunarmagn"
+"Repack","Endurpakka"
+"Repeat Customer Revenue","Repeat Customer Revenue"
+"Repeat Customers","Repeat Customers"
+"Repeat on Day of Month","Repeat on Day of Month"
+"Replace","Replace"
+"Replace Item / BOM in all BOMs","Replace Item / BOM in all BOMs"
+"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM"
+"Replied","Replied"
+"Report Date","Report Date"
+"Report Type","Report Type"
+"Report Type is mandatory","Report Type is mandatory"
+"Reports to","Reports to"
+"Reqd By Date","Reqd By Date"
+"Reqd by Date","Reqd by Date"
+"Request Type","Request Type"
+"Request for Information","Request for Information"
+"Request for purchase.","Request for purchase."
+"Requested","Requested"
+"Requested For","Requested For"
+"Requested Items To Be Ordered","Requested Items To Be Ordered"
+"Requested Items To Be Transferred","Requested Items To Be Transferred"
+"Requested Qty","Requested Qty"
+"Requested Qty: Quantity requested for purchase, but not ordered.","Requested Qty: Quantity requested for purchase, but not ordered."
+"Requests for items.","Requests for items."
+"Required By","Required By"
+"Required Date","Required Date"
+"Required Qty","Required Qty"
+"Required only for sample item.","Required only for sample item."
+"Required raw materials issued to the supplier for producing a sub - contracted item.","Required raw materials issued to the supplier for producing a sub - contracted item."
+"Research","Research"
+"Research & Development","Research & Development"
+"Researcher","Researcher"
+"Reseller","Reseller"
+"Reserved","Reserved"
+"Reserved Qty","Reserved Qty"
+"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserved Qty: Quantity ordered for sale, but not delivered."
+"Reserved Quantity","Reserved Quantity"
+"Reserved Warehouse","Reserved Warehouse"
+"Reserved Warehouse in Sales Order / Finished Goods Warehouse","Reserved Warehouse in Sales Order / Finished Goods Warehouse"
+"Reserved Warehouse is missing in Sales Order","Reserved Warehouse is missing in Sales Order"
+"Reserved Warehouse required for stock Item {0} in row {1}","Reserved Warehouse required for stock Item {0} in row {1}"
+"Reserved warehouse required for stock item {0}","Reserved warehouse required for stock item {0}"
+"Reserves and Surplus","Ársniðurstaða"
+"Reset Filters","Reset Filters"
+"Resignation Letter Date","Resignation Letter Date"
+"Resolution","Resolution"
+"Resolution Date","Resolution Date"
+"Resolution Details","Resolution Details"
+"Resolved By","Resolved By"
+"Rest Of The World","Rest Of The World"
+"Retail","Retail"
+"Retail & Wholesale","Retail & Wholesale"
+"Retailer","Retailer"
+"Review Date","Review Date"
+"Rgt","Rgt"
+"Role Allowed to edit frozen stock","Role Allowed to edit frozen stock"
+"Role that is allowed to submit transactions that exceed credit limits set.","Role that is allowed to submit transactions that exceed credit limits set."
+"Root Type","Root Type"
+"Root Type is mandatory","Root Type is mandatory"
+"Root account can not be deleted","Root account can not be deleted"
+"Root cannot be edited.","Root cannot be edited."
+"Root cannot have a parent cost center","Root cannot have a parent cost center"
+"Rounded Off","Auramismunur"
+"Rounded Total","Rounded Total"
+"Rounded Total (Company Currency)","Rounded Total (Company Currency)"
+"Row # ","Row # "
+"Row # {0}: ","Row # {0}: "
+"Row #{0}: Please specify Serial No for Item {1}","Row #{0}: Please specify Serial No for Item {1}"
+"Row {0}: Account {1} does not match with {2} {3} Name","Row {0}: Account {1} does not match with {2} {3} Name"
+"Row {0}: Account {1} does not match with {2} {3} account","Row {0}: Account {1} does not match with {2} {3} account"
+"Row {0}: Allocated amount {1} must be less than or equals to JV amount {2}","Row {0}: Allocated amount {1} must be less than or equals to JV amount {2}"
+"Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2}","Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2}"
+"Row {0}: Conversion Factor is mandatory","Row {0}: Conversion Factor is mandatory"
+"Row {0}: Credit entry can not be linked with a {1}","Row {0}: Credit entry can not be linked with a {1}"
+"Row {0}: Debit entry can not be linked with a {1}","Row {0}: Debit entry can not be linked with a {1}"
+"Row {0}: Payment Amount cannot be greater than Outstanding Amount","Row {0}: Payment Amount cannot be greater than Outstanding Amount"
+"Row {0}: Payment against Sales/Purchase Order should always be marked as advance","Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
+"Row {0}: Payment amount can not be negative","Row {0}: Payment amount can not be negative"
+"Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.","Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
+"Row {0}: Qty is mandatory","Row {0}: Qty is mandatory"
+"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}"
+"Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}","Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}"
+"Row {0}: {1} is not a valid {2}","Row {0}: {1} is not a valid {2}"
+"Row {0}:Start Date must be before End Date","Row {0}:Start Date must be before End Date"
+"Rules for adding shipping costs.","Rules for adding shipping costs."
+"Rules for applying pricing and discount.","Rules for applying pricing and discount."
+"Rules to calculate shipping amount for a sale","Rules to calculate shipping amount for a sale"
+"S.O. No.","S.O. No."
+"SHE Cess on Excise","SHE Cess on Excise"
+"SHE Cess on Service Tax","SHE Cess on Service Tax"
+"SHE Cess on TDS","SHE Cess on TDS"
+"SMS Center","SMS Center"
+"SMS Gateway URL","SMS Gateway URL"
+"SMS Log","SMS Log"
+"SMS Parameter","SMS Parameter"
+"SMS Sender Name","SMS Sender Name"
+"SMS Settings","SMS Settings"
+"SO Date","SO Date"
+"SO Pending Qty","SO Pending Qty"
+"SO Qty","SO Qty"
+"Salary","Laun"
+"Salary Information","Salary Information"
+"Salary Manager","Salary Manager"
+"Salary Mode","Salary Mode"
+"Salary Slip","Salary Slip"
+"Salary Slip Deduction","Salary Slip Deduction"
+"Salary Slip Earning","Salary Slip Earning"
+"Salary Slip of employee {0} already created for this month","Salary Slip of employee {0} already created for this month"
+"Salary Structure","Salary Structure"
+"Salary Structure Deduction","Salary Structure Deduction"
+"Salary Structure Earning","Salary Structure Earning"
+"Salary Structure Earnings","Salary Structure Earnings"
+"Salary breakup based on Earning and Deduction.","Salary breakup based on Earning and Deduction."
+"Salary components.","Salary components."
+"Salary template master.","Salary template master."
+"Sales","Sala"
+"Sales Analytics","Sales Analytics"
+"Sales BOM","Sales BOM"
+"Sales BOM Help","Sales BOM Help"
+"Sales BOM Item","Sales BOM Item"
+"Sales BOM Items","Sales BOM Items"
+"Sales Browser","Sales Browser"
+"Sales Details","Sales Details"
+"Sales Discounts","Sales Discounts"
+"Sales Email Settings","Sales Email Settings"
+"Sales Expenses","Sölukostnaður"
+"Sales Extras","Sales Extras"
+"Sales Funnel","Sales Funnel"
+"Sales Invoice","Sales Invoice"
+"Sales Invoice Advance","Sales Invoice Advance"
+"Sales Invoice Item","Sales Invoice Item"
+"Sales Invoice Items","Sales Invoice Items"
+"Sales Invoice Message","Sales Invoice Message"
+"Sales Invoice No","Sales Invoice No"
+"Sales Invoice Trends","Sales Invoice Trends"
+"Sales Invoice {0} has already been submitted","Sales Invoice {0} has already been submitted"
+"Sales Invoice {0} must be cancelled before cancelling this Sales Order","Sales Invoice {0} must be cancelled before cancelling this Sales Order"
+"Sales Item","Sales Item"
+"Sales Manager","Sales Manager"
+"Sales Master Manager","Sales Master Manager"
+"Sales Order","Sales Order"
+"Sales Order Date","Sales Order Date"
+"Sales Order Item","Sales Order Item"
+"Sales Order Items","Sales Order Items"
+"Sales Order Message","Sales Order Message"
+"Sales Order No","Sales Order No"
+"Sales Order Required","Sales Order Required"
+"Sales Order Trends","Sales Order Trends"
+"Sales Order required for Item {0}","Sales Order required for Item {0}"
+"Sales Order {0} is not submitted","Sales Order {0} is not submitted"
+"Sales Order {0} is not valid","Sales Order {0} is not valid"
+"Sales Order {0} is stopped","Sales Order {0} is stopped"
+"Sales Partner","Sales Partner"
+"Sales Partner Name","Sales Partner Name"
+"Sales Partner Target","Sales Partner Target"
+"Sales Partners Commission","Sales Partners Commission"
+"Sales Person","Sales Person"
+"Sales Person Name","Sales Person Name"
+"Sales Person Target Variance Item Group-Wise","Sales Person Target Variance Item Group-Wise"
+"Sales Person Targets","Sales Person Targets"
+"Sales Person-wise Transaction Summary","Sales Person-wise Transaction Summary"
+"Sales Price List","Sales Price List"
+"Sales Register","Sales Register"
+"Sales Return","Sales Return"
+"Sales Returned","Sales Returned"
+"Sales Taxes and Charges","Sales Taxes and Charges"
+"Sales Taxes and Charges Master","Sales Taxes and Charges Master"
+"Sales Team","Sales Team"
+"Sales Team Details","Sales Team Details"
+"Sales Team1","Sales Team1"
+"Sales User","Sales User"
+"Sales and Purchase","Sales and Purchase"
+"Sales campaigns.","Sales campaigns."
+"Salutation","Salutation"
+"Sample Size","Sample Size"
+"Sanctioned Amount","Sanctioned Amount"
+"Saturday","Saturday"
+"Schedule","Schedule"
+"Schedule Date","Schedule Date"
+"Schedule Details","Schedule Details"
+"Scheduled","Scheduled"
+"Scheduled Date","Scheduled Date"
+"Scheduled to send to {0}","Scheduled to send to {0}"
+"Scheduled to send to {0} recipients","Scheduled to send to {0} recipients"
+"Scheduler Failed Events","Scheduler Failed Events"
+"School/University","School/University"
+"Score (0-5)","Score (0-5)"
+"Score Earned","Score Earned"
+"Score must be less than or equal to 5","Score must be less than or equal to 5"
+"Scrap %","Scrap %"
+"Seasonality for setting budgets.","Seasonality for setting budgets."
+"Secretary","Secretary"
+"Secured Loans","Veðlán"
+"Securities & Commodity Exchanges","Securities & Commodity Exchanges"
+"Securities and Deposits","Verðbréf og innstæður"
+"See ""Rate Of Materials Based On"" in Costing Section","See ""Rate Of Materials Based On"" in Costing Section"
+"Select ""Yes"" for sub - contracting items","Select ""Yes"" for sub - contracting items"
+"Select ""Yes"" if this item is used for some internal purpose in your company.","Select ""Yes"" if this item is used for some internal purpose in your company."
+"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Select ""Yes"" if this item represents some work like training, designing, consulting etc."
+"Select ""Yes"" if you are maintaining stock of this item in your Inventory.","Select ""Yes"" if you are maintaining stock of this item in your Inventory."
+"Select ""Yes"" if you supply raw materials to your supplier to manufacture this item.","Select ""Yes"" if you supply raw materials to your supplier to manufacture this item."
+"Select Budget Distribution to unevenly distribute targets across months.","Select Budget Distribution to unevenly distribute targets across months."
+"Select Budget Distribution, if you want to track based on seasonality.","Select Budget Distribution, if you want to track based on seasonality."
+"Select Company...","Select Company..."
+"Select DocType","Select DocType"
+"Select Fiscal Year","Select Fiscal Year"
+"Select Fiscal Year...","Select Fiscal Year..."
+"Select Items","Select Items"
+"Select Sales Orders","Select Sales Orders"
+"Select Sales Orders from which you want to create Production Orders.","Select Sales Orders from which you want to create Production Orders."
+"Select Time Logs and Submit to create a new Sales Invoice.","Select Time Logs and Submit to create a new Sales Invoice."
+"Select Transaction","Select Transaction"
+"Select Your Language","Select Your Language"
+"Select account head of the bank where cheque was deposited.","Select account head of the bank where cheque was deposited."
+"Select company name first.","Select company name first."
+"Select template from which you want to get the Goals","Select template from which you want to get the Goals"
+"Select the Employee for whom you are creating the Appraisal.","Select the Employee for whom you are creating the Appraisal."
+"Select the period when the invoice will be generated automatically","Select the period when the invoice will be generated automatically"
+"Select the relevant company name if you have multiple companies","Select the relevant company name if you have multiple companies"
+"Select the relevant company name if you have multiple companies.","Select the relevant company name if you have multiple companies."
+"Select type of transaction","Select type of transaction"
+"Select who you want to send this newsletter to","Select who you want to send this newsletter to"
+"Select your home country and check the timezone and currency.","Select your home country and check the timezone and currency."
+"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt."
+"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note"
+"Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.","Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item."
+"Selecting ""Yes"" will allow you to make a Production Order for this item.","Selecting ""Yes"" will allow you to make a Production Order for this item."
+"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master."
+"Selling","Sala"
+"Selling Amount","Selling Amount"
+"Selling Rate","Selling Rate"
+"Selling Settings","Selling Settings"
+"Selling must be checked, if Applicable For is selected as {0}","Selling must be checked, if Applicable For is selected as {0}"
+"Send","Send"
+"Send Autoreply","Send Autoreply"
+"Send Email","Send Email"
+"Send From","Send From"
+"Send Notifications To","Send Notifications To"
+"Send Now","Send Now"
+"Send SMS","Send SMS"
+"Send To","Send To"
+"Send To Type","Send To Type"
+"Send automatic emails to Contacts on Submitting transactions.","Send automatic emails to Contacts on Submitting transactions."
+"Send mass SMS to your contacts","Send mass SMS to your contacts"
+"Send regular summary reports via Email.","Send regular summary reports via Email."
+"Send to this list","Send to this list"
+"Sender Name","Sender Name"
+"Sent","Send"
+"Sent On","Sent On"
+"Separate production order will be created for each finished good item.","Separate production order will be created for each finished good item."
+"Serial #","Serial #"
+"Serial No","Serial No"
+"Serial No / Batch","Serial No / Batch"
+"Serial No Details","Serial No Details"
+"Serial No Service Contract Expiry","Serial No Service Contract Expiry"
+"Serial No Status","Serial No Status"
+"Serial No Warranty Expiry","Serial No Warranty Expiry"
+"Serial No is mandatory for Item {0}","Serial No is mandatory for Item {0}"
+"Serial No {0} created","Serial No {0} created"
+"Serial No {0} does not belong to Delivery Note {1}","Serial No {0} does not belong to Delivery Note {1}"
+"Serial No {0} does not belong to Item {1}","Serial No {0} does not belong to Item {1}"
+"Serial No {0} does not belong to Warehouse {1}","Serial No {0} does not belong to Warehouse {1}"
+"Serial No {0} does not exist","Serial No {0} does not exist"
+"Serial No {0} has already been received","Serial No {0} has already been received"
+"Serial No {0} is under maintenance contract upto {1}","Serial No {0} is under maintenance contract upto {1}"
+"Serial No {0} is under warranty upto {1}","Serial No {0} is under warranty upto {1}"
+"Serial No {0} not found","Serial No {0} not found"
+"Serial No {0} not in stock","Serial No {0} not in stock"
+"Serial No {0} quantity {1} cannot be a fraction","Serial No {0} quantity {1} cannot be a fraction"
+"Serial No {0} status must be 'Available' to Deliver","Serial No {0} status must be 'Available' to Deliver"
+"Serial Nos Required for Serialized Item {0}","Serial Nos Required for Serialized Item {0}"
+"Serial Number Series","Serial Number Series"
+"Serial number {0} entered more than once","Serial number {0} entered more than once"
+"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation","Serialized Item {0} cannot be updated \
+					using Stock Reconciliation"
+"Series","Röð"
+"Series List for this Transaction","Series List for this Transaction"
+"Series Updated","Series Updated"
+"Series Updated Successfully","Series Updated Successfully"
+"Series is mandatory","Series is mandatory"
+"Series {0} already used in {1}","Röð {0} er þegar notuð í {1}"
+"Service","Þjónusta"
+"Service Address","Service Address"
+"Service Tax","Þjónustuskattur"
+"Services","Þjónustur"
+"Set","Set"
+"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Stilla sjálfgefin gildi eins og fyrirtæki, gjaldmiðil, reikningsár o.fl."
+"Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.","Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution."
+"Set Status as Available","Set Status as Available"
+"Set as Default","Set as Default"
+"Set as Lost","Set as Lost"
+"Set prefix for numbering series on your transactions","Set prefix for numbering series on your transactions"
+"Set targets Item Group-wise for this Sales Person.","Set targets Item Group-wise for this Sales Person."
+"Setting Account Type helps in selecting this Account in transactions.","Setting Account Type helps in selecting this Account in transactions."
+"Setting this Address Template as default as there is no other default","Setting this Address Template as default as there is no other default"
+"Setting up...","Setting up..."
+"Settings","Stillingar"
+"Settings for Accounts","Stillingar fyrir reikninga"
+"Settings for Buying Module","Settings for Buying Module"
+"Settings for HR Module","Settings for HR Module"
+"Settings for Selling Module","Settings for Selling Module"
+"Settings to extract Job Applicants from a mailbox e.g. ""jobs@example.com""","Settings to extract Job Applicants from a mailbox e.g. ""jobs@example.com"""
+"Setup","Uppsetning"
+"Setup Already Complete!!","Setup Already Complete!!"
+"Setup Complete","Setup Complete"
+"Setup SMS gateway settings","Setup SMS gateway settings"
+"Setup Series","Setup Series"
+"Setup Wizard","Setup Wizard"
+"Setup incoming server for jobs email id. (e.g. jobs@example.com)","Setup incoming server for jobs email id. (e.g. jobs@example.com)"
+"Setup incoming server for sales email id. (e.g. sales@example.com)","Setup incoming server for sales email id. (e.g. sales@example.com)"
+"Setup incoming server for support email id. (e.g. support@example.com)","Setup incoming server for support email id. (e.g. support@example.com)"
+"Share","Share"
+"Share With","Share With"
+"Shareholders Funds","Óráðstafað eigið fé"
+"Shipments to customers.","Shipments to customers."
+"Shipping","Shipping"
+"Shipping Account","Shipping Account"
+"Shipping Address","Shipping Address"
+"Shipping Address Name","Shipping Address Name"
+"Shipping Amount","Shipping Amount"
+"Shipping Rule","Shipping Rule"
+"Shipping Rule Condition","Shipping Rule Condition"
+"Shipping Rule Conditions","Shipping Rule Conditions"
+"Shipping Rule Label","Shipping Rule Label"
+"Shop","Shop"
+"Shopping Cart","Innkaupakarfa"
+"Short biography for website and other publications.","Short biography for website and other publications."
+"Shortage Qty","Shortage Qty"
+"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse."
+"Show / Hide features like Serial Nos, POS etc.","Show / Hide features like Serial Nos, POS etc."
+"Show In Website","Show In Website"
+"Show a slideshow at the top of the page","Show a slideshow at the top of the page"
+"Show in Website","Show in Website"
+"Show this slideshow at the top of the page","Show this slideshow at the top of the page"
+"Show zero values","Show zero values"
+"Shown in Website","Shown in Website"
+"Sick Leave","Sick Leave"
+"Signature","Signature"
+"Signature to be appended at the end of every email","Signature to be appended at the end of every email"
+"Single","Single"
+"Single unit of an Item.","Single unit of an Item."
+"Sit tight while your system is being setup. This may take a few moments.","Sit tight while your system is being setup. This may take a few moments."
+"Slideshow","Slideshow"
+"Soap & Detergent","Soap & Detergent"
+"Software","Software"
+"Software Developer","Software Developer"
+"Sorry, Serial Nos cannot be merged","Sorry, Serial Nos cannot be merged"
+"Sorry, companies cannot be merged","Sorry, companies cannot be merged"
+"Source","Source"
+"Source File","Source File"
+"Source Warehouse","Source Warehouse"
+"Source and target warehouse cannot be same for row {0}","Source and target warehouse cannot be same for row {0}"
+"Source of Funds (Liabilities)","Skuldir og eigið fé"
+"Source warehouse is mandatory for row {0}","Source warehouse is mandatory for row {0}"
+"Spartan","Spartan"
+"Special Characters except ""-"" and ""/"" not allowed in naming series","Special Characters except ""-"" and ""/"" not allowed in naming series"
+"Specification Details","Specification Details"
+"Specifications","Specifications"
+"Specify Exchange Rate to convert one currency into another","Specify Exchange Rate to convert one currency into another"
+"Specify a list of Territories, for which, this Price List is valid","Specify a list of Territories, for which, this Price List is valid"
+"Specify a list of Territories, for which, this Shipping Rule is valid","Specify a list of Territories, for which, this Shipping Rule is valid"
+"Specify a list of Territories, for which, this Taxes Master is valid","Specify a list of Territories, for which, this Taxes Master is valid"
+"Specify conditions to calculate shipping amount","Specify conditions to calculate shipping amount"
+"Specify the operations, operating cost and give a unique Operation no to your operations.","Specify the operations, operating cost and give a unique Operation no to your operations."
+"Split Delivery Note into packages.","Split Delivery Note into packages."
+"Sports","Sports"
+"Sr","Sr"
+"Standard","Standard"
+"Standard Buying","Standard Buying"
+"Standard Reports","Staðlaðar skýrslur"
+"Standard Selling","Stöðluð sala"
+"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Staðlaðir skilmálar og skilyrði sem hægt er að bæta við sölu og innkaup.
+
+Dæmi:
+
+1. Gildi tilboðsins.
+1. Greiðsluskilmálar (fyrirfram, í reikning, að hluta fyrirfram etc).
+1. Hvað er aukalega (eða það sem viðskiptavinur þarf að greiða).
+1. Öryggi / notkunarviðvörun.
+1. Ábyrgð ef einhver er.
+1. Skilareglur.
+1. Sendingarskilmálar, ef við á.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company."
+"Standard contract terms for Sales or Purchase.","Standard contract terms for Sales or Purchase."
+"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax."
+"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers."
+"Start","Byrja"
+"Start Date","Byrjunardagsetning"
+"Start POS","Ræsa verlunarkerfi (POS)"
+"Start date of current invoice's period","Start date of current invoice's period"
+"Start date of current order's period","Start date of current order's period"
+"Start date should be less than end date for Item {0}","Start date should be less than end date for Item {0}"
+"State","State"
+"Statement of Account","Statement of Account"
+"Static Parameters","Static Parameters"
+"Status","Status"
+"Status must be one of {0}","Status must be one of {0}"
+"Status of {0} {1} is now {2}","Status of {0} {1} is now {2}"
+"Status updated to {0}","Status updated to {0}"
+"Statutory info and other general information about your Supplier","Statutory info and other general information about your Supplier"
+"Stay Updated","Stay Updated"
+"Stock","Birgðir"
+"Stock Adjustment","Birgðaleiðrétting"
+"Stock Adjustment Account","Reikningur fyrir birgðaleiðréttingu"
+"Stock Ageing","Stock Ageing"
+"Stock Analytics","Stock Analytics"
+"Stock Assets","Vörubirgðir"
+"Stock Balance","Stock Balance"
+"Stock Entries already created for Production Order ","Stock Entries already created for Production Order "
+"Stock Entry","Stock Entry"
+"Stock Entry Detail","Stock Entry Detail"
+"Stock Expenses","Birgðagjöld"
+"Stock Frozen Upto","Stock Frozen Upto"
+"Stock Item","Stock Item"
+"Stock Ledger","Stock Ledger"
+"Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts","Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+"Stock Ledger Entry","Stock Ledger Entry"
+"Stock Ledger entries balances updated","Stock Ledger entries balances updated"
+"Stock Level","Stock Level"
+"Stock Liabilities","Birgðaskuldir"
+"Stock Projected Qty","Stock Projected Qty"
+"Stock Queue (FIFO)","Stock Queue (FIFO)"
+"Stock Received But Not Billed","Mótteknar birgðir en ekki greiddar"
+"Stock Reconcilation Data","Stock Reconcilation Data"
+"Stock Reconcilation Template","Stock Reconcilation Template"
+"Stock Reconciliation","Stock Reconciliation"
+"Stock Reconciliation can be used to update the stock on a particular date, usually as per physical inventory.","Stock Reconciliation can be used to update the stock on a particular date, usually as per physical inventory."
+"Stock Settings","Stock Settings"
+"Stock UOM","Stock UOM"
+"Stock UOM Replace Utility","Stock UOM Replace Utility"
+"Stock UOM updatd for Item {0}","Stock UOM updatd for Item {0}"
+"Stock Uom","Stock Uom"
+"Stock Value","Stock Value"
+"Stock Value Difference","Stock Value Difference"
+"Stock balances updated","Stock balances updated"
+"Stock cannot be updated against Delivery Note {0}","Stock cannot be updated against Delivery Note {0}"
+"Stock entries exist against warehouse {0} cannot re-assign or modify 'Master Name'","Stock entries exist against warehouse {0} cannot re-assign or modify 'Master Name'"
+"Stock transactions before {0} are frozen","Stock transactions before {0} are frozen"
+"Stock: ","Stock: "
+"Stop","Stop"
+"Stop Birthday Reminders","Stop Birthday Reminders"
+"Stop users from making Leave Applications on following days.","Stop users from making Leave Applications on following days."
+"Stopped","Stopped"
+"Stopped order cannot be cancelled. Unstop to cancel.","Stopped order cannot be cancelled. Unstop to cancel."
+"Stores","Verslanir"
+"Stub","Stub"
+"Sub Assemblies","Sub Assemblies"
+"Sub-currency. For e.g. ""Cent""","Sub-currency. For e.g. ""Cent"""
+"Subcontract","Subcontract"
+"Subcontracted","Subcontracted"
+"Subject","Subject"
+"Submit Salary Slip","Submit Salary Slip"
+"Submit all salary slips for the above selected criteria","Submit all salary slips for the above selected criteria"
+"Submit this Production Order for further processing.","Submit this Production Order for further processing."
+"Submitted","Submitted"
+"Subsidiary","Subsidiary"
+"Successful: ","Successful: "
+"Successfully Reconciled","Successfully Reconciled"
+"Suggestions","Suggestions"
+"Sunday","Sunday"
+"Supplier","Supplier"
+"Supplier (Payable) Account","Supplier (Payable) Account"
+"Supplier (vendor) name as entered in supplier master","Supplier (vendor) name as entered in supplier master"
+"Supplier > Supplier Type","Supplier > Supplier Type"
+"Supplier Account","Supplier Account"
+"Supplier Account Head","Supplier Account Head"
+"Supplier Address","Supplier Address"
+"Supplier Addresses and Contacts","Supplier Addresses and Contacts"
+"Supplier Details","Supplier Details"
+"Supplier Id","Supplier Id"
+"Supplier Intro","Supplier Intro"
+"Supplier Invoice Date","Supplier Invoice Date"
+"Supplier Invoice No","Supplier Invoice No"
+"Supplier Name","Supplier Name"
+"Supplier Naming By","Supplier Naming By"
+"Supplier Part Number","Supplier Part Number"
+"Supplier Quotation","Supplier Quotation"
+"Supplier Quotation Item","Supplier Quotation Item"
+"Supplier Reference","Supplier Reference"
+"Supplier Type","Supplier Type"
+"Supplier Type / Supplier","Supplier Type / Supplier"
+"Supplier Type master.","Supplier Type master."
+"Supplier Warehouse","Supplier Warehouse"
+"Supplier Warehouse mandatory for sub-contracted Purchase Receipt","Supplier Warehouse mandatory for sub-contracted Purchase Receipt"
+"Supplier database.","Supplier database."
+"Supplier master.","Supplier master."
+"Supplier of Goods or Services.","Supplier of Goods or Services."
+"Supplier warehouse where you have issued raw materials for sub - contracting","Supplier warehouse where you have issued raw materials for sub - contracting"
+"Supplier(s)","Supplier(s)"
+"Supplier-Wise Sales Analytics","Supplier-Wise Sales Analytics"
+"Support","Þjónusta"
+"Support Analtyics","Support Analtyics"
+"Support Analytics","Support Analytics"
+"Support Email","Support Email"
+"Support Email Settings","Support Email Settings"
+"Support Manager","Support Manager"
+"Support Password","Support Password"
+"Support Team","Support Team"
+"Support Ticket","Support Ticket"
+"Support queries from customers.","Support queries from customers."
+"Symbol","Symbol"
+"Sync Support Mails","Sync Support Mails"
+"Sync with Dropbox","Sync with Dropbox"
+"Sync with Google Drive","Sync with Google Drive"
+"System","Kerfi"
+"System Balance","Kerfisstaða"
+"System Manager","Kerfisstjóri"
+"System Settings","Kerfisstillingar"
+"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. If set, it will become default for all HR forms."
+"System for managing Backups","Kerfi til að stjórna afritun"
+"TDS (Advertisement)","TDS (Advertisement)"
+"TDS (Commission)","TDS (Commission)"
+"TDS (Contractor)","TDS (Contractor)"
+"TDS (Interest)","TDS (Interest)"
+"TDS (Rent)","TDS (Rent)"
+"TDS (Salary)","TDS (Salary)"
+"Table for Item that will be shown in Web Site","Tafla fyrir atriði sem verða sýnd á vefsíðu"
+"Taken","Taken"
+"Target","Target"
+"Target  Amount","Target  Amount"
+"Target Detail","Target Detail"
+"Target Details","Target Details"
+"Target Details1","Target Details1"
+"Target Distribution","Target Distribution"
+"Target On","Target On"
+"Target Qty","Target Qty"
+"Target Warehouse","Target Warehouse"
+"Target warehouse in row {0} must be same as Production Order","Target warehouse in row {0} must be same as Production Order"
+"Target warehouse is mandatory for row {0}","Target warehouse is mandatory for row {0}"
+"Task","Task"
+"Task Details","Task Details"
+"Task Subject","Task Subject"
+"Tasks","Tasks"
+"Tax","Tax"
+"Tax Amount After Discount Amount","Tax Amount After Discount Amount"
+"Tax Assets","Skatteignir"
+"Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items","Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items"
+"Tax Rate","Tax Rate"
+"Tax and other salary deductions.","Tax and other salary deductions."
+"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges","Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges"
+"Tax template for buying transactions.","Tax template for buying transactions."
+"Tax template for selling transactions.","Tax template for selling transactions."
+"Taxes","Taxes"
+"Taxes and Charges","Taxes and Charges"
+"Taxes and Charges Added","Taxes and Charges Added"
+"Taxes and Charges Added (Company Currency)","Taxes and Charges Added (Company Currency)"
+"Taxes and Charges Calculation","Taxes and Charges Calculation"
+"Taxes and Charges Deducted","Taxes and Charges Deducted"
+"Taxes and Charges Deducted (Company Currency)","Taxes and Charges Deducted (Company Currency)"
+"Taxes and Charges Total","Taxes and Charges Total"
+"Taxes and Charges Total (Company Currency)","Taxes and Charges Total (Company Currency)"
+"Technology","Technology"
+"Telecommunications","Telecommunications"
+"Telephone Expenses","Fjarskiptaútgjöld"
+"Television","Television"
+"Template","Template"
+"Template for performance appraisals.","Template for performance appraisals."
+"Template of terms or contract.","Template of terms or contract."
+"Temporary Accounts (Assets)","Tímabundnir reikningar (Eignir)"
+"Temporary Accounts (Liabilities)","Tímabundnir reikningar (Skuldir)"
+"Temporary Assets","Tímabundnar eignir"
+"Temporary Liabilities","Tímabundnar skuldir"
+"Term Details","Term Details"
+"Terms","Terms"
+"Terms and Conditions","Terms and Conditions"
+"Terms and Conditions Content","Terms and Conditions Content"
+"Terms and Conditions Details","Terms and Conditions Details"
+"Terms and Conditions Template","Terms and Conditions Template"
+"Terms and Conditions1","Terms and Conditions1"
+"Terretory","Terretory"
+"Territory","Territory"
+"Territory / Customer","Territory / Customer"
+"Territory Manager","Territory Manager"
+"Territory Name","Territory Name"
+"Territory Target Variance Item Group-Wise","Territory Target Variance Item Group-Wise"
+"Territory Targets","Territory Targets"
+"Test","Test"
+"Test Email Id","Test Email Id"
+"Test the Newsletter","Test the Newsletter"
+"The BOM which will be replaced","The BOM which will be replaced"
+"The First User: You","The First User: You"
+"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"""
+"The Organization","The Organization"
+"The account head under Liability, in which Profit/Loss will be booked","The account head under Liability, in which Profit/Loss will be booked"
+"The date on which next invoice will be generated. It is generated on submit.","The date on which next invoice will be generated. It is generated on submit."
+"The date on which next invoice will be generated. It is generated on submit.
+","The date on which next invoice will be generated. It is generated on submit.
+"
+"The date on which recurring invoice will be stop","The date on which recurring invoice will be stop"
+"The date on which recurring order will be stop","The date on which recurring order will be stop"
+"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","The day of the month on which auto invoice will be generated e.g. 05, 28 etc"
+"The day of the month on which auto invoice will be generated e.g. 05, 28 etc ","The day of the month on which auto invoice will be generated e.g. 05, 28 etc "
+"The day of the month on which auto order will be generated e.g. 05, 28 etc","The day of the month on which auto order will be generated e.g. 05, 28 etc"
+"The day of the month on which auto order will be generated e.g. 05, 28 etc ","The day of the month on which auto order will be generated e.g. 05, 28 etc "
+"The day(s) on which you are applying for leave are holiday. You need not apply for leave.","The day(s) on which you are applying for leave are holiday. You need not apply for leave."
+"The first Leave Approver in the list will be set as the default Leave Approver","The first Leave Approver in the list will be set as the default Leave Approver"
+"The first user will become the System Manager (you can change that later).","The first user will become the System Manager (you can change that later)."
+"The gross weight of the package. Usually net weight + packaging material weight. (for print)","The gross weight of the package. Usually net weight + packaging material weight. (for print)"
+"The name of your company for which you are setting up this system.","The name of your company for which you are setting up this system."
+"The net weight of this package. (calculated automatically as sum of net weight of items)","The net weight of this package. (calculated automatically as sum of net weight of items)"
+"The new BOM after replacement","The new BOM after replacement"
+"The rate at which Bill Currency is converted into company's base currency","The rate at which Bill Currency is converted into company's base currency"
+"The selected item cannot have Batch","The selected item cannot have Batch"
+"The unique id for tracking all recurring invoices. It is generated on submit.","The unique id for tracking all recurring invoices. It is generated on submit."
+"The unique id for tracking all recurring invoices. It is generated on submit.","The unique id for tracking all recurring invoices. It is generated on submit."
+"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
+"There are more holidays than working days this month.","There are more holidays than working days this month."
+"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","There can only be one Shipping Rule Condition with 0 or blank value for ""To Value"""
+"There is not enough leave balance for Leave Type {0}","There is not enough leave balance for Leave Type {0}"
+"There is nothing to edit.","There is nothing to edit."
+"There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.","There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists."
+"There were errors.","There were errors."
+"There were no updates in the items selected for this digest.","There were no updates in the items selected for this digest."
+"This Currency is disabled. Enable to use in transactions","This Currency is disabled. Enable to use in transactions"
+"This Leave Application is pending approval. Only the Leave Apporver can update status.","This Leave Application is pending approval. Only the Leave Apporver can update status."
+"This Time Log Batch has been billed.","This Time Log Batch has been billed."
+"This Time Log Batch has been cancelled.","This Time Log Batch has been cancelled."
+"This Time Log conflicts with {0}","This Time Log conflicts with {0}"
+"This format is used if country specific format is not found","This format is used if country specific format is not found"
+"This is a root account and cannot be edited.","This is a root account and cannot be edited."
+"This is a root customer group and cannot be edited.","This is a root customer group and cannot be edited."
+"This is a root item group and cannot be edited.","This is a root item group and cannot be edited."
+"This is a root sales person and cannot be edited.","This is a root sales person and cannot be edited."
+"This is a root territory and cannot be edited.","This is a root territory and cannot be edited."
+"This is an example website auto-generated from ERPNext","This is an example website auto-generated from ERPNext"
+"This is the number of the last created transaction with this prefix","This is the number of the last created transaction with this prefix"
+"This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.","This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
+"This will be used for setting rule in HR module","This will be used for setting rule in HR module"
+"Thread HTML","Thread HTML"
+"Thursday","Thursday"
+"Time Log","Time Log"
+"Time Log Batch","Time Log Batch"
+"Time Log Batch Detail","Time Log Batch Detail"
+"Time Log Batch Details","Time Log Batch Details"
+"Time Log Batch {0} must be 'Submitted'","Time Log Batch {0} must be 'Submitted'"
+"Time Log Status must be Submitted.","Time Log Status must be Submitted."
+"Time Log for tasks.","Time Log for tasks."
+"Time Log is not billable","Time Log is not billable"
+"Time Log {0} must be 'Submitted'","Time Log {0} must be 'Submitted'"
+"Time Zone","Tímabelti"
+"Time Zones","Tímabelti"
+"Time and Budget","Time and Budget"
+"Time at which items were delivered from warehouse","Time at which items were delivered from warehouse"
+"Time at which materials were received","Time at which materials were received"
+"Title","Title"
+"Titles for print templates e.g. Proforma Invoice.","Titles for print templates e.g. Proforma Invoice."
+"To","To"
+"To Currency","To Currency"
+"To Date","Lokadagur"
+"To Date should be same as From Date for Half Day leave","To Date should be same as From Date for Half Day leave"
+"To Date should be within the Fiscal Year. Assuming To Date = {0}","To Date should be within the Fiscal Year. Assuming To Date = {0}"
+"To Datetime","To Datetime"
+"To Discuss","To Discuss"
+"To Do List","To Do List"
+"To Package No.","To Package No."
+"To Produce","To Produce"
+"To Time","To Time"
+"To Value","To Value"
+"To Warehouse","To Warehouse"
+"To add child nodes, explore tree and click on the node under which you want to add more nodes.","To add child nodes, explore tree and click on the node under which you want to add more nodes."
+"To assign this issue, use the ""Assign"" button in the sidebar.","To assign this issue, use the ""Assign"" button in the sidebar."
+"To create a Bank Account","Til að stofna bankareikning"
+"To create a Tax Account","Til að búa til virðisaukaskattsreikninga"
+"To create an Account Head under a different company, select the company and save customer.","To create an Account Head under a different company, select the company and save customer."
+"To date cannot be before from date","To date cannot be before from date"
+"To enable <b>Point of Sale</b> features","To enable <b>Point of Sale</b> features"
+"To enable <b>Point of Sale</b> view","To enable <b>Point of Sale</b> view"
+"To get Item Group in details table","To get Item Group in details table"
+"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
+"To merge, following properties must be same for both items","To merge, following properties must be same for both items"
+"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+"To set this Fiscal Year as Default, click on 'Set as Default'","To set this Fiscal Year as Default, click on 'Set as Default'"
+"To track any installation or commissioning related work after sales","To track any installation or commissioning related work after sales"
+"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No"
+"To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.","To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product."
+"To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>","To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>"
+"To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.","To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item."
+"Too many columns. Export the report and print it using a spreadsheet application.","Of margir dálkar. Flytjið út skýrsluna og prentið með töflureikni."
+"Tools","Verkfæri"
+"Total","Alls"
+"Total ({0})","Alls ({0})"
+"Total Absent","Alls fjarverandi"
+"Total Achieved","Alls náð"
+"Total Actual","Total Raun niðurstaða"
+"Total Advance","Alls fyrirfram"
+"Total Amount","Heildarupphæð"
+"Total Amount To Pay","Heikdarupphæð til greiðslu"
+"Total Amount in Words","Heildarupphæð með orðum"
+"Total Billing This Year: ","Heildar reikningsfærsla á þessu ári: "
+"Total Characters","Fjöldi stafa"
+"Total Claimed Amount","Total Claimed Amount"
+"Total Commission","Heildar umboðslaun"
+"Total Cost","Heildarkostnaður"
+"Total Credit","Heildar kredit"
+"Total Debit","Heildar debet"
+"Total Debit must be equal to Total Credit. The difference is {0}","Heildar debet verður að stemma við heildar kredit. Mismunurinn er {0}"
+"Total Deduction","Heildar frádráttur"
+"Total Earning","Heildartekjur"
+"Total Experience","Heildarreynsla"
+"Total Fixed Cost","Allur fastur kostnaður"
+"Total Hours","Heildar stundir"
+"Total Hours (Expected)","Total Hours (Expected)"
+"Total Invoiced Amount","Total Invoiced Amount"
+"Total Leave Days","Total Leave Days"
+"Total Leaves Allocated","Total Leaves Allocated"
+"Total Message(s)","Total Message(s)"
+"Total Operating Cost","Total Operating Cost"
+"Total Order Considered","Total Order Considered"
+"Total Order Value","Total Order Value"
+"Total Outgoing","Total Outgoing"
+"Total Payment Amount","Total Payment Amount"
+"Total Points","Total Points"
+"Total Present","Total Present"
+"Total Qty","Total Qty"
+"Total Raw Material Cost","Total Raw Material Cost"
+"Total Revenue","Total Revenue"
+"Total Sanctioned Amount","Total Sanctioned Amount"
+"Total Score (Out of 5)","Total Score (Out of 5)"
+"Total Target","Total Target"
+"Total Tax (Company Currency)","Total Tax (Company Currency)"
+"Total Taxes and Charges","Total Taxes and Charges"
+"Total Taxes and Charges (Company Currency)","Total Taxes and Charges (Company Currency)"
+"Total Variable Cost","Total Variable Cost"
+"Total Variance","Total Variance"
+"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})","Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})"
+"Total allocated percentage for sales team should be 100","Total allocated percentage for sales team should be 100"
+"Total amount of invoices received from suppliers during the digest period","Total amount of invoices received from suppliers during the digest period"
+"Total amount of invoices sent to the customer during the digest period","Total amount of invoices sent to the customer during the digest period"
+"Total cannot be zero","Total cannot be zero"
+"Total in words","Total in words"
+"Total points for all goals should be 100. It is {0}","Total points for all goals should be 100. það er {0}"
+"Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials","Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials"
+"Total weightage assigned should be 100%. It is {0}","Total weightage assigned should be 100%. það er {0}"
+"Total(Amt)","Heildar(upphæð)"
+"Total(Qty)","Heildar(magn)"
+"Totals","Heildar"
+"Track Leads by Industry Type.","Track Leads by Industry Type."
+"Track separate Income and Expense for product verticals or divisions.","Track separate Income and Expense for product verticals or divisions."
+"Track this Delivery Note against any Project","Track this Delivery Note against any Project"
+"Track this Sales Order against any Project","Track this Sales Order against any Project"
+"Transaction","Færsla"
+"Transaction Date","Færsludagur"
+"Transaction not allowed against stopped Production Order {0}","Færsla ekki heimil þegar hætt hefur verið við framleiðslupöntun {0}"
+"Transfer","Flytja"
+"Transfer Material","Flytja efni"
+"Transfer Raw Materials","Flytja hráefni"
+"Transferred Qty","Flutt magn"
+"Transportation","Flutningur"
+"Transporter Info","Upplýsingar um flytjanda"
+"Transporter Name","Nafn flytjanda"
+"Transporter lorry number","Númer á vöruflutningabifreið flytjanda"
+"Travel","Ferð"
+"Travel Expenses","Ferðakostnaður"
+"Tree Type","Tree Type"
+"Tree of Item Groups.","Tree of Item Groups."
+"Tree of finanial Cost Centers.","Tree of finanial Cost Centers."
+"Tree of finanial accounts.","Tree of finanial accounts."
+"Trial Balance","Trial Balance"
+"Tuesday","Þriðjudagur"
+"Type","Gerð"
+"Type of document to rename.","Gerð skjals sem á að endurnefna"
+"Type of leaves like casual, sick etc.","Type of leaves like casual, sick etc."
+"Types of Expense Claim.","Tegundir af kostnaðarkröfum."
+"Types of activities for Time Sheets","Types of activities for Time Sheets"
+"Types of employment (permanent, contract, intern etc.).","Types of employment (permanent, contract, intern etc.)."
+"UOM Conversion Detail","UOM Conversion Detail"
+"UOM Conversion Details","UOM Conversion Details"
+"UOM Conversion Factor","UOM Conversion Factor"
+"UOM Conversion factor is required in row {0}","UOM Conversion factor is required in row {0}"
+"UOM Name","UOM Name"
+"UOM coversion factor required for UOM: {0} in Item: {1}","UOM coversion factor required for UOM: {0} in Item: {1}"
+"Under AMC","Under AMC"
+"Under Graduate","Under Graduate"
+"Under Warranty","Í ábyrgð"
+"Unit","Eining"
+"Unit of Measure","Mælieining"
+"Unit of Measure {0} has been entered more than once in Conversion Factor Table","Unit of Measure {0} has been entered more than once in Conversion Factor Table"
+"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unit of measurement of this item (e.g. Kg, Unit, No, Pair)."
+"Units/Hour","Eining/Klukkustund"
+"Units/Shifts","Units/Shifts"
+"Unpaid","Ógreitt"
+"Unreconciled Payment Details","Unreconciled Payment Details"
+"Unscheduled","Unscheduled"
+"Unsecured Loans","Ótryggð lán"
+"Unstop","Unstop"
+"Unstop Material Request","Unstop Material Request"
+"Unstop Purchase Order","Unstop Purchase Order"
+"Unsubscribed","Unsubscribed"
+"Upcoming Calendar Events (max 10)","Upcoming Calendar Events (max 10)"
+"Update","Update"
+"Update Clearance Date","Update Clearance Date"
+"Update Cost","Update Cost"
+"Update Finished Goods","Uppfæra fullunnar vörur"
+"Update Series","Uppfæra röð"
+"Update Series Number","Uppfæra númer raðar"
+"Update Stock","Update Stock"
+"Update additional costs to calculate landed cost of items","Update additional costs to calculate landed cost of items"
+"Update bank payment dates with journals.","Update bank payment dates with journals."
+"Update clearance date of Journal Entries marked as 'Bank Vouchers'","Update clearance date of Journal Entries marked as 'Bank Vouchers'"
+"Updated","Updated"
+"Updated Birthday Reminders","Updated Birthday Reminders"
+"Upload Attendance","Upload Attendance"
+"Upload Backups to Dropbox","Upload Backups to Dropbox"
+"Upload Backups to Google Drive","Upload Backups to Google Drive"
+"Upload HTML","Upload HTML"
+"Upload a .csv file with two columns: the old name and the new name. Max 500 rows.","Upload a .csv file with two columns: the old name and the new name. Max 500 rows."
+"Upload attendance from a .csv file","Upload attendance from a .csv file"
+"Upload stock balance via csv.","Upload stock balance via csv."
+"Upload your letter head and logo - you can edit them later.","Upload your letter head and logo - you can edit them later."
+"Upper Income","Efri tekjumörk"
+"Urgent","Áríðandi"
+"Use Multi-Level BOM","Use Multi-Level BOM"
+"Use SSL","Nota SSL"
+"Used for Production Plan","Notað í framleiðsluáætlun"
+"User","Notandi"
+"User ID","Notendakenni"
+"User ID not set for Employee {0}","Notendakenni ekki skilgreint fyrir starfsmann {0}"
+"User Name","Notandanafn"
+"User Name or Support Password missing. Please enter and try again.","Notandanafn eða stuðnings lykilorð vantar. Skráðu og reyndu aftur."
+"User Remark","Athugasemd notanda"
+"User Remark will be added to Auto Remark","Athugasemd notanda verður bætt við sjálfvirk athugasemd"
+"User Specific","Tiltekinn notandi"
+"User must always select","Notandi verður alltaf að velja"
+"User {0} is already assigned to Employee {1}","User {0} is already assigned to Employee {1}"
+"User {0} is disabled","Notandi {0} er óvirkur"
+"Username","Notandanafn"
+"Users who can approve a specific employee's leave applications","Users who can approve a specific employee's leave applications"
+"Users with this role are allowed to create / modify accounting entry before frozen date","Users with this role are allowed to create / modify accounting entry before frozen date"
+"Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts","Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts"
+"Utilities","Veitur"
+"Utility Expenses","Veitugjöld"
+"Valid For Territories","Valid For Territories"
+"Valid From","Valid From"
+"Valid Upto","Valid Upto"
+"Valid for Territories","Valid for Territories"
+"Validate","Validate"
+"Valuation","Valuation"
+"Valuation Method","Valuation Method"
+"Valuation Rate","Valuation Rate"
+"Valuation Rate required for Item {0}","Valuation Rate required for Item {0}"
+"Valuation and Total","Valuation and Total"
+"Value","Value"
+"Value or Qty","Value or Qty"
+"Variance","Variance"
+"Vehicle Dispatch Date","Vehicle Dispatch Date"
+"Vehicle No","Vehicle No"
+"Venture Capital","Venture Capital"
+"Verified By","Verified By"
+"View Details","View Details"
+"View Ledger","View Ledger"
+"View Now","View Now"
+"Visit report for maintenance call.","Visit report for maintenance call."
+"Voucher #","Voucher #"
+"Voucher Detail No","Voucher Detail No"
+"Voucher Detail Number","Voucher Detail Number"
+"Voucher ID","Voucher ID"
+"Voucher No","Númer fylgiskjals"
+"Voucher Type","Færslugerð"
+"Voucher Type and Date","Gerð og dagsetning fylgiskjals"
+"Walk In","Walk In"
+"Warehouse","Vörugeymsla"
+"Warehouse Contact Info","Upplýsingar um tengilið vörugeymslu"
+"Warehouse Detail","Upplýsingar um vörugeymslu"
+"Warehouse Name","Nafn vörugeymslu"
+"Warehouse and Reference","Vörugeymsla og tilvísun"
+"Warehouse can not be deleted as stock ledger entry exists for this warehouse.","Warehouse can not be deleted as stock ledger entry exists for this warehouse."
+"Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt","Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt"
+"Warehouse cannot be changed for Serial No.","Warehouse cannot be changed for Serial No."
+"Warehouse is mandatory for stock Item {0} in row {1}","Warehouse is mandatory for stock Item {0} in row {1}"
+"Warehouse not found in the system","Warehouse not found in the system"
+"Warehouse required for stock Item {0}","Warehouse required for stock Item {0}"
+"Warehouse where you are maintaining stock of rejected items","Warehouse where you are maintaining stock of rejected items"
+"Warehouse {0} can not be deleted as quantity exists for Item {1}","Warehouse {0} can not be deleted as quantity exists for Item {1}"
+"Warehouse {0} does not belong to company {1}","Warehouse {0} does not belong to company {1}"
+"Warehouse {0} does not exist","Warehouse {0} does not exist"
+"Warehouse {0}: Company is mandatory","Warehouse {0}: Company is mandatory"
+"Warehouse {0}: Parent account {1} does not bolong to the company {2}","Warehouse {0}: Parent account {1} does not bolong to the company {2}"
+"Warehouse-wise Item Reorder","Warehouse-wise Item Reorder"
+"Warehouses","Warehouses"
+"Warehouses.","Warehouses."
+"Warn","Warn"
+"Warning: Leave application contains following block dates","Warning: Leave application contains following block dates"
+"Warning: Material Requested Qty is less than Minimum Order Qty","Warning: Material Requested Qty is less than Minimum Order Qty"
+"Warning: Sales Order {0} already exists against same Purchase Order number","Warning: Sales Order {0} already exists against same Purchase Order number"
+"Warning: System will not check overbilling since amount for Item {0} in {1} is zero","Warning: System will not check overbilling since amount for Item {0} in {1} is zero"
+"Warranty / AMC Details","Warranty / AMC Details"
+"Warranty / AMC Status","Warranty / AMC Status"
+"Warranty Expiry Date","Warranty Expiry Date"
+"Warranty Period (Days)","Warranty Period (Days)"
+"Warranty Period (in days)","Warranty Period (in days)"
+"We buy this Item","We buy this Item"
+"We sell this Item","We sell this Item"
+"Website","Vefsíða"
+"Website Description","Website Description"
+"Website Item Group","Website Item Group"
+"Website Item Groups","Website Item Groups"
+"Website Manager","Website Manager"
+"Website Settings","Website Settings"
+"Website Warehouse","Website Warehouse"
+"Wednesday","Wednesday"
+"Weekly","Weekly"
+"Weekly Off","Weekly Off"
+"Weight UOM","Weight UOM"
+"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Weight is mentioned,\nPlease mention ""Weight UOM"" too"
+"Weightage","Weightage"
+"Weightage (%)","Weightage (%)"
+"Welcome","Welcome"
+"Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!","Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!"
+"Welcome to ERPNext. Please select your language to begin the Setup Wizard.","Welcome to ERPNext. Please select your language to begin the Setup Wizard."
+"What does it do?","What does it do?"
+"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email."
+"When submitted, the system creates difference entries to set the given stock and valuation on this date.","When submitted, the system creates difference entries to set the given stock and valuation on this date."
+"Where items are stored.","Where items are stored."
+"Where manufacturing operations are carried out.","Where manufacturing operations are carried out."
+"Widowed","Widowed"
+"Will be calculated automatically when you enter the details","Will be calculated automatically when you enter the details"
+"Will be updated after Sales Invoice is Submitted.","Will be updated after Sales Invoice is Submitted."
+"Will be updated when batched.","Will be updated when batched."
+"Will be updated when billed.","Will be updated when billed."
+"Wire Transfer","Wire Transfer"
+"With Operations","With Operations"
+"Work Details","Work Details"
+"Work Done","Work Done"
+"Work In Progress","Verk í vinnslu"
+"Work-in-Progress Warehouse","Verk í vinnslu vörugeymsla"
+"Work-in-Progress Warehouse is required before Submit","Verk í vinnslu, vörugeymslu er krafist fyrir sendingu"
+"Working","Vinna"
+"Working Days","Vinnudagar"
+"Workstation","Vinnustöð"
+"Workstation Name","Nafn á vinnustöð"
+"Write Off Account","Afskrifta reikningur"
+"Write Off Amount","Afskrifta upphæð"
+"Write Off Amount <=","Afskrifta upphæð <="
+"Write Off Based On","Afskriftir byggðar á"
+"Write Off Cost Center","Write Off Cost Center"
+"Write Off Outstanding Amount","Afskrifa útistandandi upphæð"
+"Write Off Voucher","Afskrifa fylgiskjal"
+"Wrong Template: Unable to find head row.","Wrong Template: Unable to find head row."
+"Year","Ár"
+"Year Closed","Ár lokað"
+"Year End Date","Lokadagsetning árs"
+"Year Name","Nafn árs"
+"Year Start Date","Upphafsdagsetning árs"
+"Year of Passing","Núverandi ár"
+"Yearly","Árlega"
+"Yes","Já"
+"You are not authorized to add or update entries before {0}","Þú hefur ekki leyfi til að bæta við eða uppfæra færslur fyrir {0}"
+"You are not authorized to set Frozen value","Þú hefur ekki leyfi til að setja frosin gildi"
+"You are the Expense Approver for this record. Please Update the 'Status' and Save","Þú ert kostnaðar samþykkjandi fyrir þessa færslu. Please Update the 'Status' and Save"
+"You are the Leave Approver for this record. Please Update the 'Status' and Save","You are the Leave Approver for this record. Please Update the 'Status' and Save"
+"You can enter any date manually","You can enter any date manually"
+"You can enter the minimum quantity of this item to be ordered.","You can enter the minimum quantity of this item to be ordered."
+"You can not change rate if BOM mentioned agianst any item","You can not change rate if BOM mentioned agianst any item"
+"You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.","You can not enter both Delivery Note No and Sales Invoice No. Please enter any one."
+"You can not enter current voucher in 'Against Journal Voucher' column","You can not enter current voucher in 'Against Journal Voucher' column"
+"You can set Default Bank Account in Company master","You can set Default Bank Account in Company master"
+"You can start by selecting backup frequency and granting access for sync","You can start by selecting backup frequency and granting access for sync"
+"You can submit this Stock Reconciliation.","You can submit this Stock Reconciliation."
+"You can update either Quantity or Valuation Rate or both.","You can update either Quantity or Valuation Rate or both."
+"You cannot credit and debit same account at the same time","You cannot credit and debit same account at the same time"
+"You have entered duplicate items. Please rectify and try again.","You have entered duplicate items. Please rectify and try again."
+"You may need to update: {0}","You may need to update: {0}"
+"You must Save the form before proceeding","You must Save the form before proceeding"
+"Your Customer's TAX registration numbers (if applicable) or any general information","Your Customer's TAX registration numbers (if applicable) or any general information"
+"Your Customers","Your Customers"
+"Your Login Id","Your Login Id"
+"Your Products or Services","Your Products or Services"
+"Your Suppliers","Your Suppliers"
+"Your email address","Your email address"
+"Your financial year begins on","Your financial year begins on"
+"Your financial year ends on","Your financial year ends on"
+"Your sales person who will contact the customer in future","Your sales person who will contact the customer in future"
+"Your sales person will get a reminder on this date to contact the customer","Your sales person will get a reminder on this date to contact the customer"
+"Your setup is complete. Refreshing...","Your setup is complete. Refreshing..."
+"Your support email id - must be a valid email - this is where your emails will come!","Your support email id - must be a valid email - this is where your emails will come!"
+"[Error]","[Error]"
+"[Select]","[Select]"
+"`Freeze Stocks Older Than` should be smaller than %d days.","`Freeze Stocks Older Than` should be smaller than %d days."
+"and","and"
+"are not allowed.","are not allowed."
+"assigned by","assigned by"
+"cannot be greater than 100","cannot be greater than 100"
+"disabled user","disabled user"
+"e.g. ""Build tools for builders""","e.g. ""Build tools for builders"""
+"e.g. ""MC""","e.g. ""MC"""
+"e.g. ""My Company LLC""","e.g. ""My Company LLC"""
+"e.g. 5","e.g. 5"
+"e.g. Bank, Cash, Credit Card","e.g. Bank, Cash, Credit Card"
+"e.g. Kg, Unit, Nos, m","e.g. Kg, Unit, Nos, m"
+"e.g. VAT","e.g. VAT"
+"eg. Cheque Number","eg. Númer ávísunar"
+"example: Next Day Shipping","example: Next Day Shipping"
+"fold","fold"
+"hidden","hidden"
+"hours","hours"
+"lft","lft"
+"old_parent","old_parent"
+"rgt","rgt"
+"to","to"
+"website page link","website page link"
+"{0} '{1}' not in Fiscal Year {2}","{0} '{1}' not in Fiscal Year {2}"
+"{0} ({1}) must have role 'Expense Approver'","{0} ({1}) must have role 'Expense Approver'"
+"{0} ({1}) must have role 'Leave Approver'","{0} ({1}) must have role 'Leave Approver'"
+"{0} Credit limit {1} crossed","{0} Credit limit {1} crossed"
+"{0} Recipients","{0} Recipients"
+"{0} Serial Numbers required for Item {0}. Only {0} provided.","{0} Serial Numbers required for Item {0}. Only {0} provided."
+"{0} Tree","{0} Tree"
+"{0} against Purchase Order {1}","{0} against Purchase Order {1}"
+"{0} against Sales Invoice {1}","{0} against Sales Invoice {1}"
+"{0} against Sales Order {1}","{0} against Sales Order {1}"
+"{0} budget for Account {1} against Cost Center {2} will exceed by {3}","{0} budget for Account {1} against Cost Center {2} will exceed by {3}"
+"{0} can not be negative","{0} can not be negative"
+"{0} created","{0} created"
+"{0} days from {1}","{0} days from {1}"
+"{0} does not belong to Company {1}","{0} does not belong to Company {1}"
+"{0} entered twice in Item Tax","{0} entered twice in Item Tax"
+"{0} is an invalid email address in 'Notification \
+					Email Address'","{0} is an invalid email address in 'Notification \
+					Email Address'"
+"{0} is mandatory","{0} is mandatory"
+"{0} is mandatory for Item {1}","{0} is mandatory for Item {1}"
+"{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.","{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
+"{0} is not a stock Item","{0} is not a stock Item"
+"{0} is not a valid Batch Number for Item {1}","{0} is not a valid Batch Number for Item {1}"
+"{0} is not a valid Leave Approver. Removing row #{1}.","{0} is not a valid Leave Approver. Removing row #{1}."
+"{0} is not a valid email id","{0} is not a valid email id"
+"{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.","{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect."
+"{0} is required","{0} is required"
+"{0} must be a Purchased or Sub-Contracted Item in row {1}","{0} must be a Purchased or Sub-Contracted Item in row {1}"
+"{0} must be reduced by {1} or you should increase overflow tolerance","{0} must be reduced by {1} or you should increase overflow tolerance"
+"{0} valid serial nos for Item {1}","{0} valid serial nos for Item {1}"
+"{0} {1} against Bill {2} dated {3}","{0} {1} against Bill {2} dated {3}"
+"{0} {1} has already been submitted","{0} {1} has already been submitted"
+"{0} {1} has been modified. Please refresh.","{0} {1} has been modified. Please refresh."
+"{0} {1} is fully billed","{0} {1} is fully billed"
+"{0} {1} is not submitted","{0} {1} is not submitted"
+"{0} {1} is stopped","{0} {1} is stopped"
+"{0} {1} must be submitted","{0} {1} must be submitted"
+"{0} {1} not in any Fiscal Year","{0} {1} not in any Fiscal Year"
+"{0} {1} status is 'Stopped'","{0} {1} status is 'Stopped'"
+"{0} {1} status is Stopped","{0} {1} status is Stopped"
+"{0} {1} status is Unstopped","{0} {1} status is Unstopped"
+"{0} {1}: Cost Center is mandatory for Item {2}","{0} {1}: Cost Center is mandatory for Item {2}"
+"{0}: {1} not found in Invoice Details table","{0}: {1} not found in Invoice Details table"
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 8421a5b..2dcba43 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -34,11 +34,11 @@
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Aggiungi / Modifica < / a>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Aggiungi / Modifica < / a>"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> modello predefinito </ h4>  <p> Utilizza <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </ a> e tutti i campi di indirizzo ( compresi i campi personalizzati se presenti) sarà disponibile </ p>  <pre> <code> {{address_line1}} <br>  {% se address_line2%} {{address_line2}} {<br> % endif -%}  {{city}} <br>  {% se lo stato%} {{stato}} <br> {% endif -%}  {% se pincode%} PIN: {{}} pincode <br> {% endif -%}  {{country}} <br>  {% se il telefono%} Telefono: {{phone}} {<br> % endif -}%  {% se il fax%} Fax: {{fax}} <br> {% endif -%}  {% se email_id%} Email: {{email_id}} <br> {% endif -%}  </ code> </ pre>"
-A Customer Group exists with same name please change the Customer name or rename the Customer Group,Un gruppo cliente con lo stesso nome già esiste. Si prega di modificare il nome del cliente o rinominare il gruppo clienti.
-A Customer exists with same name,Un cliente con lo stesso nome esiste già.
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
+A Customer exists with same name,Esiste un Cliente con lo stesso nome
 A Lead with this email id should exist,Un potenziale cliente (lead) con questa e-mail dovrebbe esistere
 A Product or Service,Un prodotto o servizio
-A Supplier exists with same name,Un fornitore con lo stesso nome già esiste
+A Supplier exists with same name,Esiste un Fornitore con lo stesso nome
 A symbol for this currency. For e.g. $,Un simbolo per questa valuta. Per esempio $
 AMC Expiry Date,AMC Data Scadenza
 Abbr,Abbr
@@ -50,10 +50,10 @@
 Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
 Accepted Quantity,Quantità accettata
 Accepted Warehouse,Magazzino Accettato
-Account,conto
-Account Balance,Bilancio Conto
+Account,Account
+Account Balance,Bilancio Account
 Account Created: {0},Account Creato : {0}
-Account Details,Dettagli conto
+Account Details,Dettagli Account
 Account Head,Conto Capo
 Account Name,Nome Conto
 Account Type,Tipo Conto
@@ -80,7 +80,7 @@
 Account {0}: Parent account {1} does not exist,Account {0}: conto Parent {1} non esiste
 Account {0}: You can not assign itself as parent account,Account {0}: Non è possibile assegnare stesso come conto principale
 Account: {0} can only be updated via \					Stock Transactions,Account: {0} può essere aggiornato solo tramite \ transazioni di magazzino
-Accountant,ragioniere
+Accountant,Ragioniere
 Accounting,Contabilità
 "Accounting Entries can be made against leaf nodes, called","Scritture contabili può essere fatta contro nodi foglia , chiamato"
 "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
@@ -281,7 +281,7 @@
 Authorization Control,Controllo Autorizzazioni
 Authorization Rule,Ruolo Autorizzazione
 Auto Accounting For Stock Settings,Contabilità Auto Per Impostazioni Immagini
-Auto Material Request,Richiesta Materiale Auto
+Auto Material Request,Richiesta Automatica Materiale 
 Auto-raise Material Request if quantity goes below re-order level in a warehouse,Auto aumenta Materiale Richiesta se la quantità scende sotto il livello di riordino in un magazzino
 Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
 Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box 
@@ -294,10 +294,10 @@
 Available Stock for Packing Items,Disponibile Magazzino per imballaggio elementi
 "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibile in distinta , bolla di consegna , fattura di acquisto , ordine di produzione , ordine di acquisto , ricevuta d'acquisto , fattura di vendita , ordini di vendita , dell'entrata Stock , Timesheet"
 Average Age,Età media
-Average Commission Rate,Media della Commissione Tasso
+Average Commission Rate,Tasso medio di commissione
 Average Discount,Sconto Medio
-Awesome Products,Prodotti impressionante
-Awesome Services,impressionante Servizi
+Awesome Products,Prodotti di punta
+Awesome Services,Servizi di punta
 BOM Detail No,DIBA Dettagli N.
 BOM Explosion Item,DIBA Articolo Esploso
 BOM Item,DIBA Articolo
@@ -339,7 +339,7 @@
 Bank/Cash Balance,Banca/Contanti Saldo
 Banking,bancario
 Barcode,Codice a barre
-Barcode {0} already used in Item {1},Barcode {0} già utilizzato alla voce {1}
+Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 Based On,Basato su
 Basic,di base
 Basic Info,Info Base
@@ -374,7 +374,7 @@
 Bills raised to Customers.,Fatture sollevate dai Clienti.
 Bin,Bin
 Bio,Bio
-Biotechnology,biotecnologia
+Biotechnology,Biotecnologia
 Birthday,Compleanno
 Block Date,Data Blocco
 Block Days,Giorno Blocco
@@ -383,7 +383,7 @@
 Blog Subscriber,Abbonati Blog
 Blood Group,Gruppo Discendenza
 Both Warehouse must belong to same Company,Entrambi Warehouse deve appartenere alla stessa Società
-Box,scatola
+Box,Scatola
 Branch,Ramo
 Brand,Marca
 Brand Name,Nome Marca
@@ -427,7 +427,7 @@
 Calls,chiamate
 Campaign,Campagna
 Campaign Name,Nome Campagna
-Campaign Name is required,È obbligatorio Nome campagna
+Campaign Name is required,Nome Campagna obbligatorio
 Campaign Naming By,Campagna di denominazione
 Campaign-.####,Campagna . # # # #
 Can be approved by {0},Può essere approvato da {0}
@@ -498,7 +498,7 @@
 Chemical,chimico
 Cheque,Assegno
 Cheque Date,Data Assegno
-Cheque Number,Controllo Numero
+Cheque Number,Numero Assegno
 Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
 City,Città
 City/Town,Città/Paese
@@ -532,7 +532,7 @@
 Comment,Commento
 Comments,Commenti
 Commercial,commerciale
-Commission,commissione
+Commission,Commissione
 Commission Rate,Tasso Commissione
 Commission Rate (%),Tasso Commissione (%)
 Commission on Sales,Commissione sulle vendite
@@ -573,7 +573,7 @@
 Considered as an Opening Balance,Considerato come Apertura Saldo
 Consultant,Consulente
 Consulting,Consulting
-Consumable,consumabili
+Consumable,Consumabile
 Consumable Cost,Costo consumabili
 Consumable cost per hour,Costo consumabili per ora
 Consumed Qty,Q.tà Consumata
@@ -612,7 +612,7 @@
 Copy From Item Group,Copiare da elemento Gruppo
 Cosmetics,cosmetici
 Cost Center,Centro di Costo
-Cost Center Details,Dettaglio Centro di Costo
+Cost Center Details,Dettagli Centro di Costo
 Cost Center Name,Nome Centro di Costo
 Cost Center is required for 'Profit and Loss' account {0},È necessaria Centro di costo per ' economico ' conto {0}
 Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
@@ -639,7 +639,7 @@
 Create rules to restrict transactions based on values.,Creare regole per limitare le transazioni in base ai valori .
 Created By,Creato da
 Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
-Creation Date,Data di creazione
+Creation Date,Data di Creazione
 Creation Document No,Creazione di documenti No
 Creation Document Type,Creazione tipo di documento
 Creation Time,Tempo di creazione
@@ -910,7 +910,7 @@
 Emergency Contact,Contatto di emergenza
 Emergency Contact Details,Dettagli Contatto Emergenza
 Emergency Phone,Telefono di emergenza
-Employee,Dipendenti
+Employee,Dipendente
 Employee Birthday,Compleanno Dipendente
 Employee Details,Dettagli Dipendente
 Employee Education,Istruzione Dipendente
@@ -920,11 +920,11 @@
 Employee Internal Work Historys,Cronologia Lavoro Interno Dipendente
 Employee Leave Approver,Dipendente Lascia Approvatore
 Employee Leave Balance,Approvazione Bilancio Dipendete
-Employee Name,Nome Dipendete
-Employee Number,Numero Dipendenti
+Employee Name,Nome Dipendente
+Employee Number,Numero Dipendente
 Employee Records to be created by,Record dei dipendenti di essere creati da
 Employee Settings,Impostazioni per i dipendenti
-Employee Type,Tipo Dipendenti
+Employee Type,Tipo Dipendente
 "Employee designation (e.g. CEO, Director etc.).","Designazione dei dipendenti (ad esempio amministratore delegato , direttore , ecc.)"
 Employee master.,Maestro dei dipendenti .
 Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
@@ -937,7 +937,7 @@
 Employment Details,Dettagli Dipendente
 Employment Type,Tipo Dipendente
 Enable / disable currencies.,Abilitare / disabilitare valute .
-Enabled,Attivo
+Enabled,Attivato
 Encashment Date,Data Incasso
 End Date,Data di Fine
 End Date can not be less than Start Date,Data finale non può essere inferiore a Data di inizio
@@ -995,7 +995,7 @@
 Expected Delivery Date cannot be before Sales Order Date,Data prevista di consegna non può essere precedente Sales Order Data
 Expected End Date,Data prevista di fine
 Expected Start Date,Data prevista di inizio
-Expense,spese
+Expense,Spesa
 Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
 Expense Account,Conto uscite
 Expense Account is mandatory,Conto spese è obbligatorio
@@ -1703,8 +1703,8 @@
 Music,musica
 Must be Whole Number,Devono essere intere Numero
 Name,Nome
-Name and Description,Nome e descrizione
-Name and Employee ID,Nome e ID dipendente
+Name and Description,Nome e Descrizione
+Name and Employee ID,Nome e ID Dipendente
 "Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Nome del nuovo account . Nota : Si prega di non creare account per i Clienti e Fornitori , vengono creati automaticamente dal cliente e maestro fornitore"
 Name of person or organization that this address belongs to.,Nome della persona o organizzazione che questo indirizzo appartiene.
 Name of the Budget Distribution,Nome della distribuzione del bilancio
@@ -1723,12 +1723,12 @@
 Net Weight of each Item,Peso netto di ogni articolo
 Net pay cannot be negative,Retribuzione netta non può essere negativo
 Never,Mai
-New ,New 
-New Account,nuovo account
-New Account Name,Nuovo nome account
+New ,Nuovo
+New Account,Nuovo Account
+New Account Name,Nuovo Nome Account
 New BOM,Nuovo BOM
 New Communications,New Communications
-New Company,New Company
+New Company,Nuova Azienda
 New Cost Center,Nuovo Centro di costo
 New Cost Center Name,Nuovo Centro di costo Nome
 New Delivery Notes,Nuovi Consegna Note
@@ -1737,7 +1737,7 @@
 New Leave Application,Nuovo Lascia Application
 New Leaves Allocated,Nuove foglie allocato
 New Leaves Allocated (In Days),Nuove foglie attribuiti (in giorni)
-New Material Requests,Nuovo materiale Richieste
+New Material Requests,Nuove Richieste di Materiale
 New Projects,Nuovi Progetti
 New Purchase Orders,Nuovi Ordini di acquisto
 New Purchase Receipts,Nuovo acquisto Ricevute
@@ -1758,7 +1758,7 @@
 Newsletter has already been sent,Newsletter è già stato inviato
 "Newsletters to contacts, leads.","Newsletter ai contatti, lead."
 Newspaper Publishers,Editori Giornali
-Next,prossimo
+Next,Successivo
 Next Contact By,Avanti Contatto Con
 Next Contact Date,Avanti Contact Data
 Next Date,Avanti Data
@@ -1768,7 +1768,7 @@
 No Customer or Supplier Accounts found,Nessun cliente o fornitore Conti trovati
 No Expense Approvers. Please assign 'Expense Approver' Role to atleast one user,Nessun approvazioni di spesa . Assegnare ruoli ' Expense Approvatore ' per atleast un utente
 No Item with Barcode {0},Nessun articolo con codice a barre {0}
-No Item with Serial No {0},Nessun articolo con Serial No {0}
+No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
 No Items to pack,Non ci sono elementi per il confezionamento
 No Leave Approvers. Please assign 'Leave Approver' Role to atleast one user,Nessun Lascia le approvazioni . Assegnare ruoli ' Lascia Approvatore ' per atleast un utente
 No Permission,Nessuna autorizzazione
@@ -1781,18 +1781,18 @@
 No default BOM exists for Item {0},Non esiste BOM predefinito per la voce {0}
 No description given,Nessuna descrizione fornita
 No employee found,Nessun dipendente trovato
-No employee found!,Nessun dipendente trovata!
+No employee found!,Nessun dipendente trovato!
 No of Requested SMS,No di SMS richiesto
 No of Sent SMS,No di SMS inviati
 No of Visits,No di visite
 No permission,Nessuna autorizzazione
 No record found,Nessun record trovato
-No records found in the Invoice table,Nessun record trovati nella tabella Fattura
-No records found in the Payment table,Nessun record trovati nella tabella di pagamento
+No records found in the Invoice table,Nessun record trovato nella tabella Fattura
+No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
 No salary slip found for month: ,Nessun foglio paga trovato per mese:
 Non Profit,non Profit
 Nos,nos
-Not Active,Non attivo
+Not Active,Non Attivo
 Not Applicable,Non Applicabile
 Not Available,Non disponibile
 Not Billed,Non fatturata
@@ -1824,8 +1824,8 @@
 Number Format,Formato numero
 Offer Date,offerta Data
 Office,Ufficio
-Office Equipments,ufficio Equipments
-Office Maintenance Expenses,Spese di manutenzione degli uffici
+Office Equipments,Attrezzature Ufficio
+Office Maintenance Expenses,Spese Manutenzione Ufficio
 Office Rent,Affitto Ufficio
 Old Parent,Vecchio genitore
 On Net Total,Sul totale netto
@@ -1836,9 +1836,9 @@
 "Only Serial Nos with status ""Available"" can be delivered.",Possono essere consegnati solo i numeri seriali con stato &quot;Disponibile&quot;.
 Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
-Open,Aprire
+Open,Aperto
 Open Production Orders,Aprire ordini di produzione
-Open Tickets,Biglietti Open
+Open Tickets,Tickets Aperti
 Opening (Cr),Opening ( Cr )
 Opening (Dr),Opening ( Dr)
 Opening Date,Data di apertura
@@ -1855,16 +1855,16 @@
 Operation {0} not present in Operations Table,Operazione {0} non presente in Operations tabella
 Operations,Operazioni
 Opportunity,Opportunità
-Opportunity Date,Opportunity Data
+Opportunity Date,Data Opportunità
 Opportunity From,Opportunità da
 Opportunity Item,Opportunità articolo
-Opportunity Items,Articoli Opportunità
+Opportunity Items,Opportunità Articoli
 Opportunity Lost,Occasione persa
 Opportunity Type,Tipo di Opportunità
 Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
 Order Type,Tipo di ordine
 Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
-Ordered,ordinato
+Ordered,Ordinato
 Ordered Items To Be Billed,Articoli ordinati da fatturare
 Ordered Items To Be Delivered,Articoli ordinati da consegnare
 Ordered Qty,Quantità ordinato
@@ -1877,11 +1877,11 @@
 Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
 Other,Altro
 Other Details,Altri dettagli
-Others,altrui
+Others,Altri
 Out Qty,out Quantità
 Out Value,out Valore
 Out of AMC,Fuori di AMC
-Out of Warranty,Fuori garanzia
+Out of Warranty,Fuori Garanzia
 Outgoing,In partenza
 Outstanding Amount,Eccezionale Importo
 Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
@@ -1890,7 +1890,7 @@
 Overlapping conditions found between:,Condizioni sovrapposti trovati tra :
 Overview,Panoramica
 Owned,Di proprietà
-Owner,proprietario
+Owner,Proprietario
 P L A - Cess Portion,PLA - Cess Porzione
 PL or BS,PL o BS
 PO Date,PO Data
@@ -2275,8 +2275,8 @@
 Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
 Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantità di prodotto ottenuto dopo la produzione / reimballaggio da determinati quantitativi di materie prime
 Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
-Quarter,Quartiere
-Quarterly,Trimestrale
+Quarter,Trimestrale
+Quarterly,Trimestralmente
 Quick Help,Guida rapida
 Quotation,Quotazione
 Quotation Item,Quotazione articolo
@@ -2858,20 +2858,20 @@
 Target Warehouse,Obiettivo Warehouse
 Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
 Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
-Task,Task
-Task Details,Attività Dettagli
-Tasks,compiti
-Tax,Tax
+Task,Attività
+Task Details,Dettagli Attività
+Tasks,Attività
+Tax,Tassa
 Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
 Tax Assets,Attività fiscali
 Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Tasse categoria non può essere ' valutazione ' o ' di valutazione e Total ', come tutti gli articoli sono elementi non-azione"
-Tax Rate,Aliquota fiscale
+Tax Rate,Aliquota Fiscale
 Tax and other salary deductions.,Fiscale e di altre deduzioni salariali.
 Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges,Tabella di dettaglio fiscale prelevato dalla voce principale come una stringa e memorizzato in questo campo. Usato per imposte e oneri
 Tax template for buying transactions.,Modello fiscale per l'acquisto di transazioni.
 Tax template for selling transactions.,Modello fiscale per la vendita di transazioni.
 Taxable,Imponibile
-Taxes,Tassazione.
+Taxes,Tasse
 Taxes and Charges,Tasse e Costi
 Taxes and Charges Added,Tasse e spese aggiuntive
 Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
@@ -2892,7 +2892,7 @@
 Temporary Assets,Le attività temporanee
 Temporary Liabilities,Passivo temporanee
 Term Details,Dettagli termine
-Terms,condizioni
+Terms,Termini
 Terms and Conditions,Termini e Condizioni
 Terms and Conditions Content,Termini e condizioni contenuti
 Terms and Conditions Details,Termini e condizioni dettagli
@@ -2900,7 +2900,7 @@
 Terms and Conditions1,Termini e Condizioni 1
 Terretory,Terretory
 Territory,Territorio
-Territory / Customer,Territorio / clienti
+Territory / Customer,Territorio / Cliente
 Territory Manager,Territory Manager
 Territory Name,Territorio Nome
 Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
@@ -2909,9 +2909,9 @@
 Test Email Id,Prova Email Id
 Test the Newsletter,Provare la Newsletter
 The BOM which will be replaced,La distinta base che sarà sostituito
-The First User: You,Il primo utente : è
+The First User: You,Il Primo Utente : Tu
 "The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""",L&#39;articolo che rappresenta il pacchetto. Questo elemento deve avere &quot;è Stock Item&quot; come &quot;No&quot; e &quot;Is Voce di vendita&quot; come &quot;Yes&quot;
-The Organization,l'Organizzazione
+The Organization,L'Organizzazione
 "The account head under Liability, in which Profit/Loss will be booked","La testa account con responsabilità, in cui sarà prenotato Utile / Perdita"
 The date on which next invoice will be generated. It is generated on submit.,La data in cui verrà generato prossima fattura. Viene generato su Invia.
 The date on which recurring invoice will be stop,La data in cui fattura ricorrente sarà ferma
@@ -2943,11 +2943,11 @@
 This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 This is a root sales person and cannot be edited.,Si tratta di una persona di vendita di root e non può essere modificato .
 This is a root territory and cannot be edited.,Questo è un territorio root e non può essere modificato .
-This is an example website auto-generated from ERPNext,Questo è un sito esempio generata automaticamente da ERPNext
+This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
 This is the number of the last created transaction with this prefix,Questo è il numero dell&#39;ultimo transazione creata con questo prefisso
 This will be used for setting rule in HR module,Questo verrà utilizzato per regola impostazione nel modulo HR
 Thread HTML,HTML Discussione
-Thursday,Giovedi
+Thursday,Giovedì
 Time Log,Tempo di Log
 Time Log Batch,Tempo Log Batch
 Time Log Batch Detail,Ora Dettaglio Batch Log
@@ -2957,8 +2957,8 @@
 Time Log for tasks.,Tempo di log per le attività.
 Time Log is not billable,Il tempo log non è fatturabile
 Time Log {0} must be 'Submitted',Tempo di log {0} deve essere ' inoltrata '
-Time Zone,Time Zone
-Time Zones,Time Zones
+Time Zone,Fuso Orario
+Time Zones,Fusi Orari
 Time and Budget,Tempo e budget
 Time at which items were delivered from warehouse,Ora in cui gli elementi sono stati consegnati dal magazzino
 Time at which materials were received,Ora in cui sono stati ricevuti i materiali
@@ -2969,7 +2969,7 @@
 To Date,Di sesso
 To Date should be same as From Date for Half Day leave,Per data deve essere lo stesso Dalla Data per il congedo mezza giornata
 To Date should be within the Fiscal Year. Assuming To Date = {0},Per data deve essere entro l'anno fiscale. Assumendo A Data = {0}
-To Discuss,Per Discutere
+To Discuss,Da Discutere
 To Do List,To Do List
 To Package No.,A Pacchetto no
 To Produce,per produrre
@@ -3046,7 +3046,7 @@
 Transfer Material,Material Transfer
 Transfer Raw Materials,Trasferimento materie prime
 Transferred Qty,Quantità trasferito
-Transportation,Trasporti
+Transportation,Trasporto
 Transporter Info,Info Transporter
 Transporter Name,Trasportatore Nome
 Transporter lorry number,Numero di camion Transporter
@@ -3073,11 +3073,11 @@
 Under AMC,Sotto AMC
 Under Graduate,Sotto Laurea
 Under Warranty,Sotto Garanzia
-Unit,unità
-Unit of Measure,Unità di misura
+Unit,Unità
+Unit of Measure,Unità di Misura
 Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
 "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unità di misura di questo oggetto (es. Kg, Unità, No, coppia)."
-Units/Hour,Unità / Hour
+Units/Hour,Unità / Ora
 Units/Shifts,Unità / turni
 Unpaid,Non pagata
 Unreconciled Payment Details,Non riconciliate Particolari di pagamento
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 61690cd..2a2dd68 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -152,8 +152,8 @@
 Against Document No,ドキュメントNoに対する
 Against Expense Account,費用勘定に対する
 Against Income Account,所得収支に対する
-Against Journal Entry,ジャーナルバウチャーに対する
-Against Journal Entry {0} does not have any unmatched {1} entry,ジャーナルバウチャーに対して{0}は、比類のない{1}のエントリがありません
+Against Journal Voucher,ジャーナルバウチャーに対する
+Against Journal Voucher {0} does not have any unmatched {1} entry,ジャーナルバウチャーに対して{0}は、比類のない{1}のエントリがありません
 Against Purchase Invoice,購入の請求書に対する
 Against Sales Invoice,納品書に対する
 Against Sales Order,受注に対する
@@ -299,7 +299,7 @@
 Awesome Products,素晴らしい製品
 Awesome Services,素晴らしいサービス
 BOM Detail No,部品表の詳細はありません
-BOM Explosion Item,BOM爆発アイテム
+BOM Explosion Item,部品表展開アイテム
 BOM Item,部品表の項目
 BOM No,部品表はありません
 BOM No. for a Finished Good Item,完成品アイテムの部品表番号
@@ -310,15 +310,15 @@
 BOM number not allowed for non-manufactured Item {0} in row {1},非製造されたアイテムのために許可されていない部品表番号は{0}行{1}
 BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
 BOM replaced,部品表置き換え
-BOM {0} for Item {1} in row {2} is inactive or not submitted,BOMは{0}商品{1}の行に{2}が提出され、非アクティブであるかどう
-BOM {0} is not active or not submitted,BOMは{0}アクティブか提出していないではありません
-BOM {0} is not submitted or inactive BOM for Item {1},BOMは{0}商品{1}のために提出または非アクティブのBOMされていません
+BOM {0} for Item {1} in row {2} is inactive or not submitted,部品表は{0}項目ごとに{1}の行に{2}非アクティブか、提出されていない
+BOM {0} is not active or not submitted,BOMは{0}非アクティブか提出されていません。
+BOM {0} is not submitted or inactive BOM for Item {1},部品表は{0}{1}項目の部品表は提出されていないか非アクティブ
 Backup Manager,バックアップマネージャ
 Backup Right Now,今すぐバックアップ
 Backups will be uploaded to,バックアップをするとアップロードされます。
-Balance Qty,バランス数量
-Balance Sheet,バランスシート
-Balance Value,バランス値
+Balance Qty,残高数量
+Balance Sheet,貸借対照表
+Balance Value,価格のバランス
 Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 Balance must be,残高がある必要があります
 "Balances of Accounts of type ""Bank"" or ""Cash""",タイプ「銀行」の口座の残高または「現金」
@@ -335,7 +335,7 @@
 Bank Reconciliation,銀行和解
 Bank Reconciliation Detail,銀行和解の詳細
 Bank Reconciliation Statement,銀行和解声明
-Bank Entry,銀行の領収書
+Bank Voucher,銀行の領収書
 Bank/Cash Balance,銀行/現金残高
 Banking,銀行業務
 Barcode,バーコード
@@ -355,7 +355,7 @@
 Batch Time Logs for billing.,請求のための束のタイムログ。
 Batch-Wise Balance History,バッチ式残高記録
 Batched for Billing,請求の一括処理
-Better Prospects,より良い展望
+Better Prospects,いい見通し
 Bill Date,ビル日
 Bill No,請求はありません
 Bill No {0} already booked in Purchase Invoice {1},請求·いいえ{0}はすでに購入の請求書に計上{1}
@@ -371,8 +371,8 @@
 Billing Address Name,請求先住所の名前
 Billing Status,課金状況
 Bills raised by Suppliers.,サプライヤーが提起した請求書。
-Bills raised to Customers.,お客様に上げ法案。
-Bin,ビン
+Bills raised to Customers.,顧客に上がる請求
+Bin,Binary 
 Bio,自己紹介
 Biotechnology,バイオテクノロジー
 Birthday,誕生日
@@ -384,12 +384,12 @@
 Blood Group,血液型
 Both Warehouse must belong to same Company,両方の倉庫は同じ会社に属している必要があります
 Box,ボックス
-Branch,ブランチ (branch)
+Branch,支店
 Brand,ブランド
 Brand Name,ブランド名
 Brand master.,ブランドのマスター。
 Brands,ブランド
-Breakdown,内訳
+Breakdown,故障
 Broadcasting,放送
 Brokerage,証券仲介
 Budget,予算
@@ -400,13 +400,13 @@
 Budget Distribution Detail,予算配分の詳細
 Budget Distribution Details,予算配分の詳細
 Budget Variance Report,予算差異レポート
-Budget cannot be set for Group Cost Centers,予算はグループ原価センタの設定はできません
+Budget cannot be set for Group Cost Centers,予算は、グループの原価センターに設定することはできません。
 Build Report,レポートを作成
-Bundle items at time of sale.,販売時にアイテムをバンドル。
+Bundle items at time of sale.,販売時に商品をまとめる。
 Business Development Manager,ビジネス開発マネージャー
 Buying,買収
 Buying & Selling,購買＆販売
-Buying Amount,金額を購入
+Buying Amount,購入金額
 Buying Settings,[設定]を購入
 "Buying must be checked, if Applicable For is selected as {0}",適用のためには次のように選択されている場合の購入は、チェックする必要があります{0}
 C-Form,C-フォーム
@@ -435,7 +435,7 @@
 "Can not filter based on Voucher No, if grouped by Voucher",バウチャーに基づいてフィルタリングすることはできませんいいえ、クーポンごとにグループ化された場合
 Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',または '前の行の合計' '前の行の量に「充電式である場合にのみ、行を参照することができます
 Cancel Material Visit {0} before cancelling this Customer Issue,この顧客の問題をキャンセルする前の材料の訪問{0}をキャンセル
-Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前の材料の訪問{0}をキャンセル
+Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセル{0}する前に材料の訪問をキャンセル
 Cancelled,キャンセル済み
 Cancelling this Stock Reconciliation will nullify its effect.,このストック調整をキャンセルすると、その効果を無効にします。
 Cannot Cancel Opportunity as Quotation Exists,引用が存在する限り機会をキャンセルすることはできません
@@ -470,7 +470,7 @@
 Case No. cannot be 0,ケース番号は0にすることはできません
 Cash,現金
 Cash In Hand,手持ちの現金
-Cash Entry,金券
+Cash Voucher,金券
 Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 Cash/Bank Account,現金/銀行口座
 Casual Leave,臨時休暇
@@ -489,7 +489,7 @@
 "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",自動定期的な請求書を必要とするかどうかを確認します。いずれの売上請求書を提出した後、定期的なセクションは表示されます。
 Check if you want to send salary slip in mail to each employee while submitting salary slip,あなたが給料スリップを提出しながら、各従業員へのメール給与伝票を送信するかどうかを確認してください
 Check this if you want to force the user to select a series before saving. There will be no default if you check this.,あなたが保存する前に、一連の選択をユーザに強制したい場合は、これを確認してください。これをチェックするとデフォルトはありません。
-Check this if you want to show in website,あなたのウェブサイトに表示する場合は、これをチェックする
+Check this if you want to show in website,もしあなたのウェブサイトに表示する場合は、これをチェックしてください。
 Check this to disallow fractions. (for Nos),画分を許可しないように、これをチェックしてください。 （NOS用）
 Check this to pull emails from your mailbox,あなたのメールボックスからメールをプルするために、これをチェックする
 Check to activate,アクティブにするためにチェックする
@@ -515,7 +515,7 @@
 Client,顧客
 Close Balance Sheet and book Profit or Loss.,貸借対照表と帳簿上の利益または損失を閉じる。
 Closed,閉じました。
-Closing (Cr),クロム（Cr）を閉じる
+Closing (Cr),（Cr）を閉じる
 Closing (Dr),（DR）を閉じる
 Closing Account Head,決算ヘッド
 Closing Account {0} must be of type 'Liability',アカウント{0}を閉じると、タイプ '責任'でなければなりません
@@ -531,30 +531,30 @@
 Comma separated list of email addresses,コンマは、電子メールアドレスのリストを区切り
 Comment,コメント
 Comments,コメント
-Commercial,商用版
+Commercial,コマーシャル
 Commission,委員会
 Commission Rate,手数料率
 Commission Rate (%),手数料率（％）
 Commission on Sales,販売委員会
-Commission rate cannot be greater than 100,手数料率は、100を超えることはできません
+Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 Communication,コミュニケーション
 Communication HTML,通信のHTML
 Communication History,通信履歴
 Communication log.,通信ログ。
 Communications,コミュニケーション
 Company,会社
-Company (not Customer or Supplier) master.,会社（ないお客様、またはサプライヤ）のマスター。
-Company Abbreviation,会社の略
+Company (not Customer or Supplier) master.,会社（顧客、又はサプライヤーではない）のマスター。
+Company Abbreviation,会社の省略
 Company Details,会社の詳細情報
 Company Email,会社の電子メール
 "Company Email ID not found, hence mail not sent",会社の電子メールIDが見つかりません、したがって送信されませんでした。
 Company Info,会社情報
 Company Name,（会社名）
 Company Settings,会社の設定
-Company is missing in warehouses {0},当社は、倉庫にありません{0}
-Company is required,当社は必要とされている
-Company registration numbers for your reference. Example: VAT Registration Numbers etc.,あなたの参照のための会社の登録番号。例：付加価値税登録番号など
-Company registration numbers for your reference. Tax numbers etc.,あなたの参照のための会社の登録番号。税番号など
+Company is missing in warehouses {0},会社は、倉庫にありません{0}
+Company is required,会社は必要です
+Company registration numbers for your reference. Example: VAT Registration Numbers etc.,あなたの参考のための会社の登録番号。例：付加価値税登録番号など…
+Company registration numbers for your reference. Tax numbers etc.,あなたの参考のための会社の登録番号。税番号など
 "Company, Month and Fiscal Year is mandatory",会社、月と年度は必須です
 Compensatory Off,代償オフ
 Complete,完了
@@ -594,7 +594,7 @@
 Contacts,連絡先
 Content,内容
 Content Type,コンテンツの種類
-Contra Entry,コントラバウチャー
+Contra Voucher,コントラバウチャー
 Contract,契約書
 Contract End Date,契約終了日
 Contract End Date must be greater than Date of Joining,契約終了日は、参加の日よりも大きくなければならない
@@ -625,7 +625,7 @@
 Country Name,国名
 Country wise default Address Templates,国ごとのデフォルトのアドレス·テンプレート
 "Country, Timezone and Currency",国、タイムゾーンと通貨
-Create Bank Entry for the total salary paid for the above selected criteria,上で選択した基準に支払わ総給与のために銀行券を作成
+Create Bank Voucher for the total salary paid for the above selected criteria,上で選択した基準に支払わ総給与のために銀行券を作成
 Create Customer,顧客を作成
 Create Material Requests,素材の要求を作成
 Create New,新規作成
@@ -647,7 +647,7 @@
 Credit,クレジット
 Credit Amt,クレジットアマウント
 Credit Card,クレジットカード
-Credit Card Entry,クレジットカードのバウチャー
+Credit Card Voucher,クレジットカードのバウチャー
 Credit Controller,クレジットコントローラ
 Credit Days,クレジット日数
 Credit Limit,支払いの上限
@@ -981,7 +981,7 @@
 Excise Duty Edu Cess 2,物品税エドゥ目的税2
 Excise Duty SHE Cess 1,物品税SHE目的税1
 Excise Page Number,物品税ページ番号
-Excise Entry,物品税バウチャー
+Excise Voucher,物品税バウチャー
 Execution,実行
 Executive Search,エグゼクティブサーチ
 Exemption Limit,免除の制限
@@ -1026,7 +1026,7 @@
 External,外部
 Extract Emails,電子メールを抽出します
 FCFS Rate,FCFSレート
-Failed: ,Failed: 
+Failed: ,失敗しました：
 Family Background,家族の背景
 Fax,ファックス
 Features Setup,特長のセットアップ
@@ -1048,7 +1048,7 @@
 Finished Goods,完成品
 First Name,お名前（名）
 First Responded On,最初に奏効
-Fiscal Year,年度
+Fiscal Year,会計年度
 Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},当連結会計年度の開始日と会計年度終了日は、すでに会計年度に設定されている{0}
 Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart.,当連結会計年度の開始日と会計年度終了日は離れて年を超えることはできません。
 Fiscal Year Start Date should not be greater than Fiscal Year End Date,当連結会計年度の開始日が会計年度終了日を超えてはならない
@@ -1061,7 +1061,7 @@
 "For 'Sales BOM' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",「販売のBOM」のアイテム、倉庫、シリアル番号およびバッチには 'をパッキングリスト」テーブルから考慮されます。倉庫とバッチいいえ任意の「販売のBOM」の項目のすべての梱包項目について同じである場合、これらの値は、メインアイテムテーブルに入力することができ、値が「パッキングリスト」テーブルにコピーされます。
 For Company,会社のために
 For Employee,従業員の
-For Employee Name,従業員名用
+For Employee Name,従業員名の
 For Price List,価格表のための
 For Production,生産のための
 For Reference Only.,参考値。
@@ -1080,30 +1080,30 @@
 Freeze Stocks Older Than [Days],[日]より古い株式を凍結する
 Freight and Forwarding Charges,貨物および転送料金
 Friday,金曜日
-From,はじまり
+From,から
 From Bill of Materials,部品表から
 From Company,会社から
 From Currency,通貨から
 From Currency and To Currency cannot be same,通貨から通貨へ同じにすることはできません
 From Customer,顧客から
 From Customer Issue,お客様の問題から
-From Date,日
+From Date,日から
 From Date cannot be greater than To Date,日から日へより大きくすることはできません
 From Date must be before To Date,日付から日付の前でなければなりません
 From Date should be within the Fiscal Year. Assuming From Date = {0},日から年度内にする必要があります。日から仮定する= {0}
 From Delivery Note,納品書から
 From Employee,社員から
-From Lead,鉛を
+From Lead,鉛から
 From Maintenance Schedule,メンテナンススケジュールから
-From Material Request,素材要求から
-From Opportunity,オポチュニティから
+From Material Request,素材リクエストから
+From Opportunity,機会から
 From Package No.,パッケージ番号から
 From Purchase Order,発注から
 From Purchase Receipt,購入時の領収書から
 From Quotation,見積りから
 From Sales Order,受注から
 From Supplier Quotation,サプライヤー見積から
-From Time,時から
+From Time,時間から
 From Value,値から
 From and To dates required,から、必要な日数に
 From value must be less than to value in row {0},値から行の値以下でなければなりません{0}
@@ -1183,10 +1183,10 @@
 Half Yearly,半年ごとの
 Half-yearly,半年ごとの
 Happy Birthday!,お誕生日おめでとう！
-Hardware,size
-Has Batch No,バッチ番号があります
-Has Child Node,子ノードを持って
-Has Serial No,シリアル番号を持っている
+Hardware,ハードウェア
+Has Batch No,束の番号があります
+Has Child Node,子ノードがあります
+Has Serial No,シリアル番号があります
 Head of Marketing and Sales,マーケティングおよび販売部長
 Header,ヘッダー
 Health Care,健康管理
@@ -1208,7 +1208,7 @@
 Holidays,休日
 Home,ホーム
 Host,ホスト
-"Host, Email and Password required if emails are to be pulled",メールが引っ張られるのであれば必要なホスト、メールとパスワード
+"Host, Email and Password required if emails are to be pulled",メールが引っ張られるのであれば、ホスト、メールとパスワードが必要です。
 Hour,時
 Hour Rate,時間率
 Hour Rate Labour,時間レート労働
@@ -1329,7 +1329,7 @@
 Invoice Period From and Invoice Period To dates mandatory for recurring invoice,請求書を定期的に必須の日付へと請求期間からの請求書の期間
 Invoice Period To,請求書の期間
 Invoice Type,請求書の種類
-Invoice/Journal Entry Details,請求書/ジャーナルクーポン詳細
+Invoice/Journal Voucher Details,請求書/ジャーナルクーポン詳細
 Invoiced Amount (Exculsive Tax),請求された金額（Exculsive税）
 Is Active,アクティブである
 Is Advance,進歩である
@@ -1459,11 +1459,11 @@
 Jobs Email Settings,仕事のメール設定
 Journal Entries,仕訳
 Journal Entry,仕訳
-Journal Entry,伝票
-Journal Entry Account,伝票の詳細
-Journal Entry Account No,伝票の詳細番号
-Journal Entry {0} does not have account {1} or already matched,伝票は{0}アカウントを持っていない{1}、またはすでに一致
-Journal Entries {0} are un-linked,ジャーナルバウチャー{0}アンリンクされている
+Journal Voucher,伝票
+Journal Voucher Detail,伝票の詳細
+Journal Voucher Detail No,伝票の詳細番号
+Journal Voucher {0} does not have account {1} or already matched,伝票は{0}アカウントを持っていない{1}、またはすでに一致
+Journal Vouchers {0} are un-linked,ジャーナルバウチャーは{0}連結されていません。
 Keep a track of communication related to this enquiry which will help for future reference.,今後の参考のために役立ちます。この照会に関連した通信を追跡する。
 Keep it web friendly 900px (w) by 100px (h),900px(w)100px(h)にすることで適用それを維持する。
 Key Performance Area,重要実行分野
@@ -1578,7 +1578,7 @@
 Major/Optional Subjects,大手/オプション科目
 Make ,作成する
 Make Accounting Entry For Every Stock Movement,すべての株式の動きの会計処理のエントリを作成
-Make Bank Entry,銀行バウチャーを作る
+Make Bank Voucher,銀行バウチャーを作る
 Make Credit Note,クレジットメモしておきます
 Make Debit Note,デビットメモしておきます
 Make Delivery,配達をする
@@ -1707,11 +1707,11 @@
 Name,名前
 Name and Description,名前と説明
 Name and Employee ID,名前と従業員ID
-"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master",新しいアカウントの名前。注：お客様のアカウントを作成しないでください、それらは顧客とサプライヤマスタから自動的に作成され
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master",新しいアカウントの名前。注：お客様のアカウントを作成しないでください、それらは顧客とサプライヤーマスターから自動的に作成されます。
 Name of person or organization that this address belongs to.,このアドレスが所属する個人または組織の名前。
 Name of the Budget Distribution,予算配分の名前
-Naming Series,シリーズの命名
-Negative Quantity is not allowed,負の量は許可されていません
+Naming Series,シリーズを名付ける
+Negative Quantity is not allowed,負の数量は許可されていません
 Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} {2} {3}上の倉庫{1}の項目{0}のための負のストックError（{6}）
 Negative Valuation Rate is not allowed,負の評価レートは、許可されていません
 Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4},倉庫にある項目{1}のためのバッチでマイナス残高{0} {2} {3} {4}に
@@ -1724,8 +1724,8 @@
 Net Weight UOM,純重量UOM
 Net Weight of each Item,各項目の正味重量
 Net pay cannot be negative,正味賃金は負にすることはできません
-Never,使用しない
-New ,New 
+Never,決して
+New ,新しい
 New Account,新しいアカウント
 New Account Name,新しいアカウント名
 New BOM,新しい部品表
@@ -1733,17 +1733,17 @@
 New Company,新会社
 New Cost Center,新しいコストセンター
 New Cost Center Name,新しいコストセンター名
-New Delivery Notes,新しい納品書
+New Delivery Notes,新しい発送伝票
 New Enquiries,新しいお問い合わせ
 New Leads,新規リード
-New Leave Application,新しい休業申出
+New Leave Application,新しい休暇届け
 New Leaves Allocated,割り当てられた新しい葉
 New Leaves Allocated (In Days),（日数）が割り当て新しい葉
 New Material Requests,新素材のリクエスト
 New Projects,新しいプロジェクト
 New Purchase Orders,新しい発注書
 New Purchase Receipts,新規購入の領収書
-New Quotations,新しい名言
+New Quotations,新しい引用
 New Sales Orders,新しい販売注文
 New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号は、倉庫を持つことができません。倉庫在庫入力や購入時の領収書で設定する必要があります
 New Stock Entries,新入荷のエントリー
@@ -1766,8 +1766,8 @@
 Next Date,次の日
 Next email will be sent on:,次の電子メールは上に送信されます。
 No,いいえ
-No Customer Accounts found.,現在、アカウントはありませんでした。
-No Customer or Supplier Accounts found,顧客やサプライヤアカウント見つからないん
+No Customer Accounts found.,顧客アカウントが見つかりませんでした。
+No Customer or Supplier Accounts found,顧客やサプライヤーアカウントが見つかりません。
 No Expense Approvers. Please assign 'Expense Approver' Role to atleast one user,出費を承認しない。少なくとも1ユーザーに「経費承認者の役割を割り当ててください
 No Item with Barcode {0},バーコード{0}に項目なし
 No Item with Serial No {0},シリアル番号{0}に項目なし
@@ -1777,7 +1777,7 @@
 No Production Orders created,作成しない製造指図しない
 No Supplier Accounts found. Supplier Accounts are identified based on 'Master Type' value in account record.,いいえサプライヤーアカウント見つかりませんでした。サプライヤーアカウントはアカウント·レコードに「マスタータイプ」の値に基づいて識別されます。
 No accounting entries for the following warehouses,次の倉庫にはアカウンティングエントリません
-No addresses created,作成されないアドレスません
+No addresses created,アドレスが作れません。
 No contacts created,NO接点は作成されません
 No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,デフォルトのアドレステンプレートが見つかりませんでした。[設定]> [印刷とブランディング>アドレステンプレートから新しいものを作成してください。
 No default BOM exists for Item {0},デフォルトのBOMが存在しないアイテムのため{0}
@@ -1817,7 +1817,7 @@
 Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：この原価センタグループです。グループに対する会計上のエントリを作成することはできません。
 Note: {0},注：{0}
 Notes,注釈
-Notes:,注:
+Notes:,注意事項:
 Nothing to request,要求するものがありません
 Notice (days),お知らせ（日）
 Notification Control,通知制御
@@ -1998,7 +1998,7 @@
 Phone,電話
 Phone No,電話番号
 Piecework,出来高仕事
-Pincode,PINコード
+Pincode,郵便番号
 Place of Issue,発行場所
 Plan for maintenance visits.,メンテナンスの訪問を計画します。
 Planned Qty,計画数量
@@ -2369,11 +2369,11 @@
 Reference No & Reference Date is required for {0},リファレンスノー·基準日は、{0}に必要です
 Reference No is mandatory if you entered Reference Date,あなたは基準日を入力した場合の基準はありませんが必須です
 Reference Number,参照番号
-Reference Row #,参照行番号
+Reference Row #,参照行＃
 Refresh,リフレッシュ
 Registration Details,登録の詳細
 Registration Info,登録情報
-Rejected,拒否
+Rejected,拒否された
 Rejected Quantity,拒否された数量
 Rejected Serial No,拒否されたシリアル番号
 Rejected Warehouse,拒否された倉庫
@@ -3103,7 +3103,7 @@
 Update Series Number,シリーズ番号の更新
 Update Stock,在庫の更新
 Update bank payment dates with journals.,銀行支払日と履歴を更新して下さい。
-Update clearance date of Journal Entries marked as 'Bank Entry',履歴欄を「銀行決済」と明記してクリアランス日（清算日）を更新して下さい。
+Update clearance date of Journal Entries marked as 'Bank Vouchers',履歴欄を「銀行決済」と明記してクリアランス日（清算日）を更新して下さい。
 Updated,更新済み
 Updated Birthday Reminders,誕生日の事前通知の更新完了
 Upload Attendance,参加者をアップロードする。（参加者をメインのコンピューターに送る。）
@@ -3243,7 +3243,7 @@
 Write Off Based On,ベースオンを償却
 Write Off Cost Center,原価の事業経費
 Write Off Outstanding Amount,事業経費未払金額
-Write Off Entry,事業経費領収書
+Write Off Voucher,事業経費領収書
 Wrong Template: Unable to find head row.,間違ったテンプレートです。：見出し／最初の行が見つかりません。
 Year,年
 Year Closed,年間休館
@@ -3262,7 +3262,7 @@
 You can enter the minimum quantity of this item to be ordered.,最小限の数量からこの商品を注文することができます
 You can not change rate if BOM mentioned agianst any item,部品表が否認した商品は、料金を変更することができません
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,納品書と売上請求書の両方を入力することはできません。どちらら一つを記入して下さい
-You can not enter current voucher in 'Against Journal Entry' column,''アゲンストジャーナルバウチャー’’の欄に、最新の領収証を入力することはできません。
+You can not enter current voucher in 'Against Journal Voucher' column,''アゲンストジャーナルバウチャー’’の欄に、最新の領収証を入力することはできません。
 You can set Default Bank Account in Company master,あなたは、会社のマスターにメイン銀行口座を設定することができます
 You can start by selecting backup frequency and granting access for sync,バックアップの頻度を選択し、同期するためのアクセスに承諾することで始めることができます
 You can submit this Stock Reconciliation.,あなたは、この株式調整を提出することができます。
@@ -3339,49 +3339,3 @@
 {0} {1} status is Unstopped,{0} {1}ステータスが塞がです
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}：コストセンターではアイテムのために必須である{2}
 {0}: {1} not found in Invoice Details table,{0}：{1}請求書詳細テーブルにない
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","もし、ごhref=""#Sales Browser/Customer Group"">追加/編集</ A>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","もし、ごhref=""#Sales Browser/Territory"">追加/編集</ A>"
-Billed,課金
-Company,会社
-Currency is required for Price List {0},通貨は価格表{0}に必要です
-Default Customer Group,デフォルトの顧客グループ
-Default Territory,デフォルトの地域
-Delivered,配送
-Enable Shopping Cart,ショッピングカートを使用可能に
-Go ahead and add something to your cart.,先に行くと、ショッピングカートに何かを追加。
-Hey! Go ahead and add an address,ハイ！先に行くとアドレスを追加
-Invalid Billing Address,無効な請求先住所
-Invalid Shipping Address,無効な配送先住所
-Missing Currency Exchange Rates for {0},{0}のために為替レートが不足して
-Name is required,名前が必要です
-Not Allowed,許可されていない
-Paid,料金
-Partially Billed,部分的に銘打た
-Partially Delivered,部分的に配信
-Please specify a Price List which is valid for Territory,地域で有効な価格表を指定してください
-Please specify currency in Company,会社で通貨を指定してください
-Please write something,何かを書いてください
-Please write something in subject and message!,件名とメッセージで何かを書いてください！
-Price List,価格リスト
-Price List not configured.,価格表が構成されていません。
-Quotation Series,引用シリーズ
-Shipping Rule,出荷ルール
-Shopping Cart,カート
-Shopping Cart Price List,ショッピングカート価格表
-Shopping Cart Price Lists,ショッピングカート価格表
-Shopping Cart Settings,ショッピングカートの設定
-Shopping Cart Shipping Rule,ショッピングカート配送ルール
-Shopping Cart Shipping Rules,ショッピングカート配送ルール
-Shopping Cart Taxes and Charges Master,ショッピングカートの税金、料金マスター
-Shopping Cart Taxes and Charges Masters,ショッピングカートの税金、料金のマスターズ
-Something went wrong!,何かが間違っていた！
-Something went wrong.,エラーが発生しました。
-Tax Master,税金のマスター
-To Pay,支払わなければ
-Updated,更新日
-You are not allowed to reply to this ticket.,あなたは、このチケットに返信することはできません。
-You need to be logged in to view your cart.,あなたは買い物カゴを見るためにログインする必要があります。
-You need to enable Shopping Cart,あなたはショッピングカートを有効にする必要があります
-{0} cannot be purchased using Shopping Cart,{0}ショッピングカートを使用して購入することはできません
-{0} is required,{0}が必要である
-{0} {1} has a common territory {2},{0} {1}は、共通の領土を持っている{2}
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 235b8c9..3d80c3c 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -34,9 +34,9 @@
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> toevoegen / bewerken < / a>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> toevoegen / bewerken < / a>"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> Standaardsjabloon </ h4>  <p> Gebruikt <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </ a> en alle velden van Address ( inclusief aangepaste velden indien aanwezig) zal beschikbaar zijn </ p>  <pre> <code> {{address_line1}} <br>  {% if address_line2%} {{address_line2}} {<br> % endif -%}  {{city}} <br>  {% if staat%} {{staat}} {% endif <br> -%}  {% if pincode%} PIN: {{pincode}} {% endif <br> -%}  {{land}} <br>  {% if telefoon%} Telefoon: {{telefoon}} {<br> % endif -%}  {% if fax%} Fax: {{fax}} {% endif <br> -%}  {% if email_id%} E-mail: {{email_id}} <br> ; {% endif -%}  </ code> </ pre>"
-A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat.Gelieve de naam van de Klant of de Klantgroep te wijzigen
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
 A Customer exists with same name,Een Klant bestaat met dezelfde naam
-A Lead with this email id should exist,Een Lead met deze e-mail-ID moet bestaan
+A Lead with this email id should exist,Een Lead met dit email-ID moet bestaan
 A Product or Service,Een product of dienst
 A Supplier exists with same name,Een leverancier bestaat met dezelfde naam
 A symbol for this currency. For e.g. $,Een symbool voor deze valuta. Voor bijvoorbeeld $
@@ -55,15 +55,15 @@
 Account Created: {0},Account Gemaakt : {0}
 Account Details,Account Details
 Account Head,Account Hoofding
-Account Name,Rekeningnaam
+Account Name,Rekening Naam
 Account Type,Rekening Type
 "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
 "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
-Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn ( Perpetual Inventory ) wordt aangemaakt onder deze account .
+Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn wordt aangemaakt onder dit account .
 Account head {0} created,Account hoofding {0} aangemaakt
 Account must be a balance sheet account,Rekening moet een balansrekening zijn
-Account with child nodes cannot be converted to ledger,Rekening met kind nodes kunnen niet worden geconverteerd naar ledger
-Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet in groep .
+Account with child nodes cannot be converted to ledger,Rekening met onderliggende regels kunnen niet worden geconverteerd naar grootboek
+Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
 Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
 Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
@@ -86,9 +86,9 @@
 "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Boekhoudkundige afschrijving bevroren tot deze datum, kan niemand / te wijzigen toegang behalve rol hieronder aangegeven."
 Accounting journal entries.,Accounting journaalposten.
 Accounts,Rekeningen
-Accounts Browser,Rekeningen Browser
-Accounts Frozen Upto,Rekeningen bevroren Tot
-Accounts Payable,Accounts Payable
+Accounts Browser,Rekeningen Verkenner
+Accounts Frozen Upto,Rekeningen bevroren tot
+Accounts Payable,Crediteuren
 Accounts Receivable,Debiteuren
 Accounts Settings,Accounts Settings
 Active,Actief
@@ -298,23 +298,23 @@
 Average Discount,Gemiddelde korting
 Awesome Products,Awesome producten
 Awesome Services,Awesome Services
-BOM Detail No,BOM Detail Geen
+BOM Detail No,BOM Detail nr.
 BOM Explosion Item,BOM Explosie Item
 BOM Item,BOM Item
-BOM No,BOM Geen
-BOM No. for a Finished Good Item,BOM Nee voor een afgewerkte goed item
+BOM No,BOM nr.
+BOM No. for a Finished Good Item,BOM nr. voor een afgewerkt goederen item
 BOM Operation,BOM Operatie
 BOM Operations,BOM Operations
 BOM Replace Tool,BOM Replace Tool
-BOM number is required for manufactured Item {0} in row {1},BOM nummer is vereist voor gefabriceerde Item {0} in rij {1}
-BOM number not allowed for non-manufactured Item {0} in row {1},BOM nummer niet toegestaan ​​voor niet - gefabriceerde Item {0} in rij {1}
+BOM number is required for manufactured Item {0} in row {1},BOM nr. is vereist voor gefabriceerde Item {0} in rij {1}
+BOM number not allowed for non-manufactured Item {0} in row {1},BOM nr. niet toegestaan ​​voor niet - gefabriceerde Item {0} in rij {1}
 BOM recursion: {0} cannot be parent or child of {2},BOM recursie : {0} mag niet ouder of kind zijn van {2}
 BOM replaced,BOM vervangen
 BOM {0} for Item {1} in row {2} is inactive or not submitted,BOM {0} voor post {1} in rij {2} is niet actief of niet ingediend
 BOM {0} is not active or not submitted,BOM {0} is niet actief of niet ingediend
 BOM {0} is not submitted or inactive BOM for Item {1},BOM {0} is niet voorgelegd of inactief BOM voor post {1}
 Backup Manager,Backup Manager
-Backup Right Now,Back-up Right Now
+Backup Right Now,Back-up direct
 Backups will be uploaded to,Back-ups worden geüpload naar
 Balance Qty,Balance Aantal
 Balance Sheet,balans
@@ -323,36 +323,36 @@
 Balance must be,Evenwicht moet worden
 "Balances of Accounts of type ""Bank"" or ""Cash""","Saldi van de rekeningen van het type "" Bank "" of "" Cash """
 Bank,Bank
-Bank / Cash Account,Bank / Cash Account
-Bank A/C No.,Bank A / C Nee
+Bank / Cash Account,Bank / Kassa rekening
+Bank A/C No.,Bank A / C nr.
 Bank Account,Bankrekening
-Bank Account No.,Bank Account Nr
-Bank Accounts,bankrekeningen
+Bank Account No.,Bank rekening nr.
+Bank Accounts,Bankrekeningen
 Bank Clearance Summary,Bank Ontruiming Samenvatting
 Bank Draft,Bank Draft
-Bank Name,Naam van de bank
+Bank Name,Bank naam
 Bank Overdraft Account,Bank Overdraft Account
 Bank Reconciliation,Bank Verzoening
 Bank Reconciliation Detail,Bank Verzoening Detail
 Bank Reconciliation Statement,Bank Verzoening Statement
 Bank Entry,Bank Entry
 Bank/Cash Balance,Bank / Geldsaldo
-Banking,bank
+Banking,Bankieren
 Barcode,Barcode
-Barcode {0} already used in Item {1},Barcode {0} al gebruikt in post {1}
+Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
 Based On,Gebaseerd op
-Basic,basisch
-Basic Info,Basic Info
-Basic Information,Basisinformatie
-Basic Rate,Basic Rate
-Basic Rate (Company Currency),Basic Rate (Company Munt)
+Basic,Basis
+Basic Info,Basis Info
+Basic Information,Basis Informatie
+Basic Rate,Basis Tarief
+Basic Rate (Company Currency),Basis Tarief (Bedrijfs Valuta)
 Batch,Partij
-Batch (lot) of an Item.,Batch (lot) van een item.
-Batch Finished Date,Batch Afgewerkt Datum
-Batch ID,Batch ID
-Batch No,Batch nr.
-Batch Started Date,Batch Gestart Datum
-Batch Time Logs for billing.,Batch Time Logs voor de facturering.
+Batch (lot) of an Item.,Partij (veel) van een item.
+Batch Finished Date,Einddatum partij
+Batch ID,Partij ID
+Batch No,Partij nr.
+Batch Started Date,Aanvangdatum partij
+Batch Time Logs for billing.,Partij logbestanden voor facturering.
 Batch-Wise Balance History,Batch-Wise Balance Geschiedenis
 Batched for Billing,Gebundeld voor facturering
 Better Prospects,Betere vooruitzichten
@@ -369,28 +369,28 @@
 Billing,Billing
 Billing Address,Factuuradres
 Billing Address Name,Factuuradres Naam
-Billing Status,Billing Status
-Bills raised by Suppliers.,Rekeningen die door leveranciers.
+Billing Status,Factuur Status
+Bills raised by Suppliers.,Facturen van leveranciers.
 Bills raised to Customers.,Bills verhoogd tot klanten.
 Bin,Bak
 Bio,Bio
-Biotechnology,biotechnologie
-Birthday,verjaardag
-Block Date,Blokkeren Datum
-Block Days,Blokkeren Dagen
+Biotechnology,Biotechnologie
+Birthday,Verjaardag
+Block Date,Blokeer Datum
+Block Days,Blokeer Dagen
 Block leave applications by department.,Blok verlaten toepassingen per afdeling.
 Blog Post,Blog Post
 Blog Subscriber,Blog Abonnee
 Blood Group,Bloedgroep
-Both Warehouse must belong to same Company,Beide Warehouse moeten behoren tot dezelfde Company
-Box,doos
+Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
+Box,Doos
 Branch,Tak
 Brand,Merk
 Brand Name,Merknaam
-Brand master.,Brand meester.
+Brand master.,Merk meester.
 Brands,Merken
 Breakdown,Storing
-Broadcasting,omroep
+Broadcasting,Uitzenden
 Brokerage,makelarij
 Budget,Begroting
 Budget Allocated,Budget
@@ -404,10 +404,10 @@
 Build Report,Build Report
 Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
 Business Development Manager,Business Development Manager
-Buying,Het kopen
-Buying & Selling,Kopen en verkopen
-Buying Amount,Kopen Bedrag
-Buying Settings,Kopen Instellingen
+Buying,Inkoop
+Buying & Selling,Inkopen en verkopen
+Buying Amount,Inkoop aantal
+Buying Settings,Inkoop Instellingen
 "Buying must be checked, if Applicable For is selected as {0}","Kopen moet worden gecontroleerd, indien van toepassing voor is geselecteerd als {0}"
 C-Form,C-Form
 C-Form Applicable,C-Form Toepasselijk
@@ -422,9 +422,9 @@
 CENVAT Service Tax Cess 2,CENVAT Dienst Belastingen Cess 2
 Calculate Based On,Bereken Based On
 Calculate Total Score,Bereken Totaal Score
-Calendar Events,Kalender Evenementen
-Call,Noemen
-Calls,oproepen
+Calendar Events,Agenda Evenementen
+Call,Bellen
+Calls,Oproepen
 Campaign,Campagne
 Campaign Name,Campagnenaam
 Campaign Name is required,Campagne Naam is vereist
@@ -1478,26 +1478,26 @@
 Landed Cost updated successfully,Landed Cost succesvol bijgewerkt
 Language,Taal
 Last Name,Achternaam
-Last Purchase Rate,Laatste Purchase Rate
+Last Purchase Rate,Laatste inkoop aantal
 Latest,laatst
-Lead,Leiden
-Lead Details,Lood Details
-Lead Id,lead Id
+Lead,Lead
+Lead Details,Lead Details
+Lead Id,Lead Id
 Lead Name,Lead Naam
-Lead Owner,Lood Owner
-Lead Source,Lood Bron
+Lead Owner,Lead Eigenaar
+Lead Source,Lead Bron
 Lead Status,Lead Status
 Lead Time Date,Lead Tijd Datum
 Lead Time Days,Lead Time Dagen
 Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Levertijd dagen is het aantal dagen waarmee dit artikel wordt verwacht in uw magazijn. Deze dag wordt opgehaald in Laden en aanvragen als u dit item.
 Lead Type,Lood Type
 Lead must be set if Opportunity is made from Lead,Lood moet worden ingesteld als Opportunity is gemaakt van lood
-Leave Allocation,Laat Toewijzing
-Leave Allocation Tool,Laat Toewijzing Tool
+Leave Allocation,Verlof Toewijzing
+Leave Allocation Tool,Verlof Toewijzing Tool
 Leave Application,Verlofaanvraag
-Leave Approver,Laat Fiatteur
-Leave Approvers,Verlaat Goedkeurders
-Leave Balance Before Application,Laat Balance Voor het aanbrengen
+Leave Approver,Verlof goedkeurder
+Leave Approvers,Verlof goedkeurders
+Leave Balance Before Application,Verlofsaldo voor aanvraag
 Leave Block List,Laat Block List
 Leave Block List Allow,Laat Block List Laat
 Leave Block List Allowed,Laat toegestaan ​​Block List
@@ -1505,31 +1505,31 @@
 Leave Block List Dates,Laat Block List Data
 Leave Block List Name,Laat Block List Name
 Leave Blocked,Laat Geblokkeerde
-Leave Control Panel,Laat het Configuratiescherm
-Leave Encashed?,Laat verzilverd?
+Leave Control Panel,Verlof Configuratiescherm
+Leave Encashed?,Verlof verzilverd?
 Leave Encashment Amount,Laat inning Bedrag
-Leave Type,Laat Type
-Leave Type Name,Laat Type Naam
-Leave Without Pay,Verlof zonder wedde
+Leave Type,Verlof Type
+Leave Type Name,Verlof Type Naam
+Leave Without Pay,Onbetaald verlof
 Leave application has been approved.,Verlof aanvraag is goedgekeurd .
 Leave application has been rejected.,Verlofaanvraag is afgewezen .
-Leave approver must be one of {0},Verlaat approver moet een van zijn {0}
-Leave blank if considered for all branches,Laat leeg indien dit voor alle vestigingen
-Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen
+Leave approver must be one of {0},Verlof goedkeurder moet een van zijn {0}
+Leave blank if considered for all branches,Laat leeg indien dit voor alle vestigingen is
+Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen is
 Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
 Leave blank if considered for all employee types,Laat leeg indien overwogen voor alle werknemer soorten
 "Leave can be approved by users with Role, ""Leave Approver""",Laat kan worden goedgekeurd door gebruikers met Role: &quot;Laat Fiatteur&quot;
 Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
-Leaves Allocated Successfully for {0},Bladeren succesvol Toegewezen voor {0}
-Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Bladeren voor type {0} reeds voor Employee {1} voor het fiscale jaar {0}
+Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
+Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Verlof van type {0} reeds voor medewerker {1} voor het fiscale jaar {0}
 Leaves must be allocated in multiples of 0.5,"Bladeren moeten in veelvouden van 0,5 worden toegewezen"
 Ledger,Grootboek
-Ledgers,grootboeken
+Ledgers,Grootboeken
 Left,Links
-Legal,wettelijk
+Legal,Wettelijk
 Legal Expenses,Juridische uitgaven
 Letter Head,Brief Hoofd
-Letter Heads for print templates.,Letter Heads voor print templates .
+Letter Heads for print templates.,Letter Heads voor print sjablonen.
 Level,Niveau
 Lft,Lft
 Liability,aansprakelijkheid
@@ -1539,21 +1539,21 @@
 List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
 "List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Een lijst van uw producten of diensten die u koopt of verkoopt .
 "List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Een lijst van uw fiscale koppen ( zoals btw , accijnzen , ze moeten unieke namen hebben ) en hun standaard tarieven."
-Loading...,Loading ...
+Loading...,Laden ...
 Loans (Liabilities),Leningen (passiva )
 Loans and Advances (Assets),Leningen en voorschotten ( Assets )
-Local,lokaal
-Login,login
+Local,Lokaal
+Login,Login
 Login with your new User ID,Log in met je nieuwe gebruikersnaam
 Logo,Logo
-Logo and Letter Heads,Logo en Letter Heads
-Lost,verloren
-Lost Reason,Verloren Reden
+Logo and Letter Heads,Logo en Briefhoofden
+Lost,Verloren
+Lost Reason,Reden van verlies
 Low,Laag
 Lower Income,Lager inkomen
 MTN Details,MTN Details
-Main,hoofd-
-Main Reports,Belangrijkste Rapporten
+Main,Hoofd
+Main Reports,Hoofd Rapporten
 Maintain Same Rate Throughout Sales Cycle,Onderhouden Zelfde Rate Gedurende Salescyclus
 Maintain same rate throughout purchase cycle,Handhaaf dezelfde snelheid gedurende aankoop cyclus
 Maintenance,Onderhoud
@@ -1570,7 +1570,7 @@
 Maintenance Time,Onderhoud Tijd
 Maintenance Type,Onderhoud Type
 Maintenance Visit,Onderhoud Bezoek
-Maintenance Visit Purpose,Onderhoud Bezoek Doel
+Maintenance Visit Purpose,Doel van onderhouds bezoek
 Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
 Major/Optional Subjects,Major / keuzevakken
@@ -1591,21 +1591,21 @@
 Make Payment,Betalen
 Make Payment Entry,Betalen Entry
 Make Purchase Invoice,Maak inkoopfactuur
-Make Purchase Order,Maak Bestelling
+Make Purchase Order,Maak inkooporder
 Make Purchase Receipt,Maak Kwitantie
-Make Salary Slip,Maak loonstrook
+Make Salary Slip,Maak Salarisstrook
 Make Salary Structure,Maak salarisstructuur
 Make Sales Invoice,Maak verkoopfactuur
-Make Sales Order,Maak klantorder
+Make Sales Order,Maak verkooporder
 Make Supplier Quotation,Maak Leverancier Offerte
 Make Time Log Batch,Maak tijd Inloggen Batch
 Male,Mannelijk
 Manage Customer Group Tree.,Beheer Customer Group Boom .
-Manage Sales Partners.,Beheer Sales Partners.
+Manage Sales Partners.,Beheer Verkoop Partners.
 Manage Sales Person Tree.,Beheer Sales Person Boom .
 Manage Territory Tree.,Beheer Grondgebied Boom.
 Manage cost of operations,Beheer kosten van de operaties
-Management,beheer
+Management,Beheer
 Manager,Manager
 "Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.",Verplicht als Stock Item is &quot;ja&quot;. Ook de standaard opslagplaats waar de gereserveerde hoeveelheid is ingesteld van Sales Order.
 Manufacture against Sales Order,Vervaardiging tegen Verkooporder
@@ -1632,14 +1632,15 @@
 Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
 Material Issue,Materiaal Probleem
 Material Receipt,Materiaal Ontvangst
-Material Request,Materiaal aanvragen
-Material Request Detail No,Materiaal Aanvraag Detail Geen
-Material Request For Warehouse,Materiaal Request For Warehouse
-Material Request Item,Materiaal aanvragen Item
-Material Request Items,Materiaal aanvragen Items
-Material Request No,Materiaal aanvragen Geen
+Material Request,"Materiaal Aanvraag
+"
+Material Request Detail No,Materiaal Aanvraag Detail nr.
+Material Request For Warehouse,Materiaal Aanvraag voor magazijn
+Material Request Item,Materiaal Aanvraag Item
+Material Request Items,Materiaal Aanvraag Items
+Material Request No,Materiaal Aanvraag nr.
 Material Request Type,Materiaal Soort aanvraag
-Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiaal aanvragen van maximaal {0} kan worden gemaakt voor post {1} tegen Sales Order {2}
+Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiaal Aanvraag van maximaal {0} kan worden gemaakt voor item {1} tegen Verkooporder {2}
 Material Request used to make this Stock Entry,Materiaal Request gebruikt om dit Stock Entry maken
 Material Request {0} is cancelled or stopped,Materiaal aanvragen {0} wordt geannuleerd of gestopt
 Material Requests for which Supplier Quotations are not created,Materiaal Verzoeken waarvoor Leverancier Offertes worden niet gemaakt
@@ -1649,7 +1650,7 @@
 Materials,Materieel
 Materials Required (Exploded),Benodigde materialen (Exploded)
 Max 5 characters,Max. 5 tekens
-Max Days Leave Allowed,Max Dagen Laat toegestaan
+Max Days Leave Allowed,Max Dagen Verlof toegestaan
 Max Discount (%),Max Korting (%)
 Max Qty,Max Aantal
 Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
@@ -1666,20 +1667,20 @@
 Message updated,bericht geactualiseerd
 Messages,Berichten
 Messages greater than 160 characters will be split into multiple messages,Bericht van meer dan 160 tekens worden opgesplitst in meerdere mesage
-Middle Income,Midden Inkomen
+Middle Income,Modaal Inkomen
 Milestone,Mijlpaal
 Milestone Date,Mijlpaal Datum
 Milestones,Mijlpalen
-Milestones will be added as Events in the Calendar,Mijlpalen worden toegevoegd als evenementen in deze kalender
+Milestones will be added as Events in the Calendar,Mijlpalen als evenementen aan deze agenda worden toegevoegd.
 Min Order Qty,Minimum Aantal
 Min Qty,min Aantal
 Min Qty can not be greater than Max Qty,Min Aantal kan niet groter zijn dan Max Aantal zijn
 Minimum Amount,Minimumbedrag
-Minimum Order Qty,Minimum Aantal
+Minimum Order Qty,Minimum bestel aantal
 Minute,minuut
 Misc Details,Misc Details
 Miscellaneous Expenses,diverse kosten
-Miscelleneous,Miscelleneous
+Miscelleneous,Divers
 Mobile No,Mobiel Nog geen
 Mobile No.,Mobile No
 Mode of Payment,Wijze van betaling
@@ -1822,15 +1823,15 @@
 Notification Email Address,Melding e-mail adres
 Notify by Email on creation of automatic Material Request,Informeer per e-mail op de creatie van automatische Materiaal Request
 Number Format,Getalnotatie
-Offer Date,aanbieding Datum
+Offer Date,Aanbieding datum
 Office,Kantoor
 Office Equipments,Office Uitrustingen
 Office Maintenance Expenses,Office onderhoudskosten
-Office Rent,Office Rent
+Office Rent,Kantoorhuur
 Old Parent,Oude Parent
 On Net Total,On Net Totaal
-On Previous Row Amount,Op de vorige toer Bedrag
-On Previous Row Total,Op de vorige toer Totaal
+On Previous Row Amount,Aantal van vorige rij
+On Previous Row Total,Aantal van volgende rij
 Online Auctions,online Veilingen
 Only Leave Applications with status 'Approved' can be submitted,Alleen Laat Toepassingen met de status ' Goedgekeurd ' kunnen worden ingediend
 "Only Serial Nos with status ""Available"" can be delivered.","Alleen serienummers met de status ""Beschikbaar"" kan worden geleverd."
@@ -1841,7 +1842,7 @@
 Open Tickets,Open Kaarten
 Opening (Cr),Opening ( Cr )
 Opening (Dr),Opening ( Dr )
-Opening Date,Opening Datum
+Opening Date,Openingsdatum
 Opening Entry,Opening Entry
 Opening Qty,Opening Aantal
 Opening Time,Opening Time
@@ -2264,31 +2265,31 @@
 Quality Inspection Parameters,Quality Inspection Parameters
 Quality Inspection Reading,Kwaliteitscontrole Reading
 Quality Inspection Readings,Kwaliteitscontrole Lezingen
-Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor post {0}
+Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor item {0}
 Quality Management,Quality Management
 Quantity,Hoeveelheid
-Quantity Requested for Purchase,Aantal op aankoop
+Quantity Requested for Purchase,Aantal aangevraagd voor inkoop
 Quantity and Rate,Hoeveelheid en Prijs
-Quantity and Warehouse,Hoeveelheid en Warehouse
-Quantity cannot be a fraction in row {0},Hoeveelheid kan een fractie in rij niet {0}
-Quantity for Item {0} must be less than {1},Hoeveelheid voor post {0} moet kleiner zijn dan {1}
+Quantity and Warehouse,Hoeveelheid en magazijn
+Quantity cannot be a fraction in row {0},Hoeveelheid kan geen onderdeel zijn in rij {0}
+Quantity for Item {0} must be less than {1},Hoeveelheid voor item {0} moet kleiner zijn dan {1}
 Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ( {1} ) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
 Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid product verkregen na de productie / ompakken van de gegeven hoeveelheden grondstoffen
-Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor post {0} in rij {1}
+Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
 Quarter,Kwartaal
 Quarterly,Driemaandelijks
 Quick Help,Quick Help
-Quotation,Citaat
+Quotation,Offerte Aanvraag
 Quotation Item,Offerte Item
 Quotation Items,Offerte Items
-Quotation Lost Reason,Offerte Verloren Reden
+Quotation Lost Reason,Reden verlies van Offerte
 Quotation Message,Offerte Bericht
 Quotation To,Offerte Voor
-Quotation Trends,offerte Trends
-Quotation {0} is cancelled,Offerte {0} wordt geannuleerd
+Quotation Trends,Offerte Trends
+Quotation {0} is cancelled,Offerte {0} is geannuleerd
 Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
-Quotes to Leads or Customers.,Quotes om leads of klanten.
+Quotes to Leads or Customers.,Offertes naar leads of klanten.
 Raise Material Request when stock reaches re-order level,Raise Materiaal aanvragen bij voorraad strekt re-order niveau
 Raised By,Opgevoed door
 Raised By (Email),Verhoogde Door (E-mail)
@@ -2480,72 +2481,72 @@
 SO Qty,SO Aantal
 Salary,Salaris
 Salary Information,Salaris Informatie
-Salary Manager,Salaris Manager
-Salary Mode,Salaris Mode
-Salary Slip,Loonstrook
-Salary Slip Deduction,Loonstrook Aftrek
-Salary Slip Earning,Loonstrook verdienen
-Salary Slip of employee {0} already created for this month,Loonstrook van de werknemer {0} al gemaakt voor deze maand
+Salary Manager,Salaris beheerder
+Salary Mode,Salaris Modus
+Salary Slip,Salarisstrook
+Salary Slip Deduction,Salarisstrook Aftrek
+Salary Slip Earning,Salarisstrook Inkomen
+Salary Slip of employee {0} already created for this month,Salarisstrook van de werknemer {0} al gemaakt voor deze maand
 Salary Structure,Salarisstructuur
 Salary Structure Deduction,Salaris Structuur Aftrek
-Salary Structure Earning,Salaris Structuur verdienen
+Salary Structure Earning,Salaris Structuur Inkomen
 Salary Structure Earnings,Salaris Structuur winst
 Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
 Salary components.,Salaris componenten.
 Salary template master.,Salaris sjabloon meester .
-Sales,Sales
-Sales Analytics,Sales Analytics
+Sales,Verkoop
+Sales Analytics,Verkoop analyse
 Sales BOM,Verkoop BOM
 Sales BOM Help,Verkoop BOM Help
 Sales BOM Item,Verkoop BOM Item
 Sales BOM Items,Verkoop BOM Items
-Sales Browser,Sales Browser
+Sales Browser,Verkoop verkenner
 Sales Details,Verkoop Details
-Sales Discounts,Sales kortingen
-Sales Email Settings,Sales E-mailinstellingen
-Sales Expenses,verkoopkosten
+Sales Discounts,Verkoop kortingen
+Sales Email Settings,Verkoop emailinstellingen
+Sales Expenses,Verkoopkosten
 Sales Extras,Sales Extra&#39;s
 Sales Funnel,Sales Funnel
-Sales Invoice,Sales Invoice
+Sales Invoice,Verkoopfactuur
 Sales Invoice Advance,Sales Invoice Advance
-Sales Invoice Item,Sales Invoice Item
+Sales Invoice Item,Verkoopfactuur Item
 Sales Invoice Items,Verkoopfactuur Items
-Sales Invoice Message,Sales Invoice Message
-Sales Invoice No,Verkoop Factuur nr.
+Sales Invoice Message,Verkoopfactuur bericht
+Sales Invoice No,Verkoopfactuur nr.
 Sales Invoice Trends,Verkoopfactuur Trends
-Sales Invoice {0} has already been submitted,Verkoopfactuur {0} al is ingediend
-Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+Sales Invoice {0} has already been submitted,Verkoopfactuur {0} ia al ingediend
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
 Sales Order,Verkooporder
 Sales Order Date,Verkooporder Datum
-Sales Order Item,Sales Order Item
-Sales Order Items,Sales Order Items
+Sales Order Item,Verkooporder Item
+Sales Order Items,Verkooporder Items
 Sales Order Message,Verkooporder Bericht
-Sales Order No,Sales Order No
-Sales Order Required,Verkooporder Vereiste
-Sales Order Trends,Sales Order Trends
-Sales Order required for Item {0},Klantorder nodig is voor post {0}
-Sales Order {0} is not submitted,Sales Order {0} is niet ingediend
-Sales Order {0} is not valid,Sales Order {0} is niet geldig
-Sales Order {0} is stopped,Sales Order {0} is gestopt
-Sales Partner,Sales Partner
-Sales Partner Name,Sales Partner Naam
+Sales Order No,Verkooporder nr.
+Sales Order Required,Verkooporder Vereist
+Sales Order Trends,Verkooporder Trends
+Sales Order required for Item {0},Verkooporder nodig voor item {0}
+Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+Sales Order {0} is not valid,Verkooporder {0} is niet geldig
+Sales Order {0} is stopped,Verkooporder {0} is gestopt
+Sales Partner,Verkoop Partner
+Sales Partner Name,Verkoop Partner Naam
 Sales Partner Target,Sales Partner Target
 Sales Partners Commission,Sales Partners Commissie
-Sales Person,Sales Person
+Sales Person,Verkoper
 Sales Person Name,Sales Person Name
 Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise
 Sales Person Targets,Sales Person Doelen
 Sales Person-wise Transaction Summary,Sales Person-wise Overzicht opdrachten
 Sales Register,Sales Registreer
 Sales Return,Verkoop Terug
-Sales Returned,Sales Terugkerende
+Sales Returned,Terugkerende verkoop
 Sales Taxes and Charges,Verkoop en-heffingen
 Sales Taxes and Charges Master,Verkoop en-heffingen Master
-Sales Team,Sales Team
-Sales Team Details,Sales Team Details
+Sales Team,Verkoop Team
+Sales Team Details,Verkoops Team Details
 Sales Team1,Verkoop Team1
 Sales and Purchase,Verkoop en Inkoop
-Sales campaigns.,Verkoopacties .
+Sales campaigns.,Verkoop campagnes
 Salutation,Aanhef
 Sample Size,Steekproefomvang
 Sanctioned Amount,Gesanctioneerde Bedrag
@@ -2577,7 +2578,7 @@
 Select Brand...,Selecteer Merk ...
 Select Budget Distribution to unevenly distribute targets across months.,Selecteer Budget Uitkering aan ongelijk verdelen doelen uit maanden.
 "Select Budget Distribution, if you want to track based on seasonality.","Selecteer Budget Distributie, als je wilt volgen op basis van seizoensinvloeden."
-Select Company...,Selecteer Company ...
+Select Company...,Selecteer Bedrijf ...
 Select DocType,Selecteer DocType
 Select Fiscal Year...,Selecteer boekjaar ...
 Select Items,Selecteer Items
@@ -2603,10 +2604,10 @@
 "Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.",&quot;Ja&quot; zal u toelaten om Bill of Material tonen grondstof-en operationele kosten om dit item te produceren maken.
 "Selecting ""Yes"" will allow you to make a Production Order for this item.",&quot;Ja&quot; zal u toelaten om een ​​productieorder voor dit item te maken.
 "Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;Ja&quot; geeft een unieke identiteit voor elke entiteit van dit artikel die kunnen worden bekeken in de Serial No meester.
-Selling,Selling
-Selling Settings,Selling Instellingen
+Selling,Verkoop
+Selling Settings,Verkoop Instellingen
 "Selling must be checked, if Applicable For is selected as {0}","Selling moet worden gecontroleerd, indien van toepassing voor is geselecteerd als {0}"
-Send,Sturen
+Send,Verstuur
 Send Autoreply,Stuur Autoreply
 Send Email,E-mail verzenden
 Send From,Stuur Van
@@ -3138,29 +3139,29 @@
 Valuation Method,Waardering Methode
 Valuation Rate,Waardering Prijs
 Valuation Rate required for Item {0},Taxatie Rate vereist voor post {0}
-Valuation and Total,Taxatie en Total
+Valuation and Total,Taxatie en Totaal
 Value,Waarde
 Value or Qty,Waarde of Aantal
 Vehicle Dispatch Date,Vehicle Dispatch Datum
-Vehicle No,Voertuig Geen
+Vehicle No,Voertuig nr.
 Venture Capital,Venture Capital
-Verified By,Verified By
-View Ledger,Bekijk Ledger
+Verified By,Geverifieerd door
+View Ledger,Bekijk Grootboek
 View Now,Bekijk nu
 Visit report for maintenance call.,Bezoek rapport voor onderhoud gesprek.
 Voucher #,voucher #
 Voucher Detail No,Voucher Detail Geen
 Voucher Detail Number,Voucher Detail Nummer
 Voucher ID,Voucher ID
-Voucher No,Blad nr.
+Voucher No,Voucher nr.
 Voucher Type,Voucher Type
-Voucher Type and Date,Voucher Type en Date
+Voucher Type and Date,Voucher Type en Datum
 Walk In,Walk In
-Warehouse,magazijn
+Warehouse,Magazijn
 Warehouse Contact Info,Warehouse Contact Info
 Warehouse Detail,Magazijn Detail
-Warehouse Name,Warehouse Naam
-Warehouse and Reference,Magazijn en Reference
+Warehouse Name,Magazijn Naam
+Warehouse and Reference,Magazijn en Referentie
 Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd als voorraad grootboek toegang bestaat voor dit magazijn .
 Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Stock Entry / Delivery Note / Kwitantie worden veranderd
 Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
@@ -3192,9 +3193,9 @@
 We sell this Item,Wij verkopen dit item
 Website,Website
 Website Description,Website Beschrijving
-Website Item Group,Website Item Group
+Website Item Group,Website Item Groep
 Website Item Groups,Website Artikelgroepen
-Website Settings,Website-instellingen
+Website Settings,Website instellingen
 Website Warehouse,Website Warehouse
 Wednesday,Woensdag
 Weekly,Wekelijks
@@ -3203,7 +3204,7 @@
 "Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht wordt vermeld , \ nGelieve noemen "" Gewicht Verpakking "" te"
 Weightage,Weightage
 Weightage (%),Weightage (%)
-Welcome,welkom
+Welcome,Welkom
 Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Welkom bij ERPNext . In de komende paar minuten zullen we u helpen opzetten van je ERPNext account. Probeer en vul zo veel mogelijk informatie je hebt , zelfs als het duurt een beetje langer . Het zal u een hoop tijd later besparen . Good Luck !"
 Welcome to ERPNext. Please select your language to begin the Setup Wizard.,Welkom bij ERPNext . Selecteer uw taal om de installatiewizard te starten.
 What does it do?,Wat doet het?
@@ -3212,8 +3213,8 @@
 Where items are stored.,Waar items worden opgeslagen.
 Where manufacturing operations are carried out.,Wanneer de productie operaties worden uitgevoerd.
 Widowed,Weduwe
-Will be calculated automatically when you enter the details,Wordt automatisch berekend wanneer u de details
-Will be updated after Sales Invoice is Submitted.,Zal worden bijgewerkt na verkoopfactuur wordt ingediend.
+Will be calculated automatically when you enter the details,Wordt automatisch berekend wanneer u de details invult
+Will be updated after Sales Invoice is Submitted.,Zal worden bijgewerkt zodra verkoopfactuur is ingediend.
 Will be updated when batched.,Zal worden bijgewerkt wanneer gedoseerd.
 Will be updated when billed.,Zal worden bijgewerkt wanneer gefactureerd.
 Wire Transfer,overboeking
@@ -3226,7 +3227,7 @@
 Work-in-Progress Warehouse is required before Submit,Work -in- Progress Warehouse wordt vóór vereist Verzenden
 Working,Werkzaam
 Working Days,Werkdagen
-Workstation,Workstation
+Workstation,Werkstation
 Workstation Name,Naam van werkstation
 Write Off Account,Schrijf Uit account
 Write Off Amount,Schrijf Uit Bedrag
@@ -3242,9 +3243,9 @@
 Year Name,Jaar Naam
 Year Start Date,Jaar Startdatum
 Year of Passing,Jaar van de Passing
-Yearly,Jaar-
+Yearly,Jaarlijks
 Yes,Ja
-You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voordat {0}
+You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
 You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Expense Approver voor dit record . Werk van de 'Status' en opslaan
 You are the Leave Approver for this record. Please Update the 'Status' and Save,U bent de Leave Approver voor dit record . Werk van de 'Status' en opslaan
@@ -3262,16 +3263,16 @@
 You may need to update: {0},U kan nodig zijn om te werken: {0}
 You must Save the form before proceeding,U moet het formulier opslaan voordat u verder gaat
 Your Customer's TAX registration numbers (if applicable) or any general information,Uw klant fiscale nummers (indien van toepassing) of een algemene informatie
-Your Customers,uw klanten
-Your Login Id,Uw login-ID
+Your Customers,Uw Klanten
+Your Login Id,Uw loginnaam
 Your Products or Services,Uw producten of diensten
-Your Suppliers,uw Leveranciers
+Your Suppliers,Uw Leveranciers
 Your email address,Uw e-mailadres
 Your financial year begins on,Uw financiële jaar begint op
 Your financial year ends on,Uw financiële jaar eindigt op
 Your sales person who will contact the customer in future,Uw verkoop persoon die de klant in de toekomst contact op te nemen
 Your sales person will get a reminder on this date to contact the customer,Uw verkoop persoon krijgt een herinnering op deze datum aan de klant contact op te nemen
-Your setup is complete. Refreshing...,Uw installatie is voltooid . Verfrissend ...
+Your setup is complete. Refreshing...,Uw installatie is voltooid. Aan het vernieuwen ...
 Your support email id - must be a valid email - this is where your emails will come!,Uw steun e-id - moet een geldig e zijn - dit is waar je e-mails zal komen!
 [Error],[Error]
 [Select],[Selecteer ]
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index dc393bf..84c6d89 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -34,53 +34,53 @@
 "<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group"">Add / Edit</a>"
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group"">Add / Edit</a>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory"">Add / Edit</a>"
-A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Customer Group exists with same name please change the Customer name or rename the Customer Group
-A Customer exists with same name,A Customer exists with same name
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy  
+A Customer exists with same name,Odbiorca o tej nazwie już istnieje
 A Lead with this email id should exist,A Lead with this email id should exist
 A Product or Service,Produkt lub usługa
-A Supplier exists with same name,A Supplier exists with same name
-A symbol for this currency. For e.g. $,A symbol for this currency. For e.g. $
+A Supplier exists with same name,Dostawca o tej nazwie już istnieje
+A symbol for this currency. For e.g. $,Symbol waluty. Np. $
 AMC Expiry Date,AMC Expiry Date
-Abbr,Abbr
-Abbreviation cannot have more than 5 characters,Abbreviation cannot have more than 5 characters
-About,About
+Abbr,Skrót
+Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
+About,Informacje
 Above Value,Above Value
 Absent,Nieobecny
 Acceptance Criteria,Kryteria akceptacji
-Accepted,Accepted
-Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepted + Rejected Qty must be equal to Received quantity for Item {0}
-Accepted Quantity,Accepted Quantity
+Accepted,Przyjęte
+Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
+Accepted Quantity,Przyjęta Ilość
 Accepted Warehouse,Accepted Warehouse
 Account,Konto
 Account Balance,Bilans konta
-Account Created: {0},Account Created: {0}
+Account Created: {0},Utworzono Konto: {0}
 Account Details,Szczegóły konta
 Account Head,Account Head
 Account Name,Nazwa konta
-Account Type,Account Type
+Account Type,Typ konta
 Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account.
 Account head {0} created,Account head {0} created
-Account must be a balance sheet account,Account must be a balance sheet account
-Account with child nodes cannot be converted to ledger,Account with child nodes cannot be converted to ledger
-Account with existing transaction can not be converted to group.,Account with existing transaction can not be converted to group.
-Account with existing transaction can not be deleted,Account with existing transaction can not be deleted
-Account with existing transaction cannot be converted to ledger,Account with existing transaction cannot be converted to ledger
-Account {0} cannot be a Group,Account {0} cannot be a Group
-Account {0} does not belong to Company {1},Account {0} does not belong to Company {1}
-Account {0} does not exist,Account {0} does not exist
+Account must be a balance sheet account,Konto musi być bilansowe
+Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
+Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
+Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
+Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
+Account {0} cannot be a Group,Konto {0} nie może być Grupą (kontem dzielonym)
+Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
+Account {0} does not exist,Konto {0} nie istnieje
 Account {0} has been entered more than once for fiscal year {1},Account {0} has been entered more than once for fiscal year {1}
-Account {0} is frozen,Account {0} is frozen
-Account {0} is inactive,Account {0} is inactive
+Account {0} is frozen,Konto {0} jest zamrożone
+Account {0} is inactive,Konto {0} jest nieaktywne
 Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item
-Account: {0} can only be updated via \					Stock Transactions,Account: {0} can only be updated via \					Stock Transactions
+Account: {0} can only be updated via \					Stock Transactions,Konto: {0} może być aktualizowane tylko przez \ Operacje Magazynowe
 Accountant,Księgowy
 Accounting,Księgowość
 "Accounting Entries can be made against leaf nodes, called","Accounting Entries can be made against leaf nodes, called"
-"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Accounting entry frozen up to this date, nobody can do / modify entry except role specified below."
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt  nie może / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej."
 Accounting journal entries.,Accounting journal entries.
 Accounts,Księgowość
 Accounts Browser,Accounts Browser
-Accounts Frozen Upto,Accounts Frozen Upto
+Accounts Frozen Upto,Konta zamrożone do 
 Accounts Payable,Accounts Payable
 Accounts Receivable,Accounts Receivable
 Accounts Settings,Accounts Settings
@@ -106,13 +106,13 @@
 Add,Dodaj
 Add / Edit Taxes and Charges,Add / Edit Taxes and Charges
 Add Child,Add Child
-Add Serial No,Add Serial No
-Add Taxes,Add Taxes
+Add Serial No,Dodaj nr seryjny
+Add Taxes,Dodaj Podatki
 Add Taxes and Charges,Dodaj podatki i opłaty
-Add or Deduct,Add or Deduct
+Add or Deduct,Dodatki lub Potrącenia
 Add rows to set annual budgets on Accounts.,Add rows to set annual budgets on Accounts.
 Add to Cart,Add to Cart
-Add to calendar on this date,Add to calendar on this date
+Add to calendar on this date,Dodaj do kalendarza pod tą datą
 Add/Remove Recipients,Add/Remove Recipients
 Address,Adres
 Address & Contact,Adres i kontakt
@@ -145,8 +145,8 @@
 Against Entries,Against Entries
 Against Expense Account,Against Expense Account
 Against Income Account,Against Income Account
-Against Journal Entry,Against Journal Entry
-Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry
+Against Journal Voucher,Against Journal Voucher
+Against Journal Voucher {0} does not have any unmatched {1} entry,Against Journal Voucher {0} does not have any unmatched {1} entry
 Against Purchase Invoice,Against Purchase Invoice
 Against Sales Invoice,Against Sales Invoice
 Against Sales Order,Against Sales Order
@@ -194,8 +194,8 @@
 Allow Children,Allow Children
 Allow Dropbox Access,Allow Dropbox Access
 Allow Google Drive Access,Allow Google Drive Access
-Allow Negative Balance,Allow Negative Balance
-Allow Negative Stock,Allow Negative Stock
+Allow Negative Balance,Dozwolony ujemny bilans
+Allow Negative Stock,Dozwolony ujemny stan
 Allow Production Order,Allow Production Order
 Allow User,Allow User
 Allow Users,Allow Users
@@ -208,11 +208,11 @@
 Amount,Wartość
 Amount (Company Currency),Amount (Company Currency)
 Amount <=,Amount <=
-Amount >=,Amount >=
+Amount >=,Wartość >=
 Amount to Bill,Amount to Bill
 An Customer exists with same name,An Customer exists with same name
-"An Item Group exists with same name, please change the item name or rename the item group","An Item Group exists with same name, please change the item name or rename the item group"
-"An item exists with same name ({0}), please change the item group name or rename the item","An item exists with same name ({0}), please change the item group name or rename the item"
+"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
+"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
 Analyst,Analyst
 Annual,Roczny
 Another Period Closing Entry {0} has been made after {1},Another Period Closing Entry {0} has been made after {1}
@@ -261,7 +261,7 @@
 Atleast one warehouse is mandatory,Atleast one warehouse is mandatory
 Attach Image,Dołącz obrazek
 Attach Letterhead,Attach Letterhead
-Attach Logo,Attach Logo
+Attach Logo,Załącz Logo
 Attach Your Picture,Attach Your Picture
 Attendance,Attendance
 Attendance Date,Attendance Date
@@ -313,8 +313,8 @@
 Balance Qty,Balance Qty
 Balance Sheet,Balance Sheet
 Balance Value,Balance Value
-Balance for Account {0} must always be {1},Balance for Account {0} must always be {1}
-Balance must be,Balance must be
+Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
+Balance must be,Bilans powinien wynosić 
 "Balances of Accounts of type ""Bank"" or ""Cash""","Balances of Accounts of type ""Bank"" or ""Cash"""
 Bank,Bank
 Bank A/C No.,Bank A/C No.
@@ -328,7 +328,7 @@
 Bank Reconciliation,Bank Reconciliation
 Bank Reconciliation Detail,Bank Reconciliation Detail
 Bank Reconciliation Statement,Bank Reconciliation Statement
-Bank Entry,Bank Entry
+Bank Voucher,Bank Voucher
 Bank/Cash Balance,Bank/Cash Balance
 Banking,Banking
 Barcode,Kod kreskowy
@@ -339,12 +339,12 @@
 Basic Information,Basic Information
 Basic Rate,Basic Rate
 Basic Rate (Company Currency),Basic Rate (Company Currency)
-Batch,Batch
-Batch (lot) of an Item.,Batch (lot) produktu.
-Batch Finished Date,Data zakończenia lotu
-Batch ID,Identyfikator lotu
-Batch No,Nr lotu
-Batch Started Date,Data rozpoczęcia lotu
+Batch,Partia
+Batch (lot) of an Item.,Partia (pakiet) produktu.
+Batch Finished Date,Data ukończenia Partii
+Batch ID,Identyfikator Partii
+Batch No,Nr Partii
+Batch Started Date,Data rozpoczęcia Partii
 Batch Time Logs for billing.,Batch Time Logs for billing.
 Batch-Wise Balance History,Batch-Wise Balance History
 Batched for Billing,Batched for Billing
@@ -408,7 +408,7 @@
 C-Form No,C-Form No
 C-Form records,C-Form records
 Calculate Based On,Calculate Based On
-Calculate Total Score,Calculate Total Score
+Calculate Total Score,Oblicz całkowity wynik
 Calendar Events,Calendar Events
 Call,Call
 Calls,Calls
@@ -423,14 +423,14 @@
 Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
 Cancel Material Visit {0} before cancelling this Customer Issue,Cancel Material Visit {0} before cancelling this Customer Issue
 Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel Material Visits {0} before cancelling this Maintenance Visit
-Cancelled,Cancelled
+Cancelled,Anulowano
 Cancelling this Stock Reconciliation will nullify its effect.,Cancelling this Stock Reconciliation will nullify its effect.
 Cannot Cancel Opportunity as Quotation Exists,Cannot Cancel Opportunity as Quotation Exists
 Cannot approve leave as you are not authorized to approve leaves on Block Dates,Cannot approve leave as you are not authorized to approve leaves on Block Dates
 Cannot cancel because Employee {0} is already approved for {1},Cannot cancel because Employee {0} is already approved for {1}
 Cannot cancel because submitted Stock Entry {0} exists,Cannot cancel because submitted Stock Entry {0} exists
 Cannot carry forward {0},Cannot carry forward {0}
-Cannot change Year Start Date and Year End Date once the Fiscal Year is saved.,Cannot change Year Start Date and Year End Date once the Fiscal Year is saved.
+Cannot change Year Start Date and Year End Date once the Fiscal Year is saved.,Nie można zmieniać daty początkowej i końcowej uworzonego już Roku Podatkowego.
 "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 Cannot convert Cost Center to ledger as it has child nodes,Cannot convert Cost Center to ledger as it has child nodes
 Cannot covert to Group because Master Type or Account Type is selected.,Cannot covert to Group because Master Type or Account Type is selected.
@@ -457,11 +457,11 @@
 Case No. cannot be 0,Case No. cannot be 0
 Cash,Gotówka
 Cash In Hand,Cash In Hand
-Cash Entry,Cash Entry
-Cash or Bank Account is mandatory for making payment entry,Cash or Bank Account is mandatory for making payment entry
-Cash/Bank Account,Cash/Bank Account
+Cash Voucher,Cash Voucher
+Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
+Cash/Bank Account,Konto Kasa/Bank
 Casual Leave,Casual Leave
-Cell Number,Cell Number
+Cell Number,Telefon komórkowy
 Change UOM for an Item.,Change UOM for an Item.
 Change the starting / current sequence number of an existing series.,Change the starting / current sequence number of an existing series.
 Channel Partner,Channel Partner
@@ -469,8 +469,8 @@
 Chargeable,Chargeable
 Charity and Donations,Charity and Donations
 Chart Name,Chart Name
-Chart of Accounts,Chart of Accounts
-Chart of Cost Centers,Chart of Cost Centers
+Chart of Accounts,Plan Kont
+Chart of Cost Centers,Struktura kosztów (MPK)
 Check how the newsletter looks in an email by sending it to your email.,Check how the newsletter looks in an email by sending it to your email.
 "Check if recurring invoice, uncheck to stop recurring or put proper End Date","Check if recurring invoice, uncheck to stop recurring or put proper End Date"
 "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible."
@@ -486,7 +486,7 @@
 Cheque,Cheque
 Cheque Date,Cheque Date
 Cheque Number,Cheque Number
-Child account exists for this account. You can not delete this account.,Child account exists for this account. You can not delete this account.
+Child account exists for this account. You can not delete this account.,To konto zawiera konta potomne. Nie można usunąć takiego konta.
 City,Miasto
 City/Town,Miasto/Miejscowość
 Claim Amount,Claim Amount
@@ -571,13 +571,13 @@
 Contact Mobile No,Contact Mobile No
 Contact Name,Nazwa kontaktu
 Contact No.,Contact No.
-Contact Person,Contact Person
+Contact Person,Osoba kontaktowa
 Contact Type,Contact Type
 Contact master.,Contact master.
 Contacts,Kontakty
 Content,Zawartość
 Content Type,Content Type
-Contra Entry,Contra Entry
+Contra Voucher,Contra Voucher
 Contract,Kontrakt
 Contract End Date,Contract End Date
 Contract End Date must be greater than Date of Joining,Contract End Date must be greater than Date of Joining
@@ -594,7 +594,7 @@
 Converted,Converted
 Copy From Item Group,Copy From Item Group
 Cosmetics,Cosmetics
-Cost Center,Cost Center
+Cost Center,MPK
 Cost Center Details,Cost Center Details
 Cost Center Name,Cost Center Name
 Cost Center is mandatory for Item {0},Cost Center is mandatory for Item {0}
@@ -607,8 +607,8 @@
 Costing,Zestawienie kosztów
 Country,Kraj
 Country Name,Nazwa kraju
-"Country, Timezone and Currency","Country, Timezone and Currency"
-Create Bank Entry for the total salary paid for the above selected criteria,Create Bank Entry for the total salary paid for the above selected criteria
+"Country, Timezone and Currency","Kraj, Strefa czasowa i Waluta"
+Create Bank Voucher for the total salary paid for the above selected criteria,Create Bank Voucher for the total salary paid for the above selected criteria
 Create Customer,Create Customer
 Create Material Requests,Create Material Requests
 Create New,Create New
@@ -630,7 +630,7 @@
 Credit,Credit
 Credit Amt,Credit Amt
 Credit Card,Credit Card
-Credit Card Entry,Credit Card Entry
+Credit Card Voucher,Credit Card Voucher
 Credit Controller,Credit Controller
 Credit Days,Credit Days
 Credit Limit,Credit Limit
@@ -694,7 +694,7 @@
 Customize the Notification,Customize the Notification
 Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.
 DN Detail,DN Detail
-Daily,Daily
+Daily,Codziennie
 Daily Time Log Summary,Daily Time Log Summary
 Database Folder ID,Database Folder ID
 Database of potential customers.,Baza danych potencjalnych klientów.
@@ -703,14 +703,14 @@
 Date Of Retirement,Date Of Retirement
 Date Of Retirement must be greater than Date of Joining,Date Of Retirement must be greater than Date of Joining
 Date is repeated,Date is repeated
-Date of Birth,Date of Birth
+Date of Birth,Data urodzenia
 Date of Issue,Date of Issue
 Date of Joining,Date of Joining
 Date of Joining must be greater than Date of Birth,Date of Joining must be greater than Date of Birth
 Date on which lorry started from supplier warehouse,Date on which lorry started from supplier warehouse
 Date on which lorry started from your warehouse,Date on which lorry started from your warehouse
-Dates,Dates
-Days Since Last Order,Days Since Last Order
+Dates,Daty
+Days Since Last Order,Dni od ostatniego zamówienia
 Days for which Holidays are blocked for this department.,Days for which Holidays are blocked for this department.
 Dealer,Dealer
 Debit,Debit
@@ -727,23 +727,23 @@
 Default Account,Default Account
 Default BOM,Default BOM
 Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.
-Default Bank Account,Default Bank Account
+Default Bank Account,Domyślne konto bankowe
 Default Buying Cost Center,Default Buying Cost Center
 Default Buying Price List,Default Buying Price List
 Default Cash Account,Default Cash Account
 Default Company,Default Company
 Default Cost Center for tracking expense for this item.,Default Cost Center for tracking expense for this item.
 Default Currency,Domyślna waluta
-Default Customer Group,Default Customer Group
-Default Expense Account,Default Expense Account
-Default Income Account,Default Income Account
+Default Customer Group,Domyślna grupa klientów
+Default Expense Account,Domyślne konto rozchodów
+Default Income Account,Domyślne konto przychodów
 Default Item Group,Default Item Group
 Default Price List,Default Price List
 Default Purchase Account in which cost of the item will be debited.,Default Purchase Account in which cost of the item will be debited.
 Default Selling Cost Center,Default Selling Cost Center
 Default Settings,Default Settings
 Default Source Warehouse,Domyślny źródłowy magazyn
-Default Stock UOM,Default Stock UOM
+Default Stock UOM,Domyślna jednostka
 Default Supplier,Domyślny dostawca
 Default Supplier Type,Default Supplier Type
 Default Target Warehouse,Domyślny magazyn docelowy
@@ -877,7 +877,7 @@
 Email Digest: ,Email Digest: 
 Email Id,Email Id
 "Email Id where a job applicant will email e.g. ""jobs@example.com""","Email Id where a job applicant will email e.g. ""jobs@example.com"""
-Email Notifications,Email Notifications
+Email Notifications,Powiadomienia na e-mail
 Email Sent?,Email Sent?
 "Email id must be unique, already exists for {0}","Email id must be unique, already exists for {0}"
 Email ids separated by commas.,Email ids separated by commas.
@@ -935,7 +935,7 @@
 Entertainment Expenses,Entertainment Expenses
 Entries,Entries
 Entries against,Entries against
-Entries are not allowed against this Fiscal Year if the year is closed.,Entries are not allowed against this Fiscal Year if the year is closed.
+Entries are not allowed against this Fiscal Year if the year is closed.,Nie jest możliwe wykonywanie zapisów na zamkniętym Roku Podatkowym.
 Entries before {0} are frozen,Entries before {0} are frozen
 Equity,Equity
 Error: {0} > {1},Error: {0} > {1}
@@ -944,7 +944,7 @@
 "Example: ABCD.#####If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Example: ABCD.#####If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank."
 Exchange Rate,Exchange Rate
 Excise Page Number,Excise Page Number
-Excise Entry,Excise Entry
+Excise Voucher,Excise Voucher
 Execution,Execution
 Executive Search,Executive Search
 Exemption Limit,Exemption Limit
@@ -960,8 +960,8 @@
 Expected Delivery Date cannot be before Sales Order Date,Expected Delivery Date cannot be before Sales Order Date
 Expected End Date,Expected End Date
 Expected Start Date,Expected Start Date
-Expense,Expense
-Expense Account,Expense Account
+Expense,Koszt
+Expense Account,Konto Wydatków
 Expense Account is mandatory,Expense Account is mandatory
 Expense Claim,Expense Claim
 Expense Claim Approved,Expense Claim Approved
@@ -1010,7 +1010,7 @@
 Finished Goods,Finished Goods
 First Name,First Name
 First Responded On,First Responded On
-Fiscal Year,Rok obrotowy
+Fiscal Year,Rok Podatkowy
 Fixed Asset,Fixed Asset
 Fixed Assets,Fixed Assets
 Follow via Email,Follow via Email
@@ -1128,7 +1128,7 @@
 Group,Grupa
 Group by Account,Group by Account
 Group by Voucher,Group by Voucher
-Group or Ledger,Group or Ledger
+Group or Ledger,Grupa lub Konto
 Groups,Grupy
 HR Manager,HR Manager
 HR Settings,HR Settings
@@ -1399,18 +1399,18 @@
 Job Title,Job Title
 "Job profile, qualifications required etc.","Job profile, qualifications required etc."
 Jobs Email Settings,Jobs Email Settings
-Journal Entries,Journal Entries
+Journal Entries,Zapisy księgowe
 Journal Entry,Journal Entry
-Journal Entry,Journal Entry
-Journal Entry Account,Journal Entry Account
-Journal Entry Account No,Journal Entry Account No
-Journal Entry {0} does not have account {1} or already matched,Journal Entry {0} does not have account {1} or already matched
-Journal Entries {0} are un-linked,Journal Entries {0} are un-linked
+Journal Voucher,Polecenia Księgowania
+Journal Voucher Detail,Journal Voucher Detail
+Journal Voucher Detail No,Journal Voucher Detail No
+Journal Voucher {0} does not have account {1} or already matched,Journal Voucher {0} does not have account {1} or already matched
+Journal Vouchers {0} are un-linked,Journal Vouchers {0} are un-linked
 Keep a track of communication related to this enquiry which will help for future reference.,Keep a track of communication related to this enquiry which will help for future reference.
 Keep it web friendly 900px (w) by 100px (h),Keep it web friendly 900px (w) by 100px (h)
 Key Performance Area,Key Performance Area
 Key Responsibility Area,Key Responsibility Area
-Kg,Kg
+Kg,kg
 LR Date,LR Date
 LR No,Nr ciężarówki
 Label,Label
@@ -1420,8 +1420,8 @@
 Landed Cost Purchase Receipts,Landed Cost Purchase Receipts
 Landed Cost Wizard,Landed Cost Wizard
 Landed Cost updated successfully,Landed Cost updated successfully
-Language,Language
-Last Name,Last Name
+Language,Język
+Last Name,Nazwisko
 Last Purchase Rate,Last Purchase Rate
 Latest,Latest
 Lead,Lead
@@ -1518,8 +1518,8 @@
 Maintenance start date can not be before delivery date for Serial No {0},Maintenance start date can not be before delivery date for Serial No {0}
 Major/Optional Subjects,Major/Optional Subjects
 Make ,Stwórz
-Make Accounting Entry For Every Stock Movement,Make Accounting Entry For Every Stock Movement
-Make Bank Entry,Make Bank Entry
+Make Accounting Entry For Every Stock Movement,Tworzenie Zapisów Księgowych dla każdej zmiany stanu Magazynu
+Make Bank Voucher,Make Bank Voucher
 Make Credit Note,Make Credit Note
 Make Debit Note,Make Debit Note
 Make Delivery,Make Delivery
@@ -1858,20 +1858,20 @@
 Paid amount + Write Off Amount can not be greater than Grand Total,Paid amount + Write Off Amount can not be greater than Grand Total
 Pair,Para
 Parameter,Parametr
-Parent Account,Parent Account
+Parent Account,Nadrzędne konto
 Parent Cost Center,Parent Cost Center
 Parent Customer Group,Parent Customer Group
 Parent Detail docname,Parent Detail docname
-Parent Item,Parent Item
-Parent Item Group,Parent Item Group
+Parent Item,Element nadrzędny
+Parent Item Group,Grupa Elementu nadrzędnego
 Parent Item {0} must be not Stock Item and must be a Sales Item,Parent Item {0} must be not Stock Item and must be a Sales Item
 Parent Party Type,Parent Party Type
 Parent Sales Person,Parent Sales Person
 Parent Territory,Parent Territory
 Parent Website Page,Parent Website Page
 Parent Website Route,Parent Website Route
-Parent account can not be a ledger,Parent account can not be a ledger
-Parent account does not exist,Parent account does not exist
+Parent account can not be a ledger,Nadrzędne konto (Grupa) nie może być zwykłym kontem
+Parent account does not exist,Nadrzędne konto nie istnieje
 Parenttype,Parenttype
 Part-time,Part-time
 Partially Completed,Partially Completed
@@ -1957,7 +1957,7 @@
 Please enter Cost Center,Please enter Cost Center
 Please enter Delivery Note No or Sales Invoice No to proceed,Please enter Delivery Note No or Sales Invoice No to proceed
 Please enter Employee Id of this sales parson,Please enter Employee Id of this sales parson
-Please enter Expense Account,Please enter Expense Account
+Please enter Expense Account,Wprowadź konto Wydatków
 Please enter Item Code to get batch no,Please enter Item Code to get batch no
 Please enter Item Code.,Please enter Item Code.
 Please enter Item first,Please enter Item first
@@ -1992,11 +1992,11 @@
 Please save the Newsletter before sending,Please save the Newsletter before sending
 Please save the document before generating maintenance schedule,Please save the document before generating maintenance schedule
 Please select Account first,Please select Account first
-Please select Bank Account,Please select Bank Account
+Please select Bank Account,Wybierz konto Bank
 Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year
 Please select Category first,Please select Category first
 Please select Charge Type first,Please select Charge Type first
-Please select Fiscal Year,Please select Fiscal Year
+Please select Fiscal Year,Wybierz Rok Podatkowy
 Please select Group or Ledger value,Please select Group or Ledger value
 Please select Incharge Person's name,Please select Incharge Person's name
 "Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM"
@@ -2022,7 +2022,7 @@
 Please set {0},Please set {0}
 Please setup Employee Naming System in Human Resource > HR Settings,Please setup Employee Naming System in Human Resource > HR Settings
 Please setup numbering series for Attendance via Setup > Numbering Series,Please setup numbering series for Attendance via Setup > Numbering Series
-Please setup your chart of accounts before you start Accounting Entries,Please setup your chart of accounts before you start Accounting Entries
+Please setup your chart of accounts before you start Accounting Entries,Należy stworzyć własny Plan Kont zanim rozpocznie się księgowanie
 Please specify,Please specify
 Please specify Company,Please specify Company
 Please specify Company to proceed,Please specify Company to proceed
@@ -2034,8 +2034,8 @@
 Please submit to update Leave Balance.,Please submit to update Leave Balance.
 Plot,Plot
 Plot By,Plot By
-Point of Sale,Point of Sale
-Point-of-Sale Setting,Point-of-Sale Setting
+Point of Sale,Punkt Sprzedaży
+Point-of-Sale Setting,Konfiguracja Punktu Sprzedaży
 Post Graduate,Post Graduate
 Postal,Postal
 Postal Expenses,Postal Expenses
@@ -2414,7 +2414,7 @@
 Sales Details,Szczegóły sprzedaży
 Sales Discounts,Sales Discounts
 Sales Email Settings,Sales Email Settings
-Sales Expenses,Sales Expenses
+Sales Expenses,Koszty Sprzedaży
 Sales Extras,Sales Extras
 Sales Funnel,Sales Funnel
 Sales Invoice,Sales Invoice
@@ -2424,20 +2424,20 @@
 Sales Invoice Message,Sales Invoice Message
 Sales Invoice No,Nr faktury sprzedażowej
 Sales Invoice Trends,Sales Invoice Trends
-Sales Invoice {0} has already been submitted,Sales Invoice {0} has already been submitted
-Sales Invoice {0} must be cancelled before cancelling this Sales Order,Sales Invoice {0} must be cancelled before cancelling this Sales Order
+Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
 Sales Order,Zlecenie sprzedaży
-Sales Order Date,Sales Order Date
-Sales Order Item,Sales Order Item
-Sales Order Items,Sales Order Items
-Sales Order Message,Sales Order Message
-Sales Order No,Sales Order No
+Sales Order Date,Data Zlecenia
+Sales Order Item,Pozycja Zlecenia Sprzedaży
+Sales Order Items,Pozycje Zlecenia Sprzedaży
+Sales Order Message,Informacje Zlecenia Sprzedaży
+Sales Order No,Nr Zlecenia Sprzedaży
 Sales Order Required,Sales Order Required
 Sales Order Trends,Sales Order Trends
-Sales Order required for Item {0},Sales Order required for Item {0}
-Sales Order {0} is not submitted,Sales Order {0} is not submitted
-Sales Order {0} is not valid,Sales Order {0} is not valid
-Sales Order {0} is stopped,Sales Order {0} is stopped
+Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
+Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
+Sales Order {0} is stopped,Zlecenie Sprzedaży {0} jest wstrzymane
 Sales Partner,Sales Partner
 Sales Partner Name,Sales Partner Name
 Sales Partner Target,Sales Partner Target
@@ -2449,7 +2449,7 @@
 Sales Person-wise Transaction Summary,Sales Person-wise Transaction Summary
 Sales Register,Sales Register
 Sales Return,Zwrot sprzedaży
-Sales Returned,Sales Returned
+Sales Returned,Sprzedaże zwrócone
 Sales Taxes and Charges,Sales Taxes and Charges
 Sales Taxes and Charges Master,Sales Taxes and Charges Master
 Sales Team,Sales Team
@@ -2460,11 +2460,11 @@
 Salutation,Salutation
 Sample Size,Wielkość próby
 Sanctioned Amount,Sanctioned Amount
-Saturday,Saturday
-Schedule,Schedule
+Saturday,Sobota
+Schedule,Harmonogram
 Schedule Date,Schedule Date
 Schedule Details,Schedule Details
-Scheduled,Scheduled
+Scheduled,Zaplanowane
 Scheduled Date,Scheduled Date
 Scheduled to send to {0},Scheduled to send to {0}
 Scheduled to send to {0} recipients,Scheduled to send to {0} recipients
@@ -2488,13 +2488,13 @@
 Select Budget Distribution to unevenly distribute targets across months.,Select Budget Distribution to unevenly distribute targets across months.
 "Select Budget Distribution, if you want to track based on seasonality.","Select Budget Distribution, if you want to track based on seasonality."
 Select DocType,Select DocType
-Select Items,Select Items
+Select Items,Wybierz Elementy
 Select Purchase Receipts,Select Purchase Receipts
 Select Sales Orders,Select Sales Orders
 Select Sales Orders from which you want to create Production Orders.,Select Sales Orders from which you want to create Production Orders.
 Select Time Logs and Submit to create a new Sales Invoice.,Select Time Logs and Submit to create a new Sales Invoice.
 Select Transaction,Select Transaction
-Select Your Language,Select Your Language
+Select Your Language,Wybierz Swój Język
 Select account head of the bank where cheque was deposited.,Select account head of the bank where cheque was deposited.
 Select company name first.,Select company name first.
 Select template from which you want to get the Goals,Select template from which you want to get the Goals
@@ -2503,7 +2503,7 @@
 Select the relevant company name if you have multiple companies,Select the relevant company name if you have multiple companies
 Select the relevant company name if you have multiple companies.,Select the relevant company name if you have multiple companies.
 Select who you want to send this newsletter to,Select who you want to send this newsletter to
-Select your home country and check the timezone and currency.,Select your home country and check the timezone and currency.
+Select your home country and check the timezone and currency.,Wybierz kraj oraz sprawdź strefę czasową i walutę
 "Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",Wybranie “Tak” pozwoli na dostępność tego produktu w Zamówieniach i Potwierdzeniach Odbioru
 "Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note"
 "Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.","Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item."
@@ -2738,7 +2738,7 @@
 Sync with Dropbox,Sync with Dropbox
 Sync with Google Drive,Sync with Google Drive
 System,System
-System Settings,System Settings
+System Settings,Ustawienia Systemowe
 "System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. If set, it will become default for all HR forms."
 Target  Amount,Target  Amount
 Target Detail,Target Detail
@@ -2939,8 +2939,8 @@
 Travel Expenses,Travel Expenses
 Tree Type,Tree Type
 Tree of Item Groups.,Tree of Item Groups.
-Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
-Tree of finanial accounts.,Tree of finanial accounts.
+Tree of finanial Cost Centers.,Miejsca Powstawania Kosztów.
+Tree of finanial accounts.,Rejestr operacji gospodarczych.
 Trial Balance,Trial Balance
 Tuesday,Wtorek
 Type,Typ
@@ -2982,7 +2982,7 @@
 Update Stock,Update Stock
 "Update allocated amount in the above table and then click ""Allocate"" button","Update allocated amount in the above table and then click ""Allocate"" button"
 Update bank payment dates with journals.,Update bank payment dates with journals.
-Update clearance date of Journal Entries marked as 'Bank Entry',Update clearance date of Journal Entries marked as 'Bank Entry'
+Update clearance date of Journal Entries marked as 'Bank Vouchers',Update clearance date of Journal Entries marked as 'Bank Vouchers'
 Updated,Updated
 Updated Birthday Reminders,Updated Birthday Reminders
 Upload Attendance,Upload Attendance
@@ -3000,7 +3000,7 @@
 User,Użytkownik
 User ID,User ID
 User ID not set for Employee {0},User ID not set for Employee {0}
-User Name,User Name
+User Name,Nazwa Użytkownika
 User Name or Support Password missing. Please enter and try again.,User Name or Support Password missing. Please enter and try again.
 User Remark,User Remark
 User Remark will be added to Auto Remark,User Remark will be added to Auto Remark
@@ -3053,7 +3053,7 @@
 Warehouse is missing in Purchase Order,Warehouse is missing in Purchase Order
 Warehouse not found in the system,Warehouse not found in the system
 Warehouse required for stock Item {0},Warehouse required for stock Item {0}
-Warehouse required in POS Setting,Warehouse required in POS Setting
+Warehouse required in POS Setting,Magazyn wymagany w ustawieniach Punktu Sprzedaży (POS)
 Warehouse where you are maintaining stock of rejected items,Warehouse where you are maintaining stock of rejected items
 Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} can not be deleted as quantity exists for Item {1}
 Warehouse {0} does not belong to company {1},Warehouse {0} does not belong to company {1}
@@ -3117,15 +3117,15 @@
 Write Off Based On,Write Off Based On
 Write Off Cost Center,Write Off Cost Center
 Write Off Outstanding Amount,Write Off Outstanding Amount
-Write Off Entry,Write Off Entry
+Write Off Voucher,Write Off Voucher
 Wrong Template: Unable to find head row.,Wrong Template: Unable to find head row.
 Year,Rok
 Year Closed,Year Closed
 Year End Date,Year End Date
 Year Name,Year Name
 Year Start Date,Year Start Date
-Year Start Date and Year End Date are already set in Fiscal Year {0},Year Start Date and Year End Date are already set in Fiscal Year {0}
-Year Start Date and Year End Date are not within Fiscal Year.,Year Start Date and Year End Date are not within Fiscal Year.
+Year Start Date and Year End Date are already set in Fiscal Year {0},Data Początkowa i Data Końcowa są już zdefiniowane dla Roku Podatkowego {0}
+Year Start Date and Year End Date are not within Fiscal Year.,Data Początkowa i Data Końcowa nie zawierają się w Roku Podatkowym.
 Year Start Date should not be greater than Year End Date,Year Start Date should not be greater than Year End Date
 Year of Passing,Year of Passing
 Yearly,Rocznie
@@ -3136,18 +3136,18 @@
 You are the Leave Approver for this record. Please Update the 'Status' and Save,You are the Leave Approver for this record. Please Update the 'Status' and Save
 You can enter any date manually,You can enter any date manually
 You can enter the minimum quantity of this item to be ordered.,"Można wpisać minimalna ilość tego produktu, którą zamierza się zamawiać."
-You can not assign itself as parent account,You can not assign itself as parent account
+You can not assign itself as parent account,Nie można przypisać jako nadrzędne konto tego samego konta
 You can not change rate if BOM mentioned agianst any item,You can not change rate if BOM mentioned agianst any item
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.
-You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
+You can not enter current voucher in 'Against Journal Voucher' column,You can not enter current voucher in 'Against Journal Voucher' column
 You can set Default Bank Account in Company master,You can set Default Bank Account in Company master
 You can start by selecting backup frequency and granting access for sync,You can start by selecting backup frequency and granting access for sync
 You can submit this Stock Reconciliation.,You can submit this Stock Reconciliation.
 You can update either Quantity or Valuation Rate or both.,You can update either Quantity or Valuation Rate or both.
-You cannot credit and debit same account at the same time,You cannot credit and debit same account at the same time
+You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
 You have entered duplicate items. Please rectify and try again.,You have entered duplicate items. Please rectify and try again.
 You may need to update: {0},You may need to update: {0}
-You must Save the form before proceeding,You must Save the form before proceeding
+You must Save the form before proceeding,Zapisz formularz aby kontynuować
 You must allocate amount before reconcile,You must allocate amount before reconcile
 Your Customer's TAX registration numbers (if applicable) or any general information,Your Customer's TAX registration numbers (if applicable) or any general information
 Your Customers,Your Customers
@@ -3155,8 +3155,8 @@
 Your Products or Services,Your Products or Services
 Your Suppliers,Your Suppliers
 Your email address,Your email address
-Your financial year begins on,Your financial year begins on
-Your financial year ends on,Your financial year ends on
+Your financial year begins on,Rok Podatkowy rozpoczyna się 
+Your financial year ends on,Rok Podatkowy kończy się 
 Your sales person who will contact the customer in future,Your sales person who will contact the customer in future
 Your sales person will get a reminder on this date to contact the customer,Your sales person will get a reminder on this date to contact the customer
 Your setup is complete. Refreshing...,Your setup is complete. Refreshing...
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 632c659..04bf170 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -35,13 +35,13 @@
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> toevoegen / bewerken < / a>"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> modelo padrão </ h4>  <p> Usa <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </ a> e todos os campos de Endereço ( incluindo campos personalizados se houver) estará disponível </ p>  <pre> <code> {{}} address_line1 <br>  {% if address_line2%} {{}} address_line2 <br> { endif% -%}  {{cidade}} <br>  {% if%} Estado {{estado}} {% endif <br> -%}  {% if pincode%} PIN: {{}} pincode <br> {% endif -%}  {{país}} <br>  {% if%} telefone Telefone: {{telefone}} {<br> endif% -%}  {% if%} fax Fax: {{fax}} {% endif <br> -%}  {% if% email_id} E-mail: {{}} email_id <br> , {% endif -%}  </ code> </ pre>"
 A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes"
-A Customer exists with same name,Um cliente existe com o mesmo nome
+A Customer exists with same name,Existe um cliente com o mesmo nome
 A Lead with this email id should exist,Um Lead com esse ID de e-mail deve existir
 A Product or Service,Um produto ou serviço
 A Supplier exists with same name,Um Fornecedor existe com mesmo nome
 A symbol for this currency. For e.g. $,Um símbolo para esta moeda. Por exemplo: $
 AMC Expiry Date,AMC Data de Validade
-Abbr,Abbr
+Abbr,Abrv
 Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 Above Value,Acima de Valor
 Absent,Ausente
@@ -71,9 +71,9 @@
 Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
 Account {0} does not exist,Conta {0} não existe
 Account {0} has been entered more than once for fiscal year {1},Conta {0} foi inserido mais de uma vez para o ano fiscal {1}
-Account {0} is frozen,Conta {0} está congelado
-Account {0} is inactive,Conta {0} está inativo
-Account {0} is not valid,Conta {0} não é válido
+Account {0} is frozen,Conta {0} está congelada
+Account {0} is inactive,Conta {0} está inativa
+Account {0} is not valid,Conta {0} inválida
 Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Conta {0} deve ser do tipo "" Ativo Fixo "" como item {1} é um item de ativos"
 Account {0}: Parent account {1} can not be a ledger,Conta {0}: conta principal {1} não pode ser um livro
 Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: conta principal {1} não pertence à empresa: {2}
@@ -1046,16 +1046,16 @@
 Finished Goods,afgewerkte producten
 First Name,Nome
 First Responded On,Primeiro respondeu em
-Fiscal Year,Exercício fiscal
+Fiscal Year,Ano Fiscal
 Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
 Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart.,Ano Fiscal Data de Início e Término do Exercício Social Data não pode ter mais do que um ano de intervalo.
 Fiscal Year Start Date should not be greater than Fiscal Year End Date,Ano Fiscal Data de início não deve ser maior do que o Fiscal Year End Date
-Fixed Asset,ativos Fixos
+Fixed Asset,Activos Fixos
 Fixed Assets,Imobilizado
-Follow via Email,Siga por e-mail
+Follow via Email,Seguir por e-mail
 "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",Após tabela mostrará valores se os itens são sub - contratada. Estes valores serão obtidos a partir do mestre de &quot;Bill of Materials&quot; de sub - itens contratados.
-Food,comida
-"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
+Food,Comida
+"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
 "For 'Sales BOM' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens de vendas 'BOM', Armazém, N º de Série e Batch Não será considerada a partir da tabela ""Packing List"". Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item 'Vendas BOM', esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para a tabela ""Packing List""."
 For Company,Para a Empresa
 For Employee,Para Empregado
@@ -1118,14 +1118,14 @@
 "Further accounts can be made under Groups, but entries can be made against Ledger","Outras contas podem ser feitas em grupos , mas as entradas podem ser feitas contra Ledger"
 Further nodes can be only created under 'Group' type nodes,Verder nodes kunnen alleen worden gemaakt op grond van het type nodes 'Groep'
 GL Entry,Entrada GL
-Gantt Chart,Gantt
+Gantt Chart,Gráfico Gantt
 Gantt chart of all tasks.,Gantt de todas as tarefas.
 Gender,Sexo
 General,Geral
 General Ledger,General Ledger
 Generate Description HTML,Gerar Descrição HTML
-Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e ordens de produção.
-Generate Salary Slips,Gerar folhas de salários
+Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e Ordens de Produção.
+Generate Salary Slips,Gerar Folhas de Vencimento
 Generate Schedule,Gerar Agende
 Generates HTML to include selected image in the description,Gera HTML para incluir imagem selecionada na descrição
 Get Advances Paid,Obter adiantamentos pagos
@@ -1133,9 +1133,9 @@
 Get Current Stock,Obter Estoque atual
 Get Items,Obter itens
 Get Items From Sales Orders,Obter itens de Pedidos de Vendas
-Get Items from BOM,Items ophalen van BOM
+Get Items from BOM,Obter itens da Lista de Material
 Get Last Purchase Rate,Obter Tarifa de Compra Última
-Get Outstanding Invoices,Obter faturas pendentes
+Get Outstanding Invoices,Obter Facturas Pendentes
 Get Relevant Entries,Obter entradas relevantes
 Get Sales Orders,Obter Pedidos de Vendas
 Get Specification Details,Obtenha detalhes Especificação
@@ -1174,13 +1174,13 @@
 Group by Voucher,Grupo pela Vale
 Group or Ledger,Grupo ou Ledger
 Groups,Grupos
-HR Manager,Gerente de RH
-HR Settings,Configurações HR
+HR Manager,Gestor de RH
+HR Settings,Configurações RH
 HTML / Banner that will show on the top of product list.,HTML bandeira / que vai mostrar no topo da lista de produtos.
 Half Day,Meio Dia
 Half Yearly,Semestrais
 Half-yearly,Semestral
-Happy Birthday!,Happy Birthday!
+Happy Birthday!,Feliz Aniversário!
 Hardware,ferragens
 Has Batch No,Não tem Batch
 Has Child Node,Tem nó filho
@@ -1197,17 +1197,17 @@
 "Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, etc preocupações médica"
 Hide Currency Symbol,Ocultar Símbolo de Moeda
 High,Alto
-History In Company,História In Company
+History In Company,Historial na Empresa
 Hold,Segurar
 Holiday,Férias
-Holiday List,Lista de feriado
-Holiday List Name,Nome da lista férias
+Holiday List,Lista de Feriados
+Holiday List Name,Lista de Nomes de Feriados
 Holiday master.,Mestre férias .
 Holidays,Férias
 Home,Casa
 Host,Anfitrião
 "Host, Email and Password required if emails are to be pulled",E-mail host e senha necessária se e-mails devem ser puxado
-Hour,hora
+Hour,Hora
 Hour Rate,Taxa de hora
 Hour Rate Labour,A taxa de hora
 Hours,Horas
@@ -1713,7 +1713,7 @@
 Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4},Saldo negativo em lote {0} para {1} item no Armazém {2} em {3} {4}
-Net Pay,Pagamento Net
+Net Pay,Pagamento Líquido
 Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (em palavras) será visível quando você salvar a folha de salário.
 Net Profit / Loss,Lucro / Prejuízo Líquido
 Net Total,Líquida Total
@@ -1723,16 +1723,16 @@
 Net Weight of each Item,Peso líquido de cada item
 Net pay cannot be negative,Salário líquido não pode ser negativo
 Never,Nunca
-New ,New 
-New Account,nieuw account
+New ,Novo
+New Account,Nova Conta
 New Account Name,Nieuw account Naam
 New BOM,Novo BOM
-New Communications,New Communications
-New Company,nieuw bedrijf
-New Cost Center,Nieuwe kostenplaats
-New Cost Center Name,Nieuwe kostenplaats Naam
+New Communications,Comunicações Novas
+New Company,Nova empresa
+New Cost Center,Novo Centro de Custo
+New Cost Center Name,Nome de NOvo Centro de Custo
 New Delivery Notes,Novas notas de entrega
-New Enquiries,Consultas novo
+New Enquiries,Novas Consultas
 New Leads,Nova leva
 New Leave Application,Aplicação deixar Nova
 New Leaves Allocated,Nova Folhas alocado
@@ -1746,7 +1746,7 @@
 New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 New Stock Entries,Novas entradas em existências
 New Stock UOM,Nova da UOM
-New Stock UOM is required,Novo Estoque UOM é necessária
+New Stock UOM is required,Novo stock UOM é necessária
 New Stock UOM must be different from current stock UOM,Novo Estoque UOM deve ser diferente do atual UOM estoque
 New Supplier Quotations,Novas citações Fornecedor
 New Support Tickets,Novos pedidos de ajuda
@@ -2408,7 +2408,7 @@
 "Requested Qty: Quantity requested for purchase, but not ordered.","Aangevraagd Aantal : Aantal op aankoop, maar niet besteld."
 Requests for items.,Os pedidos de itens.
 Required By,Exigido por
-Required Date,Data Obrigatório
+Required Date,Data Obrigatória
 Required Qty,Quantidade requerida
 Required only for sample item.,Necessário apenas para o item amostra.
 Required raw materials issued to the supplier for producing a sub - contracted item.,Matérias-primas necessárias emitidos para o fornecedor para a produção de um sub - item contratado.
@@ -2493,7 +2493,7 @@
 Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
 Salary components.,Componentes salariais.
 Salary template master.,Mestre modelo Salário .
-Sales,De vendas
+Sales,Vendas
 Sales Analytics,Sales Analytics
 Sales BOM,BOM vendas
 Sales BOM Help,Vendas Ajuda BOM
@@ -2603,7 +2603,7 @@
 "Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.",Selecionando &quot;Sim&quot; permitirá a você criar Bill of Material mostrando matérias-primas e os custos operacionais incorridos para fabricar este item.
 "Selecting ""Yes"" will allow you to make a Production Order for this item.",Selecionando &quot;Sim&quot; vai permitir que você faça uma ordem de produção para este item.
 "Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selecionando &quot;Sim&quot; vai dar uma identidade única para cada entidade deste item que pode ser visto no mestre Número de ordem.
-Selling,Vendendo
+Selling,Vendas
 Selling Settings,Vendendo Configurações
 "Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 Send,Enviar
@@ -3140,23 +3140,24 @@
 Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
 Valuation and Total,Avaliação e Total
 Value,Valor
-Value or Qty,Waarde of Aantal
+Value or Qty,Valor ou Quantidade
 Vehicle Dispatch Date,Veículo Despacho Data
 Vehicle No,No veículo
-Venture Capital,venture Capital
-Verified By,Verified By
-View Ledger,Bekijk Ledger
-View Now,Bekijk nu
+Venture Capital,Capital de Risco
+Verified By,Verificado Por
+View Ledger,Ver Diário
+View Now,Ver Já
 Visit report for maintenance call.,Relatório de visita para a chamada manutenção.
 Voucher #,voucher #
 Voucher Detail No,Detalhe folha no
 Voucher Detail Number,Número Detalhe voucher
-Voucher ID,ID comprovante
-Voucher No,Não vale
-Voucher Type,Tipo comprovante
-Voucher Type and Date,Tipo Vale e Data
+Voucher ID,"ID de Vale
+"
+Voucher No,Vale No.
+Voucher Type,Tipo de Vale
+Voucher Type and Date,Tipo de Vale e Data
 Walk In,Walk In
-Warehouse,armazém
+Warehouse,Armazém
 Warehouse Contact Info,Armazém Informações de Contato
 Warehouse Detail,Detalhe Armazém
 Warehouse Name,Nome Armazém
@@ -3238,8 +3239,8 @@
 Wrong Template: Unable to find head row.,Template errado: Não é possível encontrar linha cabeça.
 Year,Ano
 Year Closed,Ano Encerrado
-Year End Date,Eind van het jaar Datum
-Year Name,Nome Ano
+Year End Date,Data de Fim de Ano
+Year Name,Nome do Ano
 Year Start Date,Data de início do ano
 Year of Passing,Ano de Passagem
 Yearly,Anual
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index fc22e1d..f697a9a 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -92,7 +92,7 @@
 Accounts Receivable,Conturi de încasat
 Accounts Settings,Conturi Setări
 Active,Activ
-Active: Will extract emails from ,Active: Will extract emails from 
+Active: Will extract emails from ,Activ:Se extrag emailuri din
 Activity,Activități
 Activity Log,Activitate Jurnal
 Activity Log:,Activitate Log:
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 3498897..7b3f834 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -34,66 +34,66 @@
 "<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Добавить / Изменить </>"
 "<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Добавить / Изменить </>"
 "<h4>Default Template</h4><p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p><pre><code>{{ address_line1 }}&lt;br&gt;{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}{{ city }}&lt;br&gt;{% if state %}{{ state }}&lt;br&gt;{% endif -%}{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}{{ country }}&lt;br&gt;{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code></pre>","<h4> умолчанию шаблона </ h4>  <p> Использует <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja шаблонов </ A> и все поля Адрес ( в том числе пользовательских полей если таковые имеются) будут доступны </ P>  <pre> <code> {{address_line1}} инструменты  {%, если address_line2%} {{address_line2}} инструменты { % ENDIF -%}  {{город}} инструменты  {%, если состояние%} {{состояние}} инструменты {% ENDIF -%}  {%, если пин-код%} PIN-код: {{пин-код}} инструменты {% ENDIF -%}  {{страна}} инструменты  {%, если телефон%} Телефон: {{телефон}} инструменты { % ENDIF -%}  {%, если факс%} Факс: {{факс}} инструменты {% ENDIF -%}  {%, если email_id%} Email: {{email_id}} инструменты ; {% ENDIF -%}  </ код> </ предварительно>"
-A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем, пожалуйста изменить имя клиентов или переименовать группу клиентов"
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
 A Customer exists with same name,"Клиент с таким именем уже существует
 "
-A Lead with this email id should exist,Ведущий с этим электронный идентификатор должен существовать
+A Lead with this email id should exist,Руководитеть с таким email должен существовать
 A Product or Service,Продукт или сервис
-A Supplier exists with same name,Поставщик существует с одноименным названием
-A symbol for this currency. For e.g. $,"Символ для этой валюты. Для например, $"
+A Supplier exists with same name,Поставщик с таким именем уже существует
+A symbol for this currency. For e.g. $,"Символ для этой валюты. Например, $"
 AMC Expiry Date,КУА срок действия
 Abbr,Аббревиатура
 Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 Above Value,Выше стоимости
-Absent,Рассеянность
-Acceptance Criteria,Критерии приемлемости
+Absent,Отсутствует
+Acceptance Criteria,Критерий приемлемости
 Accepted,Принято
 Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 Accepted Quantity,Принято Количество
-Accepted Warehouse,Принято Склад
+Accepted Warehouse,Принимающий склад
 Account,Аккаунт
 Account Balance,Остаток на счете
-Account Created: {0},Учетная запись создана: {0}
+Account Created: {0},Аккаунт создан: {0}
 Account Details,Подробности аккаунта
-Account Head,Счет руководитель
+Account Head,Основной счет
 Account Name,Имя Учетной Записи
 Account Type,Тип учетной записи
-"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета уже в кредит, вы не можете установить ""баланс должен быть 'как' Debit '"
-"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета уже в дебет, вы не можете установить ""баланс должен быть 'как' Кредит»"
-Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будут созданы под этой учетной записью.
-Account head {0} created,Глава счета {0} создан
-Account must be a balance sheet account,Счет должен быть балансовый счет
-Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
-Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы.
-Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
-Account with existing transaction cannot be converted to ledger,Счет с существующей сделки не могут быть преобразованы в книге
-Account {0} cannot be a Group,Аккаунт {0} не может быть в группе
+"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
+"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
+Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета.
+Account head {0} created,Основной счет {0} создан
+Account must be a balance sheet account,Счет должен быть балансовый
+Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не может быть преобразован в регистр
+Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
+Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
+Account with existing transaction cannot be converted to ledger,Счет существующей проводки не может быть преобразован в регистр
+Account {0} cannot be a Group,Счет {0} не может быть группой
 Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
 Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
 Account {0} does not exist,Аккаунт {0} не существует
 Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
-Account {0} is frozen,Аккаунт {0} заморожен
-Account {0} is inactive,Аккаунт {0} неактивен
+Account {0} is frozen,Счет {0} заморожен
+Account {0} is inactive,Счет {0} неактивен
 Account {0} is not valid,Счет {0} не является допустимым
-Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа ""Fixed Asset"", как товара {1} является активом Пункт"
-Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родитель счета {1} не может быть книга
+Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', товар {1} является активом"
+Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родительский счет {1} не может быть регистром
 Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
-Account: {0} can only be updated via \					Stock Transactions,Счета: {0} может быть обновлен только через \ Биржевые операции
+Account: {0} can only be updated via \					Stock Transactions,Счет: {0} может быть обновлен только через \ Биржевые операции
 Accountant,Бухгалтер
-Accounting,Пользователи
+Accounting,Бухгалтерия
 "Accounting Entries can be made against leaf nodes, called","Бухгалтерские записи могут быть сделаны против конечных узлов, называется"
-"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерская запись заморожены до этой даты, никто не может сделать / изменить запись, кроме роли, указанной ниже."
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерская запись заморожена до этой даты, никто не может сделать / изменить запись, кроме роли, указанной ниже."
 Accounting journal entries.,Журнал бухгалтерских записей.
 Accounts,Учётные записи
-Accounts Browser,Дебиторская Браузер
+Accounts Browser,Обзор счетов
 Accounts Frozen Upto,Счета заморожены До
-Accounts Payable,Ежемесячные счета по кредиторской задолженности
+Accounts Payable,Счета к оплате
 Accounts Receivable,Дебиторская задолженность
 Accounts Settings, Настройки аккаунта
 Active,Активен
-Active: Will extract emails from ,Active: Will extract emails from 
+Active: Will extract emails from ,Получать сообщения e-mail от
 Activity,Активность
 Activity Log,Журнал активности
 Activity Log:,Журнал активности:
@@ -109,8 +109,8 @@
 Actual Qty (at source/target),Фактический Кол-во (в источнике / цели)
 Actual Qty After Transaction,Остаток после проведения
 Actual Qty: Quantity available in the warehouse.,Фактический Кол-во: Есть в наличии на складе.
-Actual Quantity,Фактический Количество
-Actual Start Date,Фактическое начало Дата
+Actual Quantity,Фактическое Количество
+Actual Start Date,Фактическое Дата начала
 Add,Добавить
 Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
 Add Child,Добавить дочерний
@@ -153,8 +153,8 @@
 Against Document No,Против Документ №
 Against Expense Account,Против Expense Счет
 Against Income Account,Против ДОХОДОВ
-Against Journal Entry,Против Journal ваучером
-Against Journal Entry {0} does not have any unmatched {1} entry,Против Journal ваучером {0} не имеет непревзойденную {1} запись
+Against Journal Voucher,Против Journal ваучером
+Against Journal Voucher {0} does not have any unmatched {1} entry,Против Journal ваучером {0} не имеет непревзойденную {1} запись
 Against Purchase Invoice,Против счете-фактуре
 Against Sales Invoice,Против продаж счета-фактуры
 Against Sales Order,Против заказ клиента
@@ -265,10 +265,10 @@
 Assistant,Помощник
 Associate,Помощник
 Atleast one of the Selling or Buying must be selected,По крайней мере один из продажи или покупки должен быть выбран
-Atleast one warehouse is mandatory,По крайней мере один склад является обязательным
-Attach Image,Прикрепите изображение
-Attach Letterhead,Прикрепите бланке
-Attach Logo,Прикрепите логотип
+Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
+Attach Image,Прикрепить изображение
+Attach Letterhead,Прикрепить бланк
+Attach Logo,Прикрепить логотип
 Attach Your Picture,Прикрепите свою фотографию
 Attendance,Посещаемость
 Attendance Date,Посещаемость Дата
@@ -296,18 +296,18 @@
 "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации, накладной, счете-фактуре, производственного заказа, заказа на поставку, покупка получение, счет-фактура, заказ клиента, фондовой въезда, расписания"
 Average Age,Средний возраст
 Average Commission Rate,Средний Комиссия курс
-Average Discount,Средний Скидка
-Awesome Products,Потрясающие Продукты
+Average Discount,Средняя скидка
+Awesome Products,Потрясающие продукты
 Awesome Services,Потрясающие услуги
-BOM Detail No,BOM Подробно Нет
+BOM Detail No,BOM детали №
 BOM Explosion Item,BOM Взрыв Пункт
-BOM Item,Позиции спецификации
-BOM No,BOM Нет
-BOM No. for a Finished Good Item,BOM номер для готового изделия Пункт
+BOM Item,Позиция BOM
+BOM No,BOM №
+BOM No. for a Finished Good Item,BOM номер для позиции готового изделия
 BOM Operation,BOM Операция
 BOM Operations,BOM Операции
 BOM Replace Tool,BOM Заменить Tool
-BOM number is required for manufactured Item {0} in row {1},BOM номер необходим для выпускаемой Пункт {0} в строке {1}
+BOM number is required for manufactured Item {0} in row {1},BOM номер необходим для выпускаемой позиции {0} в строке {1}
 BOM number not allowed for non-manufactured Item {0} in row {1},Число спецификации не допускается для не-выпускаемой Пункт {0} в строке {1}
 BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
 BOM replaced,BOM заменить
@@ -315,7 +315,7 @@
 BOM {0} is not active or not submitted,BOM {0} не является активным или не представили
 BOM {0} is not submitted or inactive BOM for Item {1},BOM {0} не представлено или неактивным спецификации по пункту {1}
 Backup Manager,Менеджер резервных копий
-Backup Right Now,Сделать резервную копию
+Backup Right Now,Сделать резервную копию сейчас
 Backups will be uploaded to,Резервные копии будут размещены на
 Balance Qty,Баланс Кол-во
 Balance Sheet,Балансовый отчет
@@ -325,48 +325,48 @@
 "Balances of Accounts of type ""Bank"" or ""Cash""",Остатки на счетах типа «Банк» или «Денежные средства»
 Bank,Банк:
 Bank / Cash Account,Банк / Расчетный счет
-Bank A/C No.,Bank A / С №
+Bank A/C No.,Банк Сч/Тек №
 Bank Account,Банковский счет
 Bank Account No.,Счет №
 Bank Accounts,Банковские счета
-Bank Clearance Summary,Банк просвет Основная
-Bank Draft,"Тратта, выставленная банком на другой банк"
+Bank Clearance Summary,Банк уплата по счетам итого
+Bank Draft,Банковский счет
 Bank Name,Название банка
-Bank Overdraft Account,Банк Овердрафт счета
-Bank Reconciliation,Банк примирения
-Bank Reconciliation Detail,Банк примирения Подробно
-Bank Reconciliation Statement,Заявление Банк примирения
-Bank Entry,Банк Ваучер
-Bank/Cash Balance,Банк / Баланс счета
-Banking,Банковское дело
+Bank Overdraft Account,Банк овердрафтовый счет
+Bank Reconciliation,Банковская сверка
+Bank Reconciliation Detail,Банковская сверка подробно
+Bank Reconciliation Statement,Банковская сверка состояние
+Bank Voucher,Банк Ваучер
+Bank/Cash Balance,Банк /Баланс счета
+Banking,Банковские операции
 Barcode,Штрихкод
 Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
-Based On,На основе
-Basic,Базовый
-Basic Info,Введение
+Based On,На основании
+Basic,Основной
+Basic Info,Основная информация
 Basic Information,Основная информация
-Basic Rate,Базовая ставка
-Basic Rate (Company Currency),Basic Rate (Компания Валюта)
-Batch,Парти
-Batch (lot) of an Item.,Пакетная (много) элемента.
-Batch Finished Date,Пакетная Готовые Дата
-Batch ID,ID Пакета
+Basic Rate,Основная ставка
+Basic Rate (Company Currency),Основная ставка (валюта компании)
+Batch,Партия
+Batch (lot) of an Item.,Партия элементов.
+Batch Finished Date,Дата окончания партии
+Batch ID,ID партии
 Batch No,№ партии
-Batch Started Date,Пакетная работы Дата
-Batch Time Logs for billing.,Пакетные Журналы Время для выставления счетов.
-Batch-Wise Balance History,Порционно Баланс История
-Batched for Billing,Batched для биллинга
-Better Prospects,Лучшие перспективы
+Batch Started Date,Дата начала партии
+Batch Time Logs for billing.,Журналы партий для выставления счета.
+Batch-Wise Balance History,Партиями Баланс История
+Batched for Billing,Укомплектовать для выставления счета
+Better Prospects,Потенциальные покупатели
 Bill Date,Дата оплаты
 Bill No,Номер накладной
-Bill No {0} already booked in Purchase Invoice {1},Билл Нет {0} уже заказали в счете-фактуре {1}
-Bill of Material,Накладная материалов
-Bill of Material to be considered for manufacturing,"Билл материала, который будет рассматриваться на производстве"
+Bill No {0} already booked in Purchase Invoice {1},Накладная № {0} уже заказан в счете-фактуре {1}
+Bill of Material,Накладная на материалы
+Bill of Material to be considered for manufacturing,Счёт на материалы для производства
 Bill of Materials (BOM),Ведомость материалов (BOM)
-Billable,Платежные
-Billed,Объявленный
-Billed Amount,Объявленный Количество
-Billed Amt,Объявленный Amt
+Billable,Оплачиваемый
+Billed,Выдавать счета
+Billed Amount,Счетов выдано количество
+Billed Amt,Счетов выдано кол-во
 Billing,Выставление счетов
 Billing Address,Адрес для выставления счетов
 Billing Address Name,Адрес для выставления счета Имя
@@ -381,13 +381,13 @@
 Block Days,Блок дня
 Block leave applications by department.,Блок отпуска приложений отделом.
 Blog Post,Пост блога
-Blog Subscriber,Блог абонента
+Blog Subscriber,Блог подписчика
 Blood Group,Группа крови
-Both Warehouse must belong to same Company,Оба Склад должены принадлежать той же компании
+Both Warehouse must belong to same Company,Оба Склад должены принадлежать одной Компании
 Box,Рамка
-Branch,Ветвь:
+Branch,Ветвь
 Brand,Бренд
-Brand Name,Бренд
+Brand Name,Имя Бренда
 Brand master.,Бренд мастер.
 Brands,Бренды
 Breakdown,Разбивка
@@ -471,7 +471,7 @@
 Case No. cannot be 0,Дело № не может быть 0
 Cash,Наличные
 Cash In Hand,Наличность кассы
-Cash Entry,Кассовый чек
+Cash Voucher,Кассовый чек
 Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 Cash/Bank Account, Наличные / Банковский счет
 Casual Leave,Повседневная Оставить
@@ -595,7 +595,7 @@
 Contacts,Контакты
 Content,Содержимое
 Content Type,Тип контента
-Contra Entry,Contra Ваучер
+Contra Voucher,Contra Ваучер
 Contract,Контракт
 Contract End Date,Конец контракта Дата
 Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
@@ -626,7 +626,7 @@
 Country Name,Название страны
 Country wise default Address Templates,Шаблоны Страна мудрый адрес по умолчанию
 "Country, Timezone and Currency","Страна, Временной пояс и валют"
-Create Bank Entry for the total salary paid for the above selected criteria,Создание банка Ваучер на общую зарплату заплатили за вышеуказанных выбранным критериям
+Create Bank Voucher for the total salary paid for the above selected criteria,Создание банка Ваучер на общую зарплату заплатили за вышеуказанных выбранным критериям
 Create Customer,Создание клиентов
 Create Material Requests,Создать запросы Материал
 Create New,Создать новый
@@ -648,7 +648,7 @@
 Credit,Кредит
 Credit Amt,Кредитная Amt
 Credit Card,Кредитная карта
-Credit Card Entry,Ваучер Кредитная карта
+Credit Card Voucher,Ваучер Кредитная карта
 Credit Controller,Кредитная контроллер
 Credit Days,Кредитные дней
 Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
@@ -853,7 +853,7 @@
 Doc Type,Тип документа
 Document Description,Документ Описание
 Document Type,Тип документа
-Documents,Документация
+Documents,Документы
 Domain,Домен
 Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
 Download Materials Required,Скачать Необходимые материалы
@@ -900,12 +900,12 @@
 Email,E-mail
 Email Digest,E-mail Дайджест
 Email Digest Settings,Email Дайджест Настройки
-Email Digest: ,Email Digest: 
-Email Id,E-mail Id
+Email Digest: ,Email Дайджест:
+Email Id,Email Id
 "Email Id where a job applicant will email e.g. ""jobs@example.com""","E-mail Id, где соискатель вышлем например ""jobs@example.com"""
 Email Notifications,Уведомления электронной почты
 Email Sent?,Отправки сообщения?
-"Email id must be unique, already exists for {0}","Удостоверение личности электронной почты должен быть уникальным, уже существует для {0}"
+"Email id must be unique, already exists for {0}","ID электронной почты должен быть уникальным, уже существует для {0}"
 Email ids separated by commas.,Email идентификаторы через запятую.
 "Email settings to extract Leads from sales email id e.g. ""sales@example.com""","Настройки электронной почты для извлечения ведет от продаж электронный идентификатор, например, ""sales@example.com"""
 Emergency Contact,Экстренная связь
@@ -924,7 +924,7 @@
 Employee Name,Имя Сотрудника
 Employee Number,Общее число сотрудников
 Employee Records to be created by,Сотрудник отчеты должны быть созданные
-Employee Settings,Настройки работникам
+Employee Settings,Работники Настройки
 Employee Type,Сотрудник Тип
 "Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 Employee master.,Мастер сотрудников.
@@ -980,7 +980,7 @@
 Excise Duty Edu Cess 2,Акцизе Эду Цесс 2
 Excise Duty SHE Cess 1,Акцизе ОНА Цесс 1
 Excise Page Number,Количество Акцизный Страница
-Excise Entry,Акцизный Ваучер
+Excise Voucher,Акцизный Ваучер
 Execution,Реализация
 Executive Search,Executive Search
 Exemption Limit,Освобождение Предел
@@ -1196,7 +1196,7 @@
 "Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Помощь: Чтобы связать с другой записью в системе, используйте ""# формуляр / Примечание / [Примечание Имя]"", как ссылка URL. (Не используйте ""http://"")"
 "Here you can maintain family details like name and occupation of parent, spouse and children","Здесь Вы можете сохранить семейные подробности, как имя и оккупации родитель, супруг и детей"
 "Here you can maintain height, weight, allergies, medical concerns etc","Здесь вы можете поддерживать рост, вес, аллергии, медицинские проблемы и т.д."
-Hide Currency Symbol,Скрыть Символа Валюты
+Hide Currency Symbol,Скрыть Символ Валюты
 High,Высокий
 History In Company,История В компании
 Hold,Удержание
@@ -1215,7 +1215,7 @@
 How Pricing Rule is applied?,Как Ценообразование Правило применяется?
 How frequently?,Как часто?
 "How should this currency be formatted? If not set, will use system defaults","Как это должно валюта быть отформатирован? Если не установлен, будет использовать системные значения по умолчанию"
-Human Resources,Человеческие ресурсы
+Human Resources,Кадры
 Identification of the package for the delivery (for print),Идентификация пакета на поставку (для печати)
 If Income or Expense,Если доходов или расходов
 If Monthly Budget Exceeded,Если Месячный бюджет Превышен
@@ -1328,7 +1328,7 @@
 Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Счет Период С и счет-фактура Период до даты обязательных для повторяющихся счет
 Invoice Period To,Счет Период до
 Invoice Type,Тип счета
-Invoice/Journal Entry Details,Счет / Журнал Подробности Ваучер
+Invoice/Journal Voucher Details,Счет / Журнал Подробности Ваучер
 Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
 Is Active,Активен
 Is Advance,Является Advance
@@ -1458,11 +1458,11 @@
 Jobs Email Settings,Настройки Вакансии Email
 Journal Entries,Записи в журнале
 Journal Entry,Запись в дневнике
-Journal Entry,Журнал Ваучер
-Journal Entry Account,Журнал Ваучер Подробно
-Journal Entry Account No,Журнал Ваучер Подробно Нет
-Journal Entry {0} does not have account {1} or already matched,Журнал Ваучер {0} не имеет учетной записи {1} или уже согласованы
-Journal Entries {0} are un-linked,Журнал Ваучеры {0} являются не-связаны
+Journal Voucher,Журнал Ваучер
+Journal Voucher Detail,Журнал Ваучер Подробно
+Journal Voucher Detail No,Журнал Ваучер Подробно Нет
+Journal Voucher {0} does not have account {1} or already matched,Журнал Ваучер {0} не имеет учетной записи {1} или уже согласованы
+Journal Vouchers {0} are un-linked,Журнал Ваучеры {0} являются не-связаны
 Keep a track of communication related to this enquiry which will help for future reference.,"Постоянно отслеживать коммуникации, связанные на этот запрос, который поможет в будущем."
 Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
 Key Performance Area,Ключ Площадь Производительность
@@ -1481,9 +1481,9 @@
 Last Name,Фамилия
 Last Purchase Rate,Последний Покупка Оценить
 Latest,Последние
-Lead,Ответст
-Lead Details,Содержание
-Lead Id,Ведущий Id
+Lead,Лид
+Lead Details,Лид Подробности
+Lead Id,ID лида
 Lead Name,Ведущий Имя
 Lead Owner,Ведущий Владелец
 Lead Source,Ведущий Источник
@@ -1529,7 +1529,7 @@
 Left,Слева
 Legal,Легальный
 Legal Expenses,Судебные издержки
-Letter Head,Бланк
+Letter Head,Заголовок письма
 Letter Heads for print templates.,Письмо главы для шаблонов печати.
 Level,Уровень
 Lft,Lft
@@ -1554,22 +1554,22 @@
 Lower Income,Нижняя Доход
 MTN Details,MTN Подробнее
 Main,Основные
-Main Reports,Основные доклады
+Main Reports,Основные отчеты
 Maintain Same Rate Throughout Sales Cycle,Поддержание же скоростью протяжении цикла продаж
 Maintain same rate throughout purchase cycle,Поддержание же скоростью в течение покупке цикла
 Maintenance,Обслуживание
 Maintenance Date,Техническое обслуживание Дата
 Maintenance Details,Техническое обслуживание Детали
-Maintenance Schedule,График регламентных работ
-Maintenance Schedule Detail,График обслуживания Подробно
-Maintenance Schedule Item,График обслуживания товара
+Maintenance Schedule,График технического обслуживания
+Maintenance Schedule Detail,График технического обслуживания Подробно
+Maintenance Schedule Item,График обслуживания позиции
 Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
-Maintenance Schedules,Режимы технического обслуживания
+Maintenance Schedules,Графики технического обслуживания
 Maintenance Status,Техническое обслуживание Статус
 Maintenance Time,Техническое обслуживание Время
-Maintenance Type,Тип обслуживание
+Maintenance Type,Тип технического обслуживания
 Maintenance Visit,Техническое обслуживание Посетить
 Maintenance Visit Purpose,Техническое обслуживание Посетить Цель
 Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
@@ -1577,9 +1577,9 @@
 Major/Optional Subjects,Основные / факультативных предметов
 Make ,Создать
 Make Accounting Entry For Every Stock Movement,Сделать учета запись для каждого фондовой Движения
-Make Bank Entry,Сделать банк ваучер
-Make Credit Note,Сделать кредит-нота
-Make Debit Note,Сделать Debit Примечание
+Make Bank Voucher,Сделать банк ваучер
+Make Credit Note,Сделать кредитную запись
+Make Debit Note,Сделать дебетовую запись
 Make Delivery,Произвести поставку
 Make Difference Entry,Сделать Разница запись
 Make Excise Invoice,Сделать акцизного счет-фактура
@@ -1610,12 +1610,12 @@
 Manager,Менеджер
 "Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Обязательно, если со Пункт «Да». Также склад по умолчанию, где защищены количество установлено от заказа клиента."
 Manufacture against Sales Order,Производство против заказ клиента
-Manufacture/Repack,Производство / Repack
+Manufacture/Repack,Производство / Переупаковка
 Manufactured Qty,Изготовлено Кол-во
 Manufactured quantity will be updated in this warehouse,Изготовлено количество будет обновляться в этом склад
 Manufactured quantity {0} cannot be greater than planned quanitity {1} in Production Order {2},"Изготовлено количество {0} не может быть больше, чем планировалось Колличество {1} в производственного заказа {2}"
 Manufacturer,Производитель
-Manufacturer Part Number,Производитель Номер
+Manufacturer Part Number,Номенклатурный код производителя
 Manufacturing,Производство
 Manufacturing Quantity,Производство Количество
 Manufacturing Quantity is mandatory,Производство Количество является обязательным
@@ -1625,17 +1625,17 @@
 Marketing,Маркетинг
 Marketing Expenses,Маркетинговые расходы
 Married,Замужем
-Mass Mailing,Рассылок
+Mass Mailing,Массовая рассылка
 Master Name,Мастер Имя
 Master Name is mandatory if account type is Warehouse,"Мастер Имя является обязательным, если тип счета Склад"
 Master Type,Мастер Тип
-Masters,Организация
+Masters,Мастеры
 Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
 Material Issue,Материал выпуск
 Material Receipt,Материал Поступление
 Material Request,Материал Запрос
-Material Request Detail No,Материал: Запрос подробной Нет
-Material Request For Warehouse,Материал Запрос Склад
+Material Request Detail No,Материал Запрос Деталь №
+Material Request For Warehouse,Материал Запрос для Склад
 Material Request Item,Материал Запрос товара
 Material Request Items,Материал Запрос товары
 Material Request No,Материал Запрос Нет
@@ -1705,7 +1705,7 @@
 Must be Whole Number,Должно быть Целое число
 Name,Имя
 Name and Description,Название и описание
-Name and Employee ID,Имя и Код сотрудника
+Name and Employee ID,Имя и ID сотрудника
 "Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Имя нового счета. Примечание: Пожалуйста, не создавать учетные записи для клиентов и поставщиков, они создаются автоматически от Заказчика и поставщика оригиналов"
 Name of person or organization that this address belongs to.,"Имя лица или организации, что этот адрес принадлежит."
 Name of the Budget Distribution,Название Распределение бюджета
@@ -1734,13 +1734,13 @@
 New Cost Center Name,Новый Центр Стоимость Имя
 New Delivery Notes,Новые Облигации Доставка
 New Enquiries,Новые запросы
-New Leads,Новые снабжении
+New Leads,Новые лиды
 New Leave Application,Новый Оставить заявку
 New Leaves Allocated,Новые листья Выделенные
 New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 New Material Requests,Новые запросы Материал
 New Projects,Новые проекты
-New Purchase Orders,Новые Заказы
+New Purchase Orders,Новые заказы
 New Purchase Receipts,Новые поступления Покупка
 New Quotations,Новые Котировки
 New Sales Orders,Новые заказы на продажу
@@ -1750,39 +1750,39 @@
 New Stock UOM is required,Новый фонда Единица измерения требуется
 New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 New Supplier Quotations,Новые Котировки Поставщик
-New Support Tickets,Новые билеты Поддержка
-New UOM must NOT be of type Whole Number,Новый UOM НЕ должен иметь тип целого числа
+New Support Tickets,Новые заявки в службу поддержки
+New UOM must NOT be of type Whole Number,Новая единица измерения НЕ должна быть целочисленной
 New Workplace,Новый Место работы
 Newsletter,Рассылка новостей
-Newsletter Content,Рассылка Содержимое
+Newsletter Content,Содержимое рассылки
 Newsletter Status, Статус рассылки
 Newsletter has already been sent,Информационный бюллетень уже был отправлен
 "Newsletters to contacts, leads.","Бюллетени для контактов, приводит."
 Newspaper Publishers,Газетных издателей
-Next,Следующий
+Next,Далее
 Next Contact By,Следующая Контактные По
 Next Contact Date,Следующая контакты
-Next Date,Следующая Дата
-Next email will be sent on:,Следующая будет отправлено письмо на:
+Next Date,Следующая дата
+Next email will be sent on:,Следующее письмо будет отправлено на:
 No,Нет
 No Customer Accounts found.,Не найдено ни Средства клиентов.
 No Customer or Supplier Accounts found,Не найдено ни одного клиента или поставщика счета
 No Expense Approvers. Please assign 'Expense Approver' Role to atleast one user,"Нет Расходные утверждающих. Пожалуйста, назначить ""расходов утверждающего"" роли для по крайней мере одного пользователя"
 No Item with Barcode {0},Нет товара со штрих-кодом {0}
 No Item with Serial No {0},Нет товара с серийным № {0}
-No Items to pack,Нет объектов для вьючных
+No Items to pack,Нет объектов для упаковки
 No Leave Approvers. Please assign 'Leave Approver' Role to atleast one user,"Нет Leave утверждающих. Пожалуйста назначить роль ""оставить утверждающий ', чтобы по крайней мере одного пользователя"
-No Permission,Отсутствует разрешение
+No Permission,Нет разрешения
 No Production Orders created,"Нет Производственные заказы, созданные"
 No Supplier Accounts found. Supplier Accounts are identified based on 'Master Type' value in account record.,"Не найдено ни Поставщик счета. Поставщик счета определяются на основе стоимости ""Мастер Type 'в счет записи."
 No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 No addresses created,"Нет адреса, созданные"
-No contacts created,"Нет контактов, созданные"
+No contacts created,Нет созданных контактов
 No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Нет умолчанию Адрес шаблона не найдено. Пожалуйста, создайте новый из Setup> Печать и брендинга> Адресная шаблон."
 No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 No description given,Не введено описание
-No employee found,Не работник не найдено
-No employee found!,Ни один сотрудник не найден!
+No employee found,Сотрудник не найден
+No employee found!,Сотрудник не найден!
 No of Requested SMS,Нет запрашиваемых SMS
 No of Sent SMS,Нет отправленных SMS
 No of Visits,Нет посещений
@@ -1791,7 +1791,7 @@
 No records found in the Invoice table,Не записи не найдено в таблице счетов
 No records found in the Payment table,Не записи не найдено в таблице оплаты
 No salary slip found for month: ,No salary slip found for month: 
-Non Profit,Не коммерческое
+Non Profit,Некоммерческое предприятие
 Nos,кол-во
 Not Active,Не активно
 Not Applicable,Не применяется
@@ -1916,7 +1916,7 @@
 Packing Slip Item,Упаковочный лист Пункт
 Packing Slip Items,Упаковочный лист товары
 Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
-Page Break,Перерыв
+Page Break,Разрыв страницы
 Page Name,Имя страницы
 Paid Amount,Выплаченная сумма
 Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
@@ -2248,7 +2248,7 @@
 Purchase Taxes and Charges,Покупка Налоги и сборы
 Purchase Taxes and Charges Master,Покупка Налоги и сборы Мастер
 Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
-Purpose,Цели
+Purpose,Цель
 Purpose must be one of {0},Цель должна быть одна из {0}
 QA Inspection,Инспекция контроля качества
 Qty,Кол-во
@@ -2276,7 +2276,7 @@
 Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
 Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
 Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
-Quarter,квартал
+Quarter,Квартал
 Quarterly,Ежеквартально
 Quick Help,Быстрая помощь
 Quotation,Расценки
@@ -2367,11 +2367,11 @@
 Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 Reference Number,Номер для ссылок
-Reference Row #,Ссылка Row #
+Reference Row #,Ссылка строка #
 Refresh,Обновить
 Registration Details,Регистрационные данные
 Registration Info,Информация о регистрации
-Rejected,Отклонкнные
+Rejected,Отклоненные
 Rejected Quantity,Отклонен Количество
 Rejected Serial No,Отклонен Серийный номер
 Rejected Warehouse,Отклонен Склад
@@ -2392,7 +2392,7 @@
 Replace,Заменить
 Replace Item / BOM in all BOMs,Заменить пункт / BOM во всех спецификациях
 Replied,Ответил
-Report Date,Дата наблюдений
+Report Date,Дата отчета
 Report Type,Тип отчета
 Report Type is mandatory,Тип отчета является обязательным
 Reports to,Доклады
@@ -2415,10 +2415,10 @@
 Required raw materials issued to the supplier for producing a sub - contracted item.,"Обязательные сырье, выпущенные к поставщику для получения суб - контракт пункт."
 Research,Исследования
 Research & Development,Научно-исследовательские и опытно-конструкторские работы
-Researcher,Научный сотрудник
-Reseller,Торговый посредник ы (Торговые Торговый посредник и)
-Reserved,Сохранено
-Reserved Qty,Защищены Кол-во
+Researcher,Исследователь
+Reseller,Торговый посредник
+Reserved,Зарезервировано
+Reserved Qty,Зарезервированное кол-во
 "Reserved Qty: Quantity ordered for sale, but not delivered.","Защищены Кол-во: Количество приказал на продажу, но не поставлены."
 Reserved Quantity,Зарезервировано Количество
 Reserved Warehouse,Зарезервировано Склад
@@ -2449,8 +2449,8 @@
 Rounded Off,Округляется
 Rounded Total,Округлые Всего
 Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
-Row # ,Row # 
-Row # {0}: ,Row # {0}: 
+Row # ,Строка #
+Row # {0}: ,Строка # {0}:
 Row #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,Ряд # {0}: Заказал Количество может не менее минимального Кол порядка элемента (определяется в мастер пункт).
 Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
 Row {0}: Account does not match with \						Purchase Invoice Credit To account,Ряд {0}: Счет не соответствует \ Покупка Счет в плюс на счет
@@ -3068,7 +3068,7 @@
 "Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
 UOM Conversion Detail,Единица измерения Преобразование Подробно
 UOM Conversion Details,Единица измерения Детали преобразования
-UOM Conversion Factor,Коэффициент пересчета единица измерения
+UOM Conversion Factor,Коэффициент пересчета единицы измерения
 UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 UOM Name,Имя единица измерения
 UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
@@ -3088,7 +3088,7 @@
 Unstop,Откупоривать
 Unstop Material Request,Unstop Материал Запрос
 Unstop Purchase Order,Unstop Заказ
-Unsubscribed,Отписанный
+Unsubscribed,Отписавшийся
 Update,Обновить
 Update Clearance Date,Обновление просвет Дата
 Update Cost,Обновление Стоимость
@@ -3098,7 +3098,7 @@
 Update Series Number,Обновление Номер серии
 Update Stock,Обновление стока
 Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
-Update clearance date of Journal Entries marked as 'Bank Entry',"Дата обновления оформление Записей в журнале отмечается как «Банк Ваучеры"""
+Update clearance date of Journal Entries marked as 'Bank Vouchers',"Дата обновления оформление Записей в журнале отмечается как «Банк Ваучеры"""
 Updated,Обновлено
 Updated Birthday Reminders,Обновлен День рождения Напоминания
 Upload Attendance,Добавить посещаемости
@@ -3107,7 +3107,7 @@
 Upload HTML,Загрузить HTML
 Upload a .csv file with two columns: the old name and the new name. Max 500 rows.,Загрузить файл CSV с двумя колонками. Старое название и новое имя. Макс 500 строк.
 Upload attendance from a .csv file,Добавить посещаемость от. Файл CSV
-Upload stock balance via csv.,Добавить складских остатков с помощью CSV.
+Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
 Upload your letter head and logo - you can edit them later.,Загрузить письмо голову и логотип - вы можете редактировать их позже.
 Upper Income,Верхний Доход
 Urgent,Важно
@@ -3115,24 +3115,24 @@
 Use SSL,Использовать SSL
 Used for Production Plan,Используется для производственного плана
 User,Пользователь
-User ID,ID Пользователя
-User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
+User ID,ID пользователя
+User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
 User Name,Имя пользователя
 User Name or Support Password missing. Please enter and try again.,"Имя или поддержки Пароль пропавшими без вести. Пожалуйста, введите и повторите попытку."
 User Remark,Примечание Пользователь
 User Remark will be added to Auto Remark,Примечание Пользователь будет добавлен в Auto замечания
 User Remarks is mandatory,Пользователь Замечания является обязательным
 User Specific,Удельный Пользователь
-User must always select,Пользователь всегда должен выбрать
-User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
-User {0} is disabled,Пользователь {0} отключена
-Username,Имя Пользователя
+User must always select,Пользователь всегда должен выбирать
+User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
+User {0} is disabled,Пользователь {0} отключен
+Username,Имя пользователя
 Users with this role are allowed to create / modify accounting entry before frozen date,Пользователи с этой ролью могут создавать / изменять записи бухгалтерского учета перед замороженной даты
 Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Пользователи с этой ролью могут устанавливать замороженных счетов и создания / изменения бухгалтерских проводок против замороженных счетов
 Utilities,Инженерное оборудование
 Utility Expenses,Коммунальные расходы
 Valid For Territories,Действительно для территорий
-Valid From,Действует с
+Valid From,Действительно с
 Valid Upto,Действительно До
 Valid for Territories,Действительно для территорий
 Validate,Подтвердить
@@ -3144,19 +3144,19 @@
 Value,Значение
 Value or Qty,Значение или Кол-во
 Vehicle Dispatch Date,Автомобиль Отправка Дата
-Vehicle No,Автомобиль Нет
-Venture Capital,Венчурный капитал.
+Vehicle No,Автомобиль №
+Venture Capital,Венчурный капитал
 Verified By,Verified By
 View Ledger,Посмотреть Леджер
 View Now,Просмотр сейчас
 Visit report for maintenance call.,Посетите отчет за призыв обслуживания.
 Voucher #,Ваучер #
-Voucher Detail No,Ваучер Подробно Нет
+Voucher Detail No,Подробности ваучера №
 Voucher Detail Number,Ваучер Деталь Количество
-Voucher ID,Ваучер ID
-Voucher No,Ваучер
+Voucher ID,ID ваучера
+Voucher No,Ваучер №
 Voucher Type,Ваучер Тип
-Voucher Type and Date,Ваучер Тип и дата
+Voucher Type and Date,Тип и дата ваучера
 Walk In,Прогулка в
 Warehouse,Склад
 Warehouse Contact Info,Склад Контактная информация
@@ -3205,7 +3205,7 @@
 "Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n указать ""Вес UOM"" слишком"
 Weightage,Weightage
 Weightage (%),Weightage (%)
-Welcome,Добро пожаловать!
+Welcome,Добро пожаловать
 Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Добро пожаловать в ERPNext. В течение следующих нескольких минут мы поможем вам настроить ваш аккаунт ERPNext. Попробуйте и заполнить столько информации, сколько у вас есть даже если это займет немного больше времени. Это сэкономит вам много времени спустя. Удачи Вам!"
 Welcome to ERPNext. Please select your language to begin the Setup Wizard.,"Добро пожаловать в ERPNext. Пожалуйста, выберите язык, чтобы запустить мастер установки."
 What does it do?,Что оно делает?
@@ -3237,13 +3237,13 @@
 Write Off Based On,Списание на основе
 Write Off Cost Center,Списание МВЗ
 Write Off Outstanding Amount,Списание суммы задолженности
-Write Off Entry,Списание ваучер
+Write Off Voucher,Списание ваучер
 Wrong Template: Unable to find head row.,Неправильный Шаблон: Не удается найти голову строку.
-Year,Года
+Year,Год
 Year Closed,Год закрыт
-Year End Date,Год Дата окончания
-Year Name,Год Имя
-Year Start Date,Год Дата начала
+Year End Date,Дата окончания года
+Year Name,Имя года
+Year Start Date,Дата начала года
 Year of Passing,Год Passing
 Yearly,Ежегодно
 Yes,Да
@@ -3255,7 +3255,7 @@
 You can enter the minimum quantity of this item to be ordered.,Вы можете ввести минимальное количество этого пункта заказывается.
 You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,"не Вы не можете войти как Delivery Note Нет и Расходная накладная номер Пожалуйста, введите любой."
-You can not enter current voucher in 'Against Journal Entry' column,"Вы не можете ввести текущий ваучер в ""Против Journal ваучер 'колонке"
+You can not enter current voucher in 'Against Journal Voucher' column,"Вы не можете ввести текущий ваучер в ""Против Journal ваучер 'колонке"
 You can set Default Bank Account in Company master,Вы можете установить по умолчанию банковский счет в мастер компании
 You can start by selecting backup frequency and granting access for sync,Вы можете начать с выбора частоты резервного копирования и предоставления доступа для синхронизации
 You can submit this Stock Reconciliation.,Вы можете представить эту Stock примирения.
@@ -3280,7 +3280,7 @@
 [Select],[Выберите]
 `Freeze Stocks Older Than` should be smaller than %d days.,`Мораторий Акции старше` должен быть меньше% D дней.
 and,и
-are not allowed.,не допускаются.
+are not allowed.,не разрешено.
 assigned by,присвоенный
 cannot be greater than 100,"не может быть больше, чем 100"
 "e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
@@ -3332,49 +3332,3 @@
 {0} {1} status is Unstopped,{0} {1} статус отверзутся
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для п. {2}
 {0}: {1} not found in Invoice Details table,{0} {1} не найден в счете-фактуре таблице
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Добавить / Изменить </>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Добавить / Изменить </>"
-Billed,Объявленный
-Company,Организация
-Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
-Default Customer Group,По умолчанию Группа клиентов
-Default Territory,По умолчанию Территория
-Delivered,Доставлено
-Enable Shopping Cart,Включить Корзина
-Go ahead and add something to your cart.,Идем дальше и добавить что-то в корзину.
-Hey! Go ahead and add an address,16.35 Эй! Идем дальше и добавить адрес
-Invalid Billing Address,Неверный Адрес для выставления счета
-Invalid Shipping Address,Неверный адрес пересылки
-Missing Currency Exchange Rates for {0},Отсутствует валютный курс для {0}
-Name is required,Имя обязательно
-Not Allowed,Не разрешены
-Paid,Оплачено
-Partially Billed,Частично Объявленный
-Partially Delivered,Частично Поставляются
-Please specify a Price List which is valid for Territory,"Пожалуйста, сформулируйте прайс-лист, который действителен для территории"
-Please specify currency in Company,"Пожалуйста, сформулируйте валюту в компании"
-Please write something,"Пожалуйста, напишите что-нибудь"
-Please write something in subject and message!,"Пожалуйста, напишите что-нибудь в тему и текст сообщения!"
-Price List,Прайс-лист
-Price List not configured.,Прайс-лист не настроен.
-Quotation Series,Цитата серии
-Shipping Rule,Правило Доставка
-Shopping Cart,Корзина
-Shopping Cart Price List,Корзина Прайс-лист
-Shopping Cart Price Lists,Корзина Прайс-листы
-Shopping Cart Settings,Корзина Настройки
-Shopping Cart Shipping Rule,Корзина Правило Доставка
-Shopping Cart Shipping Rules,Корзина Правила Доставка
-Shopping Cart Taxes and Charges Master,Корзина Налоги и сборы Мастер
-Shopping Cart Taxes and Charges Masters,Налоги Корзина Торговые и сборы Мастера
-Something went wrong!,Что-то пошло не так!
-Something went wrong.,Что-то пошло не так.
-Tax Master,Налоговый Мастер
-To Pay,Платить
-Updated,Обновлено
-You are not allowed to reply to this ticket.,Вы не можете отвечать на этот билет.
-You need to be logged in to view your cart.,"Вы должны войти в систему, чтобы просмотреть свою корзину."
-You need to enable Shopping Cart,Вам необходимо включить Корзина
-{0} cannot be purchased using Shopping Cart,{0} не может быть приобретен с помощью Корзина
-{0} is required,{0} требуется
-{0} {1} has a common territory {2},{0} {1} имеет общую территорию {2}
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 3d13bcf..dfb507a 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -39,7 +39,7 @@
 A Lead with this email id should exist,Bu e-posta sistemde zaten kayıtlı
 A Product or Service,Ürün veya Hizmet
 A Supplier exists with same name,Aynı isimli bir Tedarikçi mevcuttur.
-A symbol for this currency. For e.g. $,Bu para birimi için bir sembol. örneğin $
+A symbol for this currency. For e.g. $,Bu para birimi için bir sembol. örn. $
 AMC Expiry Date,AMC Expiry Date
 Abbr,Kısaltma
 Abbreviation cannot have more than 5 characters,Kısaltma 5 karakterden fazla olamaz.
@@ -152,8 +152,8 @@
 Against Document No,Against Document No
 Against Expense Account,Against Expense Account
 Against Income Account,Against Income Account
-Against Journal Entry,Against Journal Entry
-Against Journal Entry {0} does not have any unmatched {1} entry,Dergi Çeki karşı {0} herhangi bir eşsiz {1} girdi yok
+Against Journal Voucher,Against Journal Voucher
+Against Journal Voucher {0} does not have any unmatched {1} entry,Dergi Çeki karşı {0} herhangi bir eşsiz {1} girdi yok
 Against Purchase Invoice,Against Purchase Invoice
 Against Sales Invoice,Against Sales Invoice
 Against Sales Order,Satış Siparişi karşı
@@ -335,7 +335,7 @@
 Bank Reconciliation,Banka Uzlaşma
 Bank Reconciliation Detail,Banka Uzlaşma Detay
 Bank Reconciliation Statement,Banka Uzlaşma Bildirimi
-Bank Entry,Banka Çeki
+Bank Voucher,Banka Çeki
 Bank/Cash Balance,Banka / Nakit Dengesi
 Banking,Bankacılık
 Barcode,Barkod
@@ -470,7 +470,7 @@
 Case No. cannot be 0,Örnek Numarası  0 olamaz
 Cash,Nakit
 Cash In Hand,Kasa mevcudu
-Cash Entry,Para yerine geçen belge
+Cash Voucher,Para yerine geçen belge
 Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
 Cash/Bank Account,Kasa / Banka Hesabı
 Casual Leave,Casual bırak
@@ -594,7 +594,7 @@
 Contacts,İletişimler
 Content,İçerik
 Content Type,İçerik Türü
-Contra Entry,Contra Çeki
+Contra Voucher,Contra Çeki
 Contract,Sözleşme
 Contract End Date,Sözleşme Bitiş Tarihi
 Contract End Date must be greater than Date of Joining,Sözleşme Bitiş Tarihi Katılma tarihinden daha büyük olmalıdır
@@ -625,7 +625,7 @@
 Country Name,Ülke Adı
 Country wise default Address Templates,Ülke bilge varsayılan Adres Şablonları
 "Country, Timezone and Currency","Ülke, Saat Dilimi ve Döviz"
-Create Bank Entry for the total salary paid for the above selected criteria,Yukarıda seçilen ölçütler için ödenen toplam maaş için Banka Çeki oluştur
+Create Bank Voucher for the total salary paid for the above selected criteria,Yukarıda seçilen ölçütler için ödenen toplam maaş için Banka Çeki oluştur
 Create Customer,Müşteri Oluştur
 Create Material Requests,Malzeme İstekleri Oluştur
 Create New,Yeni Oluştur
@@ -647,7 +647,7 @@
 Credit,Kredi
 Credit Amt,Kredi Tutarı
 Credit Card,Kredi kartı
-Credit Card Entry,Kredi Kartı Çeki
+Credit Card Voucher,Kredi Kartı Çeki
 Credit Controller,Kredi Kontrolör
 Credit Days,Kredi Gün
 Credit Limit,Kredi Limiti
@@ -979,7 +979,7 @@
 Excise Duty Edu Cess 2,ÖTV Edu Cess 2
 Excise Duty SHE Cess 1,ÖTV SHE Cess 1
 Excise Page Number,Tüketim Sayfa Numarası
-Excise Entry,Tüketim Çeki
+Excise Voucher,Tüketim Çeki
 Execution,Yerine Getirme
 Executive Search,Executive Search
 Exemption Limit,Muafiyet Sınırı
@@ -1327,7 +1327,7 @@
 Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Faturayı yinelenen zorunlu tarihler için ve Fatura Dönemi itibaren Fatura Dönemi
 Invoice Period To,Için Fatura Dönemi
 Invoice Type,Fatura Türü
-Invoice/Journal Entry Details,Fatura / Dergi Çeki Detayları
+Invoice/Journal Voucher Details,Fatura / Dergi Çeki Detayları
 Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Exculsive Vergisi)
 Is Active,Aktif mi
 Is Advance,Peşin mi
@@ -1455,13 +1455,13 @@
 Job Title,Meslek
 "Job profile, qualifications required etc.","Gerekli iş profili, nitelikleri vb"
 Jobs Email Settings,İş E-posta Ayarları
-Journal Entries,Alacak/Borç Girişleri
-Journal Entry,Alacak/Borç Girişleri
-Journal Entry,Alacak/Borç Çeki
-Journal Entry Account,Alacak/Borç Fiş Detay
-Journal Entry Account No,Alacak/Borç Fiş Detay No
-Journal Entry {0} does not have account {1} or already matched,Dergi Çeki {0} hesabı yok {1} ya da zaten eşleşti
-Journal Entries {0} are un-linked,Dergi Fişler {0} un-bağlantılı
+Journal Entries,Yevmiye Girişleri
+Journal Entry,Yevmiye Girişi
+Journal Voucher,Yevmiye Fişi
+Journal Voucher Detail,Alacak/Borç Fiş Detay
+Journal Voucher Detail No,Alacak/Borç Fiş Detay No
+Journal Voucher {0} does not have account {1} or already matched,Dergi Çeki {0} hesabı yok {1} ya da zaten eşleşti
+Journal Vouchers {0} are un-linked,Dergi Fişler {0} un-bağlantılı
 Keep a track of communication related to this enquiry which will help for future reference.,Gelecekte başvurulara yardımcı olmak için bu soruşturma ile ilgili bir iletişim takip edin.
 Keep it web friendly 900px (w) by 100px (h),100px tarafından web dostu 900px (w) it Keep (h)
 Key Performance Area,Anahtar Performans Alan
@@ -1480,13 +1480,13 @@
 Last Name,Soyadı
 Last Purchase Rate,Son Satış Fiyatı
 Latest,Son
-Lead,Lead
+Lead,Aday
 Lead Details,Lead Details
 Lead Id,Kurşun Kimliği
 Lead Name,Lead Name
 Lead Owner,Lead Owner
-Lead Source,Kurşun Kaynak
-Lead Status,Kurşun Durum
+Lead Source,Aday Kaynak
+Lead Status,Aday Durumu
 Lead Time Date,Lead Time Date
 Lead Time Days,Lead Time Days
 Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,"Lead Time gün bu öğe depoda beklenen hangi gün sayısıdır. Bu öğeyi seçtiğinizde, bu gün Malzeme İsteği getirildi."
@@ -1576,7 +1576,7 @@
 Major/Optional Subjects,Zorunlu / Opsiyonel Konular
 Make ,Make 
 Make Accounting Entry For Every Stock Movement,Her Stok Hareketi İçin Muhasebe kaydı yapmak
-Make Bank Entry,Banka Çeki Yap
+Make Bank Voucher,Banka Çeki Yap
 Make Credit Note,Kredi Not Yap
 Make Debit Note,Banka Not Yap
 Make Delivery,Teslim olun
@@ -3096,7 +3096,7 @@
 Update Series Number,Update Serisi sayısı
 Update Stock,Stok Güncelleme
 Update bank payment dates with journals.,Update bank payment dates with journals.
-Update clearance date of Journal Entries marked as 'Bank Entry',Journal Entries Update temizlenme tarihi 'Banka Fişler' olarak işaretlenmiş
+Update clearance date of Journal Entries marked as 'Bank Vouchers',Journal Entries Update temizlenme tarihi 'Banka Fişler' olarak işaretlenmiş
 Updated,Güncellenmiş
 Updated Birthday Reminders,Güncelleme Birthday Reminders
 Upload Attendance,Katılımcı ekle
@@ -3234,7 +3234,7 @@
 Write Off Based On,Write Off Based On
 Write Off Cost Center,Write Off Cost Center
 Write Off Outstanding Amount,Write Off Outstanding Amount
-Write Off Entry,Write Off Entry
+Write Off Voucher,Write Off Voucher
 Wrong Template: Unable to find head row.,Yanlış Şablon: kafa satır bulmak için açılamıyor.
 Year,Yıl
 Year Closed,Yıl Kapalı
@@ -3252,7 +3252,7 @@
 You can enter the minimum quantity of this item to be ordered.,Sen sipariş için bu maddenin minimum miktar girebilirsiniz.
 You can not change rate if BOM mentioned agianst any item,BOM herhangi bir öğenin agianst söz eğer hızını değiştiremezsiniz
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Hayır hem Teslim Not giremezsiniz ve Satış Fatura No birini girin.
-You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal Fiş Karşı' cari fiş giremezsiniz
+You can not enter current voucher in 'Against Journal Voucher' column,Sen sütununda 'Journal Fiş Karşı' cari fiş giremezsiniz
 You can set Default Bank Account in Company master,Siz Firma master Varsayılan Banka Hesap ayarlayabilirsiniz
 You can start by selecting backup frequency and granting access for sync,Yedekleme sıklığını seçme ve senkronizasyon için erişim sağlayarak başlayabilirsiniz
 You can submit this Stock Reconciliation.,Bu Stok Uzlaşma gönderebilirsiniz.
@@ -3329,49 +3329,3 @@
 {0} {1} status is Unstopped,{0} {1} durumu Unstopped olduğunu
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Maliyet Merkezi Ürün için zorunludur {2}
 {0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
-"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Ekle / Düzenle </ a>"
-"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Ekle / Düzenle </ a>"
-Billed,Faturalanmış
-Company,Şirket
-Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
-Default Customer Group,Varsayılan Müşteri Grubu
-Default Territory,Standart Bölge
-Delivered,Teslim Edildi
-Enable Shopping Cart,Alışveriş sepeti etkinleştirin
-Go ahead and add something to your cart.,Devam edin ve sepetinize şey eklemek.
-Hey! Go ahead and add an address,Hey! Devam edin ve bir adres eklemek
-Invalid Billing Address,Geçersiz Fatura Adresi
-Invalid Shipping Address,Geçersiz Teslimat Adresi
-Missing Currency Exchange Rates for {0},Döviz Kurların eksik {0}
-Name is required,Adı gerekli
-Not Allowed,İzin Verilmedi
-Paid,Ödendi
-Partially Billed,Kısmen Faturalı
-Partially Delivered,Kısmen Teslim
-Please specify a Price List which is valid for Territory,Territory için geçerli olan bir Fiyat Listesi belirtin
-Please specify currency in Company,Şirket para birimi belirtiniz
-Please write something,Bir şeyler yazınız
-Please write something in subject and message!,Konu ve mesaj bir şeyler yazınız!
-Price List,Fiyat listesi
-Price List not configured.,Fiyat Listesi yapılandırılmamış.
-Quotation Series,Teklif Serisi
-Shipping Rule,Kargo Kural
-Shopping Cart,Alışveriş Sepeti
-Shopping Cart Price List,Alışveriş Sepeti Fiyat Listesi
-Shopping Cart Price Lists,Alışveriş Sepeti Fiyat Listeleri
-Shopping Cart Settings,Alışveriş sepeti Ayarları
-Shopping Cart Shipping Rule,Alışveriş Sepeti Kargo Kural
-Shopping Cart Shipping Rules,Alışveriş Sepeti Nakliye Kuralları
-Shopping Cart Taxes and Charges Master,Alışveriş Sepeti Vergi ve Harçlar Usta
-Shopping Cart Taxes and Charges Masters,Alışveriş Sepeti Vergi ve Harçlar Masters
-Something went wrong!,Bir şeyler yanlış gitti!
-Something went wrong.,Bir şeyler yanlış gitti.
-Tax Master,Vergi Usta
-To Pay,Ödeme
-Updated,Güncellenmiş
-You are not allowed to reply to this ticket.,Bu bilet için cevap izin verilmez.
-You need to be logged in to view your cart.,Eğer sepeti görmek için oturum açmanız gerekir.
-You need to enable Shopping Cart,Sen Alışveriş Sepeti etkinleştirmeniz gerekir
-{0} cannot be purchased using Shopping Cart,{0} sepeti kullanarak satın alınamaz
-{0} is required,{0} gereklidir
-{0} {1} has a common territory {2},"{0} {1}, ortak bir bölge var {2}"
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 9e5a26f..9e73389 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -199,7 +199,7 @@
  "icon": "icon-map-marker", 
  "idx": 1, 
  "in_dialog": 0, 
- "modified": "2015-01-05 12:10:31.519685", 
+ "modified": "2015-02-05 05:11:34.249167", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address", 
@@ -215,6 +215,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Sales User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -228,6 +229,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Purchase User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -241,6 +243,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Maintenance User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }, 
@@ -254,6 +257,7 @@
    "read": 1, 
    "report": 1, 
    "role": "Accounts User", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json
index db81511..745dfa4 100644
--- a/erpnext/utilities/doctype/address_template/address_template.json
+++ b/erpnext/utilities/doctype/address_template/address_template.json
@@ -34,7 +34,7 @@
   }
  ], 
  "icon": "icon-map-marker", 
- "modified": "2015-01-15 15:25:18.709952", 
+ "modified": "2015-02-05 05:11:34.356413", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address Template", 
@@ -50,6 +50,7 @@
    "report": 1, 
    "role": "System Manager", 
    "set_user_permissions": 1, 
+   "share": 1, 
    "write": 1
   }
  ], 
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index 7ba241c..41a89c5 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -1,342 +1,353 @@
 {
- "allow_import": 1,
- "allow_rename": 1,
- "creation": "2013-01-10 16:34:32",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "creation": "2013-01-10 16:34:32", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
  "fields": [
   {
-   "fieldname": "contact_section",
-   "fieldtype": "Section Break",
-   "label": "Contact Details",
-   "options": "icon-user",
+   "fieldname": "contact_section", 
+   "fieldtype": "Section Break", 
+   "label": "Contact Details", 
+   "options": "icon-user", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "first_name",
-   "fieldtype": "Data",
-   "in_list_view": 0,
-   "label": "First Name",
-   "oldfieldname": "first_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "First Name", 
+   "oldfieldname": "first_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "last_name",
-   "fieldtype": "Data",
-   "in_list_view": 0,
-   "label": "Last Name",
-   "oldfieldname": "last_name",
-   "oldfieldtype": "Data",
+   "fieldname": "last_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "Last Name", 
+   "oldfieldname": "last_name", 
+   "oldfieldtype": "Data", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "cb00",
-   "fieldtype": "Column Break",
+   "fieldname": "cb00", 
+   "fieldtype": "Column Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "default": "Passive",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Status",
-   "options": "Passive\nOpen\nReplied",
+   "default": "Passive", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Status", 
+   "options": "Passive\nOpen\nReplied", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "email_id",
-   "fieldtype": "Data",
-   "in_list_view": 0,
-   "label": "Email Id",
-   "oldfieldname": "email_id",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "reqd": 0,
+   "fieldname": "email_id", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "Email Id", 
+   "oldfieldname": "email_id", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
    "search_index": 1
-  },
+  }, 
   {
-   "fieldname": "phone",
-   "fieldtype": "Data",
-   "label": "Phone",
-   "oldfieldname": "contact_no",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
+   "fieldname": "phone", 
+   "fieldtype": "Data", 
+   "label": "Phone", 
+   "oldfieldname": "contact_no", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
    "reqd": 0
-  },
+  }, 
   {
-   "fieldname": "contact_details",
-   "fieldtype": "Section Break",
-   "label": "Reference",
-   "options": "icon-pushpin",
+   "fieldname": "contact_details", 
+   "fieldtype": "Section Break", 
+   "label": "Reference", 
+   "options": "icon-pushpin", 
    "permlevel": 0
-  },
+  }, 
   {
-   "depends_on": "eval:!doc.supplier && !doc.sales_partner",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "label": "Customer",
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "permlevel": 0,
+   "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "label": "Customer", 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
    "print_hide": 0
-  },
+  }, 
   {
-   "depends_on": "eval:!doc.supplier && !doc.sales_partner",
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "in_list_view": 0,
-   "label": "Customer Name",
-   "permlevel": 0,
+   "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
+   "fieldname": "customer_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "Customer Name", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "depends_on": "eval:!doc.customer && !doc.sales_partner",
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "label": "Supplier",
-   "options": "Supplier",
+   "depends_on": "eval:!doc.customer && !doc.sales_partner", 
+   "fieldname": "supplier", 
+   "fieldtype": "Link", 
+   "label": "Supplier", 
+   "options": "Supplier", 
    "permlevel": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "depends_on": "eval:!doc.customer && !doc.sales_partner",
-   "fieldname": "supplier_name",
-   "fieldtype": "Data",
-   "in_list_view": 0,
-   "label": "Supplier Name",
-   "permlevel": 0,
+   "allow_on_submit": 0, 
+   "depends_on": "eval:!doc.customer && !doc.sales_partner", 
+   "fieldname": "supplier_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "Supplier Name", 
+   "permlevel": 0, 
    "read_only": 1
-  },
+  }, 
   {
-   "depends_on": "eval:!doc.customer && !doc.supplier",
-   "fieldname": "sales_partner",
-   "fieldtype": "Link",
-   "label": "Sales Partner",
-   "options": "Sales Partner",
+   "depends_on": "eval:!doc.customer && !doc.supplier", 
+   "fieldname": "sales_partner", 
+   "fieldtype": "Link", 
+   "label": "Sales Partner", 
+   "options": "Sales Partner", 
    "permlevel": 0
-  },
+  }, 
   {
-   "default": "0",
-   "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)",
-   "fieldname": "is_primary_contact",
-   "fieldtype": "Check",
-   "label": "Is Primary Contact",
-   "oldfieldname": "is_primary_contact",
-   "oldfieldtype": "Select",
+   "default": "0", 
+   "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)", 
+   "fieldname": "is_primary_contact", 
+   "fieldtype": "Check", 
+   "label": "Is Primary Contact", 
+   "oldfieldname": "is_primary_contact", 
+   "oldfieldtype": "Select", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "More Info",
-   "options": "icon-file-text",
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "label": "More Info", 
+   "options": "icon-file-text", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "mobile_no",
-   "fieldtype": "Data",
-   "label": "Mobile No",
-   "oldfieldname": "mobile_no",
-   "oldfieldtype": "Data",
+   "fieldname": "mobile_no", 
+   "fieldtype": "Data", 
+   "label": "Mobile No", 
+   "oldfieldname": "mobile_no", 
+   "oldfieldtype": "Data", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Enter department to which this Contact belongs",
-   "fieldname": "department",
-   "fieldtype": "Data",
-   "label": "Department",
+   "description": "Enter department to which this Contact belongs", 
+   "fieldname": "department", 
+   "fieldtype": "Data", 
+   "label": "Department", 
    "permlevel": 0
-  },
+  }, 
   {
-   "description": "Enter designation of this Contact",
-   "fieldname": "designation",
-   "fieldtype": "Data",
-   "label": "Designation",
+   "description": "Enter designation of this Contact", 
+   "fieldname": "designation", 
+   "fieldtype": "Data", 
+   "label": "Designation", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "unsubscribed",
-   "fieldtype": "Check",
-   "label": "Unsubscribed",
+   "fieldname": "unsubscribed", 
+   "fieldtype": "Check", 
+   "label": "Unsubscribed", 
    "permlevel": 0
   }
- ],
- "icon": "icon-user",
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "modified": "2014-09-11 18:53:17.311624",
- "modified_by": "Administrator",
- "module": "Utilities",
- "name": "Contact",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "modified": "2015-02-05 05:11:35.962993", 
+ "modified_by": "Administrator", 
+ "module": "Utilities", 
+ "name": "Contact", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Master Manager",
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales Master Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Master Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Master Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Maintenance Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales User", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase User",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase User", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance User",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Maintenance User", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "submit": 0,
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "match": "",
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "All",
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "match": "", 
+   "permlevel": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "All", 
    "submit": 0
   }
  ]
-}
+}
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
index 999ff68..4b960da 100644
--- a/erpnext/utilities/doctype/contact/contact.py
+++ b/erpnext/utilities/doctype/contact/contact.py
@@ -11,15 +11,15 @@
 
 	def autoname(self):
 		# concat first and last name
-		self.name = " ".join(filter(None, 
+		self.name = " ".join(filter(None,
 			[cstr(self.get(f)).strip() for f in ["first_name", "last_name"]]))
-		
+
 		# concat party name if reqd
 		for fieldname in ("customer", "supplier", "sales_partner"):
 			if self.get(fieldname):
 				self.name = self.name + "-" + cstr(self.get(fieldname)).strip()
 				break
-		
+
 	def validate(self):
 		self.set_status()
 		self.validate_primary_contact()
@@ -27,13 +27,13 @@
 	def validate_primary_contact(self):
 		if self.is_primary_contact == 1:
 			if self.customer:
-				frappe.db.sql("update tabContact set is_primary_contact=0 where customer = %s", 
+				frappe.db.sql("update tabContact set is_primary_contact=0 where customer = %s",
 					(self.customer))
 			elif self.supplier:
-				frappe.db.sql("update tabContact set is_primary_contact=0 where supplier = %s", 
-					 (self.supplier))	
+				frappe.db.sql("update tabContact set is_primary_contact=0 where supplier = %s",
+					 (self.supplier))
 			elif self.sales_partner:
-				frappe.db.sql("""update tabContact set is_primary_contact=0 
+				frappe.db.sql("""update tabContact set is_primary_contact=0
 					where sales_partner = %s""", (self.sales_partner))
 		else:
 			if self.customer:
@@ -46,7 +46,7 @@
 					self.is_primary_contact = 1
 			elif self.sales_partner:
 				if not frappe.db.sql("select name from tabContact \
-						where is_primary_contact=1 and sales_partner = %s", 
+						where is_primary_contact=1 and sales_partner = %s",
 						self.sales_partner):
 					self.is_primary_contact = 1
 
@@ -59,7 +59,7 @@
 	contact = frappe.get_doc("Contact", contact)
 	out = {
 		"contact_person": contact.get("name"),
-		"contact_display": " ".join(filter(None, 
+		"contact_display": " ".join(filter(None,
 			[contact.get("first_name"), contact.get("last_name")])),
 		"contact_email": contact.get("email_id"),
 		"contact_mobile": contact.get("mobile_no"),
@@ -67,5 +67,5 @@
 		"contact_designation": contact.get("designation"),
 		"contact_department": contact.get("department")
 	}
-	
-	return out
\ No newline at end of file
+
+	return out
diff --git a/erpnext/utilities/doctype/note/note.py b/erpnext/utilities/doctype/note/note.py
new file mode 100644
index 0000000..08f56fe
--- /dev/null
+++ b/erpnext/utilities/doctype/note/note.py
@@ -0,0 +1,46 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class Note(Document):
+	def autoname(self):
+		# replace forbidden characters
+		import re
+		self.name = re.sub("[%'\"#*?`]", "", self.title.strip())
+
+	def before_print(self):
+		self.print_heading = self.name
+		self.sub_heading = ""
+
+def get_permission_query_conditions(user):
+	if not user: user = frappe.session.user
+
+	if user == "Administrator":
+		return ""
+
+	return """(`tabNote`.public=1 or `tabNote`.owner="{user}" or exists (
+		select name from `tabNote User`
+			where `tabNote User`.parent=`tabNote`.name
+			and `tabNote User`.user="{user}"))""".format(user=frappe.db.escape(user))
+
+def has_permission(doc, ptype, user):
+	if doc.public == 1 or user == "Administrator":
+		return True
+
+	if user == doc.owner:
+		return True
+
+	note_user_map = dict((d.user, d) for d in doc.get("share_with"))
+	if user in note_user_map:
+		if ptype == "read":
+			return True
+		elif note_user_map.get(user).permission == "Edit":
+			return True
+
+	return False
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json
index 113832a..9394214 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@@ -1,7 +1,7 @@
 {
-  "allow_email": 1, 
+ "allow_email": 1, 
  "allow_print": 1, 
- "creation": "2012-12-03 10:25:59.000000", 
+ "creation": "2012-12-03 10:25:59", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "fields": [
@@ -31,7 +31,7 @@
  "idx": 1, 
  "issingle": 1, 
  "max_attachments": 1, 
- "modified": "2013-07-05 14:52:51.000000", 
+ "modified": "2015-02-05 05:11:44.714515", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Rename Tool", 
@@ -43,6 +43,7 @@
    "read": 1, 
    "report": 0, 
    "role": "System Manager", 
+   "share": 1, 
    "submit": 0, 
    "write": 1
   }
diff --git a/erpnext/utilities/repost_stock.py b/erpnext/utilities/repost_stock.py
index df7d82b..3143ba7 100644
--- a/erpnext/utilities/repost_stock.py
+++ b/erpnext/utilities/repost_stock.py
@@ -179,8 +179,8 @@
 		}
 
 		sle_doc = frappe.get_doc(sle_dict)
-		sle_doc.ignore_validate = True
-		sle_doc.ignore_links = True
+		sle_doc.flags.ignore_validate = True
+		sle_doc.flags.ignore_links = True
 		sle_doc.insert()
 
 		args = sle_dict.copy()
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 2c99b00..6fe4262 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -95,7 +95,7 @@
 
 class UOMMustBeIntegerError(frappe.ValidationError): pass
 
-def validate_uom_is_integer(doc, uom_field, qty_fields):
+def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
 	if isinstance(qty_fields, basestring):
 		qty_fields = [qty_fields]
 
@@ -106,7 +106,7 @@
 	if not integer_uoms:
 		return
 
-	for d in doc.get_all_children():
+	for d in doc.get_all_children(parenttype=child_dt):
 		if d.get(uom_field) in integer_uoms:
 			for f in qty_fields:
 				if d.get(f):
diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json
index 3170bfb..31a445b 100644
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json
@@ -4,5 +4,6 @@
  "admin_password": "admin",
  "auto_email_id": "admin@example.com",
  "host_name": "http://localhost:8888",
+ "auto_email_id": "admin@example.com",
  "mute_emails": 1
 }