X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=e19ea3160f0c68ea34b02dcdb65f73b5eb39df4a;hb=f01cb25258d7b619f820d8f78e9bccf4501fc58e;hp=1bc3db242f5b0528d2f98a2a65bde6275125bd14;hpb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 1bc3db24..e19ea316 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -293,11 +293,11 @@ class Cart
 		{
 			if (!empty($SysPrefs->prefs['ref_no_auto_increase']))
 				$this->reference = $Refs->get_next($this->trans_type, null, array('date' => Today()));
-			if (!is_new_reference($this->reference, $this->trans_type))	
+			else	
 			{
 				commit_transaction();
 				return -1;
-			}	
+			}
 		}
 		if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY) && !$this->is_prepaid()) {
 			// this is direct document - first add parent
@@ -565,7 +565,6 @@ class Cart
 		$total = $this->get_items_total() + $this->freight_cost;
 		$dec = user_price_dec();
 		if (!$this->tax_included ) {
-			$total += $this->get_shipping_tax();
 			$taxes = $this->get_taxes();
 			foreach($taxes as $tax)
 				$total += round($tax['Value'], $dec);