From: Joe Hunt Date: Wed, 5 May 2010 11:52:13 +0000 (+0000) Subject: Rerun X-Git-Tag: 2.3-final~913 X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=975fe59fb14e7aebb1b9071a6c6d2a2f145bdfd5 Rerun Parse error in doctext.inc doctext2.inc was forgotten. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f7f6e3b8..76576493 100644 --- 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 5f637bd4..e25e0cce 100644 --- 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 \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 18ec5a27..6d957d11 100644 --- 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 b465df3a..be6c730e 100644 --- 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."; }