Skip to content

Commit e719d90

Browse files
sahil28297sahil28297
committed
Merge branch 'staging' into production
2 parents 9e7e826 + de8f24f commit e719d90

24 files changed

Lines changed: 977 additions & 342 deletions

‎bloomstack_core/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
__version__ = '2.0.5'
4+
__version__ = '2.0.6'

‎bloomstack_core/bloomstack_core/custom/compliance_info.json‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"custom_fields": [
3+
{
4+
"_assign": null,
5+
"_comments": null,
6+
"_liked_by": null,
7+
"_user_tags": null,
8+
"allow_in_quick_entry": 0,
9+
"allow_on_submit": 0,
10+
"bold": 0,
11+
"collapsible": 0,
12+
"collapsible_depends_on": null,
13+
"columns": 0,
14+
"creation": "2020-11-23 02:56:21.909971",
15+
"default": null,
16+
"depends_on": null,
17+
"description": null,
18+
"docstatus": 0,
19+
"dt": "Compliance Info",
20+
"fetch_from": null,
21+
"fetch_if_empty": 0,
22+
"fieldname": "company",
23+
"fieldtype": "Link",
24+
"hidden": 0,
25+
"idx": 0,
26+
"ignore_user_permissions": 0,
27+
"ignore_xss_filter": 0,
28+
"in_global_search": 0,
29+
"in_list_view": 0,
30+
"in_standard_filter": 0,
31+
"insert_after": null,
32+
"label": "Company",
33+
"length": 0,
34+
"modified": "2020-11-23 02:56:21.909971",
35+
"modified_by": "Administrator",
36+
"name": "Compliance Info-company",
37+
"no_copy": 0,
38+
"options": "Company",
39+
"owner": "Administrator",
40+
"parent": null,
41+
"parentfield": null,
42+
"parenttype": null,
43+
"permlevel": 0,
44+
"precision": "",
45+
"print_hide": 0,
46+
"print_hide_if_no_value": 0,
47+
"print_width": null,
48+
"read_only": 0,
49+
"report_hide": 0,
50+
"reqd": 1,
51+
"search_index": 0,
52+
"translatable": 0,
53+
"unique": 0,
54+
"width": null
55+
},
56+
{
57+
"_assign": null,
58+
"_comments": null,
59+
"_liked_by": null,
60+
"_user_tags": null,
61+
"allow_in_quick_entry": 0,
62+
"allow_on_submit": 0,
63+
"bold": 0,
64+
"collapsible": 0,
65+
"collapsible_depends_on": null,
66+
"columns": 0,
67+
"creation": "2020-11-23 02:56:22.228158",
68+
"default": null,
69+
"depends_on": null,
70+
"description": null,
71+
"docstatus": 0,
72+
"dt": "Compliance Info",
73+
"fetch_from": null,
74+
"fetch_if_empty": 0,
75+
"fieldname": "section_break_1",
76+
"fieldtype": "Section Break",
77+
"hidden": 0,
78+
"idx": 1,
79+
"ignore_user_permissions": 0,
80+
"ignore_xss_filter": 0,
81+
"in_global_search": 0,
82+
"in_list_view": 0,
83+
"in_standard_filter": 0,
84+
"insert_after": "company",
85+
"label": null,
86+
"length": 0,
87+
"modified": "2020-11-23 02:56:22.228158",
88+
"modified_by": "Administrator",
89+
"name": "Compliance Info-section_break_1",
90+
"no_copy": 0,
91+
"options": null,
92+
"owner": "Administrator",
93+
"parent": null,
94+
"parentfield": null,
95+
"parenttype": null,
96+
"permlevel": 0,
97+
"precision": "",
98+
"print_hide": 0,
99+
"print_hide_if_no_value": 0,
100+
"print_width": null,
101+
"read_only": 0,
102+
"report_hide": 0,
103+
"reqd": 0,
104+
"search_index": 0,
105+
"translatable": 0,
106+
"unique": 0,
107+
"width": null
108+
}
109+
],
110+
"custom_perms": [],
111+
"doctype": "Compliance Info",
112+
"property_setters": [],
113+
"sync_on_migrate": 1
114+
}

