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
Thomas Leymonerie
slapos.core
Commits
8de76339
Commit
8de76339
authored
Nov 19, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rebrand alarm.
Also move invoice directly to delivered state.
parent
8e7df15d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
22 additions
and
12 deletions
+22
-12
master/bt5/slapos_accounting/PathTemplateItem/portal_alarms/slapos_deliver_confirmed_sale_invoice_transaction.xml
...rms/slapos_deliver_confirmed_sale_invoice_transaction.xml
+3
-3
master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder/property_movement_group_on_delivery.xml
...ansaction_builder/property_movement_group_on_delivery.xml
+3
-1
master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_builder/category_movement_group_on_cell.xml
...e_transaction_builder/category_movement_group_on_cell.xml
+7
-1
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_deliverConfirmedSaleInvoiceTransaction.xml
...counting/Alarm_deliverConfirmedSaleInvoiceTransaction.xml
+2
-2
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_deliverConfirmed.xml
...os_accounting/SaleInvoiceTransaction_deliverConfirmed.xml
+4
-2
master/bt5/slapos_accounting/bt/revision
master/bt5/slapos_accounting/bt/revision
+1
-1
master/bt5/slapos_accounting/bt/template_path_list
master/bt5/slapos_accounting/bt/template_path_list
+1
-0
master/bt5/vifib_slap/bt/revision
master/bt5/vifib_slap/bt/revision
+1
-1
master/bt5/vifib_slap/bt/template_path_list
master/bt5/vifib_slap/bt/template_path_list
+0
-1
No files found.
master/bt5/
vifib_slap/PathTemplateItem/portal_alarms/stop
_confirmed_sale_invoice_transaction.xml
→
master/bt5/
slapos_accounting/PathTemplateItem/portal_alarms/slapos_deliver
_confirmed_sale_invoice_transaction.xml
View file @
8de76339
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
active_sense_method_id
</string>
</key>
<key>
<string>
active_sense_method_id
</string>
</key>
<value>
<string>
Alarm_
stop
ConfirmedSaleInvoiceTransaction
</string>
</value>
<value>
<string>
Alarm_
deliver
ConfirmedSaleInvoiceTransaction
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
s
top
_confirmed_sale_invoice_transaction
</string>
</value>
<value>
<string>
s
lapos_deliver
_confirmed_sale_invoice_transaction
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
periodicity_day_frequency
</string>
</key>
<key>
<string>
periodicity_day_frequency
</string>
</key>
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Stop
confirmed Sale Invoices
</string>
</value>
<value>
<string>
Deliver
confirmed Sale Invoices
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder/property_movement_group_on_delivery.xml
View file @
8de76339
...
@@ -43,7 +43,9 @@
...
@@ -43,7 +43,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
1
</string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
update_always
</string>
</key>
<key>
<string>
update_always
</string>
</key>
...
...
master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_builder/category_movement_group_on_cell.xml
View file @
8de76339
...
@@ -43,7 +43,13 @@
...
@@ -43,7 +43,13 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
category_movement_group_on_cell
</string>
</value>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
update_always
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/
vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_stop
ConfirmedSaleInvoiceTransaction.xml
→
master/bt5/
slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_deliver
ConfirmedSaleInvoiceTransaction.xml
View file @
8de76339
...
@@ -58,7 +58,7 @@ portal.portal_catalog.searchAndActivate(\n
...
@@ -58,7 +58,7 @@ portal.portal_catalog.searchAndActivate(\n
portal_type=\'Sale Invoice Transaction\',\n
portal_type=\'Sale Invoice Transaction\',\n
simulation_state=\'confirmed\',\n
simulation_state=\'confirmed\',\n
causality_state=\'solved\',\n
causality_state=\'solved\',\n
method_id=\'SaleInvoiceTransaction_
stop
Confirmed\',\n
method_id=\'SaleInvoiceTransaction_
deliver
Confirmed\',\n
activate_kw={\'tag\': tag}\n
activate_kw={\'tag\': tag}\n
)\n
)\n
context.activate(after_tag=tag).getId()\n
context.activate(after_tag=tag).getId()\n
...
@@ -70,7 +70,7 @@ context.activate(after_tag=tag).getId()\n
...
@@ -70,7 +70,7 @@ context.activate(after_tag=tag).getId()\n
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Alarm_
stop
ConfirmedSaleInvoiceTransaction
</string>
</value>
<value>
<string>
Alarm_
deliver
ConfirmedSaleInvoiceTransaction
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/
vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_stop
Confirmed.xml
→
master/bt5/
slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_deliver
Confirmed.xml
View file @
8de76339
...
@@ -52,11 +52,13 @@
...
@@ -52,11 +52,13 @@
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n
<value>
<string>
isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n
if context.getSimulationState() == \'confirmed\' and len(context.checkConsistency()) == 0 and context.getCausalityState() == \'solved\':\n
if context.getSimulationState() == \'confirmed\' and len(context.checkConsistency()) == 0 and context.getCausalityState() == \'solved\':\n
comment = \'
Stopp
ed by alarm as all actions in confirmed state are ready.\'\n
comment = \'
Deliver
ed by alarm as all actions in confirmed state are ready.\'\n
if isTransitionPossible(context, \'start\'):\n
if isTransitionPossible(context, \'start\'):\n
context.start(comment=comment)\n
context.start(comment=comment)\n
if isTransitionPossible(context, \'stop\'):\n
if isTransitionPossible(context, \'stop\'):\n
context.stop(comment=comment)\n
context.stop(comment=comment)\n
if isTransitionPossible(context, \'deliver\'):\n
context.deliver(comment=comment)\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
@@ -65,7 +67,7 @@ if context.getSimulationState() == \'confirmed\' and len(context.checkConsistenc
...
@@ -65,7 +67,7 @@ if context.getSimulationState() == \'confirmed\' and len(context.checkConsistenc
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
SaleInvoiceTransaction_
stop
Confirmed
</string>
</value>
<value>
<string>
SaleInvoiceTransaction_
deliver
Confirmed
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_accounting/bt/revision
View file @
8de76339
83
84
\ No newline at end of file
\ No newline at end of file
master/bt5/slapos_accounting/bt/template_path_list
View file @
8de76339
...
@@ -18,6 +18,7 @@ open_sale_order_module/slapos_accounting_open_sale_order_template
...
@@ -18,6 +18,7 @@ open_sale_order_module/slapos_accounting_open_sale_order_template
open_sale_order_module/template_open_sale_order
open_sale_order_module/template_open_sale_order
organisation_module/slapos
organisation_module/slapos
organisation_module/slapos/bank_account
organisation_module/slapos/bank_account
portal_alarms/slapos_deliver_confirmed_sale_invoice_transaction
portal_alarms/slapos_instance_invoicing
portal_alarms/slapos_instance_invoicing
portal_alarms/slapos_manage_building_calculating_delivery
portal_alarms/slapos_manage_building_calculating_delivery
portal_alarms/slapos_remove_bogus_delivery_link
portal_alarms/slapos_remove_bogus_delivery_link
...
...
master/bt5/vifib_slap/bt/revision
View file @
8de76339
879
880
\ No newline at end of file
\ No newline at end of file
master/bt5/vifib_slap/bt/template_path_list
View file @
8de76339
portal_alarms/cleanup_active_process
portal_alarms/cleanup_active_process
portal_alarms/stop_confirmed_sale_invoice_transaction
portal_alarms/vifib_bang_selenium_tester_instance
portal_alarms/vifib_bang_selenium_tester_instance
portal_alarms/vifib_check_consistency
portal_alarms/vifib_check_consistency
portal_alarms/vifib_lock_person
portal_alarms/vifib_lock_person
...
...
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