Merge branch 'develop' of https://github.com/frappe/erpnext into develop

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -38,7 +38,6 @@ class BankReconciliation(Document):
 			group by t2.account, t1.name
 			order by t1.posting_date ASC, t1.name DESC
 		""".format(condition=condition), {"account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
-		condition = ''
 
 		if self.bank_account:
 			condition += 'and bank_account = %(bank_account)s'

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -245,7 +245,7 @@ def filter_pricing_rules(args, pricing_rules, doc=None):
 
 def validate_quantity_and_amount_for_suggestion(args, qty, amount, item_code, transaction_type):
 	fieldname, msg = '', ''
-	type_of_transaction = 'purcahse' if transaction_type == "buying" else "sale"
+	type_of_transaction = 'purchase' if transaction_type == 'buying' else 'sale'
 
 	for field, value in {'min_qty': qty, 'min_amt': amount}.items():
 		if (args.get(field) and value < args.get(field)
@@ -465,7 +465,7 @@ def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
 
 	item_details.free_item_data.update(item_data)
 	item_details.free_item_data['uom'] = pricing_rule.free_item_uom or item_data.stock_uom
-	item_details.free_item_data['conversion_factor'] = get_conversion_factor(free_item, 
+	item_details.free_item_data['conversion_factor'] = get_conversion_factor(free_item,
 		item_details.free_item_data['uom']).get("conversion_factor", 1)
 
 	if item_details.get("parenttype") == 'Purchase Order':
@@ -508,7 +508,7 @@ def validate_coupon_code(coupon_name):
 			frappe.throw(_("Sorry,coupon code validity has not started"))
 	elif coupon.valid_upto:
 		if coupon.valid_upto < getdate(today()) :
-			frappe.throw(_("Sorry,coupon code validity has expired"))	
+			frappe.throw(_("Sorry,coupon code validity has expired"))
 	elif coupon.used>=coupon.maximum_use:
 		frappe.throw(_("Sorry,coupon code are exhausted"))
 	else:

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -401,7 +401,7 @@ class PurchaseInvoice(BuyingController):
 				update_outstanding_amt(self.credit_to, "Supplier", self.supplier,
 					self.doctype, self.return_against if cint(self.is_return) and self.return_against else self.name)
 
-			if repost_future_gle and cint(self.update_stock) and self.auto_accounting_for_stock:
+			if (repost_future_gle or self.flags.repost_future_gle) and cint(self.update_stock) and self.auto_accounting_for_stock:
 				from erpnext.controllers.stock_controller import update_gl_entries_after
 				items, warehouses = self.get_items_and_warehouses()
 				update_gl_entries_after(self.posting_date, self.posting_time,

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -723,7 +723,7 @@ class SalesInvoice(SellingController):
 				update_outstanding_amt(self.debit_to, "Customer", self.customer,
 					self.doctype, self.return_against if cint(self.is_return) and self.return_against else self.name)
 
-			if repost_future_gle and cint(self.update_stock) \
+			if (repost_future_gle or self.flags.repost_future_gle) and cint(self.update_stock) \
 				and cint(auto_accounting_for_stock):
 					items, warehouses = self.get_items_and_warehouses()
 					update_gl_entries_after(self.posting_date, self.posting_time,

erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py

@@ -29,7 +29,7 @@ def get_data(filters):
 
 		row.update(next(asset for asset in assets if asset["asset_category"] == asset_category.get("asset_category", "")))
 		row.accumulated_depreciation_as_on_to_date = (flt(row.accumulated_depreciation_as_on_from_date) +
-				flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated))
+				flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated_during_the_period))
 
 		row.net_asset_value_as_on_from_date = (flt(row.cost_as_on_from_date) -
 				flt(row.accumulated_depreciation_as_on_from_date))
@@ -86,7 +86,6 @@ def get_asset_categories(filters):
 		group by asset_category
 	""", {"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company}, as_dict=1)
 
-
 def get_assets(filters):
 	return frappe.db.sql("""
 		SELECT results.asset_category,
@@ -94,9 +93,7 @@ def get_assets(filters):
 			   sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period,
 			   sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period
 		from (SELECT a.asset_category,
-				   ifnull(sum(a.opening_accumulated_depreciation +
-							  case when ds.schedule_date < %(from_date)s and
-										(ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
+				   ifnull(sum(case when ds.schedule_date < %(from_date)s then
 								   ds.depreciation_amount
 							  else
 								   0
@@ -107,7 +104,6 @@ def get_assets(filters):
 							  else
 								   0
 							  end), 0) as depreciation_eliminated_during_the_period,
-
 				   ifnull(sum(case when ds.schedule_date >= %(from_date)s and ds.schedule_date <= %(to_date)s
 										and (ifnull(a.disposal_date, 0) = 0 or ds.schedule_date <= a.disposal_date) then
 								   ds.depreciation_amount
@@ -120,7 +116,8 @@ def get_assets(filters):
 			union
 			SELECT a.asset_category,
 				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-										and (a.disposal_date < %(from_date)s or a.disposal_date > %(to_date)s) then
+										and (a.disposal_date < %(from_date)s or a.disposal_date > %(to_date)s) 
+										then
 									0
 							   else
 									a.opening_accumulated_depreciation
@@ -133,7 +130,6 @@ def get_assets(filters):
 				   0 as depreciation_amount_during_the_period
 			from `tabAsset` a
 			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s
-			and not exists(select * from `tabDepreciation Schedule` ds where a.name = ds.parent)
 			group by a.asset_category) as results
 		group by results.asset_category
 		""", {"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company}, as_dict=1)

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -306,10 +306,6 @@ def get_conditions(filters):
 
 def get_items(filters, additional_query_columns):
 	conditions = get_conditions(filters)
-	match_conditions = frappe.build_match_conditions("Purchase Invoice")
-
-	if match_conditions:
-		match_conditions = " and {0} ".format(match_conditions)
 
 	if additional_query_columns:
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
@@ -327,8 +323,8 @@ def get_items(filters, additional_query_columns):
 			`tabPurchase Invoice`.supplier_name, `tabPurchase Invoice`.mode_of_payment {0}
 		from `tabPurchase Invoice`, `tabPurchase Invoice Item`
 		where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
-		`tabPurchase Invoice`.docstatus = 1 %s %s
-	""".format(additional_query_columns) % (conditions, match_conditions), filters, as_dict=1)
+		`tabPurchase Invoice`.docstatus = 1 %s
+	""".format(additional_query_columns) % (conditions), filters, as_dict=1)
 
 def get_aii_accounts():
 	return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany"))

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -119,7 +119,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
 		add_sub_total_row(total_row, total_row_map, 'total_row', tax_columns)
 		data.append(total_row_map.get('total_row'))
 		skip_total_row = 1
-	
+
 	return columns, data, None, None, None, skip_total_row
 
 def get_columns(additional_table_columns, filters):
@@ -370,10 +370,6 @@ def get_group_by_conditions(filters, doctype):
 
 def get_items(filters, additional_query_columns):
 	conditions = get_conditions(filters)
-	match_conditions = frappe.build_match_conditions("Sales Invoice")
-
-	if match_conditions:
-		match_conditions = " and {0} ".format(match_conditions)
 
 	if additional_query_columns:
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
@@ -394,8 +390,8 @@ def get_items(filters, additional_query_columns):
 			`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {0}
 		from `tabSales Invoice`, `tabSales Invoice Item`
 		where `tabSales Invoice`.name = `tabSales Invoice Item`.parent
-			and `tabSales Invoice`.docstatus = 1 {1} {2}
-		""".format(additional_query_columns or '', conditions, match_conditions), filters, as_dict=1) #nosec
+			and `tabSales Invoice`.docstatus = 1 {1}
+		""".format(additional_query_columns or '', conditions), filters, as_dict=1) #nosec
 
 def get_delivery_notes_against_sales_order(item_list):
 	so_dn_map = frappe._dict()

erpnext/config/buying.py

@@ -7,6 +7,13 @@ def get_data():
 			"label": _("Purchasing"),
 			"icon": "fa fa-star",
 			"items": [
+				{
+					"type": "doctype",
+					"name": "Material Request",
+					"onboard": 1,
+					"dependencies": ["Item"],
+					"description": _("Request for purchase."),
+				},
 				{
 					"type": "doctype",
 					"name": "Purchase Order",
@@ -20,13 +27,6 @@ def get_data():
 					"onboard": 1,
 					"dependencies": ["Item", "Supplier"]
 				},
-				{
-					"type": "doctype",
-					"name": "Material Request",
-					"onboard": 1,
-					"dependencies": ["Item"],
-					"description": _("Request for purchase."),
-				},
 				{
 					"type": "doctype",
 					"name": "Request for Quotation",
@@ -63,6 +63,11 @@ def get_data():
 					"name": "Price List",
 					"description": _("Price List master.")
 				},
+				{
+					"type": "doctype",
+					"name": "Pricing Rule",
+					"description": _("Rules for applying pricing and discount.")
+				},
 				{
 					"type": "doctype",
 					"name": "Product Bundle",
@@ -80,11 +85,6 @@ def get_data():
 					"type": "doctype",
 					"name": "Promotional Scheme",
 					"description": _("Rules for applying different promotional schemes.")
-				},
-				{
-					"type": "doctype",
-					"name": "Pricing Rule",
-					"description": _("Rules for applying pricing and discount.")
 				}
 			]
 		},
@@ -149,13 +149,6 @@ def get_data():
 					"reference_doctype": "Purchase Order",
 					"onboard": 1
 				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Supplier-Wise Sales Analytics",
-					"reference_doctype": "Stock Ledger Entry",
-					"onboard": 1
-				},
 				{
 					"type": "report",
 					"is_query_report": True,
@@ -177,6 +170,16 @@ def get_data():
 					"reference_doctype": "Material Request",
 					"onboard": 1,
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Address And Contacts",
+					"label": _("Supplier Addresses And Contacts"),
+					"reference_doctype": "Address",
+					"route_options": {
+						"party_type": "Supplier"
+					}
+				}
 			]
 		},
 		{
@@ -226,18 +229,15 @@ def get_data():
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Material Requests for which Supplier Quotations are not created",
-					"reference_doctype": "Material Request"
+					"name": "Supplier-Wise Sales Analytics",
+					"reference_doctype": "Stock Ledger Entry",
+					"onboard": 1
 				},
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Address And Contacts",
-					"label": _("Supplier Addresses And Contacts"),
-					"reference_doctype": "Address",
-					"route_options": {
-						"party_type": "Supplier"
-					}
+					"name": "Material Requests for which Supplier Quotations are not created",
+					"reference_doctype": "Material Request"
 				}
 			]
 		},

erpnext/controllers/stock_controller.py

@@ -34,7 +34,7 @@ class StockController(AccountsController):
 					gl_entries = self.get_gl_entries(warehouse_account)
 				make_gl_entries(gl_entries, from_repost=from_repost)
 
-			if repost_future_gle:
+			if (repost_future_gle or self.flags.repost_future_gle):
 				items, warehouses = self.get_items_and_warehouses()
 				update_gl_entries_after(self.posting_date, self.posting_time, warehouses, items,
 					warehouse_account, company=self.company)
@@ -238,6 +238,10 @@ class StockController(AccountsController):
 		for d in self.items:
 			if not d.batch_no: continue
 
+			serial_nos = [d.name for d in frappe.get_all("Serial No", {'batch_no': d.batch_no})]
+			if serial_nos:
+				frappe.db.set_value("Serial No", { 'name': ['in', serial_nos] }, "batch_no", None)
+
 			d.batch_no = None
 			d.db_set("batch_no", None)
 

erpnext/education/doctype/student_admission/student_admission.js

@@ -11,5 +11,12 @@ frappe.ui.form.on('Student Admission', {
 
 	academic_year: function(frm) {
 		frm.trigger("program");
+	},
+
+	admission_end_date: function(frm) {
+		if(frm.doc.admission_end_date && frm.doc.admission_end_date <= frm.doc.admission_start_date){
+			frm.set_value("admission_end_date", "");
+			frappe.throw(__("Admission End Date should be greater than Admission Start Date."));
+		}
 	}
 });

erpnext/hr/doctype/shift_type/shift_type.py

@@ -75,7 +75,7 @@ class ShiftType(Document):
 		for date in dates:
 			shift_details = get_employee_shift(employee, date, True)
 			if shift_details and shift_details.shift_type.name == self.name:
-				mark_attendance(employee, date, self.name, 'Absent')
+				mark_attendance(employee, date, 'Absent', self.name)
 
 	def get_assigned_employee(self, from_date=None, consider_default_shift=False):
 		filters = {'date':('>=', from_date), 'shift_type': self.name, 'docstatus': '1'}

erpnext/loan_management/doctype/loan_application/loan_application.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "ACC-LOAP-.YYYY.-.#####",
  "creation": "2019-08-29 17:46:49.201740",
  "doctype": "DocType",
@@ -122,7 +123,6 @@
   },
   {
    "depends_on": "eval: doc.is_term_loan == 1",
-   "fetch_from": "loan_type.repayment_method",
    "fetch_if_empty": 1,
    "fieldname": "repayment_method",
    "fieldtype": "Select",
@@ -213,7 +213,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-10-24 10:32:03.740558",
+ "links": [],
+ "modified": "2020-03-01 10:21:44.413353",
  "modified_by": "Administrator",
  "module": "Loan Management",
  "name": "Loan Application",

erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py

@@ -55,7 +55,10 @@ def check_for_ltv_shortfall(process_loan_security_shortfall=None):
 			"valid_upto": (">=", update_time)
 		}, as_list=1))
 
-	loans = frappe.db.sql(""" SELECT l.name, l.loan_amount, l.total_principal_paid, lp.loan_security, lp.haircut, lp.qty
+	ltv_ratio_map = frappe._dict(frappe.get_all("Loan Security Type",
+		fields=["name", "loan_to_value_ratio"], as_list=1))
+
+	loans = frappe.db.sql(""" SELECT l.name, l.loan_amount, l.total_principal_paid, lp.loan_security, lp.haircut, lp.qty, lp.loan_security_type
 		FROM `tabLoan` l, `tabPledge` lp , `tabLoan Security Pledge`p WHERE lp.parent = p.name and p.loan = l.name and l.docstatus = 1
 		and l.is_secured_loan and l.status = 'Disbursed' and p.status in ('Pledged', 'Partially Unpledged')""", as_dict=1)
 
@@ -68,11 +71,12 @@ def check_for_ltv_shortfall(process_loan_security_shortfall=None):
 		})
 
 		current_loan_security_amount = loan_security_price_map.get(loan.loan_security, 0) * loan.qty
+		ltv_ratio = ltv_ratio_map.get(loan.loan_security_type)
 
 		loan_security_map[loan.name]['security_value'] += current_loan_security_amount - (current_loan_security_amount * loan.haircut/100)
 
 	for loan, value in iteritems(loan_security_map):
-		if value["security_value"] < value["loan_amount"]:
+		if (value["security_value"]/value["loan_amount"]) < ltv_ratio:
 			create_loan_security_shortfall(loan, value, process_loan_security_shortfall)
 
 def create_loan_security_shortfall(loan, value, process_loan_security_shortfall):

erpnext/loan_management/doctype/loan_security_type/loan_security_type.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "field:loan_security_type",
  "creation": "2019-08-29 18:46:07.322056",
  "doctype": "DocType",
@@ -8,7 +9,9 @@
   "loan_security_type",
   "unit_of_measure",
   "haircut",
-  "disabled"
+  "disabled",
+  "column_break_5",
+  "loan_to_value_ratio"
  ],
  "fields": [
   {
@@ -33,9 +36,19 @@
    "fieldtype": "Link",
    "label": "Unit Of Measure",
    "options": "UOM"
+  },
+  {
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "loan_to_value_ratio",
+   "fieldtype": "Percent",
+   "label": "Loan To Value Ratio"
   }
  ],
- "modified": "2019-10-10 03:05:37.912866",
+ "links": [],
+ "modified": "2020-02-28 12:43:20.364447",
  "modified_by": "Administrator",
  "module": "Loan Management",
  "name": "Loan Security Type",

erpnext/selling/doctype/product_bundle_item/product_bundle_item.json

@@ -1,189 +1,76 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-05-23 16:55:51", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2013-05-23 16:55:51",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_code",
+  "qty",
+  "description",
+  "rate",
+  "uom"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "label": "Item",
+   "oldfieldname": "item_code",
+   "oldfieldtype": "Link",
+   "options": "Item",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Qty",
+   "oldfieldname": "qty",
+   "oldfieldtype": "Currency",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "in_list_view": 1,
+   "label": "Description",
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "print_width": "300px"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rate", 
-   "fieldtype": "Float", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "rate",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "label": "Rate",
+   "oldfieldname": "rate",
+   "oldfieldtype": "Currency",
+   "print_hide": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "uom", 
-   "oldfieldtype": "Link", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "UOM",
+   "oldfieldname": "uom",
+   "oldfieldtype": "Link",
+   "options": "UOM",
+   "read_only": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-02-20 13:24:05.633546", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Product Bundle Item", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2020-02-28 14:06:05.725655",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Product Bundle Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }

erpnext/stock/doctype/item_price/item_price.json

@@ -10,7 +10,6 @@
   "item_code",
   "uom",
   "packing_unit",
-  "min_qty",
   "column_break_17",
   "item_name",
   "brand",
@@ -63,13 +62,6 @@
    "fieldtype": "Int",
    "label": "Packing Unit"
   },
-  {
-   "default": "1",
-   "fieldname": "min_qty",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Minimum Qty "
-  },
   {
    "fieldname": "column_break_17",
    "fieldtype": "Column Break"
@@ -216,7 +208,7 @@
  "icon": "fa fa-flag",
  "idx": 1,
  "links": [],
- "modified": "2019-12-31 03:11:09.702250",
+ "modified": "2020-02-28 14:21:25.580331",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Price",
@@ -251,6 +243,7 @@
   }
  ],
  "quick_entry": 1,
+ "sort_field": "modified",
  "sort_order": "ASC",
  "title_field": "item_name",
  "track_changes": 1

erpnext/stock/doctype/item_price/test_records.json

@@ -4,7 +4,6 @@
   "item_code": "_Test Item",
   "price_list": "_Test Price List",
   "price_list_rate": 100,
-  "min_qty": 2,
   "valid_from": "2017-04-18",
   "valid_upto": "2017-04-26"
  },
@@ -12,8 +11,7 @@
   "doctype": "Item Price",
   "item_code": "_Test Item",
   "price_list": "_Test Price List Rest of the World",
-  "price_list_rate": 10,
-  "min_qty": 5
+  "price_list_rate": 10
  },
  {
   "doctype": "Item Price",
@@ -22,7 +20,6 @@
   "price_list_rate": 20,
   "valid_from": "2017-04-18",
   "valid_upto": "2017-04-26",
-  "min_qty": 7,
   "customer": "_Test Customer",
   "uom": "_Test UOM"
  },
@@ -31,19 +28,15 @@
   "item_code": "_Test Item Home Desktop 100",
   "price_list": "_Test Price List",
   "price_list_rate": 1000,
-  "min_qty" : 10,
   "valid_from": "2017-04-10",
-  "valid_upto": "2017-04-17",
-  "min_qty": 2
+  "valid_upto": "2017-04-17"
  },
  {
   "doctype": "Item Price",
   "item_code": "_Test Item Home Desktop Manufactured",
   "price_list": "_Test Price List",
   "price_list_rate": 1000,
-  "min_qty" : 10,
   "valid_from": "2017-04-10",
-  "valid_upto": "2017-04-17",
-  "min_qty": 2
+  "valid_upto": "2017-04-17"
  }
 ]

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

@@ -7,6 +7,7 @@ import frappe, erpnext
 import frappe.defaults
 from frappe.utils import cint, flt, cstr, today, random_string
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
+from erpnext.stock.doctype.item.test_item import create_item
 from erpnext import set_perpetual_inventory
 from erpnext.stock.doctype.serial_no.serial_no import SerialNoDuplicateError
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
@@ -50,6 +51,28 @@ class TestPurchaseReceipt(unittest.TestCase):
 		self.assertEqual(current_bin_stock_value, existing_bin_stock_value + 250)
 
 		self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
+	
+	def test_batched_serial_no_purchase(self):
+		item = frappe.get_doc("Item", { 'item_name': 'Batched Serialized Item' })
+		if not item:
+			item = create_item("Batched Serialized Item")
+			item.has_batch_no = 1
+			item.create_new_batch = 1
+			item.has_serial_no = 1
+			item.batch_number_series = "BS-BATCH-.##"
+			item.serial_no_series = "BS-.####"
+			item.save()
+
+		pr = make_purchase_receipt(item_code=item.name, qty=5, rate=500)
+
+		self.assertTrue(frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name}))
+		
+		pr.load_from_db()
+		batch_no = pr.items[0].batch_no
+		pr.cancel()
+
+		self.assertFalse(frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name}))
+		self.assertFalse(frappe.db.get_all('Serial No', {'batch_no': batch_no}))
 
 	def test_purchase_receipt_gl_entry(self):
 		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", get_multiple_items = True, get_taxes_and_charges = True)

erpnext/stock/doctype/serial_no/serial_no.json

@@ -6,6 +6,7 @@
  "description": "Distinct unit of an Item",
  "doctype": "DocType",
  "document_type": "Setup",
+ "engine": "InnoDB",
  "field_order": [
   "details",
   "column_break0",
@@ -104,10 +105,11 @@
   },
   {
    "fieldname": "batch_no",
-   "fieldtype": "Data",
+   "fieldtype": "Link",
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Batch No",
+   "options": "Batch",
    "read_only": 1
   },
   {
@@ -425,7 +427,7 @@
  ],
  "icon": "fa fa-barcode",
  "idx": 1,
- "modified": "2019-08-07 17:28:32.243280",
+ "modified": "2020-02-28 19:31:09.357323",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial No",

erpnext/translations/en_us.csv

@@ -27,7 +27,6 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Packing Slip(s) cancelled,Packing Slip(s) canceled
 DocType: Payment Entry,Cheque/Reference No,Check/Reference No
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
 DocType: Cheque Print Template,Cheque Print Template,Check Print Template
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} is canceled or closed
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Quotation {0} is cancelled,Quotation {0} is canceled

erpnext/translations/es_pe.csv

@@ -544,7 +544,7 @@ DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales
 DocType: Attendance,Leave Type,Tipo de Vacaciones
 DocType: Account,Round Off,Redondear
 DocType: BOM Item,Scrap %,Chatarra %
-,Requested,Requerido
+DocType: Loan Security Pledge,Requested,Requerido
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Material Request No,Nº de Solicitud de Material

erpnext/translations/he.csv

@@ -337,7 +337,7 @@ apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,זמ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Opening (Cr),פתיחה (Cr)
 DocType: Tally Migration,Round Off Account,לעגל את החשבון
 DocType: Payment Reconciliation Payment,Reference Row,הפניה Row
-DocType: Employee,Job Applicant,עבודת מבקש
+DocType: Appointment Letter,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Entertainment & Leisure,בידור ופנאי
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,Opening,פתיחה
 DocType: Bank Account,Party Type,סוג המפלגה
@@ -662,7 +662,7 @@ DocType: Sales Invoice Item,References,אזכור
 DocType: Item,Synced With Hub,סונכרן עם רכזת
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Warehouse not found in the system,מחסן לא נמצא במערכת
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py,Total Tax,"מס סה""כ"
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py,Total Tax,"מס סה""כ"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,{0} payment entries can not be filtered by {1},לא יכולים להיות מסוננים {0} ערכי תשלום על ידי {1}
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Stock Options,אופציות
@@ -1044,7 +1044,7 @@ apps/erpnext/erpnext/controllers/buying_controller.py,Specified BOM {0} does not
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,{0} items produced,{0} פריטים המיוצרים
 DocType: Communication Medium,Communication Medium,תקשורת בינונית
 DocType: Department Approver,Approver,מאשר
-DocType: Job Applicant,Applicant Name,שם מבקש
+DocType: Appointment Letter,Applicant Name,שם מבקש
 DocType: Stock Entry,Including items for sub assemblies,כולל פריטים למכלולים תת
 DocType: Employee,Permanent Address Is,כתובת קבע
 DocType: Share Transfer,Issue,נושא
@@ -1774,7 +1774,7 @@ DocType: Item,Is Sales Item,האם פריט מכירות
 ,Purchase Order Items To Be Received,פריטים הזמנת רכש שיתקבלו
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Closing (Cr),סגירה (Cr)
 DocType: Account,Cash,מזומנים
-DocType: Certification Application,Payment Details,פרטי תשלום
+DocType: Loan Repayment,Payment Details,פרטי תשלום
 DocType: Fee Schedule,In Process,בתהליך
 apps/erpnext/erpnext/setup/doctype/company/company.js,Wrong Password,סיסמא שגויה
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
@@ -1882,7 +1882,7 @@ apps/erpnext/erpnext/controllers/buying_controller.py,From {0} | {1} {2},מ {0}
 DocType: Naming Series,Current Value,ערך נוכחי
 apps/erpnext/erpnext/public/js/account_tree_grid.js,Select Fiscal Year...,בחר שנת כספים ...
 apps/erpnext/erpnext/controllers/trends.py,Amt,AMT
-,Requested,ביקשתי
+DocType: Loan Security Pledge,Requested,ביקשתי
 DocType: BOM Update Tool,Current BOM,BOM הנוכחי
 DocType: Purchase Invoice,Advance Payments,תשלומים מראש
 DocType: Asset Maintenance,Manufacturing User,משתמש ייצור
@@ -1974,6 +1974,7 @@ DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 DocType: SMS Center,SMS Center,SMS מרכז
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Investing,תזרים מזומנים מהשקעות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
+DocType: Loan Repayment,Amount Paid,הסכום ששולם
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Investments,השקעות
 DocType: Serial No,Under Warranty,במסגרת אחריות
 DocType: Price List,Price List Name,שם מחיר המחירון
@@ -2475,7 +2476,6 @@ DocType: Job Applicant,Applicant for a Job,מועמד לעבודה
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
 DocType: Cheque Print Template,Signatory Position,תפקיד החותם
 ,Item-wise Sales Register,פריט חכם מכירות הרשמה
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Qty To Manufacture,כמות לייצור
 DocType: Bank Statement Transaction Settings Item,Transaction,עסקה
@@ -2658,7 +2658,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Debit Accou
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
 ,To Produce,כדי לייצר
 DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
-DocType: Job Card,Production,הפקה
+DocType: Plaid Settings,Production,הפקה
 DocType: Appointment Booking Settings,Holiday List,רשימת החג
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
 apps/erpnext/erpnext/public/js/setup_wizard.js,The name of the institute for which you are setting up this system.,שמו של המכון אשר אתה מגדיר מערכת זו.
@@ -3173,6 +3173,7 @@ DocType: Monthly Distribution,Name of the Monthly Distribution,שמו של הח
 ,Item Shortage Report,דווח מחסור פריט
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,פריט {0} הוא לא התקנה למס סידורי. בדוק אדון פריט
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js,Print settings updated in respective print format,הגדרות הדפסה עודכנו מודפסות בהתאמה
+apps/erpnext/erpnext/loan_management/doctype/loan_type/loan_type.py,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
 apps/erpnext/erpnext/public/js/setup_wizard.js,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js,Approve,לְאַשֵׁר
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py,The holiday on {0} is not between From Date and To Date,החג על {0} הוא לא בין מתאריך ו עד תאריך

erpnext/translations/pt_br.csv

@@ -251,7 +251,7 @@ DocType: Employee,Health Details,Detalhes sobre a Saúde
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registros contábeis congelados até a presente data, ninguém pode criar/modificar registros com exceção do perfil especificado abaixo."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,O montante do adiantamento total não pode ser maior do que o montante liberado total
 ,Payment Period Based On Invoice Date,Prazo Médio de Pagamento Baseado na Emissão da Nota
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py,Total Tax,Total de Impostos
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py,Total Tax,Total de Impostos
 DocType: Delivery Note,Return Against Delivery Note,Devolução contra Guia de Remessa
 apps/erpnext/erpnext/accounts/utils.py,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão relacionados
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note_list.js,Cannot create a Delivery Trip from Draft documents.,Você não pode criar uma Viagem de Entrega para documentos em rascunho.
@@ -553,6 +553,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Pe
 DocType: Patient,Married,Casado
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Executive Search,Executive Search
 ,Itemwise Recommended Reorder Level,Níves de Reposição Recomendados por Item
+DocType: Loan Repayment,Amount Paid,Valor pago
 DocType: Guardian,Guardian Of ,Responsável por
 DocType: Bank Statement Transaction Entry,Receivable Account,Contas a Receber
 DocType: Job Offer,Printing Details,Imprimir detalhes
@@ -651,7 +652,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"R
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 apps/erpnext/erpnext/controllers/trends.py,Total(Amt),Total (Quantia)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Item {0} is not a serialized Item,Item {0} não é um item serializado
-apps/erpnext/erpnext/hr/doctype/loan/loan.js,Principal Amount,Valor Principal
+DocType: Repayment Schedule,Principal Amount,Valor Principal
 apps/erpnext/erpnext/config/projects.py,Timesheet for tasks.,Registros de Tempo para tarefas.
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
@@ -771,7 +772,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Send SMS,Envie SMS
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html,Apply Now,Aplique agora
 apps/erpnext/erpnext/config/buying.py,Request for quotation.,Solicitação de orçamento.
-DocType: Loan,Total Payment,Pagamento Total
+DocType: Repayment Schedule,Total Payment,Pagamento Total
 DocType: Work Order,Manufactured Qty,Qtde Fabricada
 DocType: Leave Application,Leave Approver Name,Nome do Aprovador de Licenças
 DocType: Employee Attendance Tool,Employees HTML,Colaboradores HTML
@@ -842,7 +843,6 @@ DocType: Clinical Procedure,Inpatient Record,Registro de Internação
 DocType: Fee Schedule Program,Student Batch,Série de Alunos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
 DocType: Lead,Lead is an Organization,Cliente em Potencial  é uma Empresa
-DocType: Loan Application,Required by Date,Necessário até a data
 DocType: Purchase Taxes and Charges,Reference Row #,Referência Linha #
 DocType: Payroll Entry,Employee Details,Detalhes do Funcionário
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
@@ -1650,7 +1650,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Debit
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py,Last Communication Date,Data do Último Contato
 DocType: Work Order,Manufacture against Material Request,Fabricação Vinculada a uma Requisição de Material
 DocType: Email Digest,Payables,Contas a Pagar
-DocType: Vehicle Log,Odometer,Odômetro
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py,Odometer,Odômetro
 DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Department Stores,Lojas de Departamento
 DocType: Issue,First Responded On,Primeira Resposta em
@@ -1761,7 +1761,7 @@ apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,POS Profile is
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js,Please select {0},Por favor selecione {0}
 DocType: Employee Tax Exemption Declaration Category,Employee Tax Exemption Declaration Category,Categoria de Declaração de Isenção de Imposto do Colaborador
-DocType: Loan Application,Total Payable Amount,Total a Pagar
+DocType: Loan,Total Payable Amount,Total a Pagar
 apps/erpnext/erpnext/controllers/accounts_controller.py,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 DocType: Work Order,Work-in-Progress Warehouse,Armazén de Trabalho em Andamento
 apps/erpnext/erpnext/education/doctype/student/student.py,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
@@ -2527,7 +2527,7 @@ DocType: Pick List,Parent Warehouse,Armazén Pai
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
 DocType: Chapter Member,Leave Reason,Motivo da Saída
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta apresentação de slides no topo da página
-DocType: Loan Type,Maximum Loan Amount,Valor Máximo de Empréstimo
+DocType: Loan Application,Maximum Loan Amount,Valor Máximo de Empréstimo
 DocType: Serial No,Creation Time,Horário de Criação
 DocType: Employee Incentive,Employee Incentive,Incentivo ao Colaborador
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
@@ -3006,11 +3006,10 @@ apps/erpnext/erpnext/controllers/accounts_controller.py,Due Date is mandatory,A
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferido para Fabricação
 ,Employee Information,Informações do Colaborador
 DocType: Purchase Invoice,Start date of current invoice's period,Data de início do período de fatura atual
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione a conta bancária onde o valor foi depositado.
 DocType: Production Plan Item,Product Bundle Item,Item do Pacote de Produtos
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Please enter Purchase Receipt first,Digite Recibo de compra primeiro
 DocType: Opportunity,Contact Info,Informações para Contato
-DocType: Employee,Job Applicant,Candidato à Vaga
+DocType: Appointment Letter,Job Applicant,Candidato à Vaga
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Newspaper Publishers,Editor de Newsletter
 DocType: Sales Order Item,Supplier delivers to Customer,O fornecedor entrega diretamente ao cliente
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Small,Muito Pequeno

erpnext/translations/sr_sp.csv

@@ -302,6 +302,7 @@ apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_re
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogući korpu
 DocType: Purchase Invoice Item,Is Fixed Asset,Artikal je osnovno sredstvo
 ,POS,POS
+DocType: Loan Repayment,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Timesheet {0} is already completed or cancelled,Potrošeno vrijeme {0} je već potvrđeno ili otkazano
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py, (Half Day),(Pola dana)
 DocType: Shipping Rule,Net Weight,Neto težina
@@ -589,6 +590,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request_dashboard.p
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Authorization Rule,Customer / Item Name,Kupac / Naziv proizvoda
 DocType: Timesheet,Total Billed Amount,Ukupno fakturisano
+DocType: Student,Home Address,Kućna adresa
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,In Value,Prijem vrije.
 DocType: Expense Claim,Employees Email Id,ID email Zaposlenih
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js,Tree Type,Tip stabla
@@ -789,7 +791,7 @@ DocType: Production Plan,For Warehouse,Za skladište
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,Purchase Price List,Nabavni cjenovnik
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Accounts Payable Summary,Pregled obaveze prema dobavljačima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnice {0} moraju biti otkazane prije otkazivanja prodajnog naloga
-DocType: Loan,Total Payment,Ukupno plaćeno
+DocType: Repayment Schedule,Total Payment,Ukupno plaćeno
 DocType: POS Settings,POS Settings,POS podešavanja
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Iznos nabavke
 DocType: Purchase Invoice Item,Valuation Rate,Prosječna nab. cijena
@@ -916,7 +918,7 @@ DocType: Pick List,Material Transfer for Manufacture,Пренос robe za proizv
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js,Primary Contact Details,Detalji o primarnom kontaktu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html,Ref,Vezni dokument
 DocType: Account,Accounts,Računi
-,Requested,Tražena
+DocType: Loan Security Pledge,Requested,Tražena
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za stavku sa ponude
 DocType: Homepage,Products,Proizvodi