Skip to content

Commit 5d5cf73

Browse files
vjFaLkvjFaLk
authored
Update Production (#97)
Update Production
2 parents 1b1dd4e + ff0eabd commit 5d5cf73

18 files changed

Lines changed: 2020 additions & 1460 deletions

File tree

‎bloomstack_core/bloomstack_core/custom/contract.json‎

Lines changed: 83 additions & 218 deletions
Large diffs are not rendered by default.

‎bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def send_authorization_request(self):
3232
subject = "{0} requests your authorization on {1}".format(company, self.linked_doctype)
3333
message = frappe.render_template("templates/emails/authorization_request.html", {
3434
"authorization_request": self,
35+
"company": company
3536
})
3637

3738
frappe.sendmail(recipients=[self.authorizer_email], subject=subject, message=message)

‎bloomstack_core/bloomstack_core/doctype/project_template/project_template.json‎

Lines changed: 150 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,165 @@
11
{
2-
"allow_copy": 0,
3-
"allow_events_in_timeline": 0,
4-
"allow_guest_to_view": 0,
5-
"allow_import": 1,
6-
"allow_rename": 1,
7-
"autoname": "field:template_name",
8-
"beta": 0,
9-
"creation": "2019-07-23 03:10:59.196756",
10-
"custom": 0,
11-
"docstatus": 0,
12-
"doctype": "DocType",
13-
"document_type": "",
14-
"editable_grid": 1,
15-
"engine": "InnoDB",
2+
"allow_copy": 0,
3+
"allow_events_in_timeline": 0,
4+
"allow_guest_to_view": 0,
5+
"allow_import": 1,
6+
"allow_rename": 1,
7+
"autoname": "field:template_name",
8+
"beta": 0,
9+
"creation": "2019-07-23 03:10:59.196756",
10+
"custom": 0,
11+
"docstatus": 0,
12+
"doctype": "DocType",
13+
"document_type": "",
14+
"editable_grid": 1,
15+
"engine": "InnoDB",
1616
"fields": [
1717
{
18-
"allow_bulk_edit": 0,
19-
"allow_in_quick_entry": 0,
20-
"allow_on_submit": 0,
21-
"bold": 0,
22-
"collapsible": 0,
23-
"columns": 0,
24-
"fetch_if_empty": 0,
25-
"fieldname": "template_name",
26-
"fieldtype": "Data",
27-
"hidden": 0,
28-
"ignore_user_permissions": 0,
29-
"ignore_xss_filter": 0,
30-
"in_filter": 0,
31-
"in_global_search": 0,
32-
"in_list_view": 1,
33-
"in_standard_filter": 0,
34-
"label": "Template Name",
35-
"length": 0,
36-
"no_copy": 0,
37-
"permlevel": 0,
38-
"precision": "",
39-
"print_hide": 0,
40-
"print_hide_if_no_value": 0,
41-
"read_only": 0,
42-
"remember_last_selected_value": 0,
43-
"report_hide": 0,
44-
"reqd": 1,
45-
"search_index": 0,
46-
"set_only_once": 0,
47-
"translatable": 0,
18+
"allow_bulk_edit": 0,
19+
"allow_in_quick_entry": 0,
20+
"allow_on_submit": 0,
21+
"bold": 0,
22+
"collapsible": 0,
23+
"columns": 0,
24+
"fetch_if_empty": 0,
25+
"fieldname": "template_name",
26+
"fieldtype": "Data",
27+
"hidden": 0,
28+
"ignore_user_permissions": 0,
29+
"ignore_xss_filter": 0,
30+
"in_filter": 0,
31+
"in_global_search": 0,
32+
"in_list_view": 1,
33+
"in_standard_filter": 0,
34+
"label": "Template Name",
35+
"length": 0,
36+
"no_copy": 0,
37+
"permlevel": 0,
38+
"precision": "",
39+
"print_hide": 0,
40+
"print_hide_if_no_value": 0,
41+
"read_only": 0,
42+
"remember_last_selected_value": 0,
43+
"report_hide": 0,
44+
"reqd": 1,
45+
"search_index": 0,
46+
"set_only_once": 0,
47+
"translatable": 0,
4848
"unique": 1
49-
},
49+
},
5050
{
51-
"allow_bulk_edit": 0,
52-
"allow_in_quick_entry": 0,
53-
"allow_on_submit": 0,
54-
"bold": 0,
55-
"collapsible": 0,
56-
"columns": 0,
57-
"fetch_if_empty": 0,
58-
"fieldname": "sb_tasks",
59-
"fieldtype": "Section Break",
60-
"hidden": 0,
61-
"ignore_user_permissions": 0,
62-
"ignore_xss_filter": 0,
63-
"in_filter": 0,
64-
"in_global_search": 0,
65-
"in_list_view": 0,
66-
"in_standard_filter": 0,
67-
"label": "Tasks",
68-
"length": 0,
69-
"no_copy": 0,
70-
"permlevel": 0,
71-
"precision": "",
72-
"print_hide": 0,
73-
"print_hide_if_no_value": 0,
74-
"read_only": 0,
75-
"remember_last_selected_value": 0,
76-
"report_hide": 0,
77-
"reqd": 0,
78-
"search_index": 0,
79-
"set_only_once": 0,
80-
"translatable": 0,
51+
"allow_bulk_edit": 0,
52+
"allow_in_quick_entry": 0,
53+
"allow_on_submit": 0,
54+
"bold": 0,
55+
"collapsible": 0,
56+
"columns": 0,
57+
"fetch_if_empty": 0,
58+
"fieldname": "sb_tasks",
59+
"fieldtype": "Section Break",
60+
"hidden": 0,
61+
"ignore_user_permissions": 0,
62+
"ignore_xss_filter": 0,
63+
"in_filter": 0,
64+
"in_global_search": 0,
65+
"in_list_view": 0,
66+
"in_standard_filter": 0,
67+
"label": "Tasks",
68+
"length": 0,
69+
"no_copy": 0,
70+
"permlevel": 0,
71+
"precision": "",
72+
"print_hide": 0,
73+
"print_hide_if_no_value": 0,
74+
"read_only": 0,
75+
"remember_last_selected_value": 0,
76+
"report_hide": 0,
77+
"reqd": 0,
78+
"search_index": 0,
79+
"set_only_once": 0,
80+
"translatable": 0,
8181
"unique": 0
82-
},
82+
},
8383
{
84-
"allow_bulk_edit": 0,
85-
"allow_in_quick_entry": 0,
86-
"allow_on_submit": 0,
87-
"bold": 0,
88-
"collapsible": 0,
89-
"columns": 0,
90-
"fetch_if_empty": 0,
91-
"fieldname": "tasks",
92-
"fieldtype": "Table",
93-
"hidden": 0,
94-
"ignore_user_permissions": 0,
95-
"ignore_xss_filter": 0,
96-
"in_filter": 0,
97-
"in_global_search": 0,
98-
"in_list_view": 0,
99-
"in_standard_filter": 0,
100-
"label": "Tasks",
101-
"length": 0,
102-
"no_copy": 0,
103-
"options": "Project Template Task",
104-
"permlevel": 0,
105-
"precision": "",
106-
"print_hide": 0,
107-
"print_hide_if_no_value": 0,
108-
"read_only": 0,
109-
"remember_last_selected_value": 0,
110-
"report_hide": 0,
111-
"reqd": 0,
112-
"search_index": 0,
113-
"set_only_once": 0,
114-
"translatable": 0,
84+
"allow_bulk_edit": 1,
85+
"allow_in_quick_entry": 0,
86+
"allow_on_submit": 0,
87+
"bold": 0,
88+
"collapsible": 0,
89+
"columns": 0,
90+
"fetch_if_empty": 0,
91+
"fieldname": "tasks",
92+
"fieldtype": "Table",
93+
"hidden": 0,
94+
"ignore_user_permissions": 0,
95+
"ignore_xss_filter": 0,
96+
"in_filter": 0,
97+
"in_global_search": 0,
98+
"in_list_view": 0,
99+
"in_standard_filter": 0,
100+
"label": "Tasks",
101+
"length": 0,
102+
"no_copy": 0,
103+
"options": "Project Template Task",
104+
"permlevel": 0,
105+
"precision": "",
106+
"print_hide": 0,
107+
"print_hide_if_no_value": 0,
108+
"read_only": 0,
109+
"remember_last_selected_value": 0,
110+
"report_hide": 0,
111+
"reqd": 0,
112+
"search_index": 0,
113+
"set_only_once": 0,
114+
"translatable": 0,
115115
"unique": 0
116116
}
117-
],
118-
"has_web_view": 0,
119-
"hide_heading": 0,
120-
"hide_toolbar": 0,
121-
"idx": 0,
122-
"image_view": 0,
123-
"in_create": 0,
124-
"is_submittable": 0,
125-
"issingle": 0,
126-
"istable": 0,
127-
"max_attachments": 0,
128-
"modified": "2019-07-23 03:10:59.196756",
129-
"modified_by": "Administrator",
130-
"module": "Bloomstack Core",
131-
"name": "Project Template",
132-
"name_case": "",
133-
"owner": "Administrator",
117+
],
118+
"has_web_view": 0,
119+
"hide_heading": 0,
120+
"hide_toolbar": 0,
121+
"idx": 0,
122+
"image_view": 0,
123+
"in_create": 0,
124+
"is_submittable": 0,
125+
"issingle": 0,
126+
"istable": 0,
127+
"max_attachments": 0,
128+
"modified": "2019-10-10 03:13:57.157435",
129+
"modified_by": "Administrator",
130+
"module": "Bloomstack Core",
131+
"name": "Project Template",
132+
"name_case": "",
133+
"owner": "Administrator",
134134
"permissions": [
135135
{
136-
"amend": 0,
137-
"cancel": 0,
138-
"create": 1,
139-
"delete": 1,
140-
"email": 1,
141-
"export": 1,
142-
"if_owner": 0,
143-
"import": 0,
144-
"permlevel": 0,
145-
"print": 1,
146-
"read": 1,
147-
"report": 1,
148-
"role": "System Manager",
149-
"set_user_permissions": 0,
150-
"share": 1,
151-
"submit": 0,
136+
"amend": 0,
137+
"cancel": 0,
138+
"create": 1,
139+
"delete": 1,
140+
"email": 1,
141+
"export": 1,
142+
"if_owner": 0,
143+
"import": 0,
144+
"permlevel": 0,
145+
"print": 1,
146+
"read": 1,
147+
"report": 1,
148+
"role": "System Manager",
149+
"set_user_permissions": 0,
150+
"share": 1,
151+
"submit": 0,
152152
"write": 1
153153
}
154-
],
155-
"quick_entry": 0,
156-
"read_only": 0,
157-
"read_only_onload": 0,
158-
"show_name_in_global_search": 0,
159-
"sort_field": "modified",
160-
"sort_order": "DESC",
161-
"title_field": "template_name",
162-
"track_changes": 1,
163-
"track_seen": 0,
154+
],
155+
"quick_entry": 0,
156+
"read_only": 0,
157+
"read_only_onload": 0,
158+
"show_name_in_global_search": 0,
159+
"sort_field": "modified",
160+
"sort_order": "DESC",
161+
"title_field": "template_name",
162+
"track_changes": 1,
163+
"track_seen": 0,
164164
"track_views": 0
165165
}

