From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 24 Nov 2008 10:59:42 +0000 (+0000)
Subject: Release 2.0.5
X-Git-Tag: 2.3-final~1379
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=1f53291908fb2043b06a3aa9644a026aac450472;p=fa-stable.git

Release 2.0.5
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0516a846..e5cc3f3a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,16 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+------------------------------- Release 2.0.5 --------------------------------------------
+24-Nov.2008 Joe Hunt
+! Release 2.0.5
+$ config.php
+! Changed update.html
+$ update.html
+# Small bug fixes
+$ /reporting/includes/header2.inc
+  /sales/view/view_receipt.php
+
 20-Nov-2008 Janusz Dobrowolski
 # [0000082] Bad js allocation on All/None button press.
 $ /sales/allocations/customer_allocate.php
diff --git a/config.php b/config.php
index c21a79b9..a8c37f49 100644
--- a/config.php
+++ b/config.php
@@ -38,7 +38,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	// Main Title
 	$app_title = "FrontAccounting";
 	// application version
-	$version 		= "2.0.4";
+	$version 		= "2.0.5";
 
 	// Build for development purposes
 	$build_version 	= date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));
diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 84d93e1e..ac10c408 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -111,7 +111,7 @@
 		$this->Text($mcol, $doc_Due_Date . ":", $mcol2);
 		if ($doctype == 9)
 			$this->Text($mcol2, sql2date($myrow['delivery_date']));
-		else if ($doctype != 8 && isset($myrow['due_date']))
+		else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
 			$this->Text($mcol2, sql2date($myrow['due_date']));
 		if ($branch != null)
 		{
diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 13797b0a..71210945 100644
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -4,12 +4,16 @@ $page_security = 1;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("View Customer Payment"), true);
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
+$js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(900, 600);
+
+page(_("View Customer Payment"), true, false, "", $js);
+
 if (isset($_GET["trans_no"]))
 {
 	$trans_id = $_GET["trans_no"];
@@ -43,7 +47,7 @@ $voided = is_voided_display(systypes::cust_payment(), $trans_id, _("This custome
 
 if (!$voided)
 {
-	display_allocations_from(payment_person_types::customer(), $receipt['debtor_no'], systypes::cust_payment(), $trans_id, -$receipt['Total']);
+	display_allocations_from(payment_person_types::customer(), $receipt['debtor_no'], systypes::cust_payment(), $trans_id, $receipt['Total']);
 }
 
 end_page(true);
diff --git a/update.html b/update.html
index 2c070204..cc0bb64d 100644
--- a/update.html
+++ b/update.html
@@ -53,7 +53,7 @@ password and choose the update script from the local harddisk.</li>
 do this, before entering FrontAccounting!
 Enter the database user and the password and choose the alter.sql
 script. &nbsp;Do the same for the alter2.sql script. If you have
-already updated release 2.0 Beta, you can just run the alter2.sql script.<br />You must also manuelly ensure that you have write permission to the new folder /company/0.</strong></li>
+already updated release 2.0 Beta, you can just run the alter2.sql script.<br />You must also manuelly ensure that you have write permission to the new folder /company/0.<br /></strong><strong>There are no database changes during a major and minor release. Like from 2.0 to 2.0.1 - 2.0.5 .</strong></li>
 </ul>
 
 <p>&nbsp;</p>