Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
Dokos
Dokos
Commits
14195bb1
Commit
14195bb1
authored
Mar 08, 2020
by
Charles-Henri Decultot
Browse files
Merge branch 'staging'
parents
a49b9e76
169c5d2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
erpnext/__init__.py
erpnext/__init__.py
+1
-1
erpnext/erpnext_integrations/webhooks_controller.py
erpnext/erpnext_integrations/webhooks_controller.py
+1
-1
No files found.
erpnext/__init__.py
View file @
14195bb1
...
...
@@ -5,7 +5,7 @@ import frappe
from
erpnext.hooks
import
regional_overrides
from
frappe.utils
import
getdate
__version__
=
'1.3.
9
'
__version__
=
'1.3.
10
'
def
get_default_company
(
user
=
None
):
'''Get default company for user'''
...
...
erpnext/erpnext_integrations/webhooks_controller.py
View file @
14195bb1
...
...
@@ -84,7 +84,7 @@ class WebhooksController():
if
self
.
metadata
.
get
(
"reference_doctype"
)
==
"Subscription"
:
self
.
subscription
=
frappe
.
get_doc
(
self
.
metadata
.
get
(
"reference_doctype"
),
self
.
metadata
.
get
(
"reference_name"
))
if
self
.
subscription
.
status
==
'Active'
:
self
.
subscription
.
run_method
(
"process_active_subscription"
,
dict
(
payment_entry
=
self
.
payment_entry
.
name
)
)
self
.
subscription
.
run_method
(
"process_active_subscription"
,
payment_entry
=
self
.
payment_entry
.
name
)
def
change_status
(
self
):
self
.
integration_request
.
db_set
(
"error"
,
_
(
"This type of event is not handled by dokos"
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment