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
e0e67af5
Commit
e0e67af5
authored
Jun 02, 2020
by
Charles-Henri Decultot
Browse files
Merge branch 'staging'
parents
27501684
33319f89
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/doctype/gocardless_settings/gocardless_settings.py
...ations/doctype/gocardless_settings/gocardless_settings.py
+1
-1
No files found.
erpnext/__init__.py
View file @
e0e67af5
...
...
@@ -5,7 +5,7 @@ import frappe
from
erpnext.hooks
import
regional_overrides
from
frappe.utils
import
getdate
__version__
=
'1.4.
5
'
__version__
=
'1.4.
6
'
def
get_default_company
(
user
=
None
):
'''Get default company for user'''
...
...
erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
View file @
e0e67af5
...
...
@@ -114,7 +114,7 @@ class GoCardlessSettings(PaymentGatewayController):
try
:
self
.
integration_request
=
create_request_log
(
self
.
data
,
"Request"
,
"GoCardless"
)
self
.
_payment_request
=
frappe
.
get_doc
(
"Payment Request"
,
self
.
data
.
name
)
self
.
_payment_request
=
frappe
.
get_doc
(
"Payment Request"
,
self
.
data
.
payment_request
)
self
.
create_charge_on_gocardless
()
return
self
.
finalize_request
(
self
.
output
.
attributes
.
get
(
"id"
)
if
self
.
output
.
attributes
else
None
)
...
...
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