[fix] [minor] merge conflict fixes
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 99bfe5c..ece17a4 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
- "modified": "2013-11-18 15:16:50",
+ "modified": "2013-12-09 14:05:34",
"modified_by": "Administrator",
"owner": "Administrator"
},
diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index a5ff125..5707665 100644
--- a/manufacturing/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -120,18 +120,24 @@
"options": "Price List"
},
{
+<<<<<<< HEAD
+=======
"depends_on": "with_operations",
+>>>>>>> 4e677a3f5235c96e86c5fe5acd8d2f59dff895dc
"description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"doctype": "DocField",
"fieldname": "operations",
"fieldtype": "Section Break",
+ "hidden": 0,
"label": "Operations",
"oldfieldtype": "Section Break"
},
{
+ "depends_on": "with_operations",
"doctype": "DocField",
"fieldname": "bom_operations",
"fieldtype": "Table",
+ "hidden": 0,
"label": "BOM Operations",
"oldfieldname": "bom_operations",
"oldfieldtype": "Table",
diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt
index 3689718..6b28f10 100644
--- a/setup/doctype/email_settings/email_settings.txt
+++ b/setup/doctype/email_settings/email_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-25 17:53:21",
"docstatus": 0,
- "modified": "2013-11-28 11:54:42",
+ "modified": "2013-12-06 13:12:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -103,6 +103,7 @@
"label": "Auto Email Id"
},
{
+ "default": "1",
"description": "If checked, an email with an attached HTML format will be added to part of the EMail body as well as attachment. To only send as attachment, uncheck this.",
"doctype": "DocField",
"fieldname": "send_print_in_body_and_attachment",
diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js
index 76284ea..73fd441 100644
--- a/stock/doctype/stock_entry/stock_entry.js
+++ b/stock/doctype/stock_entry/stock_entry.js
@@ -244,7 +244,7 @@
cur_frm.cscript.toggle_related_fields = function(doc) {
disable_from_warehouse = inList(["Material Receipt", "Sales Return"], doc.purpose);
- disable_to_warehouse = inList(["Material Issue", "Purchase Return"], doc.purpose)
+ disable_to_warehouse = inList(["Material Issue", "Purchase Return"], doc.purpose);
cur_frm.toggle_enable("from_warehouse", !disable_from_warehouse);
cur_frm.toggle_enable("to_warehouse", !disable_to_warehouse);
@@ -302,7 +302,7 @@
}
cur_frm.cscript.purpose = function(doc, cdt, cdn) {
- cur_frm.cscript.toggle_related_fields(doc, cdt, cdn);
+ cur_frm.cscript.toggle_related_fields(doc);
}
// Overloaded query for link batch_no