From f094b8ffe36fb0c2b27ebb4055052e66caf04055 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 26 Oct 2009 15:43:10 +0000 Subject: [PATCH] Fixed another compatibility issue with MySQL 3.xx (DATE) Late language changes --- CHANGELOG.txt | 7 + lang/en_US/LC_MESSAGES/en_US.mo | Bin 901 -> 901 bytes .../LC_MESSAGES/empty.po | 124 ++++++++---------- reporting/rep710.php | 3 +- 4 files changed, 62 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fc97f271..c70b560d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,13 @@ Legend: ! -> Note $ -> Affected files +26-Oct-2009 Joe Hunt +# Fixed another compatibility issue with MySQL 3.xx (DATE) +$ /reporting/rep710.php +! Late changes in empty.po and en_US.mo +$ /lang/new_language_template/LC_MESSAGES/empty.po + /lang/en_US/LC_MESSAGES/en_US.mo + 24-Oct-2009 Janusz Dobrowolski # Fixed compatibility issue with MySQL 3.xx $ /admin/db/tags_db.inc diff --git a/lang/en_US/LC_MESSAGES/en_US.mo b/lang/en_US/LC_MESSAGES/en_US.mo index 5d7bff9f14d1993002acf6f8972ee845db669b91..f499b8b4bc844c5823caa5220f5399547f0c96e4 100644 GIT binary patch delta 34 icmZo=Z)M*Q!pLD{s$gJgWn?)yhEV~|+1$d&$OHh5(+8sf delta 34 icmZo=Z)M*Q!pLD@s9<1eWn?iqhEV~|+1$d&$OHh4*awvW diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po index 5dd597ea..04107de3 100644 --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FrontAccounting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-24 11:02+0100\n" -"PO-Revision-Date: 2009-10-24 11:02+0100\n" +"POT-Creation-Date: 2009-10-25 09:27+0100\n" +"PO-Revision-Date: 2009-10-25 09:28+0100\n" "Last-Translator: FrontAccounting \n" "Language-Team: Translators\n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ msgstr "" "X-Poedit-Basepath: c:\\Apache2\\htdocs\\account22\n" "X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account22\n" -#: c:\Apache2\htdocs\account22/frontaccounting.php:79 #: c:\Apache2\htdocs\account22/frontaccounting.php:80 +#: c:\Apache2\htdocs\account22/frontaccounting.php:81 msgid "Main Menu" msgstr "" -#: c:\Apache2\htdocs\account22/frontaccounting.php:81 +#: c:\Apache2\htdocs\account22/frontaccounting.php:82 #: c:\Apache2\htdocs\account22/access/logout.php:17 #: c:\Apache2\htdocs\account22/access/backup/logout1.php:17 msgid "Logout" @@ -478,7 +478,7 @@ msgstr "" #: c:\Apache2\htdocs\account22/admin/display_prefs.php:140 #: c:\Apache2\htdocs\account22/admin/forms_setup.php:61 #: c:\Apache2\htdocs\account22/admin/gl_setup.php:220 -#: c:\Apache2\htdocs\account22/admin/inst_module.php:265 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:267 msgid "Update" msgstr "" @@ -1029,8 +1029,8 @@ msgstr "" #: c:\Apache2\htdocs\account22/admin/inst_lang.php:139 #: c:\Apache2\htdocs\account22/admin/inst_module.php:194 -#: c:\Apache2\htdocs\account22/admin/inst_module.php:235 -#: c:\Apache2\htdocs\account22/admin/inst_module.php:294 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:296 #: c:\Apache2\htdocs\account22/admin/printers.php:88 #: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117 msgid "Name" @@ -1117,17 +1117,17 @@ msgid "Selected extension has been successfully deleted" msgstr "" #: c:\Apache2\htdocs\account22/admin/inst_module.php:194 -#: c:\Apache2\htdocs\account22/admin/inst_module.php:235 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 msgid "Tab" msgstr "" #: c:\Apache2\htdocs\account22/admin/inst_module.php:194 -#: c:\Apache2\htdocs\account22/admin/inst_module.php:235 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 msgid "Link text" msgstr "" #: c:\Apache2\htdocs\account22/admin/inst_module.php:194 -#: c:\Apache2\htdocs\account22/admin/inst_module.php:295 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:297 msgid "Folder" msgstr "" @@ -1135,57 +1135,57 @@ msgstr "" msgid "Access extensions" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:222 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:223 msgid "" "You are about to delete this extension\\n" "Do you want to continue?" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:235 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 msgid "Active" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:297 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:299 msgid "Menu Tab" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:298 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:300 msgid "Menu Link Text" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:300 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:302 msgid "Default status" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:302 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:304 msgid "Module File" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:303 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:305 msgid "Access Levels Extensions" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:304 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:306 msgid "SQL File" msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:307 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:309 msgid "Select your module PHP file from your local harddisk." msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:315 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:317 msgid "Extension data has been updated." msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:317 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:319 msgid "Extension has been installed." msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:334 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:336 msgid "Current active extensions set has been saved." msgstr "" -#: c:\Apache2\htdocs\account22/admin/inst_module.php:348 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:350 msgid "Extensions:" msgstr "" @@ -9844,12 +9844,12 @@ msgid "The security settings on your account do not permit you to access this fu msgstr "" #: c:\Apache2\htdocs\account22/includes/types.inc:47 -#: c:\Apache2\htdocs\account22/includes/types.inc:262 +#: c:\Apache2\htdocs\account22/includes/types.inc:251 msgid "Bank Payment" msgstr "" #: c:\Apache2\htdocs\account22/includes/types.inc:48 -#: c:\Apache2\htdocs\account22/includes/types.inc:261 +#: c:\Apache2\htdocs\account22/includes/types.inc:250 msgid "Bank Deposit" msgstr "" @@ -9882,7 +9882,7 @@ msgid "Supplier Payment" msgstr "" #: c:\Apache2\htdocs\account22/includes/types.inc:61 -#: c:\Apache2\htdocs\account22/includes/types.inc:119 +#: c:\Apache2\htdocs\account22/includes/types.inc:108 msgid "Work Order" msgstr "" @@ -9922,119 +9922,103 @@ msgstr "" msgid "Cash" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:96 -msgid "Purchases" -msgstr "" - -#: c:\Apache2\htdocs\account22/includes/types.inc:97 -msgid "Items and Inventory" -msgstr "" - -#: c:\Apache2\htdocs\account22/includes/types.inc:100 -msgid "Banking and General Ledger" -msgstr "" - -#: c:\Apache2\htdocs\account22/includes/types.inc:101 -msgid "Setup" -msgstr "" - -#: c:\Apache2\htdocs\account22/includes/types.inc:195 +#: c:\Apache2\htdocs\account22/includes/types.inc:184 msgid "Assemble" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:196 +#: c:\Apache2\htdocs\account22/includes/types.inc:185 msgid "Unassemble" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:197 +#: c:\Apache2\htdocs\account22/includes/types.inc:186 msgid "Advanced Manufacture" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:204 +#: c:\Apache2\htdocs\account22/includes/types.inc:193 msgid "Labour Cost" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:205 +#: c:\Apache2\htdocs\account22/includes/types.inc:194 msgid "Overhead Cost" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:220 +#: c:\Apache2\htdocs\account22/includes/types.inc:209 msgid "Assets" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:222 +#: c:\Apache2\htdocs\account22/includes/types.inc:211 msgid "Equity" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:223 +#: c:\Apache2\htdocs\account22/includes/types.inc:212 msgid "Income" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:224 +#: c:\Apache2\htdocs\account22/includes/types.inc:213 msgid "Cost of Goods Sold" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:225 +#: c:\Apache2\htdocs\account22/includes/types.inc:214 msgid "Expense" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:240 +#: c:\Apache2\htdocs\account22/includes/types.inc:229 msgid "Remainder" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:242 +#: c:\Apache2\htdocs\account22/includes/types.inc:231 msgid "Amount, increase base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:243 +#: c:\Apache2\htdocs\account22/includes/types.inc:232 msgid "Amount, reduce base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:244 +#: c:\Apache2\htdocs\account22/includes/types.inc:233 msgid "% amount of base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:245 +#: c:\Apache2\htdocs\account22/includes/types.inc:234 msgid "% amount of base, increase base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:246 +#: c:\Apache2\htdocs\account22/includes/types.inc:235 msgid "% amount of base, reduce base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:247 +#: c:\Apache2\htdocs\account22/includes/types.inc:236 msgid "Taxes added" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:248 +#: c:\Apache2\htdocs\account22/includes/types.inc:237 msgid "Taxes added, increase base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:249 +#: c:\Apache2\htdocs\account22/includes/types.inc:238 msgid "Taxes added, reduce base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:250 +#: c:\Apache2\htdocs\account22/includes/types.inc:239 msgid "Taxes included" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:251 +#: c:\Apache2\htdocs\account22/includes/types.inc:240 msgid "Taxes included, increase base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:252 +#: c:\Apache2\htdocs\account22/includes/types.inc:241 msgid "Taxes included, reduce base" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:264 +#: c:\Apache2\htdocs\account22/includes/types.inc:253 msgid "Supplier Invoice/Credit" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:280 +#: c:\Apache2\htdocs\account22/includes/types.inc:269 msgid "Purchased" msgstr "" -#: c:\Apache2\htdocs\account22/includes/types.inc:281 +#: c:\Apache2\htdocs\account22/includes/types.inc:270 msgid "Service" msgstr "" @@ -10241,16 +10225,16 @@ msgstr "" msgid "New role" msgstr "" -#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2156 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2163 msgid "No " msgstr "" -#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2191 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2198 #, php-format msgid "Activated for '%s'" msgstr "" -#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2194 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2201 msgid "Installed on system" msgstr "" diff --git a/reporting/rep710.php b/reporting/rep710.php index 131b4b4e..befed437 100644 --- a/reporting/rep710.php +++ b/reporting/rep710.php @@ -36,7 +36,6 @@ function getTransactions($from, $to, $type, $user) $sql = "SELECT a.*, SUM(IF(ISNULL(g.amount), NULL, IF(g.amount > 0, g.amount, 0))) AS amount, u.user_id, - DATE(a.stamp) as stamp, UNIX_TIMESTAMP(a.stamp) as unix_stamp FROM ".TB_PREF."audit_trail AS a JOIN ".TB_PREF."users AS u LEFT JOIN ".TB_PREF."gl_trans AS g ON (g.type_no=a.trans_no @@ -95,7 +94,7 @@ function print_audit_trail() while ($myrow=db_fetch($trans)) { - $rep->TextCol(0, 1, sql2date($myrow['stamp'])); + $rep->TextCol(0, 1, sql2date(date("Y-m-d", $myrow['unix_stamp']))); if (user_date_format() == 0) $rep->TextCol(1, 2, date("h:i:s a", $myrow['unix_stamp'])); else -- 2.30.2