Skip to content

Commit

Permalink
Merge pull request #48 from jHetzer/release/0.4.1
Browse files Browse the repository at this point in the history
Release/0.4.1
  • Loading branch information
jHetzer authored Oct 12, 2021
2 parents c13a151 + d851f9c commit bc06600
Show file tree
Hide file tree
Showing 22 changed files with 214 additions and 2,463 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@
*.swp
.eslintcache
package.json
package-lock.json
yarn.locak
tags
erpnextfints/docs/current
node_modules
__pycache__
tags
erpnextfints/docs/current

# VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"python.linting.flake8Enabled": true,
"python.linting.enabled": true
}
4 changes: 1 addition & 3 deletions erpnextfints/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# -*- coding: utf-8 -*- # noqa: D100, D104
from __future__ import unicode_literals

__version__ = '0.3.6'
__version__ = '0.4.1'
3 changes: 3 additions & 0 deletions erpnextfints/config/desktop.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, jHetzer and contributors
# For license information, please see license.txt
from __future__ import unicode_literals

from frappe import _


Expand Down
4 changes: 4 additions & 0 deletions erpnextfints/config/erpnextfints.py
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, jHetzer and contributors
# For license information, please see license.txt
from __future__ import unicode_literals

from frappe import _


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# For license information, please see license.txt

from __future__ import unicode_literals

import frappe
from frappe import _
from frappe.model.document import Document
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, jHetzer and Contributors
# See license.txt

from __future__ import unicode_literals

import frappe # noqa: F401 # pylint: disable=unused-import
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# For license information, please see license.txt

from __future__ import unicode_literals

import frappe
from frappe.model.document import Document
from dateutil.relativedelta import relativedelta
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# -*- coding: utf-8 -*-
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"cards_label": "Reports & Masters",
"category": "Modules",
"charts": [],
"creation": "2021-10-09 13:42:33.536589",
"developer_mode_only": 0,
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Workspace",
"extends_another_page": 0,
"hide_custom": 0,
"icon": "money-coins-1",
"idx": 0,
"is_default": 0,
"is_standard": 1,
"label": "ERPNext FinTS",
"links": [
{
"hidden": 0,
"is_query_report": 0,
"label": "Integrations",
"link_type": "DocType",
"onboard": 0,
"type": "Card Break"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "FinTS Login",
"link_to": "FinTS Login",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "FinTS Import",
"link_to": "FinTS Import",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "FinTS Schedule",
"link_to": "FinTS Schedule",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "Tools",
"link_type": "DocType",
"onboard": 0,
"type": "Card Break"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "Bank Account Wizard",
"link_to": "bank_account_wizard",
"link_type": "Page",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "Assign Payment Entries",
"link_to": "assign_payment_entries",
"link_type": "Page",
"onboard": 0,
"type": "Link"
}
],
"modified": "2021-10-09 14:25:25.697594",
"modified_by": "Administrator",
"module": "ERPNextFinTS",
"name": "ERPNext FinTS",
"owner": "Administrator",
"pin_to_bottom": 0,
"pin_to_top": 0,
"shortcuts": []
}
114 changes: 86 additions & 28 deletions erpnextfints/hooks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, jHetzer and contributors
# For license information, please see license.txt
from __future__ import unicode_literals

from . import __version__ as app_version # noqa: F401

app_name = "erpnextfints"
Expand All @@ -22,6 +25,13 @@
# web_include_css = "/assets/erpnextfints/css/erpnextfints.css"
# web_include_js = "/assets/erpnextfints/js/erpnextfints.js"

# include custom scss in every website theme (without file extension ".scss")
# website_theme_scss = "erpnextfints/public/scss/website"

# include js, css files in header of web form
# webform_include_js = {"doctype": "public/js/doctype.js"}
# webform_include_css = {"doctype": "public/css/doctype.css"}

# include js in page
# page_js = {"page" : "public/js/file.js"}

Expand All @@ -40,12 +50,9 @@

# website user home page (by Role)
# role_home_page = {
# "Role": "home_page"
# "Role": "home_page"
# }

# Website user home page (by function)
# get_website_user_home_page = "erpnextfints.utils.get_home_page"

# Generators
# ----------

Expand All @@ -69,23 +76,31 @@
# Permissions evaluated in scripted ways