‎bloomstack_core/bloomstack_core/custom/harvest.json‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"custom_fields": [
3+
{
4+
"_assign": null,
5+
"_comments": null,
6+
"_liked_by": null,
7+
"_user_tags": null,
8+
"allow_in_quick_entry": 0,
9+
"allow_on_submit": 0,
10+
"bold": 0,
11+
"collapsible": 0,
12+
"collapsible_depends_on": null,
13+
"columns": 0,
14+
"creation": "2020-11-23 02:22:01.223230",
15+
"default": null,
16+
"depends_on": null,
17+
"description": null,
18+
"docstatus": 0,
19+
"dt": "Harvest",
20+
"fetch_from": null,
21+
"fetch_if_empty": 0,
22+
"fieldname": "company",
23+
"fieldtype": "Link",
24+
"hidden": 0,
25+
"idx": 1,
26+
"ignore_user_permissions": 0,
27+
"ignore_xss_filter": 0,
28+
"in_global_search": 0,
29+
"in_list_view": 0,
30+
"in_standard_filter": 0,
31+
"insert_after": null,
32+
"label": "Company",
33+
"length": 0,
34+
"modified": "2020-11-23 02:22:01.223230",
35+
"modified_by": "Administrator",
36+
"name": "Harvest-company",
37+
"no_copy": 0,
38+
"options": "Company",
39+
"owner": "Administrator",
40+
"parent": null,
41+
"parentfield": null,
42+
"parenttype": null,
43+
"permlevel": 0,
44+
"precision": "",
45+
"print_hide": 0,
46+
"print_hide_if_no_value": 0,
47+
"print_width": null,
48+
"read_only": 0,
49+
"report_hide": 0,
50+
"reqd": 1,
51+
"search_index": 0,
52+
"translatable": 0,
53+
"unique": 0,
54+
"width": null
55+
},
56+
{
57+
"_assign": null,
58+
"_comments": null,
59+
"_liked_by": null,
60+
"_user_tags": null,
61+
"allow_in_quick_entry": 0,
62+
"allow_on_submit": 0,
63+
"bold": 0,
64+
"collapsible": 0,
65+
"collapsible_depends_on": null,
66+
"columns": 0,
67+
"creation": "2020-11-23 02:22:01.383865",
68+
"default": null,
69+
"depends_on": null,
70+
"description": null,
71+
"docstatus": 0,
72+
"dt": "Harvest",
73+
"fetch_from": null,
74+
"fetch_if_empty": 0,
75+
"fieldname": "section_break_1",
76+
"fieldtype": "Section Break",
77+
"hidden": 0,
78+
"idx": 2,
79+
"ignore_user_permissions": 0,
80+
"ignore_xss_filter": 0,
81+
"in_global_search": 0,
82+
"in_list_view": 0,
83+
"in_standard_filter": 0,
84+
"insert_after": "company",
85+
"label": null,
86+
"length": 0,
87+
"modified": "2020-11-23 02:22:01.383865",
88+
"modified_by": "Administrator",
89+
"name": "Harvest-section_break_1",
90+
"no_copy": 0,
91+
"options": null,
92+
"owner": "Administrator",
93+
"parent": null,
94+
"parentfield": null,
95+
"parenttype": null,
96+
"permlevel": 0,
97+
"precision": "",
98+
"print_hide": 0,
99+
"print_hide_if_no_value": 0,
100+
"print_width": null,
101+
"read_only": 0,
102+
"report_hide": 0,
103+
"reqd": 0,
104+
"search_index": 0,
105+
"translatable": 0,
106+
"unique": 0,
107+
"width": null
108+
}
109+
],
110+
"custom_perms": [],
111+
"doctype": "Harvest",
112+
"property_setters": [],
113+
"sync_on_migrate": 1
114+
}

0 commit comments

Comments
 (0)