X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fsales_db.inc;h=1eb5e9060371c40d786d7897e9e09acab4e8c173;hb=5363021b0a477a1332cc19598c245edd2f8afd91;hp=3708b7f5eaa749ba104f9a43766c4405fdbf44e4;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 3708b7f5..1eb5e906 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -1,13 +1,13 @@
 <?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.
+	Released under the terms of the GNU General Public License, GPL, 
+	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>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/db/inventory_db.inc");
@@ -60,7 +60,7 @@ function add_gl_trans_customer($type, $type_no, $date_, $account, $dimension, $d
 function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=null)
 {
 	if ($date == null)
-	    $date = Today();
+	    $date = new_doc_date();
 
 	if ($factor === null) 
 	{
@@ -289,15 +289,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
 		$cart->dimension2_id = $myrow['dimension2_id'];
 		$cart->Comments = '';
 		foreach ( $trans_no as $trans ) {
-			$coms =  get_comments($doc_type,$trans);
-			while($row=db_fetch($coms)) {
-				$text = $row['memo_'];
-				if ($text!='') {
-					if ($cart->Comments!='')
-						$cart->Comments .= "\n";
-					$cart->Comments .= $text;
-				}
-			}
+			$cart->Comments .= get_comments_string($doc_type,$trans);
 		}
 
 		// FIX this should be calculated sum() for multiply parents