Inserted Copyright Notice and fixed graphic items
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Tue, 25 Nov 2008 00:35:19 +0000 (00:35 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Tue, 25 Nov 2008 00:35:19 +0000 (00:35 +0000)
35 files changed:
CHANGELOG.txt
access/login.php
access/logout.php
admin/attachments.php
admin/backups.php
admin/change_current_user_password.php
admin/db/company_db.inc
admin/db/maintenance_db.inc
admin/db/printers_db.inc
admin/db/users_db.inc
admin/db/v_banktrans.inc
admin/db/voiding_db.inc
admin/display_prefs.php
admin/fiscalyears.php
admin/forms_setup.php
admin/gl_setup.php
admin/inst_upgrade.php
admin/payment_terms.php
admin/print_profiles.php
admin/printers.php
admin/shipping_companies.php
admin/users.php
admin/view_print_transaction.php
admin/void_transaction.php
gl/gl_journal.php
gl/includes/ui/gl_bank_ui.inc
gl/includes/ui/gl_journal_ui.inc
gl/inquiry/bank_inquiry.php
gl/inquiry/tax_inquiry.php
gl/manage/bank_accounts.php
includes/ui/ui_controls.inc
reporting/includes/pdf_report.inc
reporting/rep709.php
sales/includes/ui/sales_credit_ui.inc
sql/alter2.1.php

index 60ab21c47610b6001b693d9b783cfb42d9ff38a5..f90bd18029cbd031b5929a640b038faec896c102 100644 (file)
@@ -19,6 +19,43 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+25-Nov-2008 Joe Hunt
+! Inserted Copyright Notice and fixed graphic items
+$ /access/login.php
+  /access/logout.php
+  /admin/attachments.php
+  /admin/backups.php
+  /admin/change_current_user_password.php
+  /admin/db/company_db.inc
+  /admin/db/maintenence_db.inc
+  /admin/db/printers_db.inc
+  /admin/db/users_db.inc
+  /admin/db/v_banktrans.inc
+  /admin/db/voiding_db.inc
+  /admin/display_prefs.php
+  /admin/fiscalyears.php
+  /admin/forms_setup.php
+  /admin/gl_setup.php
+  /admin/inst_upgrade.php
+  /admin/payment_terms.php
+  /admin/print_profiles.php
+  /admin/printers.php
+  /admin/shipping_companies.php
+  /admin/users.php
+  /admin/view_print_transaction.php
+  /admin/void_transaction.php
+  /gl/gl_journal.php
+  /gl/includes/ui/gl_bank_ui.inc
+  /gl/includes/ui/gl_journal_ui.inc
+  /gl/inquiry/bank_inquiry.php
+  /gl/inquiry/tax_inquiry.php
+  /gl/manage/bank_accounts.php
+  /includes/ui/ui_controls.inc
+  /reporting/includes/pdf_report.inc
+  /reporting/rep709.php
+  /sales/includes/ui/sales_credit_ui.inc
+  /sql/alter2.1.php
+  
 24-Nov-2008 Janusz Dobrowolski
 + Added alias/foreign item codes and sales kits support.
 $ /applications/inventory.php
index 5644151811e195cbd93c31dbdc909626cc5aa095..dc2a1965e691a7d0d32bd851e70f51098c2aa179 100644 (file)
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
        if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
                die("Restricted access");
        include_once($path_to_root . "/includes/ui/ui_view.inc");
index a52b4249c45a60f8ea818ed3a000b07462e603f9..fc2a2d67890882337c533a351fc44bf8aa68c79a 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 1;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
index a36801d4ebc39dfe8df50e969331ac2ff80ac196..fb5b5e68b1ee80c057a753079b12cdb270be5911 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 8;
 
@@ -170,9 +179,9 @@ function display_rows($type)
                label_cell($row['filetype']);
                label_cell(sql2date($row['tran_date']));
                edit_button_cell("Edit".$row['id'], _("Edit"));
-               edit_button_cell("view".$row['id'], _("View"));
-               edit_button_cell("download".$row['id'], _("Download"));
-               edit_button_cell("Delete".$row['id'], _("Delete"));
+               button_cell("view".$row['id'], _("View"), false, ICON_VIEW);
+               button_cell("download".$row['id'], _("Download"), false, ICON_DOWN);
+               delete_button_cell("Delete".$row['id'], _("Delete"));
        end_row();
        }       
        end_table(1);
index 76c595a4a36fdb67dbb96f619924e8d1ea6bb250..8dfec9a138cb81723b12331aea12656578ff37cd 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 15;
 
 $path_to_root="..";
index 1f739243e21ff1b7fa2e9fb6765434e5e78cc46e..abfd8529f43c6647533708b1738a06208677c211 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security=1;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
index fde84cfe29b2a69ccd04a8807659f9faa0e8c9cd..817b5d19b0c0eec69fc4a2b638a6624202f22ce2 100644 (file)
@@ -1,6 +1,14 @@
 <?php
-
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act,
                $freight_act,
                $exchange_diff_act,
index 1a73d00a9bc05c67f47f076413eb0a0e04b91e4d..d5124981594d41cecb485ae6b5f0215d9d737d41 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 function write_config_db($new = false)
 {
        global $path_to_root, $def_coy, $db_connections, $tb_pref_counter;
index 043268a677f842249e74d2d9e9cb64a1f8549099..4d3fa96cc3a8607f9e838fc378485e278dd417e0 100644 (file)
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 function write_printer_def($id, $name, $descr, $queue, $host, $port, $timeout)
 {
        if ($id>0)
index 876f183f62dbc7dc61c0c251285a6e04aca7df22..53f3c40cdf1f22624f54be4168459eb63347f13d 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**********************************************************************
-    Copyright (C) 2005-2008  FrontAccounting, LLC.
+    Copyright (C) FrontAccounting, LLC.
        Released under the terms of the GNU Affero General Public License,
        AGPL, as published by the Free Software Foundation, either version 
        3 of the License, or (at your option) any later version.
index 9b254e83c04add2c19929daa578193829dec3154..51650c0c4d538eed0232981fab281eb3914b1d28 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 function validate_bank_trans()
index e81dd1b0dfc848376edd0fd44b27269cf05fb4f4..96e46a26bbd545b43adfc7950773e4e42ae3f313 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
index 384c0e5b398bf3fc103a5a1b8c3c2242666a788a..d23363e161ad6fe14db490a09275faf32839b344 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**********************************************************************
-    Copyright (C) 2005-2008  FrontAccounting, LLC.
+    Copyright (C) 2008  FrontAccounting, LLC.
        Released under the terms of the GNU Affero General Public License,
        AGPL, as published by the Free Software Foundation, either version 
        3 of the License, or (at your option) any later version.
index 8dfe4a8f5197d6c084d6558e07f0c9ab45896337..8aa558b0d908b8ef92c31d029d2218fb0977da2c 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 9;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -141,7 +150,7 @@ function display_fiscalyears()
                label_cell($closed_text);
                edit_button_cell("Edit".$myrow['id'], _("Edit"));
                if ($myrow["id"] != $company_year)
-                       edit_button_cell("Delete".$myrow['id'], _("Delete"));
+                       delete_button_cell("Delete".$myrow['id'], _("Delete"));
                else
                        label_cell('');
                end_row();
index b4a8aa28ae50b4fcd2f57d6b88134536c831c975..828a36fde3ab46e44ade65d6cc9302a1b722261a 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security =10;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
index b69397477570010ac9a1d8403ee27a91439461a6..e457da5cbb31d79089330ee25e9d3b0e4a2fa689 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security =10;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
index 793e050b58acab89bcc624a596ab4345bb3cf369..9141808debec6d073754a488a8164527e1f844ef 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 20;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
index 24969c94a268301ac5611b8aff46536c0b7bd8c7..2b323d2775a62ea038a13491e39accfb0e82cb45 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 10;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
@@ -164,7 +173,7 @@ while ($myrow = db_fetch($result))
     label_cell($full_text);
     label_cell($after_text);
        edit_button_cell("Edit".$myrow["terms_indicator"], _("Edit"));
-       edit_button_cell("Delete".$myrow["terms_indicator"], _("Delete"));
+       delete_button_cell("Delete".$myrow["terms_indicator"], _("Delete"));
     end_row();
 
 
index 05e5b70ad00f529acefcc4ba5e8af889b2f15b3d..49a8723ffb768e6933c9fbae4429d861b8ef958e 100644 (file)
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 15;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
index 89d64476bfb455f4a8805d4675d74ce2f375a6d5..1b6d063b9a96e70b4ac9fdd7c995845de9236a7e 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 15;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
@@ -89,7 +98,7 @@ while ($myrow = db_fetch($result))
     label_cell($myrow['host']);
     label_cell($myrow['queue']);
        edit_button_cell("Edit".$myrow['id'], _("Edit"));
-       edit_button_cell("Delete".$myrow['id'], _("Delete"));
+       delete_button_cell("Delete".$myrow['id'], _("Delete"));
     end_row();
 
 
index 1c16fa3f72358dccb17f9e5514200531452fe8d6..94dfd489b524a6128dc296ba16e9e4c562ea9c14 100644 (file)
@@ -1,6 +1,14 @@
 <?php
-
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 14;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
@@ -113,7 +121,7 @@ while ($myrow = db_fetch($result))
        label_cell($myrow["phone"]);
        label_cell($myrow["address"]);
        edit_button_cell("Edit".$myrow[0], _("Edit"));
-       edit_button_cell("Delete".$myrow[0], _("Delete"));
+       delete_button_cell("Delete".$myrow[0], _("Delete"));
        end_row();
 }
 
index 05e9adc973b406c414626dbd844f64d106a772da..d99edc62e673b657060f6fee3f2fffb2eb3b8b05 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security=15;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -122,7 +131,7 @@ while ($myrow = db_fetch($result))
        edit_button_cell("Edit".$myrow["user_id"], _("Edit"));
     if (strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username) &&
        $_SESSION["wa_current_user"]->access == 2)
