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
2988be8c
Commit
2988be8c
authored
12 years ago
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update invoice builder to update existing invoices.
parent
e8337e13
master
20240521_variousimprovements
20240704
20240827
20240905_fixup
20240913
20240914
20240925
20240930
20241004
20241008
20241021
20241106
20241107
20241114
20241127
20241209
20241230
20250108
20250117_beforesquash_newapi
20250121
alain-message
allocation_consistency_instance_node
amarisoft
change_subscription_price
cleanup
cliff-cleanup
crm_fix
customprice
cygwin-link-local
event_attachment
feat/cmmi_cache
feat/openorderbasedsecurity
feat/statuscleanup
feat/testcase
feature/cgroups
feature/format-crumbled
feature/manager-cpuset
feature/option_create_tun
feature/tun-cgroup-cleanup
fix/slapos-ansible
format_loop
hosting_daily_invoice
hotfix/proxy-root-instance
localwip
manager_update_parameter
master-dev
message-box
new-api-master-client
panel_computer_guid
panel_filter_action_dict
py3_fixup
regulatisation_request_for_organisation
seb
shop_rapid_space
slap_tool_less_sql_query
slapos-override-env
slapproxy-connection-parameter
speed_improvement
splitopenorder
subscription_change_request
tomo_fix_slapos_format
tomo_fix_slapos_node_boot
tomo_listbox_update
trigger_allocation_alarm
upgrade_decision_event
usage_report
wip
wip20210701
wip20210819
wip20220131
1.4.27
1.4.26
1.4.25
1.4.24
1.4.23
1.4.22
1.4.21
1.4.20
1.4.19
1.4.17
1.4.16
1.4.15
1.4.14
1.4.12
1.4.11
1.4.10
1.4.9
1.4.8
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.18
1.3.17
1.3.16
1.3.15
1.3.14
1.3.13
1.3.12
1.3.11
1.3.10
1.3.9
1.3.8
1.3.7
1.3.6.3
1.3.6.2
1.3.6.1
1.3.6
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0
1.2.4.1
1.2.4
1.2.3.1
1.2.3
1.2.2
1.2.1
1.2.0
1.1.3
1.1.2
1.1.1
1.1.0
1.0.5
1.0.4
1.0.3
1.0.2
1.0.1
1.0.0
1.0.0rc6
1.0.0rc5
1.0.0rc4
1.0.0rc3
1.0.0-rc1
0.35.1
0.34
master-20180917
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
135 additions
and
9 deletions
+135
-9
master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_builder.xml
...ateItem/portal_deliveries/slapos_sale_invoice_builder.xml
+1
-3
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/DeliveryBuilder_selectSlapOSConfirmedInvoiceList.xml
...tion/DeliveryBuilder_selectSlapOSConfirmedInvoiceList.xml
+75
-0
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SlapOSSaleInvoiceTransaction_postGeneration.xml
...imulation/SlapOSSaleInvoiceTransaction_postGeneration.xml
+8
-4
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py
...ccounting/TestTemplateItem/testSlapOSAccountingBuilder.py
+50
-1
master/bt5/slapos_accounting/bt/revision
master/bt5/slapos_accounting/bt/revision
+1
-1
No files found.
master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_builder.xml
View file @
2988be8c
...
...
@@ -130,9 +130,7 @@
</item>
<item>
<key>
<string>
delivery_select_method_id
</string>
</key>
<value>
<none/>
</value>
<value>
<string>
DeliveryBuilder_selectSlapOSConfirmedInvoiceList
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/DeliveryBuilder_selectSlapOSConfirmedInvoiceList.xml
0 → 100644
View file @
2988be8c
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string>
portal_type = context.getDeliveryPortalType()\n
simulation_state = \'confirmed\'\n
\n
# use catalog to prefetch, but check later in ZODB\n
return [x.getObject() for x in context.getPortalObject().portal_catalog(\n
portal_type=portal_type,\n
# BEWARE: it works only in case of per-tree building\n
default_destination_section_uid=movement_list[0].getDestinationSectionUid(),\n
simulation_state=simulation_state) if x.getSimulationState() == simulation_state]\n
</string>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
movement_list, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
DeliveryBuilder_selectSlapOSConfirmedInvoiceList
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SlapOSSaleInvoiceTransaction_postGeneration.xml
View file @
2988be8c
...
...
@@ -59,11 +59,15 @@ if related_simulation_movement_path_list is None:\n
raise RuntimeError, \'related_simulation_movement_path_list is missing. Update ERP5 Product.\'\n
\n
invoice = context\n
invoice.setResource(invoice.getPriceCurrency())\n
price_currency = invoice.getPriceCurrency()\n
if invoice.getResource() != price_currency:\n
invoice.setResource(price_currency)\n
comment = translateString(\'Initialised by Delivery Builder.\')\n
invoice.plan(comment=comment)\n
invoice.confirm(comment=comment)\n
invoice.startBuilding()\n
if invoice.portal_workflow.isTransitionPossible(invoice, \'plan\'):\n
invoice.plan(comment=comment)\n
if invoice.portal_workflow.isTransitionPossible(invoice, \'confirm\'):\n
invoice.confirm(comment=comment)\n
invoice.startBuilding(comment=comment)\n
</string>
</value>
</item>
<item>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py
View file @
2988be8c
...
...
@@ -46,7 +46,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
portal_type
=
'Simulation Movement'
))
def
checkDelivery
(
self
,
simulation_movement
,
delivery
,
delivery_portal_type
,
category_list
,
simulation_state
=
'delivered'
):
category_list
,
simulation_state
=
'delivered'
,
already_solved
=
False
):
self
.
assertEqual
(
delivery_portal_type
,
delivery
.
getPortalType
())
self
.
assertEqual
(
simulation_state
,
delivery
.
getSimulationState
())
self
.
assertEqual
(
'building'
,
delivery
.
getCausalityState
())
...
...
@@ -349,6 +349,55 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
category_list
=
category_list
+
convertCategoryList
(
'causality'
,
[
delivery_2
.
getRelativeUrl
()]),
**
invoice_kw
)
# check delivering of movement later
delivery_line_2_bis
=
delivery_line_2
.
Base_createCloneDocument
(
batch_mode
=
1
)
delivery_line_2_bis
.
edit
(
price
=
0.0
,
resource
=
'service_module/slapos_instance_setup'
)
simulation_movement_2_bis
=
applied_rule_2
.
newContent
(
quantity
=
delivery_line_2_bis
.
getQuantity
(),
price
=
delivery_line_2_bis
.
getPrice
(),
start_date
=
delivery_2
.
getStartDate
(),
stop_date
=
delivery_2
.
getStopDate
(),
delivery
=
delivery_line_2_bis
.
getRelativeUrl
(),
**
simulation_movement_kw
)
simulation_movement_2_bis
.
edit
(
resource
=
delivery_line_2_bis
.
getResource
())
invoice_rule_2_bis
=
simulation_movement_2_bis
.
newContent
(
portal_type
=
'Applied Rule'
,
specialise
=
'portal_rules/slapos_invoice_simulation_rule'
)
invoice_movement_2_bis
=
invoice_rule_2_bis
.
newContent
(
start_date
=
delivery_2
.
getStartDate
(),
stop_date
=
delivery_2
.
getStopDate
(),
quantity
=
delivery_line_2_bis
.
getQuantity
(),
price
=
delivery_line_2_bis
.
getPrice
(),
**
invoice_movement_kw
)
invoice_movement_2_bis
.
edit
(
resource
=
delivery_line_2_bis
.
getResource
())
self
.
tic
()
# test the test
delivery_2
.
updateCausalityState
(
solve_automatically
=
False
)
self
.
tic
()
self
.
assertEqual
(
'solved'
,
delivery_2
.
getCausalityState
())
self
.
portal
.
portal_deliveries
.
slapos_sale_invoice_builder
.
build
(
path
=
'%s/%%'
%
applied_rule_1
.
getPath
())
self
.
portal
.
portal_deliveries
.
slapos_sale_invoice_builder
.
build
(
path
=
'%s/%%'
%
applied_rule_2
.
getPath
())
self
.
tic
()
self
.
checkSimulationMovement
(
invoice_movement_2_bis
)
invoice_line_2_bis
=
invoice_movement_2_bis
.
getDeliveryValue
()
self
.
assertNotEqual
(
invoice_line_2
,
invoice_line_2_bis
)
self
.
assertEqual
(
invoice_line_2
.
getParentValue
(),
invoice_line_2_bis
.
getParentValue
())
self
.
checkDeliveryLine
(
invoice_movement_2_bis
,
invoice_line_2_bis
,
**
line_kw
)
self
.
checkDelivery
(
invoice_movement_2_bis
,
invoice_2
,
category_list
=
category_list
+
convertCategoryList
(
'causality'
,
[
delivery_2
.
getRelativeUrl
()]),
**
invoice_kw
)
class
TestSlapOSSaleInvoiceTransactionBuilder
(
TestSlapOSSalePackingListBuilder
):
def
checkSimulationMovement
(
self
,
simulation_movement
):
self
.
assertNotEqual
(
0.0
,
simulation_movement
.
getDeliveryRatio
())
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_accounting/bt/revision
View file @
2988be8c
161
\ No newline at end of file
162
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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