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

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index a537894b..1eb5e906 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	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/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/db/inventory_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_order_db.inc");
@@ -51,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) 
 	{
@@ -76,7 +85,9 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	if ($factor == 0) return false; // auto price calculations off
 
 	$base_id = get_base_sales_type();
-        $home_curr = get_company_currency();
+	if ($base_id <= 0) return 0; // auto price calculations off
+	
+    $home_curr = get_company_currency();
 
     // get all prices which we can use to guess the price.
     // alternative is make up to 2 additional sql queries
@@ -278,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