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
0
Merge Requests
0
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
Paul Graydon
slapos.core
Commits
37198d9a
Commit
37198d9a
authored
Dec 07, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Payment created by order builder are handled with payzen
parent
11c9ac9d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
1 deletion
+4
-1
master/bt5/slapos_accounting/PathTemplateItem/portal_orders/slapos_payment_transaction_builder/category_movement_group_on_delivery.xml
...ansaction_builder/category_movement_group_on_delivery.xml
+1
-0
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateUnrelatedInvoiceList.xml
..._accounting/OrderBuilder_generateUnrelatedInvoiceList.xml
+1
-0
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py
...ccounting/TestTemplateItem/testSlapOSAccountingBuilder.py
+1
-0
master/bt5/slapos_accounting/bt/revision
master/bt5/slapos_accounting/bt/revision
+1
-1
No files found.
master/bt5/slapos_accounting/PathTemplateItem/portal_orders/slapos_payment_transaction_builder/category_movement_group_on_delivery.xml
View file @
37198d9a
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
<string>
source_payment
</string>
<string>
source_payment
</string>
<string>
source_section
</string>
<string>
source_section
</string>
<string>
specialise
</string>
<string>
specialise
</string>
<string>
payment_mode
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateUnrelatedInvoiceList.xml
View file @
37198d9a
...
@@ -85,6 +85,7 @@ for invoice in portal.portal_catalog(**select_kw):\n
...
@@ -85,6 +85,7 @@ for invoice in portal.portal_catalog(**select_kw):\n
start_date=invoice.getStartDate(),\n
start_date=invoice.getStartDate(),\n
stop_date=invoice.getStopDate(),\n
stop_date=invoice.getStopDate(),\n
specialise=invoice.getSpecialise(),\n
specialise=invoice.getSpecialise(),\n
payment_mode=\'payzen\',\n
source_payment=\'organisation_module/slapos/bank_account\', # the other place defnied: business process\n
source_payment=\'organisation_module/slapos/bank_account\', # the other place defnied: business process\n
)\n
)\n
temp_movement_rec = newTempSimulationMovement(\n
temp_movement_rec = newTempSimulationMovement(\n
...
...
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py
View file @
37198d9a
...
@@ -1235,6 +1235,7 @@ class TestSlapOSPaymentTransactionOrderBuilder(testSlapOSMixin):
...
@@ -1235,6 +1235,7 @@ class TestSlapOSPaymentTransactionOrderBuilder(testSlapOSMixin):
'price_currency/%s'
%
invoice
.
getPriceCurrency
(),
'price_currency/%s'
%
invoice
.
getPriceCurrency
(),
'resource/%s'
%
invoice
.
getResource
(),
'resource/%s'
%
invoice
.
getResource
(),
'source_payment/organisation_module/slapos/bank_account'
,
'source_payment/organisation_module/slapos/bank_account'
,
'payment_mode/payzen'
,
'source_section/%s'
%
invoice
.
getSourceSection
(),
'source_section/%s'
%
invoice
.
getSourceSection
(),
]
]
self
.
assertSameSet
(
expected_set
,
payment
.
getCategoryList
())
self
.
assertSameSet
(
expected_set
,
payment
.
getCategoryList
())
...
...
master/bt5/slapos_accounting/bt/revision
View file @
37198d9a
203
204
\ No newline at end of file
\ No newline at end of file
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