-               edit_button_cell("Delete".$myrow["user_id"], _("Delete"));
+               delete_button_cell("Delete".$myrow["user_id"], _("Delete"));
        else
                label_cell('');
        end_row();
index 8f4c319c244456923bcdfc6c582286998e414e3b..dbae9f3467628618b52118c4a2acbecc1a516042 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 5;
 
@@ -132,9 +141,9 @@ function handle_search()
                        label_cell($line[$trans_no_name]);
                        if ($trans_ref)
                                label_cell($line[$trans_ref]);
-                       label_cell(get_trans_view_str($_POST['filterType'],$line[$trans_no_name], _("View")));
+                       label_cell(get_trans_view_str($_POST['filterType'],$line[$trans_no_name], _("View"), ICON_VIEW));
                        if ($print_out)
-                               label_cell(print_document_link($line[$trans_no_name], _("Print"), true, $print_type));
+                               label_cell(print_document_link($line[$trans_no_name], _("Print"), true, $print_type, ICON_PRINT));
                label_cell(get_gl_view_str($_POST['filterType'], $line[$trans_no_name]));
 
                end_row();
index 4b5669400032cc4cca1800f5a303eaff8699bbc1..0e116ab96eed9b1c7c41f43edc142dba33ab99d3 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 14;
 include_once($path_to_root . "/includes/session.inc");
index 2cef81c84cfca176a4b1fa377efb30e61ac7a061..fe4b56c2669dfed0cc54dd9e63f8b87da604b2ed 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 3;
 $path_to_root="..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
index fa6a500f43157bb2445e2eeec3046bcb8f21aa06..1626657694b0abcba8edacb2f3a764e7a1e4e891 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 function display_bank_header(&$order)
 {
        global $table_style2, $Ajax;
@@ -114,13 +123,13 @@ function display_gl_items($title, &$order)
 
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
-                       _("Dimension")." 2", _("Amount"), _("Memo"));
+                       _("Dimension")." 2", _("Amount"), _("Memo"), "");
        else if ($dim == 1)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension"),
-                       _("Amount"), _("Memo"));
+                       _("Amount"), _("Memo"), "");
        else
                $th = array(_("Account Code"), _("Account Description"),
-                       _("Amount"), _("Memo"));
+                       _("Amount"), _("Memo"), "");
 
        if (count($order->gl_items)) $th[] = '';
 
@@ -149,7 +158,7 @@ function display_gl_items($title, &$order)
 
                        edit_button_cell("Edit$item->index", _("Edit"),
                                _('Edit document line'));
-                       edit_button_cell("Delete$item->index", _("Delete"),
+                       delete_button_cell("Delete$item->index", _("Delete"),
                                _('Remove line from document'));
                end_row();
                }
