Added payments and bills scafolding

This commit is contained in:
Marc 2014-07-23 16:24:56 +00:00
parent e57226b769
commit 02feb824bd
24 changed files with 1876 additions and 1598 deletions

View File

@ -62,3 +62,6 @@ Remember that, as always with QuerySets, any subsequent chained methods which im
* DOCUMENT: orchestration.middleware: we need to know when an operation starts and ends in order to perform bulk server updates and also to wait for related objects to be saved (base object is saved first and then related)
orders.signales: we perform changes right away because data model state can change under monitoring and other periodik task, and we should keep orders consistency under any situation.
dependency collector with max_recursion that matches the number of dots on service.match and service.metric
* Be consistent with dates: name_on, created ?

View File

@ -58,8 +58,6 @@ def get_accounts():
if isinstalled('orchestra.apps.orders'):
url = reverse('admin:orders_order_changelist')
accounts.append(items.MenuItem(_("Orders"), url))
url = reverse('admin:orders_service_changelist')
accounts.append(items.MenuItem(_("Services"), url))
return accounts
@ -80,6 +78,8 @@ def get_administration_models():
administration_models.append('orchestra.apps.resources.*')
if isinstalled('orchestra.apps.miscellaneous'):
administration_models.append('orchestra.apps.miscellaneous.models.MiscService')
if isinstalled('orchestra.apps.orders'):
administration_models.append('orchestra.apps.orders.models.Service')
return administration_models

View File

@ -0,0 +1,50 @@
from django.contrib import admin
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
from orchestra.admin.utils import admin_link, admin_date
from orchestra.apps.accounts.admin import AccountAdminMixin
from .filters import BillTypeListFilter
from .models import (Bill, Invoice, AmendmentInvoice, Fee, AmendmentFee, Budget,
BillLine, BudgetLine)
class BillLineInline(admin.TabularInline):
model = BillLine
class BudgetLineInline(admin.TabularInline):
model = Budget
class BillAdmin(AccountAdminMixin, admin.ModelAdmin):
list_display = (
'ident', 'status', 'bill_type_link', 'account_link', 'created_on_display'
)
list_filter = (BillTypeListFilter, 'status',)
readonly_fields = ('ident',)
inlines = [BillLineInline]
account_link = admin_link('account')
created_on_display = admin_date('created_on')
def bill_type_link(self, bill):
bill_type = bill.bill_type.lower()
url = reverse('admin:bills_%s_changelist' % bill_type)
return '<a href="%s">%s</a>' % (url, bill.get_bill_type_display())
bill_type_link.allow_tags = True
bill_type_link.short_description = _("type")
bill_type_link.admin_order_field = 'bill_type'
def get_inline_instances(self, request, obj=None):
if self.model is Budget:
self.inlines = [BudgetLineInline]
return super(BillAdmin, self).get_inline_instances(request, obj=obj)
admin.site.register(Bill, BillAdmin)
admin.site.register(Invoice, BillAdmin)
admin.site.register(AmendmentInvoice, BillAdmin)
admin.site.register(Fee, BillAdmin)
admin.site.register(AmendmentFee, BillAdmin)
admin.site.register(Budget, BillAdmin)

View File

@ -0,0 +1,15 @@
from rest_framework import viewsets
from orchestra.api import router
from orchestra.apps.accounts.api import AccountApiMixin
from .models import Bill
from .serializers import BillSerializer
class BillViewSet(AccountApiMixin, viewsets.ModelViewSet):
model = Bill
serializer_class = BillSerializer
router.register(r'bills', BillViewSet)

View File

@ -0,0 +1,39 @@
from django.contrib.admin import SimpleListFilter
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
class BillTypeListFilter(SimpleListFilter):
""" Filter tickets by created_by according to request.user """
title = 'Type'
parameter_name = ''
def __init__(self, request, *args, **kwargs):
super(BillTypeListFilter, self).__init__(request, *args, **kwargs)
self.request = request
def lookups(self, request, model_admin):
return (
('bill', _("All")),
('invoice', _("Invoice")),
('amendmentinvoice', _("Amendment invoice")),
('fee', _("Fee")),
('fee', _("Amendment fee")),
('budget', _("Budget")),
)
def queryset(self, request, queryset):
return queryset
def value(self):
return self.request.path.split('/')[-2]
def choices(self, cl):
for lookup, title in self.lookup_choices:
yield {
'selected': self.value() == lookup,
'query_string': reverse('admin:bills_%s_changelist' % lookup),
'display': title,
}

View File

