added comments

.gitignore

@@ -3,4 +3,8 @@
 *.egg-info
 *.swp
 tags
-app1/docs/current
+<<<<<<< HEAD
+app1/docs/current
+=======
+cpfa/docs/current
+>>>>>>> e749145085c0ecdeac8d83ab3f36927a070bec7c

MANIFEST.in

@@ -4,6 +4,7 @@ include *.json
 include *.md
 include *.py
 include *.txt
+<<<<<<< HEAD
 recursive-include app1 *.css
 recursive-include app1 *.csv
 recursive-include app1 *.html
@@ -15,4 +16,18 @@ recursive-include app1 *.png
 recursive-include app1 *.py
 recursive-include app1 *.svg
 recursive-include app1 *.txt
-recursive-exclude app1 *.pyc
+recursive-exclude app1 *.pyc
+=======
+recursive-include cpfa *.css
+recursive-include cpfa *.csv
+recursive-include cpfa *.html
+recursive-include cpfa *.ico
+recursive-include cpfa *.js
+recursive-include cpfa *.json
+recursive-include cpfa *.md
+recursive-include cpfa *.png
+recursive-include cpfa *.py
+recursive-include cpfa *.svg
+recursive-include cpfa *.txt
+recursive-exclude cpfa *.pyc
+>>>>>>> e749145085c0ecdeac8d83ab3f36927a070bec7c

README.md

@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 ## App1
 
 Test App
+=======
+## Total CPFA ERPNext
+
+Total E&P NIG CPFA ERPNext customization
+>>>>>>> e749145085c0ecdeac8d83ab3f36927a070bec7c
 
 #### License
 

app1/app1/doctype/color/color.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2018, frappe and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Color', {
+	refresh: function(frm) {
+
+	}
+});

app1/app1/doctype/color/color.json

@@ -0,0 +1,93 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:color", 
+ "beta": 0, 
+ "creation": "2018-11-13 10:51:58.790680", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "color", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Color", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-11-13 10:54:45.332066", 
+ "modified_by": "Administrator", 
+ "module": "App1", 
+ "name": "Color", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}

app1/app1/doctype/color/color.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Color(Document):
+	pass

app1/app1/doctype/color/test_color.js

@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Color", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Color
+		() => frappe.tests.make('Color', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

app1/app1/doctype/color/test_color.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, frappe and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestColor(unittest.TestCase):
+	pass

app1/app1/doctype/insurance_company/address__.html

@@ -0,0 +1,12 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+</head>
+<<body>
+  <p>Your address and contacts</p>
+  <p>{{addy.address_line1}}></p>
+  <p>{{addy.address_line2}}</p>
+  <p>City:{{addy.city}}</p>
+</body>

app1/app1/doctype/insurance_company/insurance_company.js

@@ -0,0 +1,19 @@
+// Copyright (c) 2018, frappe and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Insurance Company', {
+	refresh: function(frm) {
+	//	console.log("Hello there");
+			var addy=frappe.get_doc("Address","Address 2-Office")
+			var temp = frappe.render_template("address__.html",data={addy:addy})
+	},
+	new_contact:function(frm){
+	frappe.new_doc("Contact")
+	},
+	add_address:function(frm){
+	frappe.new_doc("Address")
+
+	}
+
+
+});

app1/app1/doctype/insurance_company/insurance_company.json

@@ -0,0 +1,154 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-11-13 08:43:13.896939", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "insurance_type", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insurance Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agric\nHealth\nDeposit\nLife\nMortgage\nProperty\nTravel\nVehicle\nGroup\nOthers", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-11-13 08:43:13.896939", 
+ "modified_by": "Administrator", 
+ "module": "App1", 
+ "name": "Insurance Company", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}