@@ -240,10 +249,10 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 
        if ($id != -1)
        {
-               edit_button_cell('UpdateItem', _("Update"),
-                               _('Confirm changes'));
-               edit_button_cell('CancelItemChanges', _("Cancel"),
-                               _('Cancel changes'));
+               button_cell('UpdateItem', _("Update"),
+                               _('Confirm changes'), ICON_UPDATE);
+               button_cell('CancelItemChanges', _("Cancel"),
+                               _('Cancel changes'), ICON_CANCEL);
                set_focus('amount');
        }
        else
index 01a22ad330ff8c1c7fa9ec6fc87d0de0d1273222..c5b5eb15a0c079169f0443bb02d19599eaea057e 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
@@ -64,13 +73,13 @@ function display_gl_items($title, &$order)
        start_table("$table_style colspan=7 width=95%");
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
-                       _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"));
+                       _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
        else if ($dim == 1)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension"),
-                       _("Debit"), _("Credit"), _("Memo"));
+                       _("Debit"), _("Credit"), _("Memo"), "");
        else
                $th = array(_("Account Code"), _("Account Description"),
-                       _("Debit"), _("Credit"), _("Memo"));
+                       _("Debit"), _("Credit"), _("Memo"), "");
 
        if (count($order->gl_items)) $th[] = '';
 
@@ -104,7 +113,7 @@ function display_gl_items($title, &$order)
 
                        edit_button_cell("Edit$item->index", _("Edit"),
                                _('Edit journal line'));
-                       edit_button_cell("Delete$item->index", _("Delete"),
+                       delete_button_cell("Delete$item->index", _("Delete"),
                                _('Remove line from journal'));
                end_row();
                } 
@@ -199,10 +208,10 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 
        if ($id != -1)
        {
-               edit_button_cell('UpdateItem', _("Update"),
-                               _('Confirm changes'));
-               edit_button_cell('CancelItemChanges', _("Cancel"),
-                               _('Cancel changes'));
+               button_cell('UpdateItem', _("Update"),
+                               _('Confirm changes'), ICON_UPDATE);
+               button_cell('CancelItemChanges', _("Cancel"),
+                               _('Cancel changes'), ICON_CANCEL);
                set_focus('amount');
        } 
        else 
index 3d1ad53a23c3df39fca2d64d5954a46adf802e71..642db5efcda8eaabf5969d435b5e34dcb2adfb31 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
@@ -72,7 +81,7 @@ $sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='" . $_POST
 $before_qty = db_query($sql, "The starting balance on hand could not be calculated");
 
 start_row("class='inquirybg'");
-label_cell("<b>"._("Opening Balance")." - ".$_POST['TransAfterDate']."</b>", "colspan=5");
+label_cell("<b>"._("Opening Balance")." - ".$_POST['TransAfterDate']."</b>", "colspan=4");
 $bfw_row = db_fetch_row($before_qty);
 $bfw = $bfw_row[0];
 display_debit_or_credit_cells($bfw);
@@ -110,7 +119,7 @@ while ($myrow = db_fetch($result))
 //end of while loop
 
 start_row("class='inquirybg'");
-label_cell("<b>" . _("Ending Balance")." - ". $_POST['TransToDate']. "</b>", "colspan=5");
+label_cell("<b>" . _("Ending Balance")." - ". $_POST['TransToDate']. "</b>", "colspan=4");
 display_debit_or_credit_cells($running_total);
 label_cell("");
 end_row();
index 1de48969ed1db30d9504acd0e32e002e1819e66f..0dc7d8f224bb81b837af3d5c897157501e603397 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
@@ -123,8 +132,8 @@ function show_results()
                amount_cell($payable);
                end_row();
                alt_table_row_color($k);
-               label_cell($tx['name'] . " " . $tx['rate'] . "%");
-               label_cell(_("Net payable or collectible") . ":");
+               label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");
+               label_cell("<b>"._("Net payable or collectible") . ":</b>");
                amount_cell($net, true);
                end_row();
        }       
index 64cff25fbda5453c21b6344c73a4631b2f003f62..a3a59b3eb45a14563428c38dd87ee2b4a9209b88 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 10;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -119,7 +128,7 @@ while ($myrow = db_fetch($result))
     label_cell($myrow["bank_account_number"], "nowrap");
     label_cell($myrow["bank_address"]);
        edit_button_cell("Edit".$myrow["id"], _("Edit"));
