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
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
bc6986e8
Commit
bc6986e8
authored
12 years ago
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use aggregate category on invoice line.
It allows to group all invoice line related to the same resource
parent
6d416c9a
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
130 additions
and
237 deletions
+130
-237
master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_builder/category_movement_group_on_line.xml
..._sale_invoice_builder/category_movement_group_on_line.xml
+0
-1
master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
...n_trade_model_builder/category_movement_group_on_line.xml
+0
-1
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_root_simulation_rule.xml
...eItem/portal_rules/vifib_invoice_root_simulation_rule.xml
+43
-0
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_root_simulation_rule/aggregate_tester.xml
...s/vifib_invoice_root_simulation_rule/aggregate_tester.xml
+0
-74
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_simulation_rule.xml
...mplateItem/portal_rules/vifib_invoice_simulation_rule.xml
+43
-0
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_simulation_rule/aggregate_tester.xml
..._rules/vifib_invoice_simulation_rule/aggregate_tester.xml
+0
-80
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_trade_model_simulation_rule.xml
...teItem/portal_rules/vifib_trade_model_simulation_rule.xml
+43
-0
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_trade_model_simulation_rule/aggregate_tester.xml
...es/vifib_trade_model_simulation_rule/aggregate_tester.xml
+0
-80
master/bt5/vifib_data_simulation/bt/revision
master/bt5/vifib_data_simulation/bt/revision
+1
-1
No files found.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_builder/category_movement_group_on_line.xml
View file @
bc6986e8
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
<tuple>
<tuple>
<string>
specialise
</string>
<string>
specialise
</string>
<string>
resource
</string>
<string>
resource
</string>
<string>
aggregate
</string>
<string>
quantity_unit
</string>
<string>
quantity_unit
</string>
<string>
base_contribution
</string>
<string>
base_contribution
</string>
<string>
base_application
</string>
<string>
base_application
</string>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
View file @
bc6986e8
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
<tuple>
<tuple>
<string>
specialise
</string>
<string>
specialise
</string>
<string>
resource
</string>
<string>
resource
</string>
<string>
aggregate
</string>
<string>
quantity_unit
</string>
<string>
quantity_unit
</string>
<string>
base_contribution
</string>
<string>
base_contribution
</string>
<string>
base_application
</string>
<string>
base_application
</string>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_root_simulation_rule.xml
View file @
bc6986e8
...
@@ -376,6 +376,49 @@
...
@@ -376,6 +376,49 @@
</value>
</value>
</item>
</item>
</dictionary>
</dictionary>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string>
Deleted objects: [\'aggregate_tester\']
</string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
916.23399.2655.32989
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<reference
id=
"8.1"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1328869860.95
</float>
<string>
GMT+1
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</list>
</tuple>
</tuple>
</pickle>
</pickle>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_root_simulation_rule/aggregate_tester.xml
deleted
100644 → 0
View file @
6d416c9a
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Category Membership Divergence Tester"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_identity_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
aggregate_tester
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Category Membership Divergence Tester
</string>
</value>
</item>
<item>
<key>
<string>
tested_property
</string>
</key>
<value>
<tuple>
<string>
aggregate
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
aggregate divergence tester
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_simulation_rule.xml
View file @
bc6986e8
...
@@ -540,6 +540,49 @@
...
@@ -540,6 +540,49 @@
</value>
</value>
</item>
</item>
</dictionary>
</dictionary>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string>
Deleted objects: [\'aggregate_tester\']
</string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
916.23399.2655.32989
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<reference
id=
"8.1"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1328869848.26
</float>
<string>
GMT+1
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</list>
</tuple>
</tuple>
</pickle>
</pickle>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_invoice_simulation_rule/aggregate_tester.xml
deleted
100644 → 0
View file @
6d416c9a
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Category Membership Divergence Tester"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_identity_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
aggregate_tester
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Category Membership Divergence Tester
</string>
</value>
</item>
<item>
<key>
<string>
tested_property
</string>
</key>
<value>
<tuple>
<string>
aggregate
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
aggregate divergence tester
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<tuple>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<tuple>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_trade_model_simulation_rule.xml
View file @
bc6986e8
...
@@ -385,6 +385,49 @@
...
@@ -385,6 +385,49 @@
</value>
</value>
</item>
</item>
</dictionary>
</dictionary>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string>
Deleted objects: [\'aggregate_tester\']
</string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
916.23399.2655.32989
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<reference
id=
"8.1"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1328869828.47
</float>
<string>
GMT+1
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</list>
</tuple>
</tuple>
</pickle>
</pickle>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_trade_model_simulation_rule/aggregate_tester.xml
deleted
100644 → 0
View file @
6d416c9a
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Category Membership Divergence Tester"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_identity_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
aggregate_tester
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Category Membership Divergence Tester
</string>
</value>
</item>
<item>
<key>
<string>
tested_property
</string>
</key>
<value>
<tuple>
<string>
aggregate
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
aggregate divergence tester
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<tuple>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<tuple>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
master/bt5/vifib_data_simulation/bt/revision
View file @
bc6986e8
115
116
\ No newline at end of file
\ 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