X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=00332e09f70b400fa5dfe17ed7b6055881700220;hb=81c7b7180002519fbd9790fcecd019c5a89fcbdf;hp=c2f7f4ab6d436ca7bf0bbadd33980700594b631c;hpb=7a50c189ea995d5fe6785feb7710c00396065d2b;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index c2f7f4ab..00332e09 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -25,7 +25,7 @@ class cart
 
 	var $document_date;
 	var $due_date;
-	var $default_sales_type; // set to the customer's sales type
+	var $sales_type; // set to the customer's sales type
 	var $sales_type_name; // set to customer's sales type name
 	var $tax_included;
 
@@ -54,7 +54,7 @@ class cart
 	var $tax_group_id;
 	var $tax_group_name;
 	var $tax_group_array = null; // saves db queries
-
+	var $price_factor;	 // ditto for price calculations
 	//-------------------------------------------------------------------------
 	//
 	//  $trans_no==0 => open new/direct document
@@ -64,94 +64,101 @@ class cart
 	function Cart($type, $trans_no=0, $view=false ) {
 		/*Constructor function initialises a new shopping cart */
 		$this->line_items = array();
-		$this->default_sales_type = "";
+		$this->sales_type = "";
 		$this->trans_type = 30;
 		$this->read($type, $trans_no, $view );
-
 	}
 
