[minor] fixed conflict while merging with master

This commit is contained in:
Nabin Hait
2013-08-21 17:49:26 +05:30
19 changed files with 340 additions and 112 deletions

View File

@@ -20,8 +20,7 @@ class DocType(BuyingController):
def is_item_table_empty(self, obj):
if not len(obj.doclist.get({"parentfield": obj.fname})):
msgprint(_("Hey there! You need to put at least one item in \
the item table."), raise_exception=True)
msgprint(_("You need to put at least one item in the item table."), raise_exception=True)
def get_supplier_details(self, name = ''):
details = sql("select supplier_name,address from `tabSupplier` where name = '%s' and docstatus != 2" %(name), as_dict = 1)