@ -1,13 +1,148 @@
from django.db import models
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from . import settings
class BillManager(models.Manager):
def get_queryset(self):
queryset = super(BillManager, self).get_queryset()
if self.model != Bill:
bill_type = self.model.get_type()
queryset = queryset.filter(bill_type=bill_type)
return queryset
class Bill(models.Model):
OPEN = 'OPEN'
CLOSED = 'CLOSED'
SEND = 'SEND'
RETURNED = 'RETURNED'
PAID = 'PAID'
BAD_DEBT = 'BAD_DEBT'
STATUSES = (
(OPEN, _("Open")),
(CLOSED, _("Closed")),
(SEND, _("Sent")),
(RETURNED, _("Returned")),
(PAID, _("Paid")),
(BAD_DEBT, _("Bad debt")),
)
TYPES = (
('INVOICE', _("Invoice")),
('AMENDMENTINVOICE', _("Amendment invoice")),
('FEE', _("Fee")),
('AMENDMENTFEE', _("Amendment Fee")),
('BUDGET', _("Budget")),
)
ident = models.CharField(_("identifier"), max_length=16, unique=True,
blank=True)
account = models.ForeignKey('accounts.Account', verbose_name=_("account"),
related_name='%(class)s')
bill_type = models.CharField(_("type"), max_length=16, choices=TYPES)
status = models.CharField(_("status"), max_length=16, choices=STATUSES,
default=OPEN)
created_on = models.DateTimeField(_("created on"), auto_now_add=True)
due_on = models.DateTimeField(_("due on"), null=True, blank=True)
last_modified_on = models.DateTimeField(_("last modified on"), auto_now=True)
#base = models.DecimalField(max_digits=12, decimal_places=2)
#tax = models.DecimalField(max_digits=12, decimal_places=2)
comments = models.TextField(_("comments"), blank=True)
# TODO rename to HTML-agnostic term like.. RAW ?
html = models.TextField(_("HTML"), blank=True)
objects = BillManager()
def __unicode__(self):
return self.ident
@classmethod
def get_type(cls):
return cls.__name__.upper()
def set_ident(self):
cls = type(self)
bill_type = self.bill_type or cls.get_type()
if bill_type == 'BILL':
raise TypeError("get_new_ident() can not be used on a Bill class")
# Bill number resets every natural year
year = timezone.now().strftime("%Y")
bills = cls.objects.filter(created_on__year=year)
number_length = settings.BILLS_IDENT_NUMBER_LENGTH
prefix = getattr(settings, 'BILLS_%s_IDENT_PREFIX' % bill_type)
if self.status == self.OPEN:
prefix = 'O{}'.format(prefix)
bills = bills.filter(status=self.OPEN)
num_bills = bills.order_by('-ident').first() or 0
if num_bills is not 0:
num_bills = int(num_bills.ident[-number_length:])
else:
bills = bills.exclude(status=self.OPEN)
num_bills = bills.count()
zeros = (number_length - len(str(num_bills))) * '0'
number = zeros + str(num_bills + 1)
self.ident = '{prefix}{year}{number}'.format(
prefix=prefix, year=year, number=number)
def save(self, *args, **kwargs):
if not self.bill_type:
self.bill_type = type(self).get_type()
if not self.ident or (self.ident.startswith('O') and self.status != self.OPEN):
self.set_ident()
super(Bill, self).save(*args, **kwargs)
class Invoice(Bill):
class Meta:
proxy = True
class AmendmentInvoice(Bill):
class Meta:
proxy = True
class Fee(Bill):
class Meta:
proxy = True
class AmendmentFee(Bill):
class Meta:
proxy = True
class Budget(Bill):
class Meta:
proxy = True
class BaseBillLine(models.Model):
bill = models.ForeignKey(Bill, verbose_name=_("bill"),
related_name='%(class)ss')
description = models.CharField(max_length=256)
initial_date = models.DateTimeField()
final_date = models.DateTimeField()
price = models.DecimalField(max_digits=12, decimal_places=2)
amount = models.IntegerField()
tax = models.DecimalField(max_digits=12, decimal_places=2)
class Meta:
abstract = True
class BudgetLine(BaseBillLine):
pass
class Invoice(models.Model):
pass
class BillLine(BaseBillLine):
order_id = models.PositiveIntegerField(blank=True)
order_last_bill_date = models.DateTimeField(null=True)
order_billed_until = models.DateTimeField(null=True)
auto = models.BooleanField(default=False)
amended_line = models.ForeignKey('self', verbose_name=_("amended line"),
related_name='amendment_lines', null=True, blank=True)
class Fee(models.Model):
pass

View File

@ -0,0 +1,15 @@
from rest_framework import serializers
from .models import Bill, BillLine
class BillLineSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = BillLine
class BillSerializer(serializers.HyperlinkedModelSerializer):
lines = BillLineSerializer(source='billlines')
class Meta:
model = Bill

View File

@ -0,0 +1,8 @@
from django.conf import settings
BILLS_IDENT_NUMBER_LENGTH = getattr(settings, 'BILLS_IDENT_NUMBER_LENGTH', 4)
BILLS_INVOICE_IDENT_PREFIX = getattr(settings, 'BILLS_INVOICE_IDENT_PREFIX', 'I')
BILLS_AMENDMENT_INVOICE_IDENT_PREFIX = getattr(settings, 'BILLS_AMENDMENT_INVOICE_IDENT_PREFIX', 'A')
BILLS_FEE_IDENT_PREFIX = getattr(settings, 'BILLS_FEE_IDENT_PREFIX', 'F')
BILLS_AMENDMENT_FEE_IDENT_PREFIX = getattr(settings, 'BILLS_AMENDMENT_FEE_IDENT_PREFIX', 'B')
BILLS_BUDGET_IDENT_PREFIX = getattr(settings, 'BILLS_BUDGET_IDENT_PREFIX', 'Q')

View File

@ -32,7 +32,7 @@ class MiscellaneousAdmin(AccountAdminMixin, admin.ModelAdmin):
def get_fields(self, request, obj=None):
if obj is None:
return ('service', 'account', 'description', 'amount', 'is_active')
if not obj.service.has_amount:
elif not obj.service.has_amount:
return ('service', 'account_link', 'description', 'is_active')
return ('service', 'account_link', 'description', 'amount', 'is_active')

View File

View File

@ -0,0 +1,7 @@
from django.contrib import admin
from .models import PaymentSource, Transaction
admin.site.register(PaymentSource)
admin.site.register(Transaction)

View File

@ -0,0 +1,21 @@
from rest_framework import viewsets
from orchestra.api import router
from orchestra.apps.accounts.api import AccountApiMixin
from .models import PaymentSource, Transaction
from .serializers import PaymentSourceSerializer, TransactionSerializer
class PaymentSourceViewSet(AccountApiMixin, viewsets.ModelViewSet):
model = PaymentSource
serializer_class = PaymentSourceSerializer
class TransactionViewSet(viewsets.ModelViewSet):
model = Transaction
serializer_class = TransactionSerializer
router.register(r'payment-sources', PaymentSourceViewSet)
router.register(r'transactions', TransactionViewSet)

View File

@ -0,0 +1,15 @@
from django.utils.translation import ugettext_lazy as _
from orchestra.utils import plugins
class PaymentMethod(plugins.Plugin):
__metaclass__ = plugins.PluginMount
class BankTransfer(PaymentMethod):
verbose_name = _("Bank transfer")
class CreditCard(PaymentMethod):
verbose_name = _("Credit card")

View File