‎bloomstack_core/bloomstack_core/page/insight_engine/insight_engine.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
<div class="col-md-4 col-xs-12 average-monthly-revenue">
2828
<div class="container">
2929
<span class="amount">{{ format_currency(average_monthly_revenue) }}</span>
30-
<span class="name">AVERAGE MONTHLY REVENUE</span>
30+
<span class="name">AVERAGE DAILY REVENUE (LAST MONTH)</span>
3131
<span class="description">Average of payments received in the last 30 days</span>
3232
</div>
3333
</div>
3434
<div class="col-md-4 col-xs-12 average-weekly-revenue">
3535
<div class="container">
3636
<span class="amount">{{ format_currency(average_weekly_revenue) }}</span>
37-
<span class="name">AVERAGE WEEKLY REVENUE</span>
37+
<span class="name">AVERAGE DAILY REVENUE (LAST WEEK)</span>
3838
<span class="description">Average of payments received in the last 7 days</span>
3939
</div>
4040
</div>

‎bloomstack_core/bloomstack_core/print_format/web_contract/__init__.py‎

Whitespace-only changes.

‎bloomstack_core/bloomstack_core/print_format/web_contract/web_contract.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"align_labels_right": 1,
3+
"creation": "2019-10-04 02:15:55.214647",
4+
"custom_format": 0,
5+
"disabled": 0,
6+
"doc_type": "Contract",
7+
"docstatus": 0,
8+
"doctype": "Print Format",
9+
"font": "Default",
10+
"format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"<div class=\\\"print-heading\\\">\\t\\t\\t\\t<h2>Contract<br><small>{{ doc.name }}</small>\\t\\t\\t\\t</h2></div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"party_name\", \"label\": \"Party Name\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Contract Period\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\", \"label\": \"Start Date\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\", \"label\": \"End Date\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Contract Details\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"contract_terms\", \"label\": \"Contract Terms\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Fulfilment Details\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"fulfilment_deadline\", \"label\": \"Fulfilment Deadline\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"fulfilled\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"requirement\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"notes\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"fulfilment_terms\", \"label\": \"Fulfilment Terms\"}, {\"fieldtype\": \"Section Break\", \"label\": \"References\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"document_type\", \"label\": \"Document Type\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"document_name\", \"label\": \"Document Name\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Signature\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"customer_signature\", \"label\": \"Customer Signature\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Signee Details\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"signee\", \"label\": \"Signee\"}, {\"print_hide\": 0, \"fieldname\": \"signed_on\", \"label\": \"Signed On\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"ip_address\", \"label\": \"IP Address\"}]",
11+
"idx": 0,
12+
"line_breaks": 1,
13+
"modified": "2019-10-11 12:49:40.854548",
14+
"modified_by": "Administrator",
15+
"module": "Bloomstack Core",
16+
"name": "Web Contract",
17+
"owner": "Administrator",
18+
"print_format_builder": 1,
19+
"print_format_type": "Server",
20+
"show_section_headings": 1,
21+
"standard": "Yes"
22+
}

0 commit comments

Comments
 (0)