Rerun

Parse error in doctext.inc
doctext2.inc was forgotten.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f7f6e3b881a2dfa7df93a6b673d15e67c01c7908..76576493a9f2ac4462f1a13932271c5a1b35af8b 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -21,7 +21,8 @@ $ -> Affected files
 
 04-May-2010 Janusz Dobrowolski/Robert Laussegger
 # Fixed amibiguites and typos in report titles.
-$ reporting/includes/doctext.inc
+$ /reporting/includes/doctext.inc
+  /reporting/includes/doctext2.inc
 
 04-May-2010 Joe Hunt
 # [0000225] Supplier Payment Report showing paid invoices (rounding problem)

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 5f637bd4c87df878ac8923eba1a4a9333457016f..e25e0cce29f47363856485a1d7c24e1dfe813de6 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FrontAccounting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 14:48+0100\n"
-"PO-Revision-Date: 2010-05-04 14:48+0100\n"
+"POT-Creation-Date: 2010-05-05 13:48+0100\n"
+"PO-Revision-Date: 2010-05-05 13:48+0100\n"
 "Last-Translator: Translation Team <info@frontaccounting.net>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: English\n"
 "X-Poedit-Country: UNITED KINGDOM\n"
@@ -10859,7 +10859,7 @@ msgid "Kindest regards"
 msgstr ""
 
 #: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:129
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:134
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:138
 msgid "Delivery Note No."
 msgstr ""
 
@@ -10872,75 +10872,83 @@ msgid "Remittance No."
 msgstr ""
 
 #: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:132
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:135
-msgid "Order No."
+msgid "Purchase Order No."
 msgstr ""
 
 #: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:133
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:139
+msgid "Order No."
+msgstr ""
+
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:134
+msgid "Quotation No."
+msgstr ""
+
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:135
 msgid "Invoice No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:133
-msgid "Word Order No."
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:136
+msgid "Work Order No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:133
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:136
 msgid "Credit No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:147
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:151
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:148
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:152
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:149
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:153
 msgid "TOTAL PO EX VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:150
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:154
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:154
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:158
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:155
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:159
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:156
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:160
 msgid "Dated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:157
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:161
 msgid "Drawn on Bank"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:159
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:163
 msgid "Received / Sign"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:163
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:167
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:165
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:169
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:169
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:173
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:172
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:176
 msgid "Statement"
 msgstr ""
 
-#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:173
+#: c:\Apache2\htdocs\account228/reporting/includes/doctext.inc:177
 msgid "as of"
 msgstr ""
 

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index 18ec5a27c22be377bf6c577ee82a4e6160765d2c..6d957d11d2c785a14fe19925873cfa15f29252ce 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -131,7 +131,7 @@ if (isset($header2type) || isset($linetype))
                ($doctype == ST_SUPPAYMENT ? _("Remittance No.") :
                ($doctype == ST_PURCHORDER ? _("Purchase Order No.") :
                ($doctype == ST_SALESORDER ? _("Order No.") :
-               ($doctype == ST_SALESQUOTE  ? _("Quotation No.") :
+               ($doctype == ST_SALESQUOTE ? _("Quotation No.") :
                ($doctype == ST_SALESINVOICE ? _("Invoice No.") :
                ($doctype == ST_WORKORDER ? _("Work Order No.") : _("Credit No.")))))))));
 

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index b465df3a09e69d3d9b94805d2876d74c36096b2a..be6c730e51b4d62878b9434451567db562a58dab 100644 (file)
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -125,11 +125,14 @@ if (isset($emailtype))
 }
 if (isset($header2type) || isset($linetype))
 {
-       $doc_Invoice_no = ($doctype==ST_CUSTDELIVERY ? "Delivery Note No." :
+       $doc_Invoice_no = ($doctype==ST_CUSTDELIVERY ? "Delivery Note No." : 
                ($doctype == ST_CUSTPAYMENT ? "Receipt No." :
                ($doctype == ST_SUPPAYMENT ? "Remittance No." :
-               (($doctype == ST_SALESQUOTE || $doctype==ST_PURCHORDER || $doctype==ST_SALESORDER) ? "Order no." : 
-               ($doctype==ST_SALESINVOICE ? "Invoice No." : ($doctype == ST_WORKORDER ? "Work Order No." : "Credit No."))))));
+               ($doctype == ST_PURCHORDER ? "Purchase Order No." :
+               ($doctype == ST_SALESORDER ? "Order No." :
+               ($doctype == ST_SALESQUOTE ? "Quotation No." :
+               ($doctype == ST_SALESINVOICE ? "Invoice No." :
+               ($doctype == ST_WORKORDER ? "Work Order No." : "Credit No."))))))));
        $doc_Delivery_no = "Delivery Note No.";
        $doc_Order_no = "Order No.";
 }