Merge pull request #2450 from ankitjavalkarwork/fix2363
Add print formats for Acc. Receivable/Payable and Summary reports
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index d92f525..f275d7d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -403,3 +403,12 @@
var sms_man = new SMSManager(cur_frm.doc);
}
+cur_frm.set_query("debit_to", function(doc) {
+ return{
+ filters: [
+ ['Account', 'root_type', '=', 'Asset'],
+ ['Account', 'account_type', '=', 'Receivable']
+ ]
+ }
+});
+
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js
index 926530e..2c079f9 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.js
+++ b/erpnext/accounts/report/gross_profit/gross_profit.js
@@ -22,5 +22,12 @@
"fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date")
},
+ {
+ "fieldname":"group_by",
+ "label": __("Group By"),
+ "fieldtype": "Select",
+ "options": "Invoice\nItem Code\nItem Group\nBrand\nWarehouse\nCustomer\nCustomer Group\nTerritory\nSales Person\nProject",
+ "default": "Invoice"
+ },
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 6f46559..d212965 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -3,130 +3,249 @@
from __future__ import unicode_literals
import frappe
-from frappe import _
-from frappe.utils import flt
-from erpnext.stock.utils import get_buying_amount, get_sales_bom_buying_amount
+from frappe import _, scrub
+from frappe.utils import flt, cstr, cint
def execute(filters=None):
if not filters: filters = {}
+ gross_profit_data = GrossProfitGenerator(filters)
- stock_ledger_entries = get_stock_ledger_entries(filters)
- source = get_source_data(filters)
- item_sales_bom = get_item_sales_bom()
-
- total_gross_profit = 0.0
- total_selling_amount = 0.0
- total_buying_amount = 0.0
-
- columns = [_("Delivery Note/Sales Invoice") + "::120", _("Link") + "::30", _("Posting Date") + ":Date", _("Posting Time"),
- _("Item Code") + ":Link/Item", _("Item Name"), _("Description"), _("Warehouse") + ":Link/Warehouse",
- _("Qty") + ":Float", _("Selling Rate") + ":Currency", _("Avg. Buying Rate") + ":Currency",
- _("Selling Amount") + ":Currency", _("Buying Amount") + ":Currency",
- _("Gross Profit") + ":Currency", _("Gross Profit %") + ":Percent", _("Project") + ":Link/Project"]
data = []
- for row in source:
- selling_amount = flt(row.base_amount)
- total_selling_amount += flt(row.base_amount)
+ source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data
- item_sales_bom_map = item_sales_bom.get(row.parenttype, {}).get(row.name, frappe._dict())
+ group_wise_columns = frappe._dict({
+ "invoice": ["name", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \
+ "warehouse", "qty", "base_rate", "buying_rate", "base_amount",
+ "buying_amount", "gross_profit", "gross_profit_percent", "project"],
+ "item_code": ["item_code", "item_name", "brand", "description", "warehouse", "qty", "base_rate",
+ "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"],
+ "warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "territory": ["territory", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "brand": ["brand", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "item_group": ["item_group", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "customer": ["customer", "customer_group", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "customer_group": ["customer_group", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "sales_person": ["sales_person", "allocated_amount", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
+ "gross_profit", "gross_profit_percent"],
+ "project": ["project", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"],
+ "territory": ["territory", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"]
+ })
- if item_sales_bom_map.get(row.item_code):
- buying_amount = get_sales_bom_buying_amount(row.item_code, row.warehouse,
- row.parenttype, row.name, row.item_row, stock_ledger_entries, item_sales_bom_map)
- else:
- buying_amount = get_buying_amount(row.item_code, row.qty, row.parenttype, row.name, row.item_row,
- stock_ledger_entries.get((row.item_code, row.warehouse), []))
+ columns = get_columns(group_wise_columns, filters)
- buying_amount = buying_amount > 0 and buying_amount or 0
- total_buying_amount += buying_amount
-
- gross_profit = selling_amount - buying_amount
- total_gross_profit += gross_profit
-
- if selling_amount:
- gross_profit_percent = (gross_profit / selling_amount) * 100.0
- else:
- gross_profit_percent = 0.0
-
- icon = """<a href="%s"><i class="icon icon-share" style="cursor: pointer;"></i></a>""" \
- % ("/".join(["#Form", row.parenttype, row.name]),)
- data.append([row.name, icon, row.posting_date, row.posting_time, row.item_code, row.item_name,
- row.description, row.warehouse, row.qty, row.base_rate,
- row.qty and (buying_amount / row.qty) or 0, row.base_amount, buying_amount,
- gross_profit, gross_profit_percent, row.project])
-
- if total_selling_amount:
- total_gross_profit_percent = (total_gross_profit / total_selling_amount) * 100.0
- else:
- total_gross_profit_percent = 0.0
-
- data.append(["Total", None, None, None, None, None, None, None, None, None, None, total_selling_amount,
- total_buying_amount, total_gross_profit, total_gross_profit_percent, None])
+ for src in source:
+ row = []
+ for col in group_wise_columns.get(scrub(filters.group_by)):
+ row.append(src.get(col))
+ data.append(row)
return columns, data
-def get_stock_ledger_entries(filters):
- query = """select item_code, voucher_type, voucher_no,
- voucher_detail_no, posting_date, posting_time, stock_value,
- warehouse, actual_qty as qty
- from `tabStock Ledger Entry`"""
+def get_columns(group_wise_columns, filters):
+ columns = []
+ column_map = frappe._dict({
+ "name": _("Sales Invoice") + "::120",
+ "posting_date": _("Posting Date") + ":Date",
+ "posting_time": _("Posting Time"),
+ "item_code": _("Item Code") + ":Link/Item",
+ "item_name": _("Item Name"),
+ "item_group": _("Item Group") + ":Link/Item",
+ "brand": _("Brand"),
+ "description": _("Description"),
+ "warehouse": _("Warehouse") + ":Link/Warehouse",
+ "qty": _("Qty") + ":Float",
+ "base_rate": _("Avg. Selling Rate") + ":Currency",
+ "buying_rate": _("Avg. Buying Rate") + ":Currency",
+ "base_amount": _("Selling Amount") + ":Currency",
+ "buying_amount": _("Buying Amount") + ":Currency",
+ "gross_profit": _("Gross Profit") + ":Currency",
+ "gross_profit_percent": _("Gross Profit %") + ":Percent",
+ "project": _("Project") + ":Link/Project",
+ "sales_person": _("Sales person"),
+ "allocated_amount": _("Allocated Amount") + ":Currency",
+ "customer": _("Customer") + ":Link/Customer",
+ "customer_group": _("Customer Group") + ":Link/Customer Group",
+ "territory": _("Territory") + ":Link/Territory"
+ })
- if filters.get("company"):
- query += """ where company=%(company)s"""
+ for col in group_wise_columns.get(scrub(filters.group_by)):
+ columns.append(column_map.get(col))
- query += " order by item_code desc, warehouse desc, posting_date desc, posting_time desc, name desc"
+ return columns
- res = frappe.db.sql(query, filters, as_dict=True)
+class GrossProfitGenerator(object):
+ def __init__(self, filters=None):
+ self.data = []
+ self.filters = frappe._dict(filters)
+ self.load_invoice_items()
+ self.load_stock_ledger_entries()
+ self.load_sales_bom()
+ self.load_non_stock_items()
+ self.process()
- out = {}
- for r in res:
- if (r.item_code, r.warehouse) not in out:
- out[(r.item_code, r.warehouse)] = []
+ def process(self):
+ self.grouped = {}
+ for row in self.si_list:
+ if self.skip_row(row, self.sales_boms):
+ continue
- out[(r.item_code, r.warehouse)].append(r)
+ row.selling_amount = flt(row.base_amount)
- return out
+ sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.name, frappe._dict())
-def get_item_sales_bom():
- item_sales_bom = {}
+ # get buying amount
+ if row.item_code in sales_boms:
+ row.buying_amount = self.get_buying_amount_from_sales_bom(row, sales_boms[row.item_code])
+ else:
+ row.buying_amount = self.get_buying_amount(row, row.item_code)
- for d in frappe.db.sql("""select parenttype, parent, parent_item,
- item_code, warehouse, -1*qty as total_qty, parent_detail_docname
- from `tabPacked Item` where docstatus=1""", as_dict=True):
- item_sales_bom.setdefault(d.parenttype, frappe._dict()).setdefault(d.parent,
- frappe._dict()).setdefault(d.parent_item, []).append(d)
+ # get buying rate
+ if row.qty:
+ row.buying_rate = (row.buying_amount / row.qty) * 100.0
+ else:
+ row.buying_rate = 0.0
- return item_sales_bom
+ # calculate gross profit
+ row.gross_profit = row.selling_amount - row.buying_amount
+ if row.selling_amount:
+ row.gross_profit_percent = (row.gross_profit / row.selling_amount) * 100.0
+ else:
+ row.gross_profit_percent = 0.0
-def get_source_data(filters):
- conditions = ""
- if filters.get("company"):
- conditions += " and company=%(company)s"
- if filters.get("from_date"):
- conditions += " and posting_date>=%(from_date)s"
- if filters.get("to_date"):
- conditions += " and posting_date<=%(to_date)s"
+ # add to grouped
+ if self.filters.group_by != "Invoice":
+ self.grouped.setdefault(row.get(scrub(self.filters.group_by)), []).append(row)
- delivery_note_items = frappe.db.sql("""select item.parenttype, dn.name,
- dn.posting_date, dn.posting_time, dn.project_name,
- item.item_code, item.item_name, item.description, item.warehouse,
- item.qty, item.base_rate, item.base_amount, item.name as "item_row",
- timestamp(dn.posting_date, dn.posting_time) as posting_datetime
- from `tabDelivery Note` dn, `tabDelivery Note Item` item
- where item.parent = dn.name and dn.docstatus = 1 %s
- order by dn.posting_date desc, dn.posting_time desc""" % (conditions,), filters, as_dict=1)
+ self.data.append(row)
- sales_invoice_items = frappe.db.sql("""select item.parenttype, si.name,
- si.posting_date, si.posting_time, si.project_name,
- item.item_code, item.item_name, item.description, item.warehouse,
- item.qty, item.base_rate, item.base_amount, item.name as "item_row",
- timestamp(si.posting_date, si.posting_time) as posting_datetime
- from `tabSales Invoice` si, `tabSales Invoice Item` item
- where item.parent = si.name and si.docstatus = 1 %s
- order by si.posting_date desc, si.posting_time desc""" % (conditions,), filters, as_dict=1)
+ if self.grouped:
+ self.collapse_group()
+ else:
+ self.grouped_data = []
- source = delivery_note_items + sales_invoice_items
- if len(source) > len(delivery_note_items):
- source.sort(key=lambda d: d.posting_datetime, reverse=True)
+ def collapse_group(self):
+ # sum buying / selling totals for group
+ self.grouped_data = []
+ for key in self.grouped.keys():
+ for i, row in enumerate(self.grouped[key]):
+ if i==0:
+ new_row = row
+ else:
+ new_row.qty += row.qty
+ new_row.buying_amount += row.buying_amount
+ new_row.selling_amount += row.selling_amount
+ # new_row.allocated_amount += (row.allocated_amount or 0) if new_row.allocated_amount else 0
- return source
+ new_row.gross_profit = new_row.selling_amount - new_row.buying_amount
+ new_row.gross_profit_percent = ((new_row.gross_profit / new_row.selling_amount) * 100.0) \
+ if new_row.selling_amount else 0
+ new_row.buying_rate = ((new_row.buying_amount / new_row.qty) * 100.0) \
+ if new_row.qty else 0
+
+ self.grouped_data.append(new_row)
+
+ def skip_row(self, row, sales_boms):
+ if cint(row.update_stock) == 0 and not row.dn_detail:
+ if row.item_code not in self.non_stock_items:
+ return True
+ elif row.item_code in sales_boms:
+ for child_item in sales_boms[row.item_code]:
+ if child_item not in self.non_stock_items:
+ return True
+ elif self.filters.get("group_by") != "Invoice" and not row.get(scrub(self.filters.get("group_by"))):
+ return True
+
+ def get_buying_amount_from_sales_bom(self, row, sales_bom):
+ buying_amount = 0.0
+ for bom_item in sales_bom[row.item_code]:
+ if bom_item.get("parent_detail_docname")==row.name:
+ buying_amount += self.get_buying_amount(row, bom_item.item_code)
+
+ return buying_amount
+
+ def get_buying_amount(self, row, item_code):
+ # IMP NOTE
+ # stock_ledger_entries should already be filtered by item_code and warehouse and
+ # sorted by posting_date desc, posting_time desc
+ if item_code in self.non_stock_items:
+ # average purchasing rate for non-stock items
+ item_rate = frappe.db.sql("""select sum(base_amount) / sum(qty)
+ from `tabPurchase Invoice Item`
+ where item_code = %s and docstatus=1""", item_code)
+
+ return flt(row.qty) * (flt(item_rate[0][0]) if item_rate else 0)
+
+ else:
+ if row.dn_detail:
+ row.parenttype = "Delivery Note"
+ row.parent = row.delivery_note
+ row.name = row.dn_detail
+ my_sle = self.sle.get((item_code, row.warehouse))
+ for i, sle in enumerate(my_sle):
+ # find the stock valution rate from stock ledger entry
+ if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \
+ sle.voucher_detail_no == row.name:
+ previous_stock_value = len(my_sle) > i+1 and \
+ flt(my_sle[i+1].stock_value) or 0.0
+ return previous_stock_value - flt(sle.stock_value)
+
+ return 0.0
+
+ def load_invoice_items(self):
+ conditions = ""
+ if self.filters.company:
+ conditions += " and company = %(company)s"
+ if self.filters.from_date:
+ conditions += " and posting_date >= %(from_date)s"
+ if self.filters.to_date:
+ conditions += " and posting_date <= %(to_date)s"
+
+ self.si_list = frappe.db.sql("""select item.parenttype, si.name,
+ si.posting_date, si.posting_time, si.project_name, si.update_stock,
+ si.customer, si.customer_group, si.territory,
+ item.item_code, item.item_name, item.description, item.warehouse,
+ item.item_group, item.brand, item.dn_detail, item.delivery_note,
+ item.qty, item.base_rate, item.base_amount, item.name as "item_row",
+ sales.sales_person, sales.sales_designation, sales.allocated_amount,
+ sales.incentives
+ from `tabSales Invoice` si
+ inner join `tabSales Invoice Item` item on item.parent = si.name
+ left join `tabSales Team` sales on sales.parent = si.name
+ where
+ si.docstatus = 1 %s
+ order by
+ si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1)
+
+ def load_stock_ledger_entries(self):
+ res = frappe.db.sql("""select item_code, voucher_type, voucher_no,
+ voucher_detail_no, stock_value, warehouse, actual_qty as qty
+ from `tabStock Ledger Entry`
+ where company=%(company)s
+ order by
+ item_code desc, warehouse desc, posting_date desc,
+ posting_time desc, name desc""", self.filters, as_dict=True)
+ self.sle = {}
+ for r in res:
+ if (r.item_code, r.warehouse) not in self.sle:
+ self.sle[(r.item_code, r.warehouse)] = []
+
+ self.sle[(r.item_code, r.warehouse)].append(r)
+
+ def load_sales_bom(self):
+ self.sales_boms = {}
+
+ for d in frappe.db.sql("""select parenttype, parent, parent_item,
+ item_code, warehouse, -1*qty as total_qty, parent_detail_docname
+ from `tabPacked Item` where docstatus=1""", as_dict=True):
+ self.sales_boms.setdefault(d.parenttype, frappe._dict()).setdefault(d.parent,
+ frappe._dict()).setdefault(d.parent_item, []).append(d)
+
+ def load_non_stock_items(self):
+ self.non_stock_items = frappe.db.sql_list("""select name from tabItem
+ where ifnull(is_stock_item, 'No')='No'""")
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
index f4e5d3d..de8b3fa 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -1,4 +1,4 @@
frappe.listview_settings['Purchase Order'] = {
add_fields: ["grand_total", "company", "currency", "supplier",
- "supplier_name", "per_received", "per_billed"]
+ "supplier_name", "per_received", "per_billed", "status"]
};
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 89f77f2..c236caf 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -1,5 +1,4 @@
{
- "allow_attach": 0,
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 0,
@@ -111,6 +110,17 @@
"permlevel": 0
},
{
+ "default": "1",
+ "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials",
+ "fieldname": "quantity",
+ "fieldtype": "Float",
+ "label": "Quantity",
+ "oldfieldname": "quantity",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "reqd": 1
+ },
+ {
"fieldname": "costing",
"fieldtype": "Section Break",
"label": "Costing",
@@ -165,30 +175,6 @@
"permlevel": 0
},
{
- "default": "1",
- "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials",
- "fieldname": "quantity",
- "fieldtype": "Float",
- "label": "Quantity",
- "oldfieldname": "quantity",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "reqd": 1
- },
- {
- "fieldname": "uom",
- "fieldtype": "Link",
- "label": "Item UOM",
- "options": "UOM",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "col_break23",
- "fieldtype": "Column Break",
- "permlevel": 0
- },
- {
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
@@ -199,14 +185,6 @@
"permlevel": 0
},
{
- "fieldname": "description",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Item Desription",
- "permlevel": 0,
- "read_only": 1
- },
- {
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_user_permissions": 1,
@@ -218,6 +196,27 @@
"read_only": 1
},
{
+ "fieldname": "col_break23",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "label": "Item UOM",
+ "options": "UOM",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Item Desription",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
"depends_on": "eval:!doc.__islocal",
"fieldname": "section_break0",
"fieldtype": "Section Break",
@@ -248,7 +247,7 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
- "modified": "2014-09-08 16:30:46.265762",
+ "modified": "2014-12-04 12:37:39.710211",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM",
diff --git a/erpnext/patches/v4_4/make_email_accounts.py b/erpnext/patches/v4_4/make_email_accounts.py
index cf94107..3ca5fe9 100644
--- a/erpnext/patches/v4_4/make_email_accounts.py
+++ b/erpnext/patches/v4_4/make_email_accounts.py
@@ -51,7 +51,6 @@
# sales, jobs
for doctype in ("Sales Email Settings", "Jobs Email Settings"):
source = dict(frappe.db.sql("select field, value from tabSingles where doctype=%s", doctype))
- print source
if source and source.get('host'):
account = frappe.new_doc("Email Account")
mapping = {
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index dba7387..a7759c5 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -166,37 +166,3 @@
frappe.throw(_("Warehouse {0} does not belong to company {1}").format(warehouse, company),
InvalidWarehouseCompany)
-def get_sales_bom_buying_amount(item_code, warehouse, voucher_type, voucher_no, voucher_detail_no,
- stock_ledger_entries, item_sales_bom):
- # sales bom item
- buying_amount = 0.0
- for bom_item in item_sales_bom[item_code]:
- if bom_item.get("parent_detail_docname")==voucher_detail_no:
- buying_amount += get_buying_amount(voucher_type, voucher_no, voucher_detail_no,
- stock_ledger_entries.get((bom_item.item_code, warehouse), []))
-
- return buying_amount
-
-def get_buying_amount(item_code, item_qty, voucher_type, voucher_no, item_row, stock_ledger_entries):
- # IMP NOTE
- # stock_ledger_entries should already be filtered by item_code and warehouse and
- # sorted by posting_date desc, posting_time desc
- if frappe.db.get_value("Item", item_code, "is_stock_item") == "Yes":
- for i, sle in enumerate(stock_ledger_entries):
- if sle.voucher_type == voucher_type and sle.voucher_no == voucher_no and \
- sle.voucher_detail_no == item_row:
- previous_stock_value = len(stock_ledger_entries) > i+1 and \
- flt(stock_ledger_entries[i+1].stock_value) or 0.0
- buying_amount = previous_stock_value - flt(sle.stock_value)
-
- return buying_amount
- else:
- item_rate = frappe.db.sql("""select sum(base_amount) / sum(qty)
- from `tabPurchase Invoice Item`
- where item_code = %s and docstatus=1""" % ('%s'), item_code)
- buying_amount = flt(item_qty) * flt(item_rate[0][0]) if item_rate else 0
-
- return buying_amount
-
- return 0.0
-
diff --git a/erpnext/utilities/doctype/contact/contact.js b/erpnext/utilities/doctype/contact/contact.js
index 6d27fcd..659630b 100644
--- a/erpnext/utilities/doctype/contact/contact.js
+++ b/erpnext/utilities/doctype/contact/contact.js
@@ -3,9 +3,7 @@
{% include 'controllers/js/contact_address_common.js' %};
-<<<<<<< HEAD
cur_frm.email_field = "email_id";
-=======
frappe.ui.form.on("Contact", "validate", function(frm) {
// clear linked customer / supplier / sales partner on saving...
$.each(["Customer", "Supplier", "Sales Partner"], function(i, doctype) {
@@ -14,18 +12,3 @@
frappe.model.remove_from_locals(doctype, name);
});
});
-
-cur_frm.cscript.refresh = function(doc) {
- cur_frm.communication_view = new frappe.views.CommunicationList({
- list: frappe.get_list("Communication", {"parent": doc.name, "parenttype": "Contact"}),
- parent: cur_frm.fields_dict.communication_html.wrapper,
- doc: doc,
- recipients: doc.email_id
- });
-}
-
->>>>>>> upstream/develop
-cur_frm.cscript.hide_dialog = function() {
- if(cur_frm.contact_list)
- cur_frm.contact_list.run();
-}
diff --git a/setup.py b/setup.py
index bd4adc6..be7f892 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,6 @@
from setuptools import setup, find_packages
-<<<<<<< HEAD
version = "5.0.0-alpha"
-=======
-version = "4.12.0"
->>>>>>> upstream/develop
with open("requirements.txt", "r") as f:
install_requires = f.readlines()