Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
94add53c
Commit
94add53c
authored
Mar 06, 2023
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: set Ban Account from the trade condition source payment
parent
2b0b4c49
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_createPaymentTransaction.py
...kins/slapos_accounting/Entity_createPaymentTransaction.py
+1
-1
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSEntityCreatePayment.py
...tal_components/test.erp5.testSlapOSEntityCreatePayment.py
+5
-1
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_createPaymentTransaction.py
View file @
94add53c
...
...
@@ -41,7 +41,7 @@ current_payment = portal.accounting_module.newContent(
ledger
=
current_invoice
.
getLedger
(),
start_date
=
current_invoice
.
getStartDate
(),
stop_date
=
current_invoice
.
getStopDate
(),
source_payment
=
'%s/bank_account'
%
current_invoice
.
getSourceSection
(),
# the other place defnied: business process
source_payment
=
current_invoice
.
getSourcePayment
(),
# Workarround to not create default lines.
created_by_builder
=
1
)
...
...
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSEntityCreatePayment.py
View file @
94add53c
...
...
@@ -29,6 +29,9 @@ class TestSlapOSEntityCreatePaymentMixin(SlapOSTestCaseMixin):
organisation
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
"Organisation"
)
bank_account
=
organisation
.
newContent
(
portal_type
=
"Bank Account"
)
currency
=
self
.
portal
.
currency_module
.
newContent
(
portal_type
=
"Currency"
)
...
...
@@ -39,6 +42,7 @@ class TestSlapOSEntityCreatePaymentMixin(SlapOSTestCaseMixin):
invoice
=
self
.
createSaleInvoiceTransaction
(
source_value
=
organisation
,
source_section_value
=
organisation
,
source_payment_value
=
bank_account
,
destination_section_value
=
person
,
destination_project_value
=
project
,
resource_value
=
currency
,
...
...
@@ -94,7 +98,7 @@ class TestSlapOSEntityCreatePaymentMixin(SlapOSTestCaseMixin):
'destination_project/%s'
%
invoice
.
getDestinationProject
(),
'price_currency/%s'
%
invoice
.
getPriceCurrency
(),
'resource/%s'
%
invoice
.
getResource
(),
'source_payment/%s
/bank_account'
%
invoice
.
getSourceSection
(),
'source_payment/%s
'
%
invoice
.
getSourcePayment
(),
'payment_mode/%s'
%
self
.
payment_mode
,
'source_section/%s'
%
invoice
.
getSourceSection
(),
#'source_project/%s' % invoice.getSourceProject(),
...
...
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