From 6af3632d9ddfb9e8c59db4e0a181e0a3e39b698f Mon Sep 17 00:00:00 2001 From: Himanshu Date: Tue, 6 Apr 2021 15:40:19 +0530 Subject: [PATCH 1/4] fix: move custom fields to company (#582) --- .../bloomstack_core/custom/company.json | 591 ------------------ 1 file changed, 591 deletions(-) delete mode 100644 bloomstack_core/bloomstack_core/custom/company.json diff --git a/bloomstack_core/bloomstack_core/custom/company.json b/bloomstack_core/bloomstack_core/custom/company.json deleted file mode 100644 index 9b620446c..000000000 --- a/bloomstack_core/bloomstack_core/custom/company.json +++ /dev/null @@ -1,591 +0,0 @@ -{ - "custom_fields": [ - { - "_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": "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": 91, - "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", - "length": 0, - "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 - }, - { - "_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-05-04 22:29:25.077842", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "default_excise_tax_account", - "fieldtype": "Link", - "hidden": 0, - "idx": 54, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "default_expense_claim_payable_account", - "label": "Default Excise Tax Account", - "length": 0, - "modified": "2020-05-04 22:29:25.077842", - "modified_by": "Administrator", - "name": "Company-default_excise_tax_account", - "no_copy": 0, - "options": "Account", - "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 - }, - { - "_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-05-04 22:29:25.279149", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "default_sales_tax_account", - "fieldtype": "Link", - "hidden": 0, - "idx": 55, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "default_excise_tax_account", - "label": "Default Sales Tax Account", - "length": 0, - "modified": "2020-05-04 22:29:25.279149", - "modified_by": "Administrator", - "name": "Company-default_sales_tax_account", - "no_copy": 0, - "options": "Account", - "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 - }, - { - "_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-05-04 22:29:25.471462", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "default_shipping_account", - "fieldtype": "Link", - "hidden": 0, - "idx": 56, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "default_sales_tax_account", - "label": "Default Shipping Account", - "length": 0, - "modified": "2020-05-04 22:29:25.471462", - "modified_by": "Administrator", - "name": "Company-default_shipping_account", - "no_copy": 0, - "options": "Account", - "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 - }, - { - "_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-05-18 19:53:38.634492", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "licenses", - "fieldtype": "Table", - "hidden": 0, - "idx": 26, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "licenses_sb", - "label": "Licenses", - "length": 0, - "modified": "2020-05-18 19:53:38.634492", - "modified_by": "Administrator", - "name": "Company-licenses", - "no_copy": 0, - "options": "Compliance License Detail", - "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 - }, - { - "_assign": null, - "_comments": null, - "_liked_by": null, - "_user_tags": null, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": null, - "columns": 0, - "creation": "2020-05-18 19:54:41.605921", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "licenses_sb", - "fieldtype": "Section Break", - "hidden": 0, - "idx": 25, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "date_of_establishment", - "label": "Licenses", - "length": 0, - "modified": "2020-05-18 19:54:41.605921", - "modified_by": "Administrator", - "name": "Company-licenses_sb", - "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 - }, - { - "_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-07-02 21:36:05.944083", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "default_cultivation_tax_account_leaf", - "fieldtype": "Link", - "hidden": 0, - "idx": 58, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "default_cultivation_tax_account_flower", - "label": "Default Cultivation Tax Account (Leaf)", - "length": 0, - "modified": "2020-07-02 21:36:05.944083", - "modified_by": "Administrator", - "name": "Company-default_cultivation_tax_account_leaf", - "no_copy": 0, - "options": "Account", - "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 - }, - { - "_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-07-02 21:38:38.572023", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "default_cultivation_tax_account_flower", - "fieldtype": "Link", - "hidden": 0, - "idx": 57, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "section_break_56", - "label": "Default Cultivation Tax Account (Flower)", - "length": 0, - "modified": "2020-07-02 21:38:38.572023", - "modified_by": "Administrator", - "name": "Company-default_cultivation_tax_account_flower", - "no_copy": 0, - "options": "Account", - "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 - }, - { - "_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-07-02 21:38:38.808640", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "default_cultivation_tax_account_plant", - "fieldtype": "Link", - "hidden": 0, - "idx": 60, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "column_break_59", - "label": "Default Cultivation Tax Account (Plant)", - "length": 0, - "modified": "2020-07-02 21:38:38.808640", - "modified_by": "Administrator", - "name": "Company-default_cultivation_tax_account_plant", - "no_copy": 0, - "options": "Account", - "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 - }, - { - "_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-07-08 00:22:22.950269", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "section_break_56", - "fieldtype": "Section Break", - "hidden": 0, - "idx": 57, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "default_shipping_account", - "label": null, - "length": 0, - "modified": "2020-07-08 00:22:22.950269", - "modified_by": "Administrator", - "name": "Company-section_break_56", - "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 - }, - { - "_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-07-08 00:22:23.155325", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Company", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "column_break_59", - "fieldtype": "Column Break", - "hidden": 0, - "idx": 60, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "default_cultivation_tax_account_leaf", - "label": null, - "length": 0, - "modified": "2020-07-08 00:22:23.155325", - "modified_by": "Administrator", - "name": "Company-column_break_59", - "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": [], - "sync_on_migrate": 1 -} \ No newline at end of file From c4b248b584e86a70a7ab8c11b514660f603a3ff9 Mon Sep 17 00:00:00 2001 From: sahil28297 <37302950+sahil28297@users.noreply.github.com> Date: Fri, 30 Apr 2021 11:48:49 +0530 Subject: [PATCH 2/4] feat(sider): add sider default config for flake8 + ignore tab errors (W191) (#586) --- .flake8 | 32 +++++++++++++++++ sider.yml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 .flake8 create mode 100644 sider.yml diff --git a/.flake8 b/.flake8 new file mode 100644 index 000000000..399b176e1 --- /dev/null +++ b/.flake8 @@ -0,0 +1,32 @@ +[flake8] +ignore = + E121, + E126, + E127, + E128, + E203, + E225, + E226, + E231, + E241, + E251, + E261, + E265, + E302, + E303, + E305, + E402, + E501, + E741, + W291, + W292, + W293, + W391, + W503, + W504, + F403, + B007, + B950, + W191, + +max-line-length = 200 \ No newline at end of file diff --git a/sider.yml b/sider.yml new file mode 100644 index 000000000..db7c41456 --- /dev/null +++ b/sider.yml @@ -0,0 +1,101 @@ +# This is a configuration file to customize code analysis by Sider. +# +# For more information, see the documentation: +# https://help.sider.review/getting-started/custom-configuration + +# Customize each tool. If analyses fail, try adjusting each option referencing the following example. +linter: + flake8: + config: .flake8 + +# # ESLint example. See https://help.sider.review/tools/javascript/eslint +# eslint: +# root_dir: project/ +# dependencies: +# - my-eslint-plugin@2 +# npm_install: false +# target: +# - src/ +# - lib/ +# ext: [.js, .jsx] +# config: config/.eslintrc.js +# ignore-path: config/.eslintignore +# ignore-pattern: "vendor/**" +# no-ignore: true +# global: ["require", "exports:true"] +# quiet: true + +# # Flake8 example. See https://help.sider.review/tools/python/flake8 +# flake8: +# root_dir: project/ +# dependencies: +# - flake8-bugbear +# - flake8-builtins==1.4.1 +# - git+https://github.com/PyCQA/flake8-import-order.git@51e16f33065512afa1a85a20b2c2d3be768f78ea +# - { name: "flake8-docstrings", version: "==1.6.0" } +# target: src/ +# config: config/.flake8 +# parallel: false + +# # Misspell example. See https://help.sider.review/tools/others/misspell +# misspell: +# root_dir: project/ +# target: [src/, test/] +# exclude: ["**/*.min.*"] +# locale: UK +# ignore: [center, behavior] + +# # remark-lint example. See https://help.sider.review/tools/markdown/remark-lint +# remark_lint: +# root_dir: project/ +# dependencies: +# - my-remark-plugin@2 +# npm_install: false +# target: [docs/] +# ext: "md,markdown" +# rc-path: config/.remarkrc +# ignore-path: config/.remarkignore +# use: +# - remark-lint-file-extension +# - remark-lint-no-heading-punctuation + +# # ShellCheck example. See https://help.sider.review/tools/shellscript/shellcheck +# shellcheck: +# root_dir: project/ +# target: +# - "**/*.{sh,bash}" +# - shebang: true +# include: [SC2104, SC2105] +# exclude: [SC1000, SC1118] +# enable: all +# shell: bash +# severity: error +# norc: true + +# # stylelint example. See https://help.sider.review/tools/css/stylelint +# stylelint: +# root_dir: project/ +# dependencies: +# - my-stylelint-plugin@2 +# npm_install: false +# config: config/.stylelintrc.yml +# syntax: scss +# ignore-path: config/.stylelintignore +# ignore-disables: true +# report-needless-disables: true +# quiet: true +# target: ["app/**/*.scss"] + +# Ignore specific files. Example: +# ignore: +# - "*.pdf" +# - "*.mp4" +# - "*.min.*" +# - "images/**" + +# Exclude specific branches. Example: +# branches: +# exclude: +# - master +# - development +# - /^release-.*$/ \ No newline at end of file From 1a97da78b91b0f02b87deb32da432d7315d03e74 Mon Sep 17 00:00:00 2001 From: sahil28297 <37302950+sahil28297@users.noreply.github.com> Date: Fri, 30 Apr 2021 11:49:27 +0530 Subject: [PATCH 3/4] feat: add mergify auto-merge rule (#587) * feat: add mergify auto-merge rule * fix: remove travis status success --- .mergify.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000..99395ebf6 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,24 @@ +pull_request_rules: + - name: Automatic merge on CI success and review + conditions: + - status-success=Sider + - status-success=Semantic Pull Request + - status-success=Codacy Static Code Analysis + - status-success=security/snyk (Bloomstack) + - label!=Don't Merge + - label!=squash + - "#approved-reviews-by>=1" + actions: + merge: + method: merge + - name: Automatic squash on CI success and review + conditions: + - status-success=Sider + - status-success=Codacy Static Code Analysis + - status-success=security/snyk (Bloomstack) + - label!=Don't Merge + - label=squash + - "#approved-reviews-by>=1" + actions: + merge: + method: squash From b0d16ad883f586e56d6eae3c1a76fdf76019b55f Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Wed, 5 May 2021 15:58:00 +0550 Subject: [PATCH 4/4] bumped to version 2.2.0 --- bloomstack_core/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bloomstack_core/__init__.py b/bloomstack_core/__init__.py index 5d136a516..0835a446f 100644 --- a/bloomstack_core/__init__.py +++ b/bloomstack_core/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -__version__ = '2.1.0' +__version__ = '2.2.0'