Skip to content

Update Master #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vjFaLk merged 68 commits into from
Aug 12, 2019
Merged

Update Master #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
b932a87
feat(core): authorization request for a document (#20)
DeeMysterio Jun 24, 2019
0b15ed9
feat(stock): Auto-generate item codes based on item details (#31)
Alchez Jun 28, 2019
7163244
feat(issues): Adds an rpc method to retrieve issues statuses includin…
DeveloperMetal Jul 2, 2019
5684bdb
Update bloomstack_core/services/issues.py
Jul 2, 2019
141f6b1
fix: casing
DeveloperMetal Jul 2, 2019
26b88f0
Merge branch 'feat-issues-service-api' of github.com:forellana-digith…
DeveloperMetal Jul 2, 2019
9e811bd
Merge pull request #37 from forellana-digithinkit/feat-issues-service…
Alchez Jul 3, 2019
08bce15
feat(core): start and stop buttons on delivery trip
DeeMysterio May 31, 2019
5b64af5
feat(core): calculate actual distance travelled by driver
diksha2607 Jun 11, 2019
d6583fb
feat(core): refactor code
diksha2607 Jun 13, 2019
cb43333
feat(core): validate odometer stop value and time
diksha2607 Jun 13, 2019
56db709
feat(core): Allow the last odometer value in vehicle doctype to be up…
diksha2607 Jun 14, 2019
d8478c8
feat(core): refactor code
diksha2607 Jun 18, 2019
8018418
feat(core): add custom fields for odometer
DeeMysterio Jun 25, 2019
261127d
fix: Remove child table changes + minor fixes
Jul 3, 2019
8a56c14
fix: Remove child table changes + minor fixes (#1)
Alchez Jul 3, 2019
dbe75bb
feat(core): actual distance travelled by the driver (#32)
Alchez Jul 3, 2019
ec3f1c9
chore: Move customizations from D9 to Bloomstack Core (#35)
Alchez Jul 4, 2019
f3fd519
chore: Move rest of the customizations from D9 to Bloomstack core
Jul 9, 2019
f6f160a
Merge pull request #39 from Alchez/fix-move-customizations
vjFaLk Jul 15, 2019
05c0d4e
fix: move Google Maps embed from d9 to core (#41)
Alchez Jul 15, 2019
50c7ab4
chore: move track and trace to core
Jul 15, 2019
aa1f07a
feat: add Insight Engine page to showcase company KPIs
Er-Naren719 Jul 10, 2019
68c1762
fix: table data and responsive style added
Er-Naren719 Jul 16, 2019
84bd579
fix: minor css changes
Er-Naren719 Jul 16, 2019
308db24
unfinished
diksha2607 Jul 16, 2019
283796c
fix: Label changed for donut chart and alignment changed for table co…
Er-Naren719 Jul 17, 2019
73f5681
fix: bug with new invoices
Jul 17, 2019
73a56d9
fix: add more invoice statuses
Jul 17, 2019
d343d3c
chore: auto-create stock entry on submit of packing slip
DeeMysterio Jul 17, 2019
229dd66
Merge pull request #42 from Alchez/hotfix-track-and-trace
vjFaLk Jul 17, 2019
cc04b41
fix: show barcode scan fields in SO and SI
Jul 18, 2019
e9f3aff
fix: refactor code
DeeMysterio Jul 18, 2019
2965e05
feat(selling): auto-create stock entry on submit of packing slip (#43)
Alchez Jul 18, 2019
923116c
fix: change Contact Support target link
Jul 22, 2019
6d255bb
Merge pull request #47 from Alchez/fix-support-portal-help-menu
neilLasrado Jul 22, 2019
b7f92b8
Merge pull request #40 from Er-Naren719/feat-insight-engine
Jul 22, 2019
0b4a67a
fix: start graph from zero
Jul 23, 2019
dc9a80d
Merge pull request #49 from Alchez/fix-sales-partner-graph
vjFaLk Jul 23, 2019
bcc2c8c
feat: add Project Template doctype to create Projects from signed Con…
Jul 23, 2019
45ccf03
changed desk bg
neilLasrado Jul 23, 2019
48fac0c
Merge pull request #50 from neilLasrado/master
vjFaLk Jul 23, 2019
50848c4
fix: makes sales order against contract
Jul 23, 2019
a9d191f
fix: change Insight Engine label to Dashboard
Jul 23, 2019
1098981
Merge pull request #51 from Alchez/fix-dashboard-label
vjFaLk Jul 23, 2019
9f8e7dd
Merge pull request #48 from Alchez/feat-project-template
neilLasrado Jul 23, 2019
32666d4
fix: add use type field to Compliance Info
Jul 24, 2019
3d7b544
Merge pull request #52 from Alchez/add-compliance-info
vjFaLk Jul 24, 2019
1bcc58b
feat: Adds intro text and relable of stock input/output
DeveloperMetal Jul 31, 2019
687f8dd
fix: show barcode scan fields in SO and SI (#44)
vjFaLk Jul 31, 2019
bb32146
fix: py3 compatibility for insight engine
Aug 1, 2019
39f9a17
fix: py3 compatibility for insight engine (#54)
vjFaLk Aug 1, 2019
e587a08
Merge pull request #53 from forellana-digithinkit/feat-tnt-text
Alchez Aug 1, 2019
10ab220
fix: add contact_name in company, only try to json.load if string whe…
vjFaLk Aug 2, 2019
74b749c
Merge pull request #55 from vjFaLk/minor-fixes
vjFaLk Aug 2, 2019
3abdffe
fix: return null data if no transactions are available
Aug 2, 2019
480cfad
fix: missing driver collection files
vjFaLk Aug 2, 2019
f523fe1
Merge pull request #57 from vjFaLk/fix-driver-collection
vjFaLk Aug 2, 2019
b986c0f
fix(bom): change the name field to item name in list view
DeeMysterio Aug 5, 2019
007f19f
fix(bom): change the name field to item name in the list view (#58)
vjFaLk Aug 6, 2019
3ec2c96
Merge pull request #56 from Alchez/fix-empty-db
vjFaLk Aug 6, 2019
fc2e24d
fix: map batches and serial numbers
Aug 6, 2019
ca7a4e3
Merge pull request #59 from Alchez/hotfix-packing-slip-serials
vjFaLk Aug 6, 2019
5dc589e
feat(track-and-trace): adds serial number listing to stock entry node
DeveloperMetal Aug 6, 2019
03b7f64
feat(track-and-trace): Adds support for comma separated serial nos
DeveloperMetal Aug 6, 2019
610a952
feat(track-and-trace): adds serial number listing to stock entry… (#60)
vjFaLk Aug 6, 2019
cecaeac
feat: Adds white space sanitation to serial nos
DeveloperMetal Aug 6, 2019
19f1266
Merge pull request #61 from forellana-digithinkit/fix-tnt-serial-sani…
vjFaLk Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
*.egg-info
*.swp
tags
bloomstack_core/docs/current
node_modules
bloomstack_core/docs/current
83 changes: 83 additions & 0 deletions bloomstack_core/bloomstack_core/custom/accounts_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"custom_fields": [
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": null,
"columns": 0,
"creation": "2019-01-29 00:54:39.492349",
"default": null,
"depends_on": null,
"description": null,
"docstatus": 0,
"dt": "Accounts Settings",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "auto_create_invoice_on_delivery_note_submit",
"fieldtype": "Check",
"hidden": 0,
"idx": 11,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"insert_after": "allow_cost_center_in_entry_of_bs_account",
"label": "Auto-Create Invoice on Delivery Note submit",
"modified": "2019-01-29 00:54:39.492349",
"modified_by": "Administrator",
"name": "Accounts Settings-auto_create_invoice_on_delivery_note_submit",
"no_copy": 0,
"options": null,
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"permlevel": 0,
"precision": "",
"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
}
],
"custom_perms": [],
"doctype": "Accounts Settings",
"property_setters": [
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"creation": "2019-01-29 00:54:46.302013",
"default_value": null,
"doc_type": "Accounts Settings",
"docstatus": 0,
"doctype_or_field": "DocType",
"field_name": null,
"idx": 0,
"modified": "2019-01-29 00:54:46.302013",
"modified_by": "Administrator",
"name": "Accounts Settings-read_only_onload",
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"property": "read_only_onload",
"property_type": "Check",
"value": null
}
],
"sync_on_migrate": 1
}
54 changes: 54 additions & 0 deletions bloomstack_core/bloomstack_core/custom/bom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"custom_fields": [],
"custom_perms": [],
"doctype": "BOM",
"property_setters": [
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"creation": "2019-08-05 00:09:19.489037",
"default_value": null,
"doc_type": "BOM",
"docstatus": 0,
"doctype_or_field": "DocType",
"field_name": null,
"idx": 0,
"modified": "2019-08-05 00:09:19.489037",
"modified_by": "Administrator",
"name": "BOM-read_only_onload",
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"property": "read_only_onload",
"property_type": "Check",
"value": null
},
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"creation": "2019-08-05 00:09:19.464857",
"default_value": null,
"doc_type": "BOM",
"docstatus": 0,
"doctype_or_field": "DocType",
"field_name": null,
"idx": 0,
"modified": "2019-08-05 00:09:19.464857",
"modified_by": "Administrator",
"name": "BOM-title_field",
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"property": "title_field",
"property_type": "Data",
"value": "item_name"
}
],
"sync_on_migrate": 1
}
83 changes: 83 additions & 0 deletions bloomstack_core/bloomstack_core/custom/company.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"custom_fields": [
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": null,
"columns": 0,
"creation": "2019-08-02 02:37:29.931335",
"default": null,
"depends_on": null,
"description": null,
"docstatus": 0,
"dt": "Company",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "contact_name",
"fieldtype": "Data",
"hidden": 0,
"idx": 82,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"insert_after": "date_of_commencement",
"label": "Contact Name",
"modified": "2019-08-02 02:37:29.931335",
"modified_by": "Administrator",
"name": "Company-contact_name",
"no_copy": 0,
"options": null,
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"permlevel": 0,
"precision": "",
"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
}
],
"custom_perms": [],
"doctype": "Company",
"property_setters": [
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"creation": "2019-08-02 02:37:29.854513",
"default_value": null,
"doc_type": "Company",
"docstatus": 0,
"doctype_or_field": "DocType",
"field_name": null,
"idx": 0,
"modified": "2019-08-02 02:37:29.854513",
"modified_by": "Administrator",
"name": "Company-read_only_onload",
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"property": "read_only_onload",
"property_type": "Check",
"value": null
}
],
"sync_on_migrate": 1
}
Loading