Permalink
Browse files

Adjusted some names in the english and the german version on koalixcr…

…m correced a bug in the balancesheet pdf creation.
  • Loading branch information...
1 parent 3770347 commit 6de25ade8da39ec71e4436b5256695a26fc6f5d2 Aaron Riedener committed May 15, 2011
@@ -5,6 +5,6 @@
ACCOUNTTYPECHOICES = (
('E', _('Earnings')),
('S', _('Spendings')),
- ('P', _('Passiv')),
- ('A', _('Activ')),
+ ('L', _('Liabilities')),
+ ('A', _('Assets')),
)
Binary file not shown.
@@ -8,107 +8,148 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 20:24+0200\n"
+"POT-Creation-Date: 2011-05-16 01:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: admin.py:13 admin.py:24
+#: admin.py:24 admin.py:38
msgid "Basic"
msgstr "Grundlagen"
-#: admin.py:31
+#: admin.py:45 admin.py:70
msgid "Basics"
msgstr "Grundlagen"
-#: admin.py:41
+#: admin.py:56
msgid "Create PDF of Balance Sheet"
msgstr "Erzeuge ein PDF der Bilanz"
-#: models.py:12
+#: admin.py:62
+msgid "Create PDF of Profit Loss Statement Sheet"
+msgstr "Erzeuge ein PDF der Erfolgsrechnung"
+
+#: models.py:17
msgid "Title"
msgstr "Titel"
-#: models.py:13
+#: models.py:18
msgid "Begin"
msgstr "Anfang"
-#: models.py:14
+#: models.py:19
msgid "End"
msgstr "Ende"
-#: models.py:60
+#: models.py:137
msgid "Accounting Calculation Unit"
msgstr "Geschäftsjahr/quartal"
-#: models.py:61
+#: models.py:138
msgid "Accounting Calculation Units"
msgstr "Geschäftsjahre/quartale"
-#: models.py:64
+#: models.py:141
msgid "Account Number"
msgstr "Kontonummer"
-#: models.py:65
+#: models.py:142
msgid "Account Title"
msgstr "Kontobezeichnung"
-#: models.py:66
+#: models.py:143
msgid "Account Type"
msgstr "Kontotyp"
-#: models.py:90 models.py:91
+#: models.py:144
+msgid "Is The Open Liabilities Account"
+msgstr "Konto für offene Rechungen"
+
+#: models.py:146
+msgid "Is The Open Interests Account"
+msgstr "Konto für offene Forderungen"
+
+#: models.py:148
+msgid "Is a Product Inventory Account"
+msgstr "Konto für Lager"
+
+#: models.py:150
+msgid "Is a Customer Payment Account"
+msgstr "Konto für Kundeneinzahlungen"
+
+#: models.py:183 models.py:184
msgid "Account"
msgstr "Konto"
-#: models.py:95
+#: models.py:188
+msgid "Product Categorie Title"
+msgstr "Produktekategorie"
+
+#: models.py:189
+msgid "Profit Account"
+msgstr "Ertrag Konto"
+
+#: models.py:190
+msgid "Loss Account"
+msgstr "Aufwand Konto"
+
+#: models.py:195 models.py:196
+msgid "Product Categorie"
+msgstr "Produktekategorie"
+
+#: models.py:201
msgid "From Account"
msgstr "Vom Konto (Soll)"
-#: models.py:96
+#: models.py:202
msgid "To Account"
msgstr "Zu Konto (Haben)"
-#: models.py:97
+#: models.py:203
msgid "Amount"
msgstr "Betrag"
-#: models.py:98
+#: models.py:204
msgid "Description"
msgstr "Beschreibung"
-#: models.py:100
+#: models.py:205
+msgid "Booking Reference"
+msgstr "Buchungsreferenz"
+
+#: models.py:206
msgid "Booking at"
msgstr "Buchung am"
-#: models.py:101
+#: models.py:207
msgid "AccountingCalculationUnit"
msgstr "Geschäftsjahr/quartal"
-#: models.py:102
+#: models.py:208
msgid "Reference Staff"
msgstr "Zuständiger Mitarbeiter"
-#: models.py:103
+#: models.py:209
msgid "Created at"
msgstr "Erstellt am"
-#: models.py:104
+#: models.py:210
msgid "Last modified"
msgstr "Zuletzt verändert"
-#: models.py:105
+#: models.py:211
msgid "Last modified by"
msgstr "Zuletzt verändert von"
-#: models.py:112
+#: models.py:219
msgid "Booking"
msgstr "Buchung"
-#: models.py:113
+#: models.py:220
msgid "Bookings"
msgstr "Buchungen"
@@ -121,12 +162,10 @@ msgid "Spendings"
msgstr "Aufwand (Ausgaben)"
#: const/accountTypeChoices.py:8
-msgid "Passiv"
-msgstr "Passiva (Schulden)"
+msgid "Liabilities"
+msgstr "Passiva"
#: const/accountTypeChoices.py:9
-msgid "Activ"
-msgstr "Aktiva (Vermögen)"
+msgid "Assets"
+msgstr "Aktiva"
-#~ msgid "Balance Sheet PDF created"
-#~ msgstr "PDF der Bilanz erzeugt"
View
@@ -27,7 +27,7 @@ def createBalanceSheetPDF(self, raisedbyuser):
calculationUnitName.appendChild(doc.createTextNode(self.__unicode__()))
main.appendChild(calculationUnitName)
organisiationname = doc.createElement("organisiationname")
- organisiationname.appendChild(doc.createTextNode(settings.MEDIA_ROOT+userExtention[0].defaultTemplateSet.organisiationname))
+ organisiationname.appendChild(doc.createTextNode(settings.MEDIA_ROOT+userExtention[0].defaultTemplateSet.organisationname))
main.appendChild(organisiationname)
calculationUnitTo = doc.createElement("calculationUnitTo")
calculationUnitTo.appendChild(doc.createTextNode(self.end.year.__str__()))
@@ -58,7 +58,7 @@ def createBalanceSheetPDF(self, raisedbyuser):
main.appendChild(currentAccountElement)
if account.accountType == "A":
overallvalue = overallvalue + currentValue;
- if account.accountType == "P":
+ if account.accountType == "L":
overallvalue = overallvalue - currentValue;
profitloss = doc.createElement("ProfitLoss")
profitloss.appendChild(doc.createTextNode(overallvalue.__str__()))
@@ -141,7 +141,7 @@ class Account(models.Model):
accountNumber = models.IntegerField(verbose_name=_("Account Number"))
title = models.CharField(verbose_name=_("Account Title"), max_length=50)
accountType = models.CharField(verbose_name=_("Account Type"), max_length=1, choices=ACCOUNTTYPECHOICES)
- isopenreliabilitiesaccount = models.BooleanField(verbose_name=_("Is The Open Reliabilities Account"))
+ isopenreliabilitiesaccount = models.BooleanField(verbose_name=_("Is The Open Liabilities Account"))
# TODO: There may only be one isopenreliabilitiesaccount and it must be an activa
isopeninterestaccount = models.BooleanField(verbose_name=_("Is The Open Interests Account"))
# TODO: There may only be one openinterestaccount and it must be an activa
View
@@ -244,8 +244,12 @@ class OptionInvoice(admin.ModelAdmin):
inlines = [SalesContractInlinePosition, SalesContractPostalAddress, SalesContractPhoneAddress, SalesContractEmailAddress]
def save_model(self, request, obj, form, change):
- obj.staff = request.user
- obj.save()
+ if (change == True):
+ obj.lastmodifiedby = request.user
+ else:
+ obj.lastmodifiedby = request.user
+ obj.staff = request.user
+ obj.save()
def recalculatePrices(self, request, queryset):
try:
@@ -33,7 +33,7 @@ def __unicode__(self):
return str(self.id) + ' ' + self.user.__unicode__()
class TemplateSet(models.Model):
- organisiationname = models.CharField(verbose_name = _("Name of the Organisation"), max_length=200)
+ organisationname = models.CharField(verbose_name = _("Name of the Organisation"), max_length=200)
title = models.CharField(verbose_name = _("Title"), max_length=100)
invoiceXSLFile = models.ForeignKey(XSLFile, verbose_name=_("XSL File for Invoice"), related_name="db_reltemplateinvoice")
quoteXSLFile = models.ForeignKey(XSLFile, verbose_name=_("XSL File for Quote"), related_name="db_reltemplatequote")
@@ -101,7 +101,7 @@
</fo:table-cell>
</fo:table-header>
<xsl:choose>
- <xsl:when test="Account[accountType='P']/None">-</xsl:when>
+ <xsl:when test="Account[accountType='A']/None">-</xsl:when>
<xsl:otherwise>
<fo:table-body font-size="9pt"
font-family="BitstreamVeraSans">
@@ -155,7 +155,7 @@
Wert
</fo:block>
</fo:table-cell>
- <xsl:for-each select="Account[@accountType='P']">
+ <xsl:for-each select="Account[@accountType='L']">
<xsl:sort select="AccountNumber" data-type="number"/>
<fo:table-row keep-together="always">
<fo:table-cell border-color="black" border-style="solid" border-width="0.5pt" padding="2.5pt">
@@ -78,7 +78,7 @@
<fo:block font-size="9pt"
font-family="BitstreamVeraSans"
text-align="left"
- line-height="13pt" >Activa</fo:block>
+ line-height="13pt" >Assets</fo:block>
<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="11cm"/>
@@ -101,7 +101,7 @@
</fo:table-cell>
</fo:table-header>
<xsl:choose>
- <xsl:when test="Account[accountType='P']/None">-</xsl:when>
+ <xsl:when test="Account[accountType='A']/None">-</xsl:when>
<xsl:otherwise>
<fo:table-body font-size="9pt"
font-family="BitstreamVeraSans">
@@ -133,7 +133,7 @@
font-family="BitstreamVeraSans"
text-align="left"
line-height="13pt"
- padding-top="0.7cm">Passiva</fo:block>
+ padding-top="0.7cm">Liabilities</fo:block>
<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="11cm"/>
@@ -155,7 +155,7 @@
Value
</fo:block>
</fo:table-cell>
- <xsl:for-each select="Account[@accountType='P']">
+ <xsl:for-each select="Account[@accountType='L']">
<xsl:sort select="AccountNumber" data-type="number"/>
<fo:table-row keep-together="always">
<fo:table-cell border-color="black" border-style="solid" border-width="0.5pt" padding="2.5pt">
@@ -181,7 +181,7 @@
font-family="BitstreamVeraSans"
text-align="left"
line-height="13pt"
- padding-top="0.7cm">Gewinn/Verlust</fo:block>
+ padding-top="0.7cm">Profit/Loss</fo:block>
<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="11cm"/>
@@ -191,7 +191,7 @@
text-align="left"
font-weight="bold"
margin-top="1cm">
- Rechnung RE-<xsl:value-of select="object[@model='crm.salescontract']/@pk"/>
+ Invoice IN-<xsl:value-of select="object[@model='crm.salescontract']/@pk"/>
</fo:block>
<fo:block font-size="9pt"
font-family="BitstreamVeraSans"

0 comments on commit 6de25ad

Please sign in to comment.