@ -0,0 +1,44 @@
from django.db import models
from django.utils.translation import ugettext_lazy as _
from jsonfield import JSONField
from . import settings
from .methods import PaymentMethod
class PaymentSource(models.Model):
account = models.ForeignKey('accounts.Account', verbose_name=_("account"),
related_name='payment_sources')
method = models.CharField(_("method"), max_length=32,
choices=PaymentMethod.get_plugin_choices())
data = JSONField(_("data"))
class Transaction(models.Model):
WAITTING_PROCESSING = 'WAITTING_PROCESSING'
WAITTING_CONFIRMATION = 'WAITTING_CONFIRMATION'
CONFIRMED = 'CONFIRMED'
REJECTED = 'REJECTED'
LOCKED = 'LOCKED'
DISCARTED = 'DISCARTED'
STATES = (
(WAITTING_PROCESSING, _("Waitting for processing")),
(WAITTING_CONFIRMATION, _("Waitting for confirmation")),
(CONFIRMED, _("Confirmed")),
(REJECTED, _("Rejected")),
(LOCKED, _("Locked")),
(DISCARTED, _("Discarted")),
)
bill = models.ForeignKey('bills.bill', verbose_name=_("bill"),
related_name='transactions')
method = models.CharField(_("payment method"), max_length=32,
choices=PaymentMethod.get_plugin_choices())
state = models.CharField(_("state"), max_length=32, choices=STATES,
default=WAITTING_PROCESSING)
data = JSONField(_("data"))
amount = models.DecimalField(_("amount"), max_digits=12, decimal_places=2)
currency = models.CharField(max_length=10, default=settings.PAYMENT_CURRENCY)
created_on = models.DateTimeField(auto_now_add=True)
modified_on = models.DateTimeField(auto_now=True)
related = models.ForeignKey('self', null=True, blank=True)

View File

@ -0,0 +1,14 @@
from rest_framework import serializers
from .models import PaymentSource, PaymentSource
class PaymentSourceSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = PaymentSource
class TransactionSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = PaymentSource

View File

@ -0,0 +1,4 @@
from django.conf import settings
PAYMENT_CURRENCY = getattr(settings, 'PAYMENT_CURRENCY', 'Eur')

View File

