Merge pull request #2442 from ankitjavalkarwork/gross-profit
Gross profit
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/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",