-       edit_button_cell("Delete".$myrow["id"], _("Delete"));
+       delete_button_cell("Delete".$myrow["id"], _("Delete"));
     end_row(); 
 }
 
index 46744ae8974b14e38dad7da4c502a6fdf5c624a2..d851544c524358f057043e133528508c65c0758f 100644 (file)
@@ -187,10 +187,10 @@ function table_header($labels)
 
 //-----------------------------------------------------------------------------------
 
-function set_icon($icon, $title)
+function set_icon($icon, $title=false)
 {
        global $path_to_root;
-       return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$title' />\n";   
+       return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0'".($title ? " title='$title'" : "")." />\n";     
 }
 
 function button($name, $value, $title=false, $icon=false)
@@ -203,7 +203,7 @@ function button($name, $value, $title=false, $icon=false)
                        $icon = ICON_DELETE;
                echo "<button type='submit' class='editbutton' name='".
                        htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
-                       "' value='' />".set_icon($icon, ($title ? $title: $value))."\n";
+                       "' value=''" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."\n";
        }
        else
                echo "<input type='submit' class='editbutton' name='"
index 115fa929d24ab9a34469ed9bffab0707fba42b7d..007ee29aff9fec4fa5c39aed84f9214a0fd62fd5 100644 (file)
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 /* $Revision$ */
 $page_security = 8;
 //include_once($path_to_root . "reporting/includes/class.pdf.inc");
index 6f0139a1ff769f94b0bee02f5bbd34c5a3091515..471343dc1939ae3a6482776b84ac805f397a17ae 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
@@ -89,7 +98,7 @@ function getSuppTransactions($from, $to)
 
 function getTaxTypes()
 {
-       $sql = "SELECT id FROM ".TB_PREF."tax_types ORDER BY id";
+       $sql = "SELECT * FROM ".TB_PREF."tax_types ORDER BY id";
     return db_query($sql,"No transactions were returned");
 }
 
@@ -187,9 +196,9 @@ function print_tax_report()
                $cols = array(0, 80, 130, 190, 290, 370, 435, 500, 565);
 
                $headers = array(_('Trans Type'), _('#'), _('Date'), _('Name'), _('Branch Name'),
-                       _('Net'), _('Tax'));
+                       _('Net'), _('Tax'), '');
 
