Merge branch 'staging' into production

Author: sahil28297

bloomstack_core/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '2.0.1'
+__version__ = '2.0.2'

bloomstack_core/bloomstack_core/custom/contract.json

@@ -22,7 +22,7 @@
    "fieldname": "sb_signature",
    "fieldtype": "Section Break",
    "hidden": 0,
-   "idx": 10,
+   "idx": 11,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -75,7 +75,7 @@
    "fieldname": "project_template",
    "fieldtype": "Link",
    "hidden": 0,
-   "idx": 13,
+   "idx": 14,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -128,7 +128,7 @@
    "fieldname": "customer_signature",
    "fieldtype": "Signature",
    "hidden": 0,
-   "idx": 23,
+   "idx": 36,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -181,7 +181,7 @@
    "fieldname": "project",
    "fieldtype": "Link",
    "hidden": 0,
-   "idx": 16,
+   "idx": 17,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -234,7 +234,7 @@
    "fieldname": "contract_terms_display",
    "fieldtype": "Text",
    "hidden": 0,
-   "idx": 28,
+   "idx": 24,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -287,7 +287,7 @@
    "fieldname": "contract_terms_help",
    "fieldtype": "HTML",
    "hidden": 0,
-   "idx": 29,
+   "idx": 25,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -340,7 +340,7 @@
    "fieldname": "employee_name",
    "fieldtype": "Data",
    "hidden": 1,
-   "idx": 6,
+   "idx": 4,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -377,36 +377,36 @@
    "_liked_by": null,
    "_user_tags": null,
    "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
+   "allow_on_submit": 1,
    "bold": 0,
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2020-06-23 20:07:53.863170",
+   "creation": "2020-06-24 02:44:23.704505",
    "default": null,
    "depends_on": null,
    "description": null,
    "docstatus": 0,
    "dt": "Contract",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "company",
-   "fieldtype": "Link",
+   "fieldname": "designation",
+   "fieldtype": "Data",
    "hidden": 0,
-   "idx": 1,
+   "idx": 34,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "insert_after": null,
-   "label": "Company",
+   "insert_after": "party_business_type",
+   "label": "Designation",
    "length": 0,
-   "modified": "2020-06-23 20:07:53.863170",
+   "modified": "2020-06-24 02:44:23.704505",
    "modified_by": "Administrator",
-   "name": "Contract-company",
+   "name": "Contract-designation",
    "no_copy": 0,
-   "options": "Company",
+   "options": null,
    "owner": "Administrator",
    "parent": null,
    "parentfield": null,
@@ -435,31 +435,31 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2020-06-24 02:44:23.704505",
+   "creation": "2020-06-25 00:17:31.772206",
    "default": null,
    "depends_on": null,
    "description": null,
    "docstatus": 0,
    "dt": "Contract",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "designation",
-   "fieldtype": "Data",
+   "fieldname": "party_business_type",
+   "fieldtype": "Select",
    "hidden": 0,
-   "idx": 21,
+   "idx": 33,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "insert_after": "party_business_type",
-   "label": "Designation",
+   "insert_after": "signed_on",
+   "label": "Party Business Type",
    "length": 0,
-   "modified": "2020-06-24 02:44:23.704505",
+   "modified": "2020-06-25 00:17:31.772206",
    "modified_by": "Administrator",
-   "name": "Contract-designation",
+   "name": "Contract-party_business_type",
    "no_copy": 0,
-   "options": null,
+   "options": "Individual\nCompany",
    "owner": "Administrator",
    "parent": null,
    "parentfield": null,
@@ -483,36 +483,36 @@
    "_liked_by": null,
    "_user_tags": null,
    "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
+   "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2020-06-25 00:17:31.772206",
+   "creation": "2020-07-22 00:49:35.624676",
    "default": null,
    "depends_on": null,
    "description": null,
    "docstatus": 0,
    "dt": "Contract",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "party_business_type",
-   "fieldtype": "Select",
+   "fieldname": "signed_by_company_date",
+   "fieldtype": "Data",
    "hidden": 0,
-   "idx": 20,
+   "idx": 39,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "insert_after": "signed_on",
-   "label": "Party Business Type",
+   "insert_after": "signed_by_company",
+   "label": "Signed By Company Date",
    "length": 0,
-   "modified": "2020-06-25 00:17:31.772206",
+   "modified": "2020-07-22 00:49:35.624676",
    "modified_by": "Administrator",
-   "name": "Contract-party_business_type",
+   "name": "Contract-signed_by_company_date",
    "no_copy": 0,
-   "options": "Individual\nCompany",
+   "options": null,
    "owner": "Administrator",
    "parent": null,
    "parentfield": null,
@@ -526,6 +526,59 @@
    "report_hide": 0,
    "reqd": 0,
    "search_index": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2020-11-09 23:15:19.240427",
+   "default": "0",
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Contract",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "amount_in_figures",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "idx": 20,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "insert_after": "contract_amount",
+   "label": "Amount In Figure",
+   "length": 0,
+   "modified": "2020-11-09 23:15:19.240427",
+   "modified_by": "Administrator",
+   "name": "Contract-amount_in_figures",
+   "no_copy": 0,
+   "options": null,
+   "owner": "Administrator",
+   "parent": null,
+   "parentfield": null,
+   "parenttype": null,
+   "permlevel": 0,
+   "precision": "0",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
    "translatable": 0,
    "unique": 0,
    "width": null
@@ -541,29 +594,29 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2020-07-22 00:49:35.624676",
+   "creation": "2020-11-09 23:20:16.098722",
    "default": null,
    "depends_on": null,
    "description": null,
    "docstatus": 0,
    "dt": "Contract",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "signed_by_company_date",
-   "fieldtype": "Data",
+   "fieldname": "contract_amount",
+   "fieldtype": "Section Break",
    "hidden": 0,
-   "idx": 36,
+   "idx": 19,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "insert_after": "signed_by_company",
-   "label": "Signed By Company Date",
+   "insert_after": "ip_address",
+   "label": "Contract Amount",
    "length": 0,
-   "modified": "2020-07-22 00:49:35.624676",
+   "modified": "2020-11-09 23:20:16.098722",
    "modified_by": "Administrator",
-   "name": "Contract-signed_by_company_date",
+   "name": "Contract-contract_amount",
    "no_copy": 0,
    "options": null,
    "owner": "Administrator",
@@ -575,11 +628,11 @@
    "print_hide": 0,
    "print_hide_if_no_value": 0,
    "print_width": null,
-   "read_only": 1,
+   "read_only": 0,
    "report_hide": 0,
    "reqd": 0,
    "search_index": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   }