[rename] [fix] merge related fixes

This commit is contained in:
Anand Doshi
2013-05-09 13:21:13 +05:30
parent bddd5d9b0c
commit 21b854b7cc
2 changed files with 8 additions and 1 deletions

View File

@@ -19,7 +19,7 @@ import webnotes
from webnotes.utils import cint, getdate, nowdate
import datetime
from webnotes import msgprint
from webnotes import msgprint, _
from controllers.stock_controller import StockController
@@ -119,6 +119,9 @@ class DocType(StockController):
def on_rename(self, new, old, merge=False):
"""rename serial_no text fields"""
if merge:
msgprint(_("Sorry. Serial Nos. cannot be merged"), raise_exception=True)
for dt in webnotes.conn.sql("""select parent from tabDocField
where fieldname='serial_no' and fieldtype='Text'"""):