+	//-------------------------------------------------------------------------
+	// Reading document into cart
+	//
+	function read($type, $trans_no = 0, $view=false ) {
 
-	function read($type, $trans_no=0, $view=false ) {
-
-	if (!is_array($trans_no)) $trans_no = array($trans_no);
+		if (!is_array($trans_no)) $trans_no = array($trans_no);
 
-	if ($trans_no[0]) {
-		if ($type==30) { // sales order
-			read_sales_order($trans_no[0], $this);
-			if ($view) {	// prepare for DN/IV entry
-				for($line_no=0; $line_no<count($this->line_items); $line_no++) {
-					$line= &$this->line_items[$line_no];
-					$line->qty_dispatched = $line->quantity-$line->qty_done;
-				}
-			}
-			} else {	// derivative transaction
-				read_sales_trans($type, $trans_no, $this);
-				if ($this->order_no) { // free hand credit notes have no order_no
-					$sodata = get_sales_order_header($this->order_no);
-					$this->cust_ref = $sodata["customer_ref"];
-//set_customer($customer_name, $customer_id, $currency, $discount)
-//*					$this->customer_name = $sodata["name"];
-//*					$this->customer_currency = $sodata["curr_code"];
-//*					$this->Comments = $sodata["comments"];
-					$this->delivery_address = $sodata["delivery_address"];
-//					$this->location_name = $sodata["location_name"];
-//					$this->document_date = sql2date($myrow["ord_date"]);
-				}
-				if (!$view && ($type!=11 || $this->trans_link!=0)) {
-					$src_type = get_parent_type($type);
-					$src_details = 0;
-					if ($src_type==30) { // get src data from sales_orders
-						$this->src_docs = array( $sodata['order_no']=>$sodata['version']);
-						$srcdetails = get_sales_order_details($this->order_no);
-					} else {	// get src_data from debtor_trans
-						$this->src_docs = get_customer_trans_version($src_type, get_parent_trans($type,$trans_no[0]));
-						$srcdetails = get_customer_trans_details($src_type,array_keys($this->src_docs));
-					}
-					// calculate & save: qtys on other docs and free qtys on src doc
-					$line_no = 0;
-					for($line_no=0; $srcline = db_fetch($srcdetails); $line_no++) {
-						$sign = 1; // $type==13 ?  1 : -1; // this is strange debtor_trans atavism
+		if ($trans_no[0]) {
+			if ($type == 30) { // sales order
+				read_sales_order($trans_no[0], $this);
+				if ($view) {	// prepare for DN/IV entry
+					for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
 						$line = &$this->line_items[$line_no];
-
-						$line->qty_old = $line->qty_dispatched = $line->quantity;
-						$line->quantity += $sign*($srcline['quantity']-$srcline['qty_done']); // add free qty on src doc
+						$line->qty_dispatched = $line->quantity - $line->qty_done;
 					}
-				} else {
-					for($line_no=0; $line_no<count($this->line_items); $line_no++) {
-						$line= &$this->line_items[$line_no];
-						$line->qty_dispatched = $line->quantity;
+				}
+				} else {	// derivative transaction
+					read_sales_trans($type, $trans_no, $this);
+					if ($this->order_no) { // free hand credit notes have no order_no
+						$sodata = get_sales_order_header($this->order_no);
+						$this->cust_ref = $sodata["customer_ref"];
+					// currently currency is hard linked to debtor account
+					//	$this->customer_currency = $sodata["curr_code"];
+						$this->delivery_to = $sodata["deliver_to"];
+						$this->delivery_address = $sodata["delivery_address"];
+					}
+					if (!$view && ($type!=11 || $this->trans_link!=0)) {
+						$src_type = get_parent_type($type);
+						$src_details = 0;
+						if ($src_type == 30) { // get src data from sales_orders
+							$this->src_docs = array( $sodata['order_no']=>$sodata['version']);
+							$srcdetails = get_sales_order_details($this->order_no);
+						} else {	// get src_data from debtor_trans
+							$this->src_docs = get_customer_trans_version($src_type, get_parent_trans($type,$trans_no[0]));
+							$srcdetails = get_customer_trans_details($src_type,array_keys($this->src_docs));
+						}
+						// calculate & save: qtys on other docs and free qtys on src doc
+						$line_no = 0;
+						for($line_no = 0; $srcline = db_fetch($srcdetails); $line_no++) {
+							$sign = 1; // $type==13 ?  1 : -1; // this is strange debtor_trans atavism
+							$line = &$this->line_items[$line_no];
+
+							$line->qty_old = $line->qty_dispatched = $line->quantity;
+							$line->quantity += $sign * ($srcline['quantity'] - $srcline['qty_done']); // add free qty on src doc
+						}
+					} else {
+						for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
+							$line = &$this->line_items[$line_no];
+							$line->qty_dispatched = $line->quantity;
+						}
 					}
 				}
+			} else {
+				$this->trans_type = $type;
+				$this->trans_no = 0;
+				// set new sales document defaults here
+				if (get_global_customer() != reserved_words::get_all())
+				  $this->customer_id = get_global_customer();
+				else
+				  $this->customer_id = '';
+				$this->document_date = Today();
+				if (!is_date_in_fiscalyear($this->document_date))
+					$this->document_date = end_fiscalyear();
+				$this->reference = references::get_next($this->trans_type);
+				if ($type == 10)
+				  $this->due_date =
+					get_invoice_duedate($this->customer_id, $this->document_date);
+				else
+				  $this->due_date =
+					add_days($this->document_date, 10); // FIX this should be in company prefs
 			}
-		} else {
-			$this->trans_type = $type;
-			$this->trans_no = 0;
-			// set new sales document defaults here
-			$this->customer_id='';
-			$this->document_date = Today();
-			if (!is_date_in_fiscalyear($this->document_date))
-			$this->document_date = end_fiscalyear();
-			$this->reference = references::get_next($this->trans_type);
-		}
 	}
 
 	//-------------------------------------------------------------------------
 	// Writing new/modified sales document to database.
 	// Makes parent documents for direct delivery/invoice by recurent call.
-
+	// $policy - 0 or 1:  writeoff/return for IV, back order/cancel for DN
 	function write($policy=0) {
 		if (count($this->src_docs) == 0 && ($this->trans_type == 10 || $this->trans_type == 13)) {
-			// direct document -> first add parent
-			$src = do_clone($this);
+			// this is direct document - first add parent
+			$src = (PHP_VERSION<5) ? $this : clone( $this ); // make local copy of this cart
 			$src->trans_type = get_parent_type($src->trans_type);
 			$src->reference = 'auto';
 
 			$src->write(1);
+
 			$type = $this->trans_type;
 			$ref = $this->reference;
 			// re-read document
 			$this->read($src->trans_type, key($src->trans_no), true);
-
 			$this->reference = $ref;
 			$this->trans_type = $type;
 			$this->src_docs= $this->trans_no;
@@ -190,11 +197,12 @@ class cart
 		$this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
 	}
 
-	function set_sales_type($sales_type, $sales_name, $tax_included=0)
+	function set_sales_type($sales_type, $sales_name, $tax_included=0, $factor=0)
 	{
-		$this->default_sales_type = $sales_type;
-		$this->sales_type_name = $sales_name;
-		$this->tax_included = $tax_included;
+	    $this->sales_type = $sales_type;
+	    $this->sales_type_name = $sales_name;
+	    $this->tax_included = $tax_included;
+	    $this->price_factor = $factor;
 	}
 
 	function set_location($id, $name)
@@ -227,7 +235,6 @@ class cart
 
 	function update_cart_item($line_no, $qty, $price, $disc)
 	{
-
 		$this->line_items[$line_no]->quantity = $qty;
 		$this->line_items[$line_no]->qty_dispatched = $qty;
 		$this->line_items[$line_no]->price = $price;
@@ -248,7 +255,7 @@ class cart
 	{
 		unset($this->line_items);
 		$this->line_items = array();
-		$this->default_sales_type = "";
+		$this->sales_type = "";
 		$this->trans_no = 0;
 		$this->customer_id = $this->order_no = 0;
 	}
@@ -268,7 +275,8 @@ class cart
 
 		foreach ($this->line_items as $ln_itm) {
 			$price = $ln_itm->line_price();
-			$total += ($ln_itm->quantity * $price * (1 - $ln_itm->discount_percent));
+			$total += round($ln_itm->quantity * $price * (1 - $ln_itm->discount_percent), 
+			   user_price_dec());
 		}
 		return $total;
 	}
@@ -279,7 +287,8 @@ class cart
 
 		foreach ($this->line_items as $ln_itm) {
 			$price = $ln_itm->line_price();
-			$total += ($ln_itm->qty_dispatched * $price * (1 - $ln_itm->discount_percent));
+			$total += round(($ln_itm->qty_dispatched * $price * (1 - $ln_itm->discount_percent)), 
+			   user_price_dec());
 		}
 		return $total;
 	}
@@ -326,18 +335,25 @@ class cart
 
 		foreach ($this->line_items as $ln_itm) {
 			$items[] = $ln_itm->stock_id;
-			$prices[] = ($ln_itm->qty_dispatched *
-				$ln_itm->line_price()* (1 - $ln_itm->discount_percent));
+			$prices[] = round(($ln_itm->qty_dispatched *
+				$ln_itm->line_price()* (1 - $ln_itm->discount_percent)),  user_price_dec());
 		}
 
 		$taxes = get_tax_for_items($items, $prices, $shipping_cost,
-		$this->tax_group_id, $this->tax_included,  $this->tax_group_array);
-
+		  $this->tax_group_id, $this->tax_included,  $this->tax_group_array);
+
+    // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
+    if ($this->customer_currency == 'CHF') {
+			$val = $taxes['1']['Value'];
+      $val1 = (floatval((intval(round(($val*20),0)))/20));
+			$taxes['1']['Value'] = $val1;
+		} 
 		return $taxes;
 	}
 
 
-	function get_tax_free_shipping() {
+	function get_tax_free_shipping()
+	{
 
 		if ($this->tax_included==0)
 			return $this->freight_cost;
@@ -345,7 +361,8 @@ class cart
 			return ($this->freight_cost - $this->get_shipping_tax());
 	}
 
-	function get_shipping_tax() {
+	function get_shipping_tax()
+	{
 
 		$tax_items = get_shipping_tax_as_array();
 		$tax_rate = 0;
@@ -358,9 +375,9 @@ class cart
 			}
 		}
 		if($this->tax_included)
-			return $this->freight_cost*$tax_rate/($tax_rate+100);
+			return round($this->freight_cost*$tax_rate/($tax_rate+100),  user_price_dec());
 		else
-			return $this->freight_cost*$tax_rate/100;
+			return round($this->freight_cost*$tax_rate/100,  user_price_dec());
 	}
 
 } /* end of class defintion */