-               $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right');
+               $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
 
                $params =   array(      0 => $comments,
                                                        1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
@@ -389,58 +398,68 @@ function print_tax_report()
        $rep->Line($rep->row - 4);
 
        $rep->row -= 16;
-       $rep->TextCol(0, 5, _("General Ledger"));
+       $rep->Font('italic');
+       $rep->TextCol(0, 1, _("General Ledger"));
+       $rep->aligns[1] = 'left';
+       $rep->TextCol(1, 3, _("Description"));
+       $rep->TextCol(3, 4, _("Amount"));
+       $rep->Font();
        $rep->Line($rep->row - 6);
 
        $rep->row -= 22;
+       
+       $taxes = getTaxTypes();
+       $total = 0;
+       $bdate = date2sql($from);
+       $edate = date2sql($to);
 
-       $trow = $rep->row;
-
-       $idcounter = count($taxes);
-       $i = 0;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $str = $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%";
-               $rep->TextCol($i, $i + 1, $str);
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
+       while ($tx = db_fetch($taxes))
        {
-               $tx = getTaxInfo($taxes[$j]);
-               $acc = get_gl_account($tx['sales_gl_code']);
-               $rep->TextCol($i, $i + 1, $acc['account_code']." ".$acc['account_name']);
-               $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $amount = get_gl_trans_from_to($from, $to, $tx['sales_gl_code']);
-               $rep->TextCol($i, $i + 1,number_format2(-$amount, $dec));
+               if ($tx['sales_gl_code'] == $tx['purchasing_gl_code'])
+               {
+                       $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) AS payable, SUM(IF(amount < 0, -amount, 0)) AS collectible
+                               FROM ".TB_PREF."gl_trans WHERE account = '".$tx['sales_gl_code']."' AND tran_date >= '$bdate' AND tran_date <= '$edate'";
+                       $result = db_query($sql, "Error retrieving tax inquiry");
+                       $row = db_fetch($result);
+                       $payable = -$row['payable'];
+                       $collectible.= -$row['collectible'];
+               }
+               else
+               {
+                       $sql = "SELECT SUM(amount) AS collectible
+                               FROM ".TB_PREF."gl_trans WHERE account = '".$tx['sales_gl_code']."' AND tran_date >= '$bdate' AND tran_date <= '$edate'";
+                       $result = db_query($sql, "Error retrieving tax inquiry");
+                       $row = db_fetch($result);
+                       $collectible = -$row['collectible'];
+                       $sql = "SELECT SUM(amount) AS payable
+                               FROM ".TB_PREF."gl_trans WHERE account = '".$tx['purchasing_gl_code']."' AND tran_date >= '$bdate' AND tran_date <= '$edate'";
+                       $result = db_query($sql, "Error retrieving tax inquiry");
+                       $row = db_fetch($result);
+                       $payable = -$row['payable'];
+               }
+               $net = $collectible + $payable;
+               $total += $net;
+               $rep->TextCol(0, 1, $tx['name'] . " " . $tx['rate'] . "%");
+               $rep->TextCol(1, 3, _("Charged on sales") . " (" . _("Output Tax")."):");
+               $rep->TextCol(3, 4, number_format2($collectible, $dec));
                $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $acc = get_gl_account($tx['purchasing_gl_code']);
-               $rep->TextCol($i, $i + 1, $acc['account_code']." ".$acc['account_name']);
+               $rep->TextCol(0, 1, $tx['name'] . " " . $tx['rate'] . "%");
+               $rep->TextCol(1, 3, _("Paid on purchases") . " (" . _("Input Tax")."):");
+               $rep->TextCol(3, 4, number_format2($payable, $dec));
                $rep->NewLine();
-       }
-       $i++;
-       $rep->row = $trow;
-       for ($j = 0; $j < $idcounter; $j++)
-       {
-               $tx = getTaxInfo($taxes[$j]);
-               $amount = get_gl_trans_from_to($from, $to, $tx['purchasing_gl_code']);
-               $rep->TextCol($i, $i + 1,number_format2($amount, $dec));
+               $rep->Font('bold');
+               $rep->TextCol(0, 1, $tx['name'] . " " . $tx['rate'] . "%");
+               $rep->TextCol(1, 3, _("Net payable or collectible"));
+               $rep->TextCol(3, 4, number_format2($net, $dec));
+               $rep->Font();
                $rep->NewLine();
        }
+       $rep->Font('bold');
+       $rep->TextCol(1, 3, _("Total payable or refund"));
+       $rep->TextCol(3, 4, number_format2($total, $dec));
+       $rep->Font();
+       $rep->NewLine();
+       
        $rep->Line($rep->row - 4);
 
        $locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc";
index c097cc976983853b2a1f32d2179b495dff6b8234..a38c4aedc86731f20b4e088eb7c040283a765a65 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/ui.inc");
 
 // ------------------------------------------------------------------------------
@@ -200,7 +209,7 @@ function display_credit_items($title, &$order)
 
            edit_button_cell("Edit$line_no", _('Edit'),
                                _('Edit document line'));
-           edit_button_cell("Delete$line_no", _('Delete'),
+           delete_button_cell("Delete$line_no", _('Delete'),
                                _('Remove line from document'));
 
            end_row();
@@ -288,10 +297,10 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
 
        if ($id!=-1)
        {
-               edit_button_cell('UpdateItem', _("Update"),
-                               _('Confirm changes'));
-               edit_button_cell('CancelItemChanges', _("Cancel"),
-                               _('Cancel changes'));
+               button_cell('UpdateItem', _("Update"),
+                               _('Confirm changes'), ICON_UPDATE);
+               button_cell('CancelItemChanges', _("Cancel"),
+                               _('Cancel changes'), ICON_CANCEL);
                hidden('line_no', $line_no);
                set_focus('qty');
        }
index 6eae749ff58bbaaa3d4fe8e6d516c70103b77f0c..51359ef2ecfc96eeb86ef968a47a89c821ddfd76 100644 (file)
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 class fa2_1 {
        var $version = '2.1';   // version installed
        var $description = 'Version 2.1';