@ -143,7 +143,8 @@ function install_requirements () {
paramiko==1.12.1 \
Pygments==1.6 \
django-filter==0.7 \
passlib==1.6.2"
passlib==1.6.2 \
jsonfield==0.9.22"
if $testing; then
APT="${APT} \

View File

@ -79,6 +79,8 @@ INSTALLED_APPS = (
'orchestra.apps.prices',
'orchestra.apps.orders',
'orchestra.apps.miscellaneous',
'orchestra.apps.bills',
'orchestra.apps.payments',
# Third-party apps
'django_extensions',
@ -140,8 +142,9 @@ FLUENT_DASHBOARD_APP_GROUPS = (
'orchestra.apps.contacts.models.Contact',
'orchestra.apps.users.models.User',
'orchestra.apps.orders.models.Order',
'orchestra.apps.orders.models.Service',
'orchestra.apps.prices.models.Pack',
'orchestra.apps.bills.models.Bill',
'orchestra.apps.payments.models.Transaction',
),
'collapsible': True,
}),
@ -154,6 +157,7 @@ FLUENT_DASHBOARD_APP_GROUPS = (
'orchestra.apps.issues.models.Ticket',
'orchestra.apps.resources.models.Resource',
'orchestra.apps.resources.models.Monitor',
'orchestra.apps.orders.models.Service',
),
'collapsible': True,
}),
@ -172,20 +176,22 @@ FLUENT_DASHBOARD_APP_ICONS = {
'databases/database': 'database.png',
'databases/databaseuser': 'postgresql.png',
'vps/vps': 'TuxBox.png',
'miscellaneous/miscellaneous': 'Misc-Misc-Box-icon.png',
'miscellaneous/miscellaneous': 'applications-other.png',
# Accounts
'accounts/account': 'Face-monkey.png',
'contacts/contact': 'contact.png',
'orders/order': 'basket.png',
'orders/service': 'price.png',
'prices/pack': 'Dialog-accept.png',
'prices/pack': 'Pack.png',
'bills/bill': 'invoice.png',
'payments/transaction': 'transaction.png',
# Administration
'users/user': 'Mr-potato.png',
'djcelery/taskstate': 'taskstate.png',
'orchestration/server': 'vps.png',
'orchestration/route': 'hal.png',
'orchestration/backendlog': 'scriptlog.png',
'issues/ticket': "Ticket_star.png",
'issues/ticket': 'Ticket_star.png',
'resources/resource': "gauge.png",
'resources/monitor': "Utilities-system-monitor.png",
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -1577,6 +1577,59 @@
style="stop-color:#eeeeec;stop-opacity:0"
id="stop2711-8" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2632"
id="linearGradient3381"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1073651,0,0,1.1073651,-0.11838007,0.83842292)"
x1="24.612919"
y1="20.159996"
x2="29.182333"
y2="12.24554" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient2623"
id="radialGradient3384"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(3.2559524,0,0,2.6945803,-52.758733,-26.144232)"
cx="24.5"
cy="18.592903"
fx="24.5"
fy="18.592903"
r="14.5" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3678-5"
id="radialGradient3387"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(4.1072011,-0.00164505,7.5168928e-4,1.8767438,-29.724697,-11.538638)"
cx="9.5926991"
cy="9.3275347"
fx="9.5926991"
fy="9.3275347"
r="21" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3686-5"
id="linearGradient3389"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.97232062,0,0,0.97232062,0.35432569,-3.1183824)"
x1="13.871766"
y1="5.7400389"
x2="13.622137"
y2="34.835339" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4542"
id="radialGradient3392"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5398041,0,0,0.52493282,-13.184042,18.30545)"
cx="24.306795"
cy="42.07798"
fx="24.306795"
fy="42.07798"
r="15.821514" />
</defs>
<sodipodi:namedview
id="base"
@ -1605,7 +1658,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -1613,178 +1666,173 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
inkscape:connector-curvature="0"
d="m 48.605707,40.393586 a 24.362043,8.3052421 0 0 1 -48.72408707,0 24.362043,8.3052421 0 1 1 48.72408707,0 z"
id="path3667"
style="opacity:0.4;fill:url(#radialGradient3392);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible" />
<rect
width="39.865143"
height="39.865143"
rx="1.2732019"
ry="1.2095807"
x="3.757411"
y="0.28476718"
id="rect4414"
style="fill:url(#radialGradient3387);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3389);stroke-width:1.10736489;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
d="m 15.419322,6.3752484 0,4.4294646 -4.463995,0 0,1.107361 4.463995,0 0,4.429464 -4.463995,0 0,1.107361 4.463995,0 0,4.429465 -4.463995,0 0,1.107361 4.463995,0 0,4.429464 -4.463995,0 0,1.107361 4.463995,0 0,4.429465 1.107361,0 0,-4.429465 4.429446,0 0,4.429465 1.107361,0 0,-4.429465 4.429539,0 0,4.429465 1.107362,0 0,-4.429465 4.429445,0 0,4.429465 1.107361,0 0,-4.429465 4.429446,0 0,-17.717837 -4.429446,0 0,-4.4294646 -1.107361,0 0,4.4294646 -4.429445,0 0,-4.4294646 -1.107362,0 0,4.4294646 -4.429539,0 0,-4.4294646 -1.107361,0 0,4.4294646 -4.429446,0 0,-4.4294646 -1.107361,0 z m 1.107361,5.5368256 4.429446,0 0,4.429464 -4.429446,0 0,-4.429464 z m 5.536807,0 4.429539,0 0,4.429464 -4.429539,0 0,-4.429464 z m 5.536901,0 4.429445,0 0,4.429464 -4.429445,0 0,-4.429464 z m 5.536806,0 4.429446,0 0,4.429464 -4.429446,0 0,-4.429464 z m -16.610514,5.536825 4.429446,0 0,4.429465 -4.429446,0 0,-4.429465 z m 5.536807,0 4.429539,0 0,4.429465 -4.429539,0 0,-4.429465 z m 5.536901,0 4.429445,0 0,4.429465 -4.429445,0 0,-4.429465 z m 5.536806,0 4.429446,0 0,4.429465 -4.429446,0 0,-4.429465 z m -16.610514,5.536826 4.429446,0 0,4.429464 -4.429446,0 0,-4.429464 z m 5.536807,0 4.429539,0 0,4.429464 -4.429539,0 0,-4.429464 z m 5.536901,0 4.429445,0 0,4.429464 -4.429445,0 0,-4.429464 z m 5.536806,0 4.429446,0 0,4.429464 -4.429446,0 0,-4.429464 z"
id="rect2281"
style="fill:url(#radialGradient3384);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 31.476108,14.126806 -5.407247,9.763801 -9.534198,-5.312349 -6.6521478,10.497973 0.9689768,0.553681 5.99327,-9.663711 9.635593,5.294586 5.96473,-10.5803 -0.968977,-0.553681 z"
id="rect2293"
style="fill:url(#linearGradient3381);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="1.1073651"
height="33.220955"
x="32.952019"
y="-43.068855"
transform="matrix(0,1,-1,0,0,0)"
id="rect2600"
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="1.1073651"
height="27.684128"
x="9.8770018"
y="6.375277"
id="rect2231"
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<g
id="g8112"
transform="matrix(0.93883963,0,0,0.93883963,-946.56186,-295.71302)"
inkscape:export-filename="/mnt/media/ucp/icons/order.png"
inkscape:export-xdpi="160"
inkscape:export-ydpi="160">
id="g8099"
transform="matrix(0.93883963,0,0,0.93883963,-946.56186,-295.71302)">
<path
style="opacity:0.4;fill:url(#radialGradient8054);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
id="path3667"
d="m 1059.9974,358.00215 a 25.9491,8.8462841 0 0 1 -51.8982,0 25.9491,8.8462841 0 1 1 51.8982,0 z"
inkscape:connector-curvature="0" />
<rect
style="fill:url(#radialGradient8049);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8051);stroke-width:1.1795038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect4414"
y="315.28046"
x="1012.2275"
ry="1.2883784"
rx="1.3561442"
height="42.462143"
width="42.462143" />
<path
style="fill:url(#radialGradient8046);fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2281"
d="m 1024.6491,321.7677 0,4.71802 -4.7548,0 0,1.1795 4.7548,0 0,4.71802 -4.7548,0 0,1.1795 4.7548,0 0,4.71802 -4.7548,0 0,1.1795 4.7548,0 0,4.71802 -4.7548,0 0,1.1795 4.7548,0 0,4.71802 1.1795,0 0,-4.71802 4.718,0 0,4.71802 1.1795,0 0,-4.71802 4.7181,0 0,4.71802 1.1795,0 0,-4.71802 4.718,0 0,4.71802 1.1795,0 0,-4.71802 4.718,0 0,-18.87206 -4.718,0 0,-4.71802 -1.1795,0 0,4.71802 -4.718,0 0,-4.71802 -1.1795,0 0,4.71802 -4.7181,0 0,-4.71802 -1.1795,0 0,4.71802 -4.718,0 0,-4.71802 -1.1795,0 z m 1.1795,5.89752 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m 5.8975,0 4.7181,0 0,4.71802 -4.7181,0 0,-4.71802 z m 5.8976,0 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m 5.8975,0 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m -17.6926,5.89752 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m 5.8975,0 4.7181,0 0,4.71802 -4.7181,0 0,-4.71802 z m 5.8976,0 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m 5.8975,0 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m -17.6926,5.89752 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m 5.8975,0 4.7181,0 0,4.71802 -4.7181,0 0,-4.71802 z m 5.8976,0 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z m 5.8975,0 4.718,0 0,4.71802 -4.718,0 0,-4.71802 z"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2773-8"
d="m 1057.0679,360.95209 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:url(#linearGradient8043);fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2293"
d="m 1041.7519,330.02423 -5.7595,10.39986 -10.1553,-5.65842 -7.0855,11.18186 1.0321,0.58975 6.3837,-10.29325 10.2633,5.6395 6.3533,-11.26955 -1.0321,-0.58975 z"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2777-6"
d="m 1057.0793,358.60067 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2781-2"
d="m 1057.0793,356.24167 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2785-4"
d="m 1057.0644,353.87685 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2789-7"
d="m 1057.0793,351.51608 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2797-9"
d="m 1057.0793,349.16287 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2799-3"
d="m 1057.0644,346.79805 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2801-9"
d="m 1057.0793,344.43728 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#ddc910;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2809-2"
d="m 1057.0793,342.07827 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#8c7200;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2793-8"
d="m 1057.0565,339.71523 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
inkscape:connector-curvature="0" />
<path
style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.17950439;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2795-3"
d="m 1055.8657,339.71345 a 4.72265,1.7654774 0 1 1 -9.4453,0 4.72265,1.7654774 0 1 1 9.4453,0 z"
inkscape:connector-curvature="0" />
</g>
<g
id="g8085"
transform="matrix(0.93883963,0,0,0.93883963,-946.56186,-295.71302)">
<path
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1.17950368;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
id="path2321-7"
d="m 1011.048,356.79288 28.3084,0 0,7.10679 -28.3084,0 0,-7.10679 z"
inkscape:connector-curvature="0" />
<path
style="fill:#59af05;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1.17950404;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
id="path2323-9"
d="m 1014.3813,349.72956 21.4339,0 3.5411,7.08818 -28.3081,0 3.3331,-7.08818 z"
inkscape:connector-curvature="0" />
<rect
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2600"
transform="matrix(0,1,-1,0,0,0)"
y="-1054.0999"
x="350.07581"
height="35.38512"
width="1.179504" />
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2325-6"
y="360.97729"
x="1011.6381"
height="1.179504"
width="27.128592" />
<rect
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2231"
y="321.76773"
x="1018.7457"
height="29.4876"
width="1.179504" />
<g
id="g8099">
<path
inkscape:connector-curvature="0"
d="m 1057.0679,360.95209 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2773-8"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,358.60067 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2777-6"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,356.24167 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2781-2"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0644,353.87685 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2785-4"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,351.51608 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2789-7"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,349.16287 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2797-9"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0644,346.79805 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2799-3"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,344.43728 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2801-9"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,342.07827 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2809-2"
style="fill:#ddc910;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0565,339.71523 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2793-8"
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#8c7200;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1055.8657,339.71345 a 4.72265,1.7654774 0 1 1 -9.4453,0 4.72265,1.7654774 0 1 1 9.4453,0 z"
id="path2795-3"
style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.17950439;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
<g
id="g8085">
<path
inkscape:connector-curvature="0"
d="m 1011.048,356.79288 28.3084,0 0,7.10679 -28.3084,0 0,-7.10679 z"
id="path2321-7"
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1.17950368;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 1014.3813,349.72956 21.4339,0 3.5411,7.08818 -28.3081,0 3.3331,-7.08818 z"
id="path2323-9"
style="fill:#59af05;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1.17950404;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="27.128592"
height="1.179504"
x="1011.6381"
y="360.97729"
id="rect2325-6"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="27.128592"
height="1.179504"
x="1011.6381"
y="358.61829"
id="rect2327-0"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1015.1028,350.96975 -2.3221,4.6443 24.5855,0 -2.4698,-4.6443 -19.7936,0 z"
id="path2329-4"
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1.17950404;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 1031.6895,353.26726 a 5.89755,1.7692638 0 0 1 -11.7951,0 5.89755,1.7692638 0 1 1 11.7951,0 z"
id="path2746-1"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1024.0227,349.72368 -1.1795,6.64905 0,7.51513 5.8975,0 0,-7.57875 -1.2901,-6.58543 -3.4279,0 z"
id="path2715-0"
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.17950416;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1017.5354,354.44676 a 1.7876629,0.58975178 0 1 1 -3.5753,0 1.7876629,0.58975178 0 1 1 3.5753,0 z"
id="path2748-4"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1037.587,354.44676 a 1.7692558,0.58975178 0 1 1 -3.5385,0 1.7692558,0.58975178 0 1 1 3.5385,0 z"
id="path2750-8"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1035.8176,352.08775 a 1.7693,0.58976651 0 1 1 -3.5386,0 1.7693,0.58976651 0 1 1 3.5386,0 z"
id="path2752-7"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1018.7149,352.08775 a 1.7692558,0.58975178 0 1 1 -3.5385,0 1.7692558,0.58975178 0 1 1 3.5385,0 z"
id="path2754-0"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="4.7180161"
height="5.8975201"
x="1023.4327"
y="357.41238"
id="rect2673-0"
style="fill:url(#linearGradient8016);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2327-0"
y="358.61829"
x="1011.6381"
height="1.179504"
width="27.128592" />
<path
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1.17950404;stroke-miterlimit:4;stroke-opacity:1"
id="path2329-4"
d="m 1015.1028,350.96975 -2.3221,4.6443 24.5855,0 -2.4698,-4.6443 -19.7936,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path2746-1"
d="m 1031.6895,353.26726 a 5.89755,1.7692638 0 0 1 -11.7951,0 5.89755,1.7692638 0 1 1 11.7951,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.17950416;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2715-0"
d="m 1024.0227,349.72368 -1.1795,6.64905 0,7.51513 5.8975,0 0,-7.57875 -1.2901,-6.58543 -3.4279,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path2748-4"
d="m 1017.5354,354.44676 a 1.7876629,0.58975178 0 1 1 -3.5753,0 1.7876629,0.58975178 0 1 1 3.5753,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path2750-8"
d="m 1037.587,354.44676 a 1.7692558,0.58975178 0 1 1 -3.5385,0 1.7692558,0.58975178 0 1 1 3.5385,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path2752-7"
d="m 1035.8176,352.08775 a 1.7693,0.58976651 0 1 1 -3.5386,0 1.7693,0.58976651 0 1 1 3.5386,0 z"
inkscape:connector-curvature="0" />
<path
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path2754-0"
d="m 1018.7149,352.08775 a 1.7692558,0.58975178 0 1 1 -3.5385,0 1.7692558,0.58975178 0 1 1 3.5385,0 z"
inkscape:connector-curvature="0" />
<rect
style="fill:url(#linearGradient8016);fill-opacity:1;fill-rule:evenodd;stroke:none"
id="rect2673-0"
y="357.41238"
x="1023.4327"
height="5.8975201"
width="4.7180161" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -681,17 +681,6 @@
style="stop-color:white;stop-opacity:0"
id="stop4226-3-7" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3734"
id="radialGradient9036"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.4091653,0,0,0.7855974,-5.0229128,32.6079)"
cx="12.046875"
cy="10.046875"
fx="12.046875"
fy="10.046875"
r="9.546875" />
<linearGradient
id="linearGradient3734">
<stop
@ -703,16 +692,6 @@
style="stop-color:black;stop-opacity:0"
id="stop3738" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2707"
id="linearGradient9038"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.833333,9.7317314e-7,6.4898544)"
x1="18"
y1="39"
x2="18"
y2="45.780262" />
<linearGradient
id="linearGradient2707">
<stop
@ -724,16 +703,6 @@
style="stop-color:#eeeeec;stop-opacity:0"
id="stop2711" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2707"
id="linearGradient9040"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.833333,9.7317314e-7,6.4898544)"
x1="18"
y1="39"
x2="18"
y2="45.780262" />
<linearGradient
id="linearGradient7810">
<stop
@ -883,6 +852,68 @@
style="stop-color:white;stop-opacity:0"
id="stop7845" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3734"
id="radialGradient3371"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.4091653,0,0,0.7855974,-5.0229128,32.6079)"
cx="12.046875"
cy="10.046875"
fx="12.046875"
fy="10.046875"
r="9.546875" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2707"
id="linearGradient3373"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.833333,9.7317314e-7,6.4898544)"
x1="18"
y1="39"
x2="18"
y2="45.780262" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2707"
id="linearGradient3375"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.833333,9.7317314e-7,6.4898544)"
x1="18"
y1="39"
x2="18"
y2="45.780262" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2707-6"
id="linearGradient8016"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.179504,0,0,0.98291961,1004.5607,319.07852)"
x1="18"
y1="39"
x2="18"
y2="45.780262" />
<linearGradient
id="linearGradient2707-6">
<stop
offset="0"
style="stop-color:#eeeeec;stop-opacity:1"
id="stop2709-5" />
<stop
offset="1"
style="stop-color:#eeeeec;stop-opacity:0"
id="stop2711-8" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2707-6"
id="linearGradient3467"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.179504,0,0,0.98291961,1004.5607,319.07852)"
x1="18"
y1="39"
x2="18"
y2="45.780262" />
</defs>
<sodipodi:namedview
id="base"
@ -891,18 +922,18 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.4748737"
inkscape:cx="21.988498"
inkscape:cy="15.426923"
inkscape:zoom="4.9497474"
inkscape:cx="57.689797"
inkscape:cy="14.157112"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="513"
inkscape:window-height="386"
inkscape:window-x="1248"
inkscape:window-y="320"
inkscape:window-maximized="0" />
inkscape:window-width="1920"
inkscape:window-height="1024"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata6495">
<rdf:RDF>
@ -920,498 +951,161 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g7850"
transform="matrix(0.92257246,0,0,0.92257246,-761.00186,-297.92194)"
inkscape:export-filename="/mnt/media/ucp/icons/transaction.png"
inkscape:export-xdpi="160"
inkscape:export-ydpi="160">
inkscape:label="Layer 1"
id="layer1-1"
transform="matrix(0.93914302,0,0,0.95061485,-0.82457823,-2.3789835)">
<path
d="M 13.520856,44.514441 0.6458606,33.014443 13.520856,21.514444 l 0,5.999999 20.874998,0 0,10.999999 -20.874998,0 0,5.999999 z"
id="path4348"
style="fill:url(#linearGradient7838);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7840);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="M 12.520856,42.147107 2.1849036,33.014443 12.520856,23.772068 l 0,4.742375 20.839142,0 0.06052,8.999999 -20.899663,0 0,4.632665 z"
id="path4360"
style="opacity:0.35400008;fill:none;stroke:url(#linearGradient7842);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="M 34.499996,26.499997 47.374992,14.999999 34.499996,3.4999999 l 0,5.9999993 -20.874998,0 0,10.9999988 20.874998,0 0,5.999999 z"
id="path3801"
style="fill:url(#linearGradient7844);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7846);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 35.499996,24.132664 10.335953,-9.132665 -10.335953,-9.2423735 0,4.7423745 -20.839143,0 -0.06052,8.999998 20.899662,0 0,4.632666 z"
id="path3803"
style="opacity:0.35400008;fill:none;stroke:url(#linearGradient7848);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
</g>
<g
id="g3440"
transform="translate(0.60609154,-2.4243661)">
<g
transform="translate(830.33466,327.19884)"
id="g3221">
transform="matrix(0.88523756,0,0,0.88523756,-890.27694,-275.44544)"
id="g8099">
<path
inkscape:connector-curvature="0"
d="m 47,40.500699 a 23,7.5 0 0 1 -45.9999998,0 23,7.5 0 1 1 45.9999998,0 z"
id="path6446"
style="opacity:0.4;fill:url(#radialGradient9036);fill-opacity:1;stroke:none;display:inline" />
<g
transform="translate(-9.0125695,-9.000183)"
id="g3838">
<path
inkscape:connector-curvature="0"
d="m 46.528917,39.003188 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3840"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,37.009618 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3842"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,35.009628 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3844"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.525987,33.004698 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3846"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,31.003205 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3848"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,29.008121 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3850"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.525987,27.003191 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3852"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,25.001697 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3854"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,23.001697 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3856"
style="fill:#ddc910;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.519277,20.998274 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path3858"
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#8c7200;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 45.509639,20.996769 a 4.0038971,1.4967846 0 1 1 -8.007794,0 4.0038971,1.4967846 0 1 1 8.007794,0 z"
id="path3860"
style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.00000036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
<g
transform="translate(-2.0125695,-1.000183)"
id="g2986">
<path
inkscape:connector-curvature="0"
d="m 46.528917,39.003188 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2773"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,37.009618 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2777"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,35.009628 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2781"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.525987,33.004698 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2785"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,31.003205 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2789"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,29.008121 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2797"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.525987,27.003191 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2799"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,25.001697 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2801"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.538557,23.001697 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2809"
style="fill:#ddc910;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 46.519277,20.998274 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2793"
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#8c7200;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 45.509639,20.996769 a 4.0038971,1.4967846 0 1 1 -8.007794,0 4.0038971,1.4967846 0 1 1 8.007794,0 z"
id="path2795"
style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.00000036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
<g
transform="translate(2.0001589,-1)"
id="g2955">
<path
inkscape:connector-curvature="0"
d="m 1.499841,33.478934 24.000325,0 0,6.025232 -24.000325,0 0,-6.025232 z"
id="path2321"
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:0.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 4.325883,27.490549 20.27169,0 0.902432,6.009461 -24.000006,0 2.825884,-6.009461 z"
id="path2323"
style="fill:#59af05;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="23"
height="1"
x="2.0001378"
y="37.026531"
id="rect2325"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="23"
height="1"
x="2.0001378"
y="35.026531"
id="rect2327"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 4.937599,28.542003 -1.96875,3.9375 21.34375,0 -0.59375,-3.9375 -18.78125,0 z"
id="path2329"
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="4.9373136"
height="6.1093535"
x="11.53135"
y="33.463902"
id="rect2341"
style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 19.000001,30.489859 a 5.0000015,1.4999994 0 1 1 -10.0000027,0 5.0000015,1.4999994 0 1 1 10.0000027,0 z"
id="path2746"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 12.500001,27.485562 -1,5.637161 0,6.37143 5,0 0,-6.425371 -1.09375,-5.58322 -2.90625,0 z"
id="path2715"
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 6.9999965,31.489856 a 1.5156056,0.49999981 0 1 1 -3.0312111,0 1.5156056,0.49999981 0 1 1 3.0312111,0 z"
id="path2748"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 24,31.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path2750"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 23,29.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path2752"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 8.0000013,29.489856 a 1.4999998,0.49999981 0 1 1 -2.9999995,0 1.4999998,0.49999981 0 1 1 2.9999995,0 z"
id="path2754"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
<g
transform="translate(0,-1)"
id="g2999">
<path
inkscape:connector-curvature="0"
d="m 41.519277,41.996758 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2413"
style="fill:#dcc610;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 41.528917,40.003188 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2417"
style="fill:#dcc610;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 41.528917,38.003198 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2421"
style="fill:#dcc610;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 41.516347,35.998268 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2425"
style="fill:#dcc610;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 41.528917,33.996778 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2429"
style="fill:#dcc610;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 41.509637,31.996778 a 5.0033537,2.4982883 0 1 1 -10.006707,0 5.0033537,2.4982883 0 1 1 10.006707,0 z"
id="path2761"
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#8c7200;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 40.507799,31.996772 a 4.0038971,1.4967846 0 1 1 -8.007794,0 4.0038971,1.4967846 0 1 1 8.007794,0 z"
id="path2763"
style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.00000036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
<g
transform="translate(2.0001589,-1)"
id="g2969">
<path
inkscape:connector-curvature="0"
d="m 5.491464,38.460922 24.008514,0 0,6.039078 -24.008514,0 0,-6.039078 z"
id="rect2271"
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:0.99999958;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 7.450819,32.494875 20.208675,0 1.839885,5.993972 -23.999394,0 1.950834,-5.993972 z"
id="path3816"
style="fill:#57ae06;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:0.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="23"
height="1"
x="6.0000005"
y="41.989853"
id="rect2441"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="23.000002"
height="1"
x="6.0000005"
y="39.989853"
id="rect2443"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 8.218751,33.521104 -1.28125,3.9375 21.15625,0 -1.21875,-3.9375 -18.65625,0 z"
id="path2269"
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 22.999992,35.489859 a 4.9999945,1.4999994 0 1 1 -9.999989,0 4.9999945,1.4999994 0 1 1 9.999989,0 z"
id="path3837"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 10.999998,36.474386 a 1.5156058,0.49999988 0 0 1 -3.0312116,0 1.5156058,0.49999988 0 1 1 3.0312116,0 z"
id="path3839"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 27,36.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path3841"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 16.500001,32.511162 -1,5.625214 0,6.357927 5,0 0,-6.411754 -1.09375,-5.571387 -2.90625,0 z"
id="rect1372"
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
width="4"
height="5"
x="16"
y="38.989853"
id="rect2721"
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="4"
height="5"
x="16"
y="38.989853"
id="rect2673"
style="fill:url(#linearGradient9038);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 26,34.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path2691"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 12,34.489856 a 1.4999998,0.49999981 0 1 1 -2.9999992,0 1.4999998,0.49999981 0 1 1 2.9999992,0 z"
id="path2693"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
<g
transform="translate(2.0001589,-9)"
id="g3782">
<path
inkscape:connector-curvature="0"
d="m 1.499841,33.478934 24.000325,0 0,6.025232 -24.000325,0 0,-6.025232 z"
id="path3784"
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:0.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 4.325883,27.490549 20.27169,0 0.902432,6.009461 -24.000006,0 2.825884,-6.009461 z"
id="path3786"
style="fill:#59af05;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="23"
height="1"
x="2.0001378"
y="37.026531"
id="rect3788"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="23"
height="1"
x="2.0001378"
y="35.026531"
id="rect3790"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 4.937599,28.542003 -1.96875,3.9375 21.34375,0 -0.59375,-3.9375 -18.78125,0 z"
id="path3792"
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="4.9373136"
height="6.1093535"
x="11.53135"
y="33.463902"
id="rect3794"
style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 19.000001,30.489859 a 5.0000015,1.4999994 0 1 1 -10.0000027,0 5.0000015,1.4999994 0 1 1 10.0000027,0 z"
id="path3796"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 12.500001,27.485562 -1,5.637161 0,6.37143 5,0 0,-6.425371 -1.09375,-5.58322 -2.90625,0 z"
id="path3798"
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 6.9999965,31.489856 a 1.5156056,0.49999981 0 1 1 -3.0312111,0 1.5156056,0.49999981 0 1 1 3.0312111,0 z"
id="path3800"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 24,31.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path3802"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 23,29.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path3804"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 8.0000013,29.489856 a 1.4999998,0.49999981 0 1 1 -2.9999995,0 1.4999998,0.49999981 0 1 1 2.9999995,0 z"
id="path3806"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
<g
transform="translate(2.0001589,-9)"
id="g3808">
<path
inkscape:connector-curvature="0"
d="m 5.491464,38.460922 24.008514,0 0,6.039078 -24.008514,0 0,-6.039078 z"
id="path3810"
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:0.99999958;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 7.450819,32.494875 20.208675,0 1.839885,5.993972 -23.999394,0 1.950834,-5.993972 z"
id="path3812"
style="fill:#57ae06;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:0.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="23"
height="1"
x="6.0000005"
y="41.989853"
id="rect3814"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="23.000002"
height="1"
x="6.0000005"
y="39.989853"
id="rect3816"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 8.218751,33.521104 -1.28125,3.9375 21.15625,0 -1.21875,-3.9375 -18.65625,0 z"
id="path3818"
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 22.999992,35.489859 a 4.9999945,1.4999994 0 1 1 -9.999989,0 4.9999945,1.4999994 0 1 1 9.999989,0 z"
id="path3820"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 10.999998,36.474386 a 1.5156058,0.49999988 0 0 1 -3.0312116,0 1.5156058,0.49999988 0 1 1 3.0312116,0 z"
id="path3822"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 27,36.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path3824"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 16.500001,32.511162 -1,5.625214 0,6.357927 5,0 0,-6.411754 -1.09375,-5.571387 -2.90625,0 z"
id="path3826"
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
width="4"
height="5"
x="16"
y="38.989853"
id="rect3828"
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="4"
height="5"
x="16"
y="38.989853"
id="rect3830"
style="fill:url(#linearGradient9040);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 26,34.489856 a 1.4999998,0.49999981 0 1 1 -2.999999,0 1.4999998,0.49999981 0 1 1 2.999999,0 z"
id="path3832"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 12,34.489856 a 1.4999998,0.49999981 0 1 1 -2.9999992,0 1.4999998,0.49999981 0 1 1 2.9999992,0 z"
id="path3834"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
<g
transform="translate(-164.55861,-16.374087)"
id="g7909" />
d="m 1057.0679,360.95209 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2773-8"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,358.60067 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2777-6"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,356.24167 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2781-2"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0644,353.87685 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2785-4"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,351.51608 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2789-7"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,349.16287 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2797-9"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0644,346.79805 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2799-3"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,344.43728 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2801-9"
style="fill:#ddca10;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0793,342.07827 a 5.9015,2.9467531 0 1 1 -11.803,0 5.9015,2.9467531 0 1 1 11.803,0 z"
id="path2809-2"
style="fill:#ddc910;fill-opacity:1;fill-rule:evenodd;stroke:#7d6c0f;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1057.0565,339.71523 a 5.9014757,2.946741 0 1 1 -11.8029,0 5.9014757,2.946741 0 1 1 11.8029,0 z"
id="path2793-8"
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#8c7200;stroke-width:1.17950475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1055.8657,339.71345 a 4.72265,1.7654774 0 1 1 -9.4453,0 4.72265,1.7654774 0 1 1 9.4453,0 z"
id="path2795-3"
style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.17950439;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
<g
transform="matrix(0.85185006,0,0,0.85185006,824.89829,320.47226)"
id="layer1-1"
inkscape:label="Layer 1">
transform="matrix(0.88523756,0,0,0.88523756,-879.08976,-274.46989)"
id="g8085">
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient7838);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7840);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path4348"
d="M 13.520856,44.514441 0.6458606,33.014443 13.520856,21.514444 l 0,5.999999 20.874998,0 0,10.999999 -20.874998,0 0,5.999999 z" />
d="m 1011.048,356.79288 28.3084,0 0,7.10679 -28.3084,0 0,-7.10679 z"
id="path2321-7"
style="fill:#4f7f21;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1.17950368;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
style="opacity:0.35400008;fill:none;stroke:url(#linearGradient7842);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path4360"
d="M 12.520856,42.147107 2.1849036,33.014443 12.520856,23.772068 l 0,4.742375 20.839142,0 0.06052,8.999999 -20.899663,0 0,4.632665 z" />
d="m 1014.3813,349.72956 21.4339,0 3.5411,7.08818 -28.3081,0 3.3331,-7.08818 z"
id="path2323-9"
style="fill:#59af05;fill-opacity:1;fill-rule:evenodd;stroke:#2e5c02;stroke-width:1.17950404;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
<rect
width="27.128592"
height="1.179504"
x="1011.6381"
y="360.97729"
id="rect2325-6"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="27.128592"
height="1.179504"
x="1011.6381"
y="358.61829"
id="rect2327-0"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient7844);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7846);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path3801"
d="M 34.499996,26.499997 47.374992,14.999999 34.499996,3.4999999 l 0,5.9999993 -20.874998,0 0,10.9999988 20.874998,0 0,5.999999 z" />
d="m 1015.1028,350.96975 -2.3221,4.6443 24.5855,0 -2.4698,-4.6443 -19.7936,0 z"
id="path2329-4"
style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:1.17950404;stroke-miterlimit:4;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
style="opacity:0.35400008;fill:none;stroke:url(#linearGradient7848);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path3803"
d="m 35.499996,24.132664 10.335953,-9.132665 -10.335953,-9.2423735 0,4.7423745 -20.839143,0 -0.06052,8.999998 20.899662,0 0,4.632666 z" />
d="m 1031.6895,353.26726 a 5.89755,1.7692638 0 0 1 -11.7951,0 5.89755,1.7692638 0 1 1 11.7951,0 z"
id="path2746-1"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1024.0227,349.72368 -1.1795,6.64905 0,7.51513 5.8975,0 0,-7.57875 -1.2901,-6.58543 -3.4279,0 z"
id="path2715-0"
style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.17950416;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
d="m 1017.5354,354.44676 a 1.7876629,0.58975178 0 1 1 -3.5753,0 1.7876629,0.58975178 0 1 1 3.5753,0 z"
id="path2748-4"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1037.587,354.44676 a 1.7692558,0.58975178 0 1 1 -3.5385,0 1.7692558,0.58975178 0 1 1 3.5385,0 z"
id="path2750-8"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1035.8176,352.08775 a 1.7693,0.58976651 0 1 1 -3.5386,0 1.7693,0.58976651 0 1 1 3.5386,0 z"
id="path2752-7"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 1018.7149,352.08775 a 1.7692558,0.58975178 0 1 1 -3.5385,0 1.7692558,0.58975178 0 1 1 3.5385,0 z"
id="path2754-0"
style="fill:#2e5c02;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="4.7180161"
height="5.8975201"
x="1023.4327"
y="357.41238"
id="rect2673-0"
style="fill:url(#linearGradient3467);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 36 KiB