[minor] merged with master branch

This commit is contained in:
Nabin Hait
2013-09-17 10:30:24 +05:30
134 changed files with 5280 additions and 549 deletions

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-08-09 14:45:51",
"modified": "2013-09-12 18:34:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -132,6 +132,7 @@
"fieldtype": "Date",
"in_filter": 1,
"label": "Purchase Order Date",
"no_copy": 1,
"oldfieldname": "transaction_date",
"oldfieldtype": "Date",
"reqd": 1,

View File

@@ -132,14 +132,10 @@ class DocType(TransactionBase):
sql("delete from `tabAddress` where name=%s",(rec['name']))
def delete_supplier_contact(self):
for rec in sql("select * from `tabContact` where supplier=%s", (self.doc.name,), as_dict=1):
sql("delete from `tabContact` where name=%s",(rec['name']))
def delete_supplier_communication(self):
webnotes.conn.sql("""\
delete from `tabCommunication`
where supplier = %s and customer is null""", self.doc.name)
for contact in webnotes.conn.sql_list("""select name from `tabContact`
where supplier=%s""", self.doc.name):
webnotes.delete_doc("Contact", contact)
def delete_supplier_account(self):
"""delete supplier's ledger if exist and check balance before deletion"""
acc = sql("select name from `tabAccount` where master_type = 'Supplier' \

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:11",
"docstatus": 0,
"modified": "2013-09-02 16:25:44",
"modified": "2013-09-10 10:53:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -137,13 +137,15 @@
"fieldname": "communication_history",
"fieldtype": "Section Break",
"label": "Communication History",
"options": "icon-comments"
"options": "icon-comments",
"print_hide": 1
},
{
"doctype": "DocField",
"fieldname": "communication_html",
"fieldtype": "HTML",
"label": "Communication HTML"
"label": "Communication HTML",
"print_hide": 1
},
{
"doctype": "DocField",
@@ -210,7 +212,8 @@
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
"options": "Communication",
"print_hide": 1
},
{
"cancel": 0,