X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=3566d686ff14bdd4c2bb82ee91d9b686d9da9f66;hb=5088ee92669272ebac6f1bd1acebc05fe382829f;hp=b3d5ac966a19d3fd17af6542801342daa0d2c0d5;hpb=89db61b110e8c40bdaadbdc08249980330c4c28d;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index b3d5ac96..3566d686 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -66,12 +66,14 @@ class cart
 	var $price_factor;	 // ditto for price calculations
 
 	var	$pos;			// user assigned POS
-	var $cash;			// cash transaction
+	var $cash;			// cash transaction - helper variable not stored in db
 	var $cash_account;
 	var $account_name;
 	var $cash_discount;	// not used as of FA 2.1
 	var $dimension_id;
 	var $dimension2_id;
+	var $payment;
+	var $payment_terms; // cached payment terms
 	//-------------------------------------------------------------------------
 	//
 	//  $trans_no==0 => open new/direct document
@@ -100,7 +102,7 @@ class cart
 		global $SysPrefs, $Refs;
 
 		if (!is_array($trans_no)) $trans_no = array($trans_no);
-		if ($trans_no[0]) 
+		if ($trans_no[0]) // read old transaction
 		{
 			if ($type == ST_SALESORDER || $type == ST_SALESQUOTE) { // sales order || sales quotation
 				read_sales_order($trans_no[0], $this, $type);
@@ -111,7 +113,7 @@ class cart
 						$line->qty_dispatched = $line->quantity - $line->qty_done;
 					}
 				}
-			} else {	// derivative transaction
+			} else {	// other type of sales 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, ST_SALESORDER);
@@ -121,9 +123,9 @@ class cart
 						$this->delivery_to = $sodata["deliver_to"];
 						$this->delivery_address = $sodata["delivery_address"];
 					}
+					// old derivative transaction edit
 					if (!$view && ($type!=ST_CUSTCREDIT || $this->trans_link!=0)) {
 						$src_type = get_parent_type($type);
-						$src_details = 0;
 						if ($src_type == ST_SALESORDER) { // get src data from sales_orders
 							$this->src_docs = array( $sodata['order_no']=>$sodata['version']);
 							$srcdetails = get_sales_order_details($this->order_no, ST_SALESORDER);
@@ -132,7 +134,6 @@ class cart
 							$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];
@@ -141,17 +142,18 @@ class cart
 							$line->qty_old = $line->qty_dispatched = $line->quantity;
 							$line->quantity += $sign * ($srcline['quantity'] - $srcline['qty_done']); // add free qty on src doc
 						}
-					} else {
+					} else { // prepare qtys for derivative document entry (not used in display)
 						for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
 							$line = &$this->line_items[$line_no];
 							$line->src_id = $line->id; // save src line ids for update
-							$line->qty_dispatched = $line->quantity;
+							$line->qty_dispatched = $line->quantity - $line->qty_done;
 						}
 					}
 				}
-		} else {
+		} else { // new document
 				$this->trans_type = $type;
 				$this->trans_no = 0;
+				$this->customer_currency = get_company_currency();
 				// set new sales document defaults here
 				if (get_global_customer() != ALL_TEXT)
 				  $this->customer_id = get_global_customer();
@@ -183,25 +185,23 @@ class cart
 					}		
 				}	
 				if ($type == ST_SALESINVOICE) {
-				  $this->due_date =
-					get_invoice_duedate($this->customer_id, $this->document_date);
-				  $this->pos = user_pos();
-				  $pos = get_sales_point($this->pos);
-				  $this->cash = !$pos['credit_sale'];
-				  if (!$pos['cash_sale'] || !$pos['credit_sale']) 
-				  	$this->pos = -1; // mark not editable payment type
-				  else
-					$this->cash = date_diff2($this->due_date, Today(), 'd')<2;
-				if ($this->cash) {
-					$this->Location = $pos['pos_location'];
-					$this->location_name = $pos['location_name'];
-					$this->cash_account = $pos['pos_account'];
-					$this->account_name = $pos['bank_account_name'];
-				}
+					$this->due_date =
+						get_invoice_duedate($this->payment, $this->document_date);
+					$this->cash = $this->payment_terms['cash_sale'];
+					if ($this->cash) {
+						$this->Location = $pos['pos_location'];
+						$this->location_name = $pos['location_name'];
+						$this->cash_account = $pos['pos_account'];
+						$this->account_name = $pos['bank_account_name'];
+					}
 				} else
-				  $this->due_date =
-					add_days($this->document_date, $SysPrefs->default_delivery_required_by());
+					$this->due_date =
+						add_days($this->document_date, $SysPrefs->default_delivery_required_by());
 			}