# permission_query_conditions = {
# "Event": "frappe.desk.doctype.event.event.get_permission_query_conditions",
# "Event": "frappe.desk.doctype.event.event.get_permission_query_conditions", # noqa: E501
# }
#
# has_permission = {
# "Event": "frappe.desk.doctype.event.event.has_permission",
# "Event": "frappe.desk.doctype.event.event.has_permission",
# }

# DocType Class
# ---------------
# Override standard doctype classes

# override_doctype_class = {
# "ToDo": "custom_app.overrides.CustomToDo"
# }

# Document Events
# ---------------
# Hook on document methods and events

# doc_events = {
# "*": {
# "on_update": "method",
# "on_cancel": "method",
# "on_trash": "method"
# }
# "*": {
# "on_update": "method",
# "on_cancel": "method",
# "on_trash": "method"
# }
# }
doc_events = {
"Bank Account": {
Expand All @@ -98,21 +113,21 @@
# ---------------

# scheduler_events = {
# "all": [
# "erpnextfints.tasks.all"
# ],
# "daily": [
# "erpnextfints.tasks.daily"
# ],
# "hourly": [
# "erpnextfints.tasks.hourly"
# ],
# "weekly": [
# "erpnextfints.tasks.weekly"
# ]
# "monthly": [
# "erpnextfints.tasks.monthly"
# ]
# "all": [
# "erpnextfints.tasks.all"
# ],
# "daily": [
# "erpnextfints.tasks.daily"
# ],
# "hourly": [
# "erpnextfints.tasks.hourly"
# ],
# "weekly": [
# "erpnextfints.tasks.weekly"
# ]
# "monthly": [
# "erpnextfints.tasks.monthly"
# ]
# }
scheduler_events = {
"daily_long": [
Expand All @@ -125,9 +140,52 @@

# before_tests = "erpnextfints.install.before_tests"

# Overriding Whitelisted Methods
# Overriding Methods
# ------------------------------
#
# override_whitelisted_methods = {
# "frappe.desk.doctype.event.event.get_events": "erpnextfints.event.get_events" # noqa: E501
# "frappe.desk.doctype.event.event.get_events": "erpnextfints.event.get_events" # noqa: E501
# }
#
# each overriding function accepts a `data` argument;
# generated from the base implementation of the doctype dashboard,
# along with any modifications made in other Frappe apps
# override_doctype_dashboards = {
# "Task": "erpnextfints.task.get_dashboard_data"
# }

# exempt linked doctypes from being automatically cancelled
#
# auto_cancel_exempted_doctypes = ["Auto Repeat"]


# User Data Protection
# --------------------

user_data_fields = [
{
"doctype": "{doctype_1}",
"filter_by": "{filter_by}",
"redact_fields": ["{field_1}", "{field_2}"],
"partial": 1,
},
{
"doctype": "{doctype_2}",
"filter_by": "{filter_by}",
"partial": 1,
},
{
"doctype": "{doctype_3}",
"strict": False,
},
{
"doctype": "{doctype_4}"
}
]

# Authentication and authorization
# --------------------------------

# auth_hooks = [
# "erpnextfints.auth.validate"
# ]
2 changes: 1 addition & 1 deletion erpnextfints/modules.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ERPNextFinTS
ERPNextFinTS
4 changes: 4 additions & 0 deletions erpnextfints/patches/v0_0_2/update_fints_import.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, jHetzer and contributors
# For license information, please see license.txt

from __future__ import unicode_literals

import frappe
Expand Down
1 change: 1 addition & 0 deletions erpnextfints/patches/v0_1_0/replace_fints_account_nr.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# For license information, please see license.txt

from __future__ import unicode_literals

import frappe


Expand Down
Empty file modified erpnextfints/utils/__init__.py
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions erpnextfints/utils/bank_account_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# For license information, please see license.txt

from __future__ import unicode_literals

import os
import json
import frappe
Expand Down
3 changes: 3 additions & 0 deletions erpnextfints/utils/fints_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
# For license information, please see license.txt

from __future__ import unicode_literals

from frappe import _
from fints.client import FinTS3PinTanClient, FinTSClientMode
from dateutil.relativedelta import relativedelta
from frappe.utils import now_datetime
from frappe.utils.file_manager import save_file
from frappe.utils.file_manager import get_file
from frappe.utils.file_manager import get_content_hash
from erpnextfints.utils.import_payment import ImportPaymentEntry
from erpnextfints.utils.assign_payment_controller import AssignmentController
import frappe
Expand Down
Empty file modified erpnextfints/utils/import_payment.py
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
License: MIT
Loading

0 comments on commit bc06600

Please sign in to comment.