[fixes][merge conflict]

This commit is contained in:
Nabin Hait
2013-06-05 12:53:53 +05:30
14 changed files with 397 additions and 133 deletions

View File

@@ -20,9 +20,9 @@ from webnotes import msgprint, _
from webnotes.utils import load_json, cstr, flt, now_datetime
from webnotes.model.doc import addchild
from webnotes.model.controller import DocListController
from controllers.status_updater import StatusUpdater
class TransactionBase(DocListController):
class TransactionBase(StatusUpdater):
def get_default_address_and_contact(self, party_type):
"""get a dict of default field values of address and contact for a given party type
party_type can be one of: customer, supplier"""