+		$this->pos = user_pos();
+		$pos = get_sales_point($this->pos);
+		if (!$pos['cash_sale'] && !$pos['credit_sale']) 
+			$this->pos = -1; // mark not editable payment type
 	}
 
 	//-------------------------------------------------------------------------
@@ -209,6 +209,7 @@ class cart
 	// 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) {
+		begin_transaction(); // prevents partial database changes in case of direct delivery/invoice
 		if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY)) {
 			// this is direct document - first add parent
 			$src = (PHP_VERSION<5) ? $this : clone( $this ); // make local copy of this cart
@@ -236,27 +237,32 @@ class cart
 		}
 		switch($this->trans_type) {
 			case ST_SALESINVOICE:
-				return write_sales_invoice($this);
+				write_sales_invoice($this); break;
 			case ST_CUSTCREDIT:
-				return write_credit_note($this, $policy);
+				write_credit_note($this, $policy); break;
 			case ST_CUSTDELIVERY:
-				return write_sales_delivery($this, $policy);
+				write_sales_delivery($this, $policy); break;
 			case ST_SALESORDER:
 			case ST_SALESQUOTE:
 				if ($this->trans_no==0)	// new document
-					return add_sales_order($this);
+					add_sales_order($this);
 				else
-					return update_sales_order($this);
+					update_sales_order($this);
 		}
+
+		commit_transaction();
 	}
 
-	function set_customer($customer_id, $customer_name, $currency, $discount, $cdiscount=0)
+	function set_customer($customer_id, $customer_name, $currency, $discount, $payment, $cdiscount=0)
 	{
 		$this->customer_name = $customer_name;
 		$this->customer_id = $customer_id;
 		$this->default_discount = $discount;
-		$this->cash_discount = $cdiscount;
 		$this->customer_currency = $currency;
+		$this->payment = $payment;
+		$this->payment_terms = get_payment_terms($payment);
+		$this->cash = $this->payment_terms['cash_sale'];
+		$this->cash_discount = $cdiscount;
 	}
 
 	function set_branch($branch_id, $tax_group_id, $tax_group_name, $phone='', $email='')
@@ -291,16 +297,16 @@ class cart
 			$this->freight_cost = $freight_cost;
 	}
 
-	function add_to_cart($line_no,$stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0)
+	function add_to_cart($line_no, $stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0)
 	{
-		if (isset($stock_id) && $stock_id != "" && isset($qty)/* && $qty > 0*/)	{
-			$this->line_items[$line_no] = new line_details($stock_id, $qty, $price, $disc,
-				$qty_done,  $standard_cost, $description, $id, $src_no);
+		$line = new line_details($stock_id, $qty, $price, $disc,
+			$qty_done,  $standard_cost, $description, $id, $src_no);
+
+		if ($line->valid) {
+			$this->line_items[$line_no] = $line;
 			return 1;
-		} else {
-			// shouldn't come here under normal circumstances
-			display_db_error("unexpected - adding an invalid item or null quantity", "", true);
-		}
+		} else
+			display_error(_("You have to enter valid stock code or nonempty description"));
 		return 0;
 	}
 
@@ -473,6 +479,9 @@ class line_details
 	var $qty_dispatched; // quantity selected to process
 	var $qty_old=0;	// quantity dispatched before edition
 	var $standard_cost;
+	var $descr_editable;
+
+	var $valid; // validation in constructor
 
 	function line_details ($stock_id, $qty, $prc, $disc_percent,
 		$qty_done, $standard_cost, $description, $id=0, $src_no=0 )
@@ -483,19 +492,19 @@ class line_details
 		$this->src_no = $src_no;
 		$item_row = get_item($stock_id);
 
-		if ($item_row == null)
-			display_db_error("invalid item added to order : $stock_id", "");
-
+		if (!$item_row) 
+			return;
+			
 		$this->mb_flag = $item_row["mb_flag"];
 		$this->units = $item_row["units"];
-		if ($description == null)
+		$this->descr_editable = $item_row["editable"];
+		if ($description == null || !$this->descr_editable)
 			$this->item_description = $item_row["description"];
 		else
 			$this->item_description = $description;
 		//$this->standard_cost = $item_row["material_cost"] + $item_row["labour_cost"] + $item_row["overhead_cost"];
 		$this->tax_type = $item_row["tax_type_id"];
 		$this->tax_type_name = $item_row["tax_type_name"];
-
 		$this->stock_id = $stock_id;
 		$this->quantity = $qty;
 		$this->qty_dispatched = $qty;
@@ -503,6 +512,7 @@ class line_details
 		$this->discount_percent = $disc_percent;
 		$this->qty_done = $qty_done;
 		$this->standard_cost = $standard_cost;
+		$this->valid = true;
 	}
 
 	// get unit price as stated on document