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
17
Merge Requests
17
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
nexedi
slapos.core
Commits
ff58e583
Commit
ff58e583
authored
Feb 29, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stabilise categories.
Setup quantity unit on tax. Also allow to tax everything.
parent
882ef613
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
25 additions
and
12 deletions
+25
-12
master/bt5/vifib_data/PathTemplateItem/service_module/cpu_consumption.xml
..._data/PathTemplateItem/service_module/cpu_consumption.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/memory_consumption.xml
...ta/PathTemplateItem/service_module/memory_consumption.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_cleanup.xml
...athTemplateItem/service_module/vifib_instance_cleanup.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_hosting.xml
...athTemplateItem/service_module/vifib_instance_hosting.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_setup.xml
.../PathTemplateItem/service_module/vifib_instance_setup.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_update.xml
...PathTemplateItem/service_module/vifib_instance_update.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_setup.xml
.../PathTemplateItem/service_module/vifib_software_setup.xml
+2
-1
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_usage_report.xml
...ta/PathTemplateItem/service_module/vifib_usage_report.xml
+3
-2
master/bt5/vifib_data/bt/revision
master/bt5/vifib_data/bt/revision
+1
-1
master/bt5/vifib_erp5/PathTemplateItem/service_module/computer_registration.xml
...PathTemplateItem/service_module/computer_registration.xml
+2
-1
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_discount.xml
...b_erp5/PathTemplateItem/service_module/vifib_discount.xml
+2
-0
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_registration.xml
...p5/PathTemplateItem/service_module/vifib_registration.xml
+1
-0
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_tax.xml
.../vifib_erp5/PathTemplateItem/service_module/vifib_tax.xml
+1
-0
master/bt5/vifib_erp5/bt/revision
master/bt5/vifib_erp5/bt/revision
+1
-1
No files found.
master/bt5/vifib_data/PathTemplateItem/service_module/cpu_consumption.xml
View file @
ff58e583
...
@@ -58,8 +58,9 @@
...
@@ -58,8 +58,9 @@
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
product_line/cloud/usage
</string>
<string>
product_line/cloud/usage
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/memory_consumption.xml
View file @
ff58e583
...
@@ -58,8 +58,9 @@
...
@@ -58,8 +58,9 @@
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
product_line/cloud/usage
</string>
<string>
product_line/cloud/usage
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_cleanup.xml
View file @
ff58e583
...
@@ -114,8 +114,9 @@
...
@@ -114,8 +114,9 @@
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
product_line/cloud/configuration
</string>
<string>
product_line/cloud/configuration
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_hosting.xml
View file @
ff58e583
...
@@ -87,8 +87,9 @@
...
@@ -87,8 +87,9 @@
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
product_line/cloud/configuration
</string>
<string>
product_line/cloud/configuration
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_setup.xml
View file @
ff58e583
...
@@ -87,8 +87,9 @@
...
@@ -87,8 +87,9 @@
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
product_line/cloud/configuration
</string>
<string>
product_line/cloud/configuration
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_update.xml
View file @
ff58e583
...
@@ -87,8 +87,9 @@
...
@@ -87,8 +87,9 @@
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
product_line/cloud/configuration
</string>
<string>
product_line/cloud/configuration
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_setup.xml
View file @
ff58e583
...
@@ -66,8 +66,9 @@
...
@@ -66,8 +66,9 @@
<value>
<value>
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/purchase
</string>
<string>
use/trade/purchase
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_usage_report.xml
View file @
ff58e583
...
@@ -62,10 +62,11 @@
...
@@ -62,10 +62,11 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
quantity_unit/volume/cubic_meter
</string>
<string>
product_line/cloud/usage
</string>
<string>
product_line/cloud/usage
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_data/bt/revision
View file @
ff58e583
98
99
\ No newline at end of file
\ No newline at end of file
master/bt5/vifib_erp5/PathTemplateItem/service_module/computer_registration.xml
View file @
ff58e583
...
@@ -65,8 +65,9 @@
...
@@ -65,8 +65,9 @@
<value>
<value>
<tuple>
<tuple>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_discount.xml
View file @
ff58e583
...
@@ -57,6 +57,8 @@
...
@@ -57,6 +57,8 @@
<value>
<value>
<tuple>
<tuple>
<string>
use/trade/discount
</string>
<string>
use/trade/discount
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_registration.xml
View file @
ff58e583
...
@@ -77,6 +77,7 @@
...
@@ -77,6 +77,7 @@
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/discounted
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
product_line/cloud/support
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_tax.xml
View file @
ff58e583
...
@@ -57,6 +57,7 @@
...
@@ -57,6 +57,7 @@
<value>
<value>
<tuple>
<tuple>
<string>
use/trade/tax
</string>
<string>
use/trade/tax
</string>
<string>
quantity_unit/unit/piece
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/vifib_erp5/bt/revision
View file @
ff58e583
390
391
\ 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