Default accounts in company should not be copied
diff --git a/erpnext/setup/doctype/company/company.txt b/erpnext/setup/doctype/company/company.txt
index 4159c51..4832ae0 100644
--- a/erpnext/setup/doctype/company/company.txt
+++ b/erpnext/setup/doctype/company/company.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-10 08:35:39",
"docstatus": 0,
- "modified": "2014-01-20 17:48:28",
+ "modified": "2014-01-30 16:32:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -110,6 +110,7 @@
"fieldname": "default_cash_account",
"fieldtype": "Link",
"label": "Default Cash Account",
+ "no_copy": 1,
"options": "Account",
"read_only": 0
},
@@ -142,6 +143,7 @@
"fieldname": "default_expense_account",
"fieldtype": "Link",
"label": "Default Expense Account",
+ "no_copy": 1,
"options": "Account"
},
{
@@ -149,6 +151,7 @@
"fieldname": "default_income_account",
"fieldtype": "Link",
"label": "Default Income Account",
+ "no_copy": 1,
"options": "Account"
},
{
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 02851e8..45cc89c 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -87,8 +87,6 @@
self.doc.status = "Sales Returned"
else:
self.doc.status = "Available"
- if not self.doc.warehouse:
- self.doc.warehouse = last_sle.warehouse
else:
if document_type == "Purchase Return":
self.doc.status = "Purchase Returned"
diff --git a/patches/1401/fix_serial_no_status_and_warehouse.py b/patches/1401/fix_serial_no_status_and_warehouse.py
index fe43c28..9e5579c 100644
--- a/patches/1401/fix_serial_no_status_and_warehouse.py
+++ b/patches/1401/fix_serial_no_status_and_warehouse.py
@@ -4,14 +4,16 @@
from __future__ import unicode_literals
import webnotes
+
def execute():
serial_nos = webnotes.conn.sql("""select name from `tabSerial No` where docstatus=0
and status in ('Available', 'Sales Returned') and ifnull(warehouse, '') = ''""")
for sr in serial_nos:
try:
- sr_bean = webnotes.bean("Serial No", sr[0])
- sr_bean.make_controller().via_stock_ledger = True
- sr_bean.save()
+ last_sle = webnotes.bean("Serial No", sr[0]).make_controller().get_last_sle()
+ if last_sle.actual_qty > 0:
+ webnotes.conn.set_value("Serial No", sr[0], "warehouse", last_sle.warehouse)
+
webnotes.conn.commit()
except:
pass
\ No newline at end of file