diff --git a/config/config.ini b/config/config.ini
index 9366cef28..5302d1b4d 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -39,7 +39,7 @@ encryption.default.key 				= this_is_the_encryption_key_change_it
 nonce.key                           = this_should_be_random_and_secret_so_change_it
 nonce.timelimit                     = 3600
 
-version.name				    	= 2013.1-beta1
+version.name				    	= 2013.1-beta2
  
 debug.level 				    	= All 
 debug.error_reporting				= E_ERROR
diff --git a/include/class/invoice.php b/include/class/invoice.php
index 1e95a556f..617954ea5 100644
--- a/include/class/invoice.php
+++ b/include/class/invoice.php
@@ -195,6 +195,23 @@ public static function get_all()
 
     }
 
+    public static function count()
+    {
+		global $logger;
+	    global $auth_session;
+
+		$sql = "SELECT 
+                    count(id) as count
+                FROM 
+                    ".TB_PREFIX."invoices 
+                WHERE 
+                    domain_id = :domain_id 
+                    ";
+		$sth = dbQuery($sql, ':domain_id', $auth_session->domain_id);
+
+        return $sth;
+
+    }
     function select_all($type='', $dir='DESC', $rp='25', $page='1', $having='')
     {
         global $config;
@@ -234,7 +251,7 @@ function select_all($type='', $dir='DESC', $rp='25', $page='1', $having='')
             $sort = "id";
         }
 
-        if($type =="count")
+        if(substr($type,"count"))
         {
             //unset($limit);
             $limit="";
@@ -342,20 +359,34 @@ function select_all($type='', $dir='DESC', $rp='25', $page='1', $having='')
                        iv.index_id as index_id,
                        b.name AS biller,
                        c.name AS customer,
-                       (SELECT coalesce(SUM(ii.total), 0) FROM " .
+                       DATE_FORMAT(date,'%Y-%m-%d') AS date,";
+
+
+                $sql .="(SELECT coalesce(SUM(ii.total), 0) FROM " .
                 TB_PREFIX . "invoice_items ii WHERE ii.invoice_id = iv.id) AS invoice_total,
                        (SELECT coalesce(SUM(ac_amount), 0) FROM " .
                 TB_PREFIX . "payment ap WHERE ap.ac_inv_id = iv.id) AS INV_PAID,
-                       ROUND( (SELECT (coalesce(invoice_total,0) - coalesce(INV_PAID,0))) ,2) As owing,
-                       DATE_FORMAT(date,'%Y-%m-%d') AS date,
+                       (SELECT invoice_total - INV_PAID) As owing,
+                       ";
+
+              //only run aging for real query
+               if($type == '')
+               {
+                    $sql .="
                        (SELECT IF((owing = 0 OR owing < 0), 0, DateDiff(now(), date))) AS Age,
                        (SELECT (CASE   WHEN Age = 0 THEN ''
                                                        WHEN Age <= 14 THEN '0-14'
                                                        WHEN Age <= 30 THEN '15-30'
                                                        WHEN Age <= 60 THEN '31-60'
                                                       WHEN Age <= 90 THEN '61-90'
-                                                       ELSE '90+'  END)) AS aging,
-                       iv.type_id As type_id,
+                                                      ELSE '90+'  END)) AS aging,";
+               } else {
+                   $sql .="
+                            (SELECT '') as Age,
+                            (SELECT '') as aging,
+                            ";
+               }
+               $sql .="iv.type_id As type_id,
                        pf.pref_description AS preference,
                        pf.status AS status,
                        (SELECT CONCAT(pf.pref_inv_wording,' ',iv.index_id)) as index_name
@@ -408,6 +439,14 @@ public static function getInvoiceItems($id) {
 			$invoiceItem['tax_amount'] = $invoiceItem['tax_amount'];
 			$invoiceItem['gross_total'] = $invoiceItem['gross_total'];
 			$invoiceItem['total'] = $invoiceItem['total'];
+			$invoiceItem['attribute_decode'] = json_decode($invoiceItem['attribute'],true);
+			foreach ($invoiceItem['attribute_decode'] as $key => $value)
+			{
+				$invoiceItem['attribute_json'][$key]['name'] = product_attributes::getName($key);
+				$invoiceItem['attribute_json'][$key]['value'] = product_attributes::getValue($key,$value);
+				$invoiceItem['attribute_json'][$key]['type'] = product_attributes::getType($key);
+				$invoiceItem['attribute_json'][$key]['visible'] = product_attributes::getVisible($key);
+			}
 			
 			$sql = "SELECT * FROM ".TB_PREFIX."products WHERE id = :id";
 			$tth = dbQuery($sql, ':id', $invoiceItem['product_id']) or die(htmlsafe(end($dbh->errorInfo())));
diff --git a/include/class/product/attributes.php b/include/class/product/attributes.php
new file mode 100644
index 000000000..2fd2093bd
--- /dev/null
+++ b/include/class/product/attributes.php
@@ -0,0 +1,76 @@
+<?php
+
+class product_attributes
+{
+    public function get($id)
+    {
+        $sql = "select * from ".TB_PREFIX."products_attributes where id = :id";
+        $sth =  dbQuery($sql,':id',$id);
+        $attribute = $sth->fetch();
+
+        $sql2 = "select * from ".TB_PREFIX."products_attribute_type where id = :id";
+        $sth2 =  dbQuery($sql2,':id',$attribute['type_id']);
+        $name = $sth2->fetch();
+        $attribute['type'] = $name['name'];
+
+        return $attribute;
+    }
+    public function getName($id)
+    {
+        $sql = "select * from ".TB_PREFIX."products_attributes where id = :id";
+        $sth =  dbQuery($sql,':id',$id);
+        $attribute = $sth->fetch();
+        return $attribute['name'];
+    }
+    public function getType($id)
+    {
+        $sql = "select 
+                    t.name as type 
+                from 
+                    ".TB_PREFIX."products_attributes as a, 
+                    ".TB_PREFIX."products_attribute_type as t 
+                where 
+                    a.id = :id 
+                    and a.type_id = t.id";
+        $sth =  dbQuery($sql,':id',$id);
+        $attribute = $sth->fetch();
+        return $attribute['type'];
+    }
+    public function getValue($attribute_id, $value_id)
+    {
+       
+        $details = product_attributes::get($attribute_id);
+
+        if($details['type'] == 'list')
+        {
+            $sql = "select value from ".TB_PREFIX."products_values where id = :id";
+            $sth =  dbQuery($sql,':id',$value_id);
+            $attribute = $sth->fetch();
+
+            return $attribute['value'];
+        } else {
+            return $value_id;
+        }
+
+    }
+    public function getVisible($id)
+    {
+        $sql = "select * from ".TB_PREFIX."products_attributes where id = :id";
+        $sth =  dbQuery($sql,':id',$id);
+        $attribute = $sth->fetch();
+        if($attribute['visible'] =='1')
+        {
+             return true;
+        } else {
+            return false;
+        }
+
+    }
+    public function getAll()
+    {
+        $sql = "select * from ".TB_PREFIX."products_attributes";
+        $sth =  dbQuery($sql);
+        $attributes = $sth->fetchAll();
+        return $attributes;
+    }
+}
diff --git a/include/jquery/jquery.functions.js.tpl b/include/jquery/jquery.functions.js.tpl
index 48fb8c060..1c56b0a2f 100644
--- a/include/jquery/jquery.functions.js.tpl
+++ b/include/jquery/jquery.functions.js.tpl
@@ -40,13 +40,14 @@
       	$('#gmail_loading').show();
 		$.ajax({
 			type: 'GET',
-			url: './index.php?module=invoices&view=product_ajax&id='+product,
+			url: './index.php?module=invoices&view=product_ajax&id='+product+'&row='+row_number,
 			data: "id: "+product,
 			dataType: "json",
 			success: function(data){
 				$('#gmail_loading').hide();
 				/*$('#state').html(data);*/
 				/*if ( (quantity.length==0) || (quantity.value==null) ) */
+				$("#json_html"+row_number).remove();
 				if (quantity=="") 
 				{	
 					$("#quantity"+row_number).attr("value","1");
@@ -61,6 +62,30 @@
 				{
 					$("#tax_id\\["+row_number+"\\]\\[1\\]").val(data['default_tax_id_2']);
 				}
+                //do the product matric code
+				if (data['show_description'] =="Y") 
+				{	
+					$("tbody#row"+row_number+" tr.details").show();
+				} else {
+					$("tbody#row"+row_number+" tr.details").hide();
+
+                }
+                if($("#description"+row_number).val() == $("#description"+row_number).attr('rel') || $("#description"+row_number).val() =='{/literal}{$LANG.description}{literal}')
+                {
+                    if (data['notes_as_description'] =="Y") 
+                    {	
+                        $("#description"+row_number).val(data['notes']);
+                        $("#description"+row_number).attr('rel',data['notes']);
+                    } else {
+                        $("#description"+row_number).val('{/literal}{$LANG.description}{literal}');
+                        $("#description"+row_number).attr('rel','{/literal}{$LANG.description}{literal}');
+
+                    }
+				} 
+				if (data['json_html'] !=="") 
+				{	
+					$("tbody#row"+row_number+" tr.details").before(data['json_html']);
+				} 
 			}
 	
    		 });
@@ -188,6 +213,9 @@
 		clonedRow.find("#products"+rowID_old).attr("rel", rowID_new);
 		clonedRow.find("#products"+rowID_old).attr("id", "products"+rowID_new);
 		clonedRow.find("#products"+rowID_new).attr("name", "products"+rowID_new);
+		clonedRow.find("#products"+rowID_new).find('option:selected').removeAttr("selected");
+		clonedRow.find("#products"+rowID_new).prepend(new Option("", ""));
+        clonedRow.find("#products"+rowID_new).find('option:eq(0)').attr('selected', true)
 		clonedRow.find("#products"+rowID_new).removeClass("validate[required]");
 
 		//clonedRow.find("#products"+rowID_new).attr("onChange", "invoice_product_change_price($(this).val(), "+rowID_new+", jQuery('#quantity"+rowID_new+"').val() )");
@@ -201,12 +229,15 @@
 		$("#description"+rowID_new, clonedRow).attr("name", "description"+rowID_new);
 		$("#description"+rowID_new, clonedRow).attr("value","{/literal}{$LANG.description}{literal}");
 		$("#description"+rowID_new, clonedRow).css({ color: "#b2adad" });
+		$(".details",clonedRow).hide();
 	
 		$("#tax_id\\["+rowID_old+"\\]\\[0\\]", clonedRow).attr("id", "tax_id["+rowID_new+"][0]");
 		$("#tax_id\\["+rowID_new+"\\]\\[0\\]", clonedRow).attr("name", "tax_id["+rowID_new+"][0]");
 		$("#tax_id\\["+rowID_old+"\\]\\[1\\]", clonedRow).attr("id", "tax_id["+rowID_new+"][1]");
 		$("#tax_id\\["+rowID_new+"\\]\\[1\\]", clonedRow).attr("name", "tax_id["+rowID_new+"][1]");
 	
+		$("#json_html"+rowID_old, clonedRow).remove();
+
 		$('#itemtable').append(clonedRow);
 		
 		$('#gmail_loading').hide();
diff --git a/include/sql_patches.php b/include/sql_patches.php
index 3e003d3d4..be8f2b1c0 100644
--- a/include/sql_patches.php
+++ b/include/sql_patches.php
@@ -1487,7 +1487,107 @@
     $patch['253']['name'] = "Add PaymentsGateway API ID field";
     $patch['253']['patch'] = "ALTER TABLE `".TB_PREFIX."biller` ADD  `paymentsgateway_api_id` VARCHAR( 255 ) NULL AFTER `eway_customer_id`;";
     $patch['253']['date'] = "20110918";
+
+    $patch['254']['name'] = "Product Matrix - update line items table";
+    $patch['254']['patch'] = "ALTER TABLE `".TB_PREFIX."invoice_items` ADD `attribute` VARCHAR( 255 ) NULL ;";
+    $patch['254']['date'] = "20130313";
+
+    $patch['255']['name'] = "Product Matrix - update line items table";
+    $patch['255']['patch'] = " 
+        CREATE TABLE `".TB_PREFIX."products_attributes` (
+            `id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+            `name` VARCHAR( 255 ) NOT NULL,
+            `type_id` VARCHAR( 255 ) NOT NULL
+            ) ENGINE = MYISAM ;";
+        $patch['255']['date'] = "20130313";
+
+    $patch['256']['name'] = "Product Matrix - update line items table";
+    $patch['256']['patch'] = "INSERT INTO `". TB_PREFIX ."products_attributes` (`id`, `name`, `type_id`) VALUES (NULL, 'Size','1'), (NULL,'Colour','1');";
+    $patch['256']['date'] = "20130313";
+
+    $patch['257']['name'] = "Product Matrix - update line items table";
+    $patch['257']['patch'] = "CREATE TABLE `". TB_PREFIX ."products_values` (
+`id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`attribute_id` INT( 11 ) NOT NULL ,
+`value` VARCHAR( 255 ) NOT NULL
+) ENGINE = MYISAM ;";
+    $patch['257']['date'] = "20130313";
+
+    $patch['258']['name'] = "Product Matrix - update line items table";
+    $patch['258']['patch'] = "INSERT INTO `". TB_PREFIX ."products_values` (`id`, `attribute_id`,`value`) VALUES (NULL,'1', 'S'),  (NULL,'1', 'M'), (NULL,'1', 'L'),  (NULL,'2', 'Red'),  (NULL,'2', 'White');";
+    $patch['258']['date'] = "20130313";
+
+    $patch['259']['name'] = "Product Matrix - update line items table";
+    $patch['259']['patch'] = "CREATE TABLE `". TB_PREFIX ."products_matrix` (
+`id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`product_id` INT( 11 ) NOT NULL ,
+`attribute_id` INT( 11 ) NOT NULL
+) ENGINE = MYISAM ;";
+    $patch['259']['date'] = "20130313";
+
+    $patch['260']['name'] = "Product Matrix - update line items table";
+    $patch['260']['patch'] =" ALTER TABLE `". TB_PREFIX ."products_matrix` ADD `product_attribute_number` INT( 11 ) NOT NULL AFTER `product_id` ;";
+    $patch['260']['date'] = "20130313";
+
+    $patch['261']['name'] = "Product Matrix - update line items table";
+    $patch['261']['patch'] =" INSERT INTO `". TB_PREFIX ."products_matrix` (`id`, `product_id`,`product_attribute_number`, `attribute_id`) VALUES (NULL,'1', '1', '1'),  (NULL,'1', '2', '2'), (NULL,'2', '1', '2');";
+    $patch['261']['date'] = "20130313";
+
+	$patch['262']['name'] = "Add product attributes system preference";
+	$patch['262']['patch'] = "INSERT INTO ".TB_PREFIX."system_defaults (id, name ,value ,domain_id ,extension_id ) VALUES (NULL , 'product_attributes', '0', '1', '1');";
+	$patch['262']['date'] = "20130313";
+
+    $patch['263']['name'] = "Product Matrix - update line items table";
+    $patch['263']['patch'] = "ALTER TABLE `".TB_PREFIX."products` ADD `attribute` VARCHAR( 255 ) NULL ;";
+    $patch['263']['date'] = "20130313";
+
+
+    $patch['264']['name'] = "Product - use notes as default line item description";
+    $patch['264']['patch'] = "ALTER TABLE `".TB_PREFIX."products` ADD `notes_as_description` VARCHAR( 1 ) NULL ;";
+    $patch['264']['date'] = "20130314";
+
+
+    $patch['265']['name'] = "Product - expand/show line item description";
+    $patch['265']['patch'] = "ALTER TABLE `".TB_PREFIX."products` ADD `show_description` VARCHAR( 1 ) NULL ;";
+    $patch['265']['date'] = "20130314";
+
+    $patch['266']['name'] = "Product - expand/show line item description";
+    $patch['266']['patch'] = "CREATE TABLE `".TB_PREFIX."products_attribute_type` (
+            `id` int(11) NOT NULL AUTO_INCREMENT,
+                `name` varchar(255) NOT NULL,
+                  PRIMARY KEY (`id`)
+              ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
+    $patch['266']['date'] = "20130322";
+
+    $patch['267']['name'] = "Product Matrix - insert attribute types";
+    $patch['267']['patch'] = "INSERT INTO `". TB_PREFIX ."products_attribute_type` (`id`, `name`) VALUES (NULL,'list'),  (NULL,'decimal'), (NULL,'free');";
+    $patch['267']['date'] = "20130325";
+
+
+    $patch['268']['name'] = "Product Matrix - insert attribute types";
+    $patch['268']['patch'] = "ALTER TABLE  `". TB_PREFIX ."products_attributes` ADD  `enabled` VARCHAR( 1 ) NULL DEFAULT  '1',
+        ADD  `visible` VARCHAR( 1 ) NULL DEFAULT  '1';";
+    $patch['268']['date'] = "20130327";
+
+    $patch['269']['name'] = "Product Matrix - insert attribute types";
+    $patch['269']['patch'] = "ALTER TABLE  `". TB_PREFIX ."products_values` ADD  `enabled` VARCHAR( 1 ) NULL DEFAULT  '1';";
+    $patch['269']['date'] = "20130327";
+
+
+
+    $patch['270']['name'] = "Make Simple Invoices faster - add index";
+    $patch['270']['patch'] = "ALTER TABLE `".TB_PREFIX."payment` ADD INDEX(`ac_inv_id`);";
+    $patch['270']['date'] = "20100419";
+
+    $patch['271']['name'] = "Make Simple Invoices faster - add index";
+    $patch['271']['patch'] = "ALTER TABLE `".TB_PREFIX."payment` ADD INDEX(`ac_amount`);";
+    $patch['271']['date'] = "20100419";
+
+    $patch['272']['name'] = "Add product attributes system preference";
+    $patch['272']['patch'] = "INSERT INTO ".TB_PREFIX."system_defaults (id, name ,value ,domain_id ,extension_id ) VALUES (NULL , 'large_dataset', '0', '1', '1');";
+    $patch['272']['date'] = "20130313";
+/*
 /*
 ALTER TABLE  `si_system_defaults` ADD  `new_id` INT( 11 ) NOT NULL FIRST; UPDATE `si_system_defaults` SET new_id = id; ALTER TABLE  `si_system_defaults` DROP  `id` ; ALTER TABLE  `si_system_defaults` DROP INDEX `name` ; ALTER TABLE  `si_system_defaults` CHANGE  `new_id`  `id` INT( 11 ) NOT NULL; ALTER TABLE  `si_system_defaults` ADD PRIMARY KEY(`domain_id`,`id` );
 
-*/
+ */
diff --git a/include/sql_queries.php b/include/sql_queries.php
index 86bc56637..ee5ea7035 100644
--- a/include/sql_queries.php
+++ b/include/sql_queries.php
@@ -672,8 +672,32 @@ function insertProductComplete($enabled=1,$visible=1,$description,
 
 function insertProduct($enabled=1,$visible=1) {
 	global $auth_session;
+    global $logger;
 	
 	(isset($_POST['enabled'])) ? $enabled = $_POST['enabled']  : $enabled = $enabled ;
+    //select all attribts
+    $sql = "select * from ".TB_PREFIX."products_attributes";
+    $sth =  dbQuery($sql);
+    $attributes = $sth->fetchAll();
+
+	$logger->log('Attr: '.var_export($attributes,true), Zend_Log::INFO);
+    $attr = array();
+    foreach($attributes as $k=>$v)
+    {
+    	$logger->log('Attr key: '.$k, Zend_Log::INFO);
+    	$logger->log('Attr value: '.var_export($v,true), Zend_Log::INFO);
+    	$logger->log('Attr set value: '.$k, Zend_Log::INFO);
+        if($_POST['attribute'.$v[id]] == 'true')
+        {
+            //$attr[$k]['attr_id'] = $v['id'];
+            $attr[$v['id']] = $_POST['attribute'.$v[id]];
+//            $attr[$k]['a$v['id']] = $_POST['attribute'.$v[id]];
+        }
+        
+    }
+	$logger->log('Attr array: '.var_export($attr,true), Zend_Log::INFO);
+	$notes_as_description = ($_POST['notes_as_description'] == 'true' ? 'Y' : NULL) ;
+    $show_description =  ($_POST['show_description'] == 'true' ? 'Y' : NULL) ;
 
 	$sql = "INSERT into
 		".TB_PREFIX."products
@@ -690,7 +714,10 @@ function insertProduct($enabled=1,$visible=1) {
             notes, 
             default_tax_id, 
             enabled, 
-            visible
+            visible,
+            attribute,
+            notes_as_description,
+            show_description
 		)
 	VALUES
 		(	
@@ -706,7 +733,10 @@ function insertProduct($enabled=1,$visible=1) {
 			:notes,
 			:default_tax_id,
 			:enabled,
-			:visible
+			:visible,
+            :attribute,
+            :notes_as_description,
+            :show_description
 		)";
 
 	return dbQuery($sql,
@@ -722,13 +752,33 @@ function insertProduct($enabled=1,$visible=1) {
 		':notes', "".$_POST['notes'],
 		':default_tax_id', $_POST['default_tax_id'],
 		':enabled', $enabled,
-		':visible', $visible
+		':visible', $visible,
+		':attribute', json_encode($attr),
+		':notes_as_description', $notes_as_description,
+		':show_description', $show_description
 		);
 }
 
 
 function updateProduct() {
 	
+    //select all attribts
+    $sql = "select * from ".TB_PREFIX."products_attributes";
+    $sth =  dbQuery($sql);
+    $attributes = $sth->fetchAll();
+
+    $attr = array();
+    foreach($attributes as $k=>$v)
+    {
+        if($_POST['attribute'.$v[id]] == 'true')
+        {
+            $attr[$v['id']] = $_POST['attribute'.$v[id]];
+        }
+        
+    }
+	$notes_as_description = ($_POST['notes_as_description'] == 'true' ? 'Y' : NULL) ;
+    $show_description =  ($_POST['show_description'] == 'true' ? 'Y' : NULL) ;
+
 	$sql = "UPDATE ".TB_PREFIX."products
 			SET
 				description = :description,
@@ -741,7 +791,10 @@ function updateProduct() {
 				custom_field4 = :custom_field4,
 				unit_price = :unit_price,
 				cost = :cost,
-				reorder_level = :reorder_level
+				reorder_level = :reorder_level,
+                attribute = :attribute,
+                notes_as_description = :notes_as_description,
+                show_description = :show_description
 			WHERE
 				id = :id";
 
@@ -757,6 +810,9 @@ function updateProduct() {
 		':unit_price', $_POST[unit_price],
 		':cost', $_POST[cost],
 		':reorder_level', $_POST[reorder_level],
+		':attribute', json_encode($attr),
+		':notes_as_description', $notes_as_description,
+		':show_description', $show_description,
 		':id', $_GET[id]
 		);
 }
@@ -903,6 +959,27 @@ function getDefaultInventory() {
 	return $delete;
 }
 
+function getDefaultProductAttributes() {
+	global $LANG;
+	global $dbh;
+
+	$sql = "SELECT value from ".TB_PREFIX."system_defaults s WHERE ( s.name = 'product_attributes')";
+	$sth = dbQuery($sql) or die(htmlsafe(end($dbh->errorInfo())));
+	$array = $sth->fetch();
+	$delete = $array['value']==1?$LANG['enabled']:$LANG['disabled'];
+	return $delete;
+}
+function getDefaultLargeDataset() {
+	global $LANG;
+	global $dbh;
+
+	$sql = "SELECT value from ".TB_PREFIX."system_defaults s WHERE ( s.name = 'large_dataset')";
+	$sth = dbQuery($sql) or die(htmlsafe(end($dbh->errorInfo())));
+	$array = $sth->fetch();
+	$delete = $array['value']==1?$LANG['enabled']:$LANG['disabled'];
+	return $delete;
+}
+
 function getDefaultLanguage() {
 	global $LANG;
 	global $dbh;
@@ -2007,11 +2084,22 @@ function updateInvoice($invoice_id) {
 		);
 }
 
-function insertInvoiceItem($invoice_id,$quantity,$product_id,$line_number,$line_item_tax_id,$description="", $unit_price="") {
+function insertInvoiceItem($invoice_id,$quantity,$product_id,$line_number,$line_item_tax_id,$description="", $unit_price="", $attribute="") {
 
 	global $logger;
 	global $LANG;
-	//do taxes
+    //do taxes
+
+    $attr = array();
+	$logger->log('Line item attributes: '.var_export($attribute,true), Zend_Log::INFO);
+    foreach($attribute as $k=>$v)
+    {
+        if($attribute[$v] !== '')
+        {
+            $attr[$k] = $v;
+        }
+        
+    }
 
 	
 	$tax_total = getTaxesPerLineItem($line_item_tax_id,$quantity, $unit_price);
@@ -2048,7 +2136,8 @@ function insertInvoiceItem($invoice_id,$quantity,$product_id,$line_number,$line_
 				tax_amount, 
 				gross_total, 
 				description, 
-				total
+                total,
+                attribute
 			) 
 			VALUES 
 			(
@@ -2059,7 +2148,8 @@ function insertInvoiceItem($invoice_id,$quantity,$product_id,$line_number,$line_
 				:tax_amount, 
 				:gross_total, 
 				:description, 
-				:total
+                :total,
+                :attribute
 			)";
 
 	//echo $sql;
@@ -2073,7 +2163,8 @@ function insertInvoiceItem($invoice_id,$quantity,$product_id,$line_number,$line_
 		':tax_amount', $tax_total,
 		':gross_total', $gross_total,
 		':description', $description,
-		':total', $total
+        ':total', $total,
+        ':attribute',json_encode($attr)
 		);
 	
 	invoice_item_tax(lastInsertId(),$line_item_tax_id,$unit_price,$quantity,"insert");
@@ -2194,13 +2285,24 @@ function invoice_item_tax($invoice_item_id,$line_item_tax_id,$unit_price,$quanti
 	//TODO fix this
 	return true;
 }
-function updateInvoiceItem($id,$quantity,$product_id,$line_number,$line_item_tax_id,$description,$unit_price) {
+function updateInvoiceItem($id,$quantity,$product_id,$line_number,$line_item_tax_id,$description,$unit_price,$attribute="") {
 
 	global $logger;
 	global $LANG;
 	//$product = getProduct($product_id);
 	//$tax = getTaxRate($tax_id);
 	
+    $attr = array();
+	$logger->log('Line item attributes: '.var_export($attribute,true), Zend_Log::INFO);
+    foreach($attribute as $k=>$v)
+    {
+        if($attribute[$v] !== '')
+        {
+            $attr[$k] = $v;
+        }
+        
+    }
+
 	$tax_total = getTaxesPerLineItem($line_item_tax_id,$quantity, $unit_price);
 
 	$logger->log('Invoice: '.$invoice_id.' Tax '.$line_item_tax_id.' for line item '.$line_number.': '.$tax_total, Zend_Log::INFO);
@@ -2232,7 +2334,8 @@ function updateInvoiceItem($id,$quantity,$product_id,$line_number,$line_item_tax
 	tax_amount = :tax_amount,
 	gross_total = :gross_total,
 	description = :description,
-	total = :total			
+	total = :total,			
+	attribute = :attribute			
 	WHERE id = :id";
 	
 	//echo $sql;
@@ -2245,6 +2348,7 @@ function updateInvoiceItem($id,$quantity,$product_id,$line_number,$line_item_tax
 		':gross_total', $gross_total,
 		':description', $description,
 		':total', $total,
+        ':attribute',json_encode($attr),
 		':id', $id
 		);
 
diff --git a/lang/en_GB/lang.php b/lang/en_GB/lang.php
index d6826d53c..a794056f3 100644
--- a/lang/en_GB/lang.php
+++ b/lang/en_GB/lang.php
@@ -124,6 +124,7 @@
 $LANG['debtors_by_aging_periods'] = "Debtors by Aging periods";//1
 $LANG['debtors_by_amount_owed'] = "Debtors by amount owed";//1
 $LANG['debtors_by_amount_owing_customer'] = "Debtors by Amount Owing per Customer";//1
+$LANG['decimal'] = "Decimal";//1
 $LANG['default_biller'] = "Default Biller";//1
 $LANG['default_customer'] = "Default Customer";//1
 $LANG['default_inv_template'] = "Default Invoice Template ";//1
@@ -187,6 +188,7 @@
 $LANG['format_tooltip'] = "format";//1
 $LANG['for'] = "for";//1
 $LANG['forum'] = "Forum";//1
+$LANG['free'] = "Free";//1
 $LANG['from'] = "From";//1
 $LANG['fwrite_error'] = "Did you get fwrite errors?";//1
 $LANG['get_help'] = "Get Help";//1
@@ -230,10 +232,10 @@
 $LANG['help_invoice_create'] = "Creating invoices is easy.  Once a biller and customer have been entered into Simple Invoices all you need to do is select an invoice type from the 'Invoice +' menu, fill in the details and click 'Save Invoice'.";//1
 $LANG['help_invoice_custom_fields'] = "Need more fields in the invoice screen? Want your own fields like 'Purchase Order', 'Project name' etc..<br /><br />Simple Invoices allows you to add whatever fields you want into the invoices.  These are called 'custom fields', to edit or setup your own fields select Custom Fields from the Options menu.";//1
 $LANG['help_invoice_types'] = "In Simple Invoices there are 2 types of invoices available<br /><br />
-An <b>Itemised Invoice</b> is an invoice that list many different items in the same invoice, with optional notes area for each line item - think accounting/legal firms or a grocery store invoice.
-<br/ ><br />
-A <b>Total Invoice</b> is an invoice that - think an invoice from a plumber that lists the actions and then has one price and the tax associated.
-";//1
+  An <b>Itemised Invoice</b> is an invoice that list many different items in the same invoice, with optional notes area for each line item - think accounting/legal firms or a grocery store invoice.
+  <br/ ><br />
+  A <b>Total Invoice</b> is an invoice that - think an invoice from a plumber that lists the actions and then has one price and the tax associated.
+  ";//1
 $LANG['help_logging'] = "To log actions performed in Simple Invoices enable this option. This creates a log in the database of what actions were performed.<br /><br />Note: At the moment the only way to view the log is in the database, soon we'll incorparte a nice log viewer into Simple Invoices.";//1
 $LANG['help_manage_custom_fields'] = "Custom Fields are special fields that you can label as whatever you need.<br /><br />This page allows you to define up to 4 custom fields for each of the following: products, customers, billers, and invoices.<br /><br />Once you define a label of one of the fields, this field will become available for use.  Ie. if you edit 'Invoice :: Custom field 1' and set the label as 'Project name', the next time you create an invoice there'll be a new field in the invoice screen called 'Project name'";//1
 $LANG['help_mysql4'] = "As you are using MySQL 4 or below as your database server some features of Simple Invoices have been disabled. Some sql queries in Simple Invoices have taken advantage of new features in MySQL 5, so things like the quick reports here on the start page, some debtors reports and a few other features of Simple Invoices have been disabled.";//1
@@ -297,7 +299,9 @@
 $LANG['itemised'] = "Itemised";//1
 $LANG['itemised_style'] = "Itemised style";//1
 $LANG['language'] = "Language";//1
+$LANG['large_dataset'] = "Large dataset";//1
 $LANG['license'] = "License";//1
+$LANG['list'] = "List";//1
 $LANG['loading'] = "Loading";//1
 $LANG['locale'] = "Locale";//1
 $LANG['logging'] = "Logging";//1
@@ -355,6 +359,9 @@
 $LANG['no_users'] = "There have been no users created. Click the 'Add User' button above to create one";//1
 $LANG['none'] = "none";//1
 $LANG['note'] = "Note";//1
+$LANG['note_attributes'] = "Note Attributes";//1
+$LANG['note_as_description'] = "Use note as line item description";//1
+$LANG['note_expand'] = "Show line item description by default";//1
 $LANG['notes'] = "Notes";//1
 $LANG['notes_opt'] = "Notes (optional)";//1
 $LANG['number_of_taxes_per_line_item'] = "Number of taxes per line item";//1
@@ -413,6 +420,7 @@
 $LANG['process_payment_via_eway'] = "Process Payment via Eway";//1
 $LANG['processing'] = "Processing, please wait ...";//1
 $LANG['product'] = "Product";//1
+$LANG['product_attributes'] = "Product Attributes";//1
 $LANG['product_description'] = "Product Description";//1
 $LANG['product_edit'] = "Edit Product";//1
 $LANG['product_enabled'] = "Product Enabled";//1
@@ -420,6 +428,7 @@
 $LANG['product_sales'] = "Product Sales";//1
 $LANG['product_to_add'] = "Product to add";//1
 $LANG['product_unit_price'] = "Product Unit Price";//1
+$LANG['product_values'] = "Product Values";//1
 $LANG['products'] = "Products";//1
 $LANG['products_by_customer'] = "Products by Customer";//1
 $LANG['products_sold_customer_total'] = "Products Sold - Customer - Total";//1
@@ -558,12 +567,14 @@
 $LANG['type'] = "Type";//1
 $LANG['Unit_Cost'] = "Unit Cost";//1
 $LANG['unit_price'] = "Unit Price";//1
+$LANG['unpaid_invoices'] = "Unpaid Invoices";//1
 $LANG['upgrading_simple_invoices'] = "Upgrading Simple Invoices";//1
 $LANG['user_add'] = "Add User";//1
 $LANG['users'] = "Users";//1
 $LANG['using_simple_invoices'] = "Using Simple Invoices";//1
 $LANG['value'] = "Value";//1
 $LANG['view'] = "View";//1
+$LANG['visible'] = "Visible";//1
 $LANG['want_more_fields'] = "Want more fields";//1
 $LANG['warning_eway'] = "<b>Note:</b> You are about to charge your customers credit card<br /> - make sure you know what you're doing!!";
 $LANG['weeks'] = "weeks";//1
diff --git a/modules/customers/details.php b/modules/customers/details.php
index 3216fd8a4..9f2f4000d 100755
--- a/modules/customers/details.php
+++ b/modules/customers/details.php
@@ -42,10 +42,34 @@
 $customFieldLabel = getCustomFieldLabels();
 $invoices = getCustomerInvoices($customer_id);
 
+//$start = (isset($_POST['start'])) ? $_POST['start'] : "0" ;
+$dir =  "DESC" ;
+$sort =  "id" ;
+$rp = (isset($_POST['rp'])) ? $_POST['rp'] : "25" ;
+$having = 'money_owed' ;
+$page = (isset($_POST['page'])) ? $_POST['page'] : "1" ;
+
+//$sql = "SELECT * FROM ".TB_PREFIX."invoices LIMIT $start, $limit";
+$invoice_owing = new invoice();
+$invoice_owing->sort=$sort;
+$invoice_owing->query=$_REQUEST['query'];
+$invoice_owing->qtype=$_REQUEST['qtype'];
+
+$large_dataset = getDefaultLargeDataset();
+if($large_dataset == $LANG['enabled'])
+{
+  $sth = $invoice_owing->select_all('large_count', $dir, $rp, $page, $having);
+} else {
+  $sth = $invoice_owing->select_all('', $dir, $rp, $page, $having);
+
+}
+$invoices_owing = $sth->fetchAll(PDO::FETCH_ASSOC);
+
 //$customFieldLabel = getCustomFieldLabels("biller");
 $smarty -> assign("stuff",$stuff);
 $smarty -> assign('customer',$customer);
 $smarty -> assign('invoices',$invoices);
+$smarty -> assign('invoices_owing',$invoices_owing);
 $smarty -> assign('customFieldLabel',$customFieldLabel);
 
 $smarty -> assign('pageActive', 'customer');
diff --git a/modules/install/essential.php b/modules/install/essential.php
index 828d18e24..b37c1894e 100644
--- a/modules/install/essential.php
+++ b/modules/install/essential.php
@@ -8,7 +8,7 @@
 	//JSON import
 	$importjson = new importjson();
 	$importjson->file = "./databases/json/essential_data.json";
-	//$importjson->debug = true;
+    //$importjson->debug = true;
 	$importjson->pattern_find = array('si_','DOMAIN-ID','LOCALE','LANGUAGE');
 	$importjson->pattern_replace = array(TB_PREFIX,'1','en_GB','en_GB');
 	//dbQuery($importjson->collate());
diff --git a/modules/invoices/details.php b/modules/invoices/details.php
index 243e16527..8da6fb5de 100755
--- a/modules/invoices/details.php
+++ b/modules/invoices/details.php
@@ -31,9 +31,95 @@
 
 
 for($i=1;$i<=4;$i++) {
-	$customFields[$i] = show_custom_field("invoice_cf$i",$invoice["custom_field$i"],"write",'',"details_screen",'','','');
+    $customFields[$i] = show_custom_field("invoice_cf$i",$invoice["custom_field$i"],"write",'',"details_screen",'','','');
 }
 
+foreach($invoiceItems as $key=>$value)
+{
+    //get list of attributes
+    $prod = getProduct($value['product_id']);
+    $json_att = json_decode($prod['attribute']);
+    if($json_att !== null)
+    {
+        $html ="<tr id='json_html". $key."'><td></td><td colspan='5'><table><tr>";
+        foreach($json_att as $k=>$v)
+        {
+            if($v == 'true')
+            {
+                $attr_name_sql = sprintf('select 
+                    a.name as name, a.enabled as enabled,  t.name type 
+                    from 
+                        si_products_attributes as a, 
+                        si_products_attribute_type as t 
+                   where 
+                        a.type_id = t.id
+                        AND a.id = %d', $k);
+                $attr_name = dbQuery($attr_name_sql);
+                $attr_name = $attr_name->fetch();
+
+                $sql2 = sprintf('select 
+                        a.name as name, 
+                        v.id as id, 
+                        v.value as value, 
+                        v.enabled as enabled 
+                   from 
+                        si_products_attributes a, 
+                        si_products_values v 
+                   where 
+                        a.id = v.attribute_id 
+                        AND a.id = %d', $k);
+                $states2 = dbQuery($sql2);
+
+                if($attr_name['enabled'] =='1' AND $attr_name['type'] == 'list')
+                {
+                    $html .= "<td>".$attr_name['name']."<select name='attribute[".$key."][".$k."]'>";
+                    $html .= "<option value=''></option>";
+                    foreach($states2 as $att_key=>$att_val)
+                    {
+                        if($att_val['enabled'] == '1')
+                        {
+                            foreach ($value['attribute_decode'] as $a_key => $a_value)
+                            {
+                                if($k == $a_key AND $a_value == $att_val['id'])
+                                {
+                                    $selected = "selected";
+                                    break;
+                                } else {
+                                    $selected = "";
+                                }
+                            }
+
+                            $html .= "<option ". $selected ." value='". $att_val['id']. "'>".$att_val['value']."</option>";
+                        }
+                    }
+                    $html .= "</select></td>";
+                }
+                if($attr_name['enabled'] =='1' AND $attr_name['type'] == 'free'  )
+                {
+                            $attribute_value ='';
+                            foreach ($value['attribute_decode'] as $a_key => $a_value)
+                            {
+                                if($k == $a_key){ $attribute_value = $a_value;}
+                            }
+                    $html .= "<td>".$attr_name['name']."<input name='attribute[".$key."][".$k."]'  value='". $attribute_value ."' /></td>";
+                }
+                if($attr_name['enabled'] =='1' AND $attr_name['type'] == 'decimal' )
+                {
+                            $attribute_value ='';
+                            foreach ($value['attribute_decode'] as $a_key => $a_value)
+                            {
+                                if($k == $a_key){ $attribute_value = $a_value;}
+                            }
+                    $html .= "<td>".$attr_name['name']."<input name='attribute[".$key."][".$k."]' size='5' value='". $attribute_value ."' /></td>";
+                }
+            }
+        }
+        $html .= "</tr></table></td></tr>";
+        $invoiceItems[$key]['html'] = $html;
+    }
+}
+
+//var_dump($invoiceItems);
 $smarty -> assign("invoice",$invoice);
 $smarty -> assign("defaults",$defaults);
 $smarty -> assign("invoiceItems",$invoiceItems);
diff --git a/modules/invoices/invoice.php b/modules/invoices/invoice.php
index 097dffcd8..0bc470c03 100755
--- a/modules/invoices/invoice.php
+++ b/modules/invoices/invoice.php
@@ -49,6 +49,16 @@
 	$show_custom_field[$i] = show_custom_field("invoice_cf$i",'',"write",'',"details_screen",'','','');
 }
 
+$sql = "select CONCAT(a.id, '-', v.id) as id, CONCAT(a.name, '-',v.value) as display from ".TB_PREFIX."products_attributes a, ".TB_PREFIX."products_values v where a.id = v.attribute_id;";
+$sth =  dbQuery($sql);
+$matrix = $sth->fetchAll();
+$smarty -> assign("matrix", $matrix);
+
+$sql_prod = "select product_id as PID, (select count(product_id) from ".TB_PREFIX."products_matrix where product_id = PID ) as count from ".TB_PREFIX."products_matrix ORDER BY count desc LIMIT 1;";
+$sth_prod =  dbQuery($sql_prod);
+$number_of_products = $sth_prod->fetchAll();
+
+$smarty -> assign("number_of_attributes", $number_of_products['0']['count']);
 $smarty -> assign("billers",$billers);
 $smarty -> assign("customers",$customers);
 $smarty -> assign("taxes",$taxes);
diff --git a/modules/invoices/product_ajax.php b/modules/invoices/product_ajax.php
index 05c1e5bd3..4f61295a4 100644
--- a/modules/invoices/product_ajax.php
+++ b/modules/invoices/product_ajax.php
@@ -1,27 +1,79 @@
 <?php
-
 
+$row_id = $_GET['row'];
 if($_GET['id'])
 {
 	//sleep(2);
-	$sql = sprintf('SELECT unit_price, default_tax_id, default_tax_id_2 FROM si_products WHERE id = %d LIMIT 1', $_GET['id']);
+	$sql = sprintf('SELECT unit_price, default_tax_id, default_tax_id_2,attribute,notes,notes_as_description,show_description FROM si_products WHERE id = %d LIMIT 1', $_GET['id']);
 	$states = dbQuery($sql);
-//	$output = '';
+    //	$output = '';
+
+
 	if($states->rowCount() > 0)
 	{	
 		$row = $states->fetch();
 
+        $json_att = json_decode($row['attribute']);
+        if($json_att !== null)
+        {
+        $html ="<tr id='json_html". $row_id ."'><td></td><td colspan='5'><table><tr>";
+        foreach($json_att as $k=>$v)
+        {
+            if($v == 'true')
+            {
+                $attr_name_sql = sprintf('select 
+                    a.name as name, a.enabled as enabled,  t.name type 
+                    from 
+                        si_products_attributes as a, 
+                        si_products_attribute_type as t 
+                   where 
+                        a.type_id = t.id
+                        AND a.id = %d', $k);
+                $attr_name = dbQuery($attr_name_sql);
+                $attr_name = $attr_name->fetch();
+
+                $sql2 = sprintf('select a.name as name, v.id as id, v.value as value, v.enabled as enabled from si_products_attributes a, si_products_values v where a.id = v.attribute_id AND a.id = %d', $k);
+                $states2 = dbQuery($sql2);
+
+                if($attr_name['enabled'] =='1' AND $attr_name['type'] == 'list')
+                {
+                    $html .= "<td>".$attr_name['name']."<select name='attribute[".$row_id."][".$k."]'>";
+                    foreach($states2 as $att_key=>$att_val)
+                    {
+                        if($att_val['enabled'] == '1')
+                        {
+                            $html .= "<option value='". $att_val['id']. "'>".$att_val['value']."</option>";
+                        }
+                    }
+                    $html .= "</select></td>";
+                }
+                if($attr_name['enabled'] =='1' AND $attr_name['type'] == 'free'  )
+                {
+                    $html .= "<td>".$attr_name['name']."<input name='attribute[".$row_id."][".$k."]' /></td>";
+                }
+                if($attr_name['enabled'] =='1' AND $attr_name['type'] == 'decimal' )
+                {
+                    $html .= "<td>".$attr_name['name']."<input name='attribute[".$row_id."][".$k."]' size='5'/></td>";
+                }
+            }
+        }
+                    $html .= "</tr></table></td></tr>";
+        }
 	//	print_r($row);
 	//		$output .= '<input id="state" class="field select two-third addr" value="'.$row['unit_price'].'"/>';
 			/*Format with decimal places with precision as defined in config.ini*/
 			$output['unit_price'] = siLocal::number_clean($row['unit_price']);
 			$output['default_tax_id'] = $row['default_tax_id'];
 			$output['default_tax_id_2'] = $row['default_tax_id_2'];
+			$output['attribute'] = $row['attribute'];
+			$output['json_attribute'] = $json_att;
+			$output['json_html'] = $html;
+			$output['notes'] = $row['notes'];
+			$output['notes_as_description'] = $row['notes_as_description'];
+			$output['show_description'] = $row['show_description'];
 	//		$output .= $_POST['id'];
 		
-	}
-	else
-	{
+	}else {
 		$output .= '';
 	}
 
diff --git a/modules/invoices/quick_view.php b/modules/invoices/quick_view.php
index c658bb4fb..3adab1a77 100755
--- a/modules/invoices/quick_view.php
+++ b/modules/invoices/quick_view.php
@@ -57,6 +57,10 @@
 }
 
 
+$sql = "select * from ".TB_PREFIX."products_attributes";
+$sth =  dbQuery($sql);
+$attributes = $sth->fetchAll();
+$smarty -> assign("attributes", $attributes);
 //Customer accounts sections
 $customerAccount = null;
 $customerAccount['total'] = calc_customer_total($customer['id']);
diff --git a/modules/invoices/save.php b/modules/invoices/save.php
index 2a08cdb6e..e0b8bbfe3 100755
--- a/modules/invoices/save.php
+++ b/modules/invoices/save.php
@@ -65,7 +65,7 @@
 			if($_POST["quantity$i"] != null)
 			{
 				if (
-						insertInvoiceItem($id,$_POST["quantity$i"],$_POST["products$i"],$i,$_POST["tax_id"][$i],$_POST["description$i"], $_POST["unit_price$i"] )
+						insertInvoiceItem($id,$_POST["quantity$i"],$_POST["products$i"],$i,$_POST["tax_id"][$i],$_POST["description$i"], $_POST["unit_price$i"],$_POST["attribute"][$i] )
 					) 
 				{
 		//			insert_invoice_item_tax(lastInsertId(), )
@@ -122,12 +122,12 @@
 				//new line item added in edit page
 				if($_POST["line_item$i"] == "")
 				{
-					insertInvoiceItem($id,$_POST["quantity$i"],$_POST["products$i"],$i,$_POST["tax_id"][$i],$_POST["description$i"], $_POST["unit_price$i"]);
+					insertInvoiceItem($id,$_POST["quantity$i"],$_POST["products$i"],$i,$_POST["tax_id"][$i],$_POST["description$i"], $_POST["unit_price$i"],$_POST["attribute"][$i]);
 				}
 				
 				if($_POST["line_item$i"] != "")
 				{
-					updateInvoiceItem($_POST["line_item$i"],$_POST["quantity$i"],$_POST["products$i"],$i,$_POST['tax_id'][$i],$_POST["description$i"],$_POST["unit_price$i"]);
+					updateInvoiceItem($_POST["line_item$i"],$_POST["quantity$i"],$_POST["products$i"],$i,$_POST['tax_id'][$i],$_POST["description$i"],$_POST["unit_price$i"],$_POST["attribute"][$i]);
 					$saved;
 					//$saved =  true;
 /*
diff --git a/modules/invoices/xml.php b/modules/invoices/xml.php
index 631111de8..702b5bf82 100644
--- a/modules/invoices/xml.php
+++ b/modules/invoices/xml.php
@@ -15,17 +15,25 @@
 $invoice->query=$_REQUEST['query'];
 $invoice->qtype=$_REQUEST['qtype'];
 $invoice->sort=$sort;
-$sth = $invoice->select_all('', $dir, $rp, $page, $having);
-$sth_count_rows = $invoice->select_all('count',$dir, $rp, $page, $having);
-
+$large_dataset = getDefaultLargeDataset();
+if($large_dataset == $LANG['enabled'])
+{
+  $sth = $invoice->select_all('large', $dir, $rp, $page, $having);
+  $sth_count_rows = invoice::count();
+  $invoice_count = $sth_count_rows->fetch(PDO::FETCH_ASSOC);
+  $invoice_count = $invoice_count['count'];
+} else {
+  $sth = $invoice->select_all('', $dir, $rp, $page, $having);
+  $sth_count_rows = $invoice->select_all('count',$dir, $rp, $page, $having);
+  $invoices_count = $sth_count_rows->rowCount();
+
+}
 $invoices = $sth->fetchAll(PDO::FETCH_ASSOC);
 
 $xml ="";
-$count = $sth_count_rows->rowCount();
-
 	$xml .= "<rows>";
 	$xml .= "<page>$page</page>";
-	$xml .= "<total>$count</total>";
+	$xml .= "<total>". $invoice_count ."</total>";
 	
 	foreach ($invoices as $row) {
 		$xml .= "<row id='".$row['id']."'>";
diff --git a/modules/product_attribute/add.php b/modules/product_attribute/add.php
new file mode 100755
index 000000000..b0f07d519
--- /dev/null
+++ b/modules/product_attribute/add.php
@@ -0,0 +1,24 @@
+<?php
+
+
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+//if valid then do save
+if ($_POST['name'] != "" ) {
+	include("./modules/product_attribute/save.php");
+}
+$pageActive = "options";
+
+$sql2= "select id, name from ".TB_PREFIX."products_attribute_type";
+$sth2 =  dbQuery($sql2);
+$types = $sth2->fetchAll(PDO::FETCH_ASSOC);
+
+$smarty -> assign("types", $types);
+
+$smarty->assign('pageActive', $pageActive);
+$smarty -> assign('save',$save);
+
+
+
+?>
diff --git a/modules/product_attribute/details.php b/modules/product_attribute/details.php
new file mode 100755
index 000000000..a6cdca642
--- /dev/null
+++ b/modules/product_attribute/details.php
@@ -0,0 +1,32 @@
+<?php
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+//if valid then do save
+if ($_POST['name'] != "" ) {
+	include("./extensions/product_matrix/modules/product_attribute/save.php");
+}
+
+#get the invoice id
+$id = $_GET['id'];
+
+$sql_prod = "select * from ".TB_PREFIX."products_attributes where id = $id;";
+$sth_prod =  dbQuery($sql_prod);
+$product_attribute = $sth_prod->fetch();
+$type = product_attributes::get($id);
+$product_attribute['type'] = $type['type'];
+
+$sql2= "select id, name from ".TB_PREFIX."products_attribute_type";
+$sth2 =  dbQuery($sql2);
+$types = $sth2->fetchAll(PDO::FETCH_ASSOC);
+
+$smarty -> assign("types", $types);
+
+
+$product_attribute['wording_for_enabled'] = $product_attribute['enabled']==1?$LANG['enabled']:$LANG['disabled'];
+$product_attribute['wording_for_visible'] = $product_attribute['visible']==1?$LANG['enabled']:$LANG['disabled'];
+$pageActive = "options";
+$smarty->assign('pageActive', $pageActive);
+$smarty->assign('product_attribute',$product_attribute);
+
+?>
diff --git a/modules/product_attribute/manage.js.php b/modules/product_attribute/manage.js.php
new file mode 100644
index 000000000..9c9ebf45b
--- /dev/null
+++ b/modules/product_attribute/manage.js.php
@@ -0,0 +1,40 @@
+<script type="text/javascript">
+{literal}
+			var columns = 5;
+			var padding = 12;
+			var grid_width = $('.col').width();
+			
+			grid_width = grid_width - (columns * padding);
+			percentage_width = grid_width / 100; 
+		
+			
+			$('#manageGrid').flexigrid
+			(
+			{
+			url: 'index.php?module=product_attribute&view=xml',
+			dataType: 'xml',
+			colModel : [
+				{display: 'Actions', name : 'actions', width : 10 * percentage_width, sortable : false, align: 'center'},
+				{display: 'ID', name : 'id', width : 10 * percentage_width, sortable : true, align: 'left'},
+				{display: 'Name', name : 'name', width : 40 * percentage_width, sortable : true, align: 'left'},
+				{display: 'Enabled', name : 'enabled', width : 20 * percentage_width, sortable : true, align: 'left'},
+				{display: 'Visible', name : 'visible', width : 20 * percentage_width, sortable : true, align: 'left'}
+				],
+
+			searchitems : [
+				{display: 'ID', name : 'id'},
+				{display: 'Name', name : 'name', isdefault: true}
+				],
+			sortname: 'id',
+			sortorder: 'asc',
+			usepager: true,
+			/*title: 'Manage Custom Fields',*/
+			useRp: false,
+			rp: 25,
+			showToggleBtn: false,
+			showTableToggleBtn: false,
+			height: 'auto'
+			}
+			);
+{/literal}
+</script>
diff --git a/modules/product_attribute/manage.php b/modules/product_attribute/manage.php
new file mode 100755
index 000000000..4742af60f
--- /dev/null
+++ b/modules/product_attribute/manage.php
@@ -0,0 +1,11 @@
+<?php
+
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+$pageActive = "options";
+$smarty->assign('pageActive', $pageActive);
+	
+
+
+?>
diff --git a/modules/product_attribute/save.php b/modules/product_attribute/save.php
new file mode 100755
index 000000000..cf71b30dd
--- /dev/null
+++ b/modules/product_attribute/save.php
@@ -0,0 +1,87 @@
+<?php
+// -Gates 5/5/2008 added domain_id to parameters 
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+# Deal with op and add some basic sanity checking
+
+$op = !empty( $_POST['op'] ) ? addslashes( $_POST['op'] ) : NULL;
+
+
+#insert invoice_preference
+if (  $op === 'insert_product_attribute' ) {
+
+	$sql = "INSERT into
+		".TB_PREFIX."products_attributes
+	VALUES
+		(
+			NULL,
+			:name,
+			:type_id,
+			:enabled,
+			:visible
+		 )";
+
+	if (dbQuery($sql,
+	  ':name', $_POST['name'],
+	  ':type_id', $_POST['type_id'],
+	  ':enabled', $_POST['enabled'],
+	  ':visible', $_POST['visible']
+	  )) {
+		$display_block = "Successfully saved";
+	} else {
+		$display_block = "Error occurred with saving";
+	}
+
+	//header( 'refresh: 2; url=manage_preferences.php' );
+	$refresh_total = "<meta http-equiv='refresh' content='2;url=index.php?module=product_attribute&amp;view=manage' />";
+
+}
+
+#edit preference
+
+else if (  $op === 'edit_product_attribute' ) {
+
+	if (isset($_POST['save_product_attribute'])) {
+		$sql = "UPDATE
+				".TB_PREFIX."products_attributes
+			SET
+				name = :name,
+				type_id = :type_id,
+				enabled = :enabled,
+				visible = :visible
+			WHERE
+				id = :id";
+
+		if (dbQuery($sql, 
+		  ':name', $_POST['name'],
+		  ':type_id', $_POST['type_id'],
+		  ':enabled', $_POST['enabled'],
+		  ':visible', $_POST['visible'],
+		  ':id', $_GET['id']))
+	    {
+			$display_block = "Successfully saved";
+		} else {
+			$display_block = "Error occurred with saving";
+		}
+
+		$refresh_total = "<meta http-equiv='refresh' content='2;url=index.php?module=product_attribute&amp;view=manage' />";
+
+		}
+
+	else if ($_POST[action] == "Cancel") {
+
+		//header( 'refresh: 0; url=manage_preferences.php' );
+		$refresh_total = "<meta http-equiv='refresh' content='0;url=index.php?module=product_attribute&amp;view=manage' />";
+	}
+}
+
+
+$refresh_total = isset($refresh_total) ? $refresh_total : '&nbsp';
+
+$pageActive = "options";
+$smarty->assign('pageActive', $pageActive);
+
+$smarty -> assign('display_block',$display_block); 
+$smarty -> assign('refresh_total',$refresh_total); 
+?>
diff --git a/modules/product_attribute/xml.php b/modules/product_attribute/xml.php
new file mode 100644
index 000000000..f9e4eb4aa
--- /dev/null
+++ b/modules/product_attribute/xml.php
@@ -0,0 +1,110 @@
+<?php
+header("Content-type: text/xml");
+
+$start = (isset($_POST['start'])) ? $_POST['start'] : "0" ;
+$dir = (isset($_POST['sortorder'])) ? $_POST['sortorder'] : "ASC" ;
+$sort = (isset($_POST['sortname'])) ? $_POST['sortname'] : "id" ;
+$limit = (isset($_POST['rp'])) ? $_POST['rp'] : "25" ;
+$page = (isset($_POST['page'])) ? $_POST['page'] : "1" ;
+
+//SC: Safety checking values that will be directly subbed in
+if (intval($page) != $page) {
+	$start = 0;
+}
+$start = (($page-1) * $limit);
+
+if (intval($limit) != $limit) {
+	$limit = 25;
+}
+if (!preg_match('/^(asc|desc)$/iD', $dir)) {
+	$dir = 'DESC';
+}
+
+
+$query = $_POST['query'];
+$qtype = $_POST['qtype'];
+
+$where = "";
+if ($query) $where = " WHERE $qtype LIKE '%$query%' ";
+
+
+
+/*Check that the sort field is OK*/
+$validFields = array('id', 'name','enabled','visible');
+
+if (in_array($sort, $validFields)) {
+	$sort = $sort;
+} else {
+	$sort = "id";
+}
+
+	//$sql = "SELECT * FROM ".TB_PREFIX."customers ORDER BY $sort $dir LIMIT $start, $limit";
+	$sql = "SELECT 
+				id, 
+				name,
+                enabled,
+                visible
+			FROM 
+				".TB_PREFIX."products_attributes
+			$where
+			ORDER BY 
+				$sort $dir 
+			LIMIT 
+				$start, $limit";
+
+	$sth = dbQuery($sql) or die(htmlsafe(end($dbh->errorInfo())));
+	$customers = $sth->fetchAll(PDO::FETCH_ASSOC);
+/*
+	$customers = null;
+
+	for($i=0; $customer = $sth->fetch(PDO::FETCH_ASSOC); $i++) {
+		if ($customer['enabled'] == 1) {
+			$customer['enabled'] = $LANG['enabled'];
+		} else {
+			$customer['enabled'] = $LANG['disabled'];
+		}
+*/
+global $dbh;
+
+$sqlTotal = "SELECT count(id) AS count FROM ".TB_PREFIX."products_attributes";
+$tth = dbQuery($sqlTotal) or die(end($dbh->errorInfo()));
+$resultCount = $tth->fetch();
+$count = $resultCount[0];
+//echo sql2xml($customers, $count);
+$xml .= "<rows>";
+
+$xml .= "<page>$page</page>";
+
+$xml .= "<total>$count</total>";
+
+foreach ($customers as $row) {
+
+	$xml .= "<row id='".$row['id']."'>";
+	$xml .= "<cell><![CDATA[<a href='index.php?module=product_attribute&view=details&action=view&id=".$row['id']."'>View</a> :: <a href='index.php?module=product_attribute&view=details&action=edit&id=".$row['id']."'>Edit</a>]]></cell>";
+	$xml .= "<cell><![CDATA[".$row['id']."]]></cell>";		
+	$xml .= "<cell><![CDATA[".utf8_encode($row['name'])."]]></cell>";
+	if ($row['enabled']=='1') {
+		$xml .= "<cell><![CDATA[<img src='images/common/tick.png' alt='".$row['enabled']."' title='".$row['enabled']."' />]]></cell>";				
+	}	
+	else {
+		$xml .= "<cell><![CDATA[<img src='images/common/cross.png' alt='".$row['enabled']."' title='".$row['enabled']."' />]]></cell>";				
+	}
+	if ($row['visible']=='1') {
+		$xml .= "<cell><![CDATA[<img src='images/common/tick.png' alt='".$row['visible']."' title='".$row['visible']."' />]]></cell>";				
+	}	
+	else {
+		$xml .= "<cell><![CDATA[<img src='images/common/cross.png' alt='".$row['visible']."' title='".$row['visible']."' />]]></cell>";				
+	}
+
+
+	$xml .= "</row>";		
+
+}
+
+
+
+$xml .= "</rows>";
+
+echo $xml;
+
+?> 
diff --git a/modules/product_value/add.php b/modules/product_value/add.php
new file mode 100755
index 000000000..6514c211f
--- /dev/null
+++ b/modules/product_value/add.php
@@ -0,0 +1,21 @@
+<?php
+
+
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+//if valid then do save
+if ($_POST['value'] !== '' ) {
+	include("./modules/product_value/save.php");
+}
+$pageActive = "options";
+
+$smarty->assign('pageActive', $pageActive);
+$smarty -> assign('save',$save);
+
+$sql = "select * from ".TB_PREFIX."products_attributes";
+$sth =  dbQuery($sql);
+$product_attributes = $sth->fetchAll();
+$smarty -> assign("product_attributes", $product_attributes);
+
+?>
diff --git a/modules/product_value/details.php b/modules/product_value/details.php
new file mode 100755
index 000000000..9f039647d
--- /dev/null
+++ b/modules/product_value/details.php
@@ -0,0 +1,32 @@
+<?php
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+//if valid then do save
+if ($_POST['value'] != "" ) {
+	include("./extensions/product_matrix/modules/product_value/save.php");
+}
+
+#get the invoice id
+$id = $_GET['id'];
+
+$sql = "select * from ".TB_PREFIX."products_values where id = $id";
+$sth =  dbQuery($sql);
+$product_value = $sth->fetch();
+$smarty -> assign("product_value", $product_value);
+
+$sql_attr_sel = "select * from ".TB_PREFIX."products_attributes where id = ".$product_value['id'];
+$sth_attr_sel =  dbQuery($sql_attr_sel);
+$product_attribute = $sth_attr_sel->fetch();
+$smarty -> assign("product_attribute", $product_attribute['name']);
+
+
+$pageActive = "options";
+$smarty->assign('pageActive', $pageActive);
+$smarty->assign('preference',$preference);
+
+$sql_attr = "select * from ".TB_PREFIX."products_attributes";
+$sth_attr =  dbquery($sql_attr);
+$product_attributes = $sth_attr->fetchall();
+$smarty -> assign("product_attributes", $product_attributes);
+?>
diff --git a/modules/product_value/manage.js.php b/modules/product_value/manage.js.php
new file mode 100644
index 000000000..bd597a195
--- /dev/null
+++ b/modules/product_value/manage.js.php
@@ -0,0 +1,40 @@
+<script type="text/javascript">
+{literal}
+			var columns = 4;
+			var padding = 12;
+			var grid_width = $('.col').width();
+			
+			grid_width = grid_width - (columns * padding);
+			percentage_width = grid_width / 100; 
+		
+			
+			$('#manageGrid').flexigrid
+			(
+			{
+			url: 'index.php?module=product_value&view=xml',
+			dataType: 'xml',
+			colModel : [
+				{display: 'Actions', name : 'actions', width : 10 * percentage_width, sortable : false, align: 'center'},
+				{display: 'ID', name : 'id', width : 10 * percentage_width, sortable : true, align: 'left'},
+				{display: 'Attribute', name : 'name', width : 30 * percentage_width, sortable : true, align: 'left'},
+				{display: 'Value', name : 'value', width : 30 * percentage_width, sortable : true, align: 'left'},
+				{display: 'Enabled', name : 'enabled', width : 20 * percentage_width, sortable : true, align: 'left'}
+				],
+
+			searchitems : [
+				{display: 'Attribute', name : 'name'},
+				{display: 'Value', name : 'value', isdefault: true}
+				],
+			sortname: 'id',
+			sortorder: 'asc',
+			usepager: true,
+			/*title: 'Manage Custom Fields',*/
+			useRp: false,
+			rp: 25,
+			showToggleBtn: false,
+			showTableToggleBtn: false,
+			height: 'auto'
+			}
+			);
+{/literal}
+</script>
diff --git a/modules/product_value/manage.php b/modules/product_value/manage.php
new file mode 100755
index 000000000..4742af60f
--- /dev/null
+++ b/modules/product_value/manage.php
@@ -0,0 +1,11 @@
+<?php
+
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+$pageActive = "options";
+$smarty->assign('pageActive', $pageActive);
+	
+
+
+?>
diff --git a/modules/product_value/save.php b/modules/product_value/save.php
new file mode 100755
index 000000000..8a0670cda
--- /dev/null
+++ b/modules/product_value/save.php
@@ -0,0 +1,78 @@
+<?php
+// -Gates 5/5/2008 added domain_id to parameters 
+//stop the direct browsing to this file - let index.php handle which files get displayed
+checkLogin();
+
+# Deal with op and add some basic sanity checking
+
+$op = !empty( $_POST['op'] ) ? addslashes( $_POST['op'] ) : NULL;
+
+
+#insert invoice_preference
+if (  $op === 'insert_product_value' ) {
+
+	$sql = "INSERT into
+		".TB_PREFIX."products_values
+	VALUES
+		(
+			NULL,
+			:attribute_id,
+            :value,
+            :enabled
+		 )";
+
+	if (dbQuery($sql,
+	  ':attribute_id', $_POST['attribute_id'],
+	  ':value', $_POST['value'],
+	  ':enabled', $_POST['enabled']
+	  )) {
+		$display_block = "Successfully saved";
+	} else {
+		$display_block = "Error occurred with saving";
+	}
+
+	//header( 'refresh: 2; url=manage_preferences.php' );
+	$refresh_total = "<meta http-equiv='refresh' content='20;url=index.php?module=product_value&amp;view=manage' />";
+
+}
+
+#edit preference
+
+if (  $op === 'edit_product_value' ) {
+
+	if (isset($_POST['save_product_value'])) {
+		$sql = "UPDATE
+				".TB_PREFIX."products_values
+			SET
+				attribute_id = :attribute_id,
+				value = :value,
+				enabled = :enabled
+			WHERE
+				id = :id";
+
+		if (dbQuery($sql, 
+		  ':attribute_id', $_POST['attribute_id'],
+		  ':value', $_POST['value'],
+		  ':enabled', $_POST['enabled'],
+		  ':id', $_GET['id'])) 
+	    {
+			$display_block = "Successfully saved";
+		} else {
+			$display_block = "Error occurred with saving";
+		}
+
+		//header( 'refresh: 2; url=manage_preferences.php' );
+		$refresh_total = "<meta http-equiv='refresh' content='2;url=index.php?module=product_value&amp;view=manage' />";
+
+		}
+}
+
+
+$refresh_total = isset($refresh_total) ? $refresh_total : '&nbsp';
+
+$pageActive = "options";
+$smarty->assign('pageActive', $pageActive);
+
+$smarty -> assign('display_block',$display_block); 
+$smarty -> assign('refresh_total',$refresh_total); 
+?>
diff --git a/modules/product_value/xml.php b/modules/product_value/xml.php
new file mode 100644
index 000000000..865a8df5b
--- /dev/null
+++ b/modules/product_value/xml.php
@@ -0,0 +1,110 @@
+<?php
+header("Content-type: text/xml");
+
+$start = (isset($_POST['start'])) ? $_POST['start'] : "0" ;
+$dir = (isset($_POST['sortorder'])) ? $_POST['sortorder'] : "ASC" ;
+$sort = (isset($_POST['sortname'])) ? $_POST['sortname'] : "id" ;
+$limit = (isset($_POST['rp'])) ? $_POST['rp'] : "25" ;
+$page = (isset($_POST['page'])) ? $_POST['page'] : "1" ;
+
+//SC: Safety checking values that will be directly subbed in
+if (intval($page) != $page) {
+	$start = 0;
+}
+$start = (($page-1) * $limit);
+
+if (intval($limit) != $limit) {
+	$limit = 25;
+}
+if (!preg_match('/^(asc|desc)$/iD', $dir)) {
+	$dir = 'DESC';
+}
+
+
+$query = $_POST['query'];
+$qtype = $_POST['qtype'];
+
+$where = "";
+if ($query) $where = " AND $qtype LIKE '%$query%' ";
+
+
+
+/*Check that the sort field is OK*/
+$validFields = array('id', 'name', 'value','enabled');
+
+if (in_array($sort, $validFields)) {
+	$sort = $sort;
+} else {
+	$sort = "id";
+}
+
+	$sql = "SELECT 
+				v.id as id, 
+				a.name as name,
+                v.value as value,
+                v.enabled as enabled
+			FROM 
+				".TB_PREFIX."products_attributes a,
+				".TB_PREFIX."products_values v
+			WHERE
+				a.id = v.attribute_id
+			$where
+			ORDER BY 
+				$sort $dir 
+			LIMIT 
+				$start, $limit";
+
+	$sth = dbQuery($sql) or die(htmlsafe(end($dbh->errorInfo())));
+	$customers = $sth->fetchAll(PDO::FETCH_ASSOC);
+/*
+	$customers = null;
+
+	for($i=0; $customer = $sth->fetch(PDO::FETCH_ASSOC); $i++) {
+		if ($customer['enabled'] == 1) {
+			$customer['enabled'] = $LANG['enabled'];
+		} else {
+			$customer['enabled'] = $LANG['disabled'];
+		}
+*/
+global $dbh;
+
+$sqlTotal = "SELECT count(id) AS count FROM ".TB_PREFIX."products_values";
+$tth = dbQuery($sqlTotal) or die(end($dbh->errorInfo()));
+$resultCount = $tth->fetch();
+$count = $resultCount[0];
+//echo sql2xml($customers, $count);
+$xml .= "<rows>";
+
+$xml .= "<page>$page</page>";
+
+$xml .= "<total>$count</total>";
+
+foreach ($customers as $row) {
+
+	$xml .= "<row id='".$row['id']."'>";
+
+	$xml .= "<cell><![CDATA[<a href='index.php?module=product_value&view=details&action=view&id=".$row['id']."'>View</a> :: <a href='index.php?module=product_value&view=details&action=edit&id=".$row['id']."'>Edit</a>]]></cell>";
+			
+	$xml .= "<cell><![CDATA[".$row['id']."]]></cell>";		
+
+	$xml .= "<cell><![CDATA[".utf8_encode($row['name'])."]]></cell>";
+	$xml .= "<cell><![CDATA[".utf8_encode($row['value'])."]]></cell>";
+	if ($row['enabled']=='1') {
+		$xml .= "<cell><![CDATA[<img src='images/common/tick.png' alt='".$row['enabled']."' title='".$row['enabled']."' />]]></cell>";				
+	}	
+	else {
+		$xml .= "<cell><![CDATA[<img src='images/common/cross.png' alt='".$row['enabled']."' title='".$row['enabled']."' />]]></cell>";				
+	}
+
+
+	$xml .= "</row>";		
+
+}
+
+
+
+$xml .= "</rows>";
+
+echo $xml;
+
+?> 
diff --git a/modules/products/add.php b/modules/products/add.php
index 3cc5cdcf8..62f486d92 100755
--- a/modules/products/add.php
+++ b/modules/products/add.php
@@ -16,6 +16,11 @@
 $smarty -> assign('save',$save);
 $smarty -> assign('taxes',$taxes);
 
+$sql = "select * from ".TB_PREFIX."products_attributes where enabled ='1'";
+$sth =  dbQuery($sql);
+$attributes = $sth->fetchAll();
+
+$smarty -> assign("attributes", $attributes);
 $smarty -> assign('pageActive', 'product_add');
 $smarty -> assign('active_tab', '#product');
 ?>
diff --git a/modules/products/details.php b/modules/products/details.php
index c106560a9..33ef82f56 100755
--- a/modules/products/details.php
+++ b/modules/products/details.php
@@ -13,11 +13,17 @@
 $tax_selected = getTaxRate($product['default_tax_id']);
 
 $smarty -> assign("defaults",getSystemDefaults());
+$product['attribute_decode'] = json_decode($product['attribute'],true);
 $smarty -> assign('product',$product);
 $smarty -> assign('taxes',$taxes);
 $smarty -> assign('tax_selected',$tax_selected);
 $smarty -> assign('customFieldLabel',$customFieldLabel);
 
+$sql = "select * from ".TB_PREFIX."products_attributes";
+$sth =  dbQuery($sql);
+$attributes = $sth->fetchAll();
+$smarty -> assign("attributes", $attributes);
+
 $smarty -> assign('pageActive', 'product_manage');
 $subPageActive = $_GET['action'] =="view"  ? "product_view" : "product_edit" ;
 $smarty -> assign('subPageActive', $subPageActive);
diff --git a/modules/system_defaults/edit.php b/modules/system_defaults/edit.php
index 0466b744f..c9b8d9f93 100755
--- a/modules/system_defaults/edit.php
+++ b/modules/system_defaults/edit.php
@@ -294,6 +294,20 @@
 	$description = $LANG['inventory'];
 	$value = dropDown($array, $defaults[$default]);
 }
+else if ($_GET['submit'] == "product_attributes") {
+
+	$array = array(0 => $LANG['disabled'], 1=>$LANG['enabled']);
+	$default = "product_attributes";
+	$description = $LANG['product_attributes'];
+	$value = dropDown($array, $defaults[$default]);
+}
+else if ($_GET['submit'] == "large_dataset") {
+
+	$array = array(0 => $LANG['disabled'], 1=>$LANG['enabled']);
+	$default = "large_dataset";
+	$description = $LANG['large_dataset'];
+	$value = dropDown($array, $defaults[$default]);
+}
 else {
 	$description = "{$LANG['no_defaults']}";
 }
diff --git a/modules/system_defaults/manage.php b/modules/system_defaults/manage.php
index 25b548046..68398fc1f 100755
--- a/modules/system_defaults/manage.php
+++ b/modules/system_defaults/manage.php
@@ -23,6 +23,8 @@
 $smarty -> assign("defaultDelete", getDefaultDelete());
 $smarty -> assign("defaultLogging", getDefaultLogging());
 $smarty -> assign("defaultInventory", getDefaultInventory());
+$smarty -> assign("defaultProductAttributes", getDefaultProductAttributes());
+$smarty -> assign("defaultLargeDataset", getDefaultLargeDataset());
 $smarty -> assign("defaultLanguage", $lang);
 
 $smarty -> assign('pageActive', 'system_default');
diff --git a/templates/default/css/main.css b/templates/default/css/main.css
index 1abe45f0a..100e9f659 100644
--- a/templates/default/css/main.css
+++ b/templates/default/css/main.css
@@ -856,7 +856,6 @@ A.cluetip:hover IMG{
 .si_form{
 	display: block;
 	margin: 20px auto;
-	width: 650px;
 	overflow: hidden;
 }
 #si_form_cron{
@@ -867,11 +866,11 @@ A.cluetip:hover IMG{
 	margin: 0 auto;
 }
 .si_form_view TABLE{
-	border: 1px solid #ddd;
+	/*border: 1px solid #ddd;*/
 }
 
 .si_form_view{
-	padding: 10px 5px;
+	/*padding: 10px 5px;*/
 }
 
 .si_form TH,
@@ -880,7 +879,7 @@ A.cluetip:hover IMG{
 	border-bottom: 1px dotted #ddd;
 }
 .si_form TBODY TH{
-	text-align: right;
+	text-align: left;
 	white-space: nowrap;
 	font-weight: normal;
 	color: #777;
@@ -889,6 +888,9 @@ A.cluetip:hover IMG{
 	vertical-align: top;
 	line-height: 26px;
 }
+.si_form TBODY TH.product_attribute{
+    text-align:left;
+}
 .si_form H4{
 	font-size: 12px;
 	color: #666;
@@ -920,21 +922,20 @@ A.cluetip:hover IMG{
 }
 
 .si_cust_account{
-	float: right;
 	width: 300px;
 }
 .si_cust_invoices TABLE,
 .si_cust_account TABLE{
-	margin: 0;
+	margin-top:10px;
 }
 .si_cust_card{
-	float: right;
 	width: 300px;
-	margin-top: 20px;
+	margin-top: 10px;
 }
 .si_cust_info{
 	float: left;
-	margin-right: 10px;
+	width:100%;
+	margin-bottom:20px;
 }
 .si_clear{
 	clear: both;
@@ -944,7 +945,7 @@ A.cluetip:hover IMG{
 }
 .si_cust_invoices TH,
 .si_cust_invoices TD{
-	text-align: right;
+	text-align: left;
 	padding-left: 30px;
 	padding-right: 5px;
 }
@@ -956,7 +957,7 @@ A.cluetip:hover IMG{
 	padding-bottom: 6px;
 	border-top: 1px solid #DDD;
 	border-bottom: 0px;
-	text-align: center;
+	text-align: left;
 	vertical-align: middle;
 }
 .si_cust_invoices TD{
@@ -965,6 +966,9 @@ A.cluetip:hover IMG{
 .si_cust_invoices TH.first{
 	border-left: none;
 }
+.si_cust_invoices TABLE{
+	width:100%;
+}
 /* @end */
 
 
@@ -1354,6 +1358,13 @@ A.cluetip:hover IMG{
 	color: #666;
 	text-align: center;
 }
+TD.si_product_attribute , .si_product_attribute TD
+{
+    padding-right: 15px;
+	color: #666;
+    border-top:none;
+	font-size: 11px;
+}
 /* @end */
 
 
@@ -1517,11 +1528,46 @@ padding-left;0px;
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
-
 #tabs_customer {
 	border-bottom: 0px #efefef solid;
-}*/
+}
+
+*/
+
+
+#tabs_customer .anchors a
+{
+    background-color:#fff;
+    margin-top:2px;
+    padding-top:6px;
+    padding-left;0px;    
+}
+#tabs_customer .ui-tabs-panel a 
+{
+    float:none;
+    background:#fff;
+    padding:0;
+    margin:0;   
+}
+#tabs_customer .ui-tabs-panel
+{
+    color:#333333;
+    border-top: 1px #efefef solid;
+}
+#tabs_customer .anchors .ui-tabs-selected a 
+{
+    background-color:#E9E9DA;
+    padding-left:12px;
+    padding-right:12px;
+    padding-top:4px;
+    padding-bottom:4px;
+}   
+
+#tabs_customer
+{
+    border-bottom: 0px #efefef solid;
 
+}
 
 .ui-wrapper { 
 	border: 1px solid #50A029; 
@@ -1531,6 +1577,9 @@ padding-left;0px;
 	border: 0;
 }
 
+.ui-tabs-panel { 
+/*	padding-top:10px;*/
+}
 .ui-tabs-hide { 
 	display: none;
 }
@@ -1566,6 +1615,7 @@ padding-left;0px;
     margin: 0;
     padding: 0 0 0 4px;
     padding-left:20px;
+    padding-right:20px;
 }
 
 .ui-tabs-nav:after { 
diff --git a/templates/default/customers/details.tpl b/templates/default/customers/details.tpl
index 1715e997e..19398d476 100644
--- a/templates/default/customers/details.tpl
+++ b/templates/default/customers/details.tpl
@@ -1 +1,402 @@
-{*
/*
* Script: details.tpl
* 	 Customer details template
*
* License:
*	 GPL v3 or above
*
* Website:
*	http://www.simpleinvoices.org
*/
*}

{if $smarty.get.action == 'view' }
<div class="si_form si_form_view" id="si_form_cust">

	<div class="si_cust_info">
		<h4>{$LANG.customer_details}</h4>
		<table>
			<tr>
				<th>{$LANG.customer_name}</th>
				<td>{$customer.name}</td>
				<td class="td_sep"></td>
				<th>{$LANG.phone}</th>
				<td>{$customer.phone|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.attention_short}</th>
				<td>{$customer.attention|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$LANG.mobile_phone}</th>
				<td>{$customer.mobile_phone|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.street}</th>
				<td>{$customer.street_address|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$LANG.fax}</th>
				<td>{$customer.fax|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.street2}</th>
				<td>{$customer.street_address2|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$LANG.email}</th>
				<td><a href="mailto:{$customer.email|htmlsafe}">{$customer.email|htmlsafe}</a></td>
			</tr>
			<tr>
				<th>{$LANG.city}</th>
				<td>{$customer.city|htmlsafe}</td>
				<td colspan="3"></td>
			</tr>
			<tr>
				<th>{$LANG.zip}</th>
				<td>{$customer.zip_code|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$customFieldLabel.customer_cf1}</th>
				<td>{$customer.custom_field1|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.state}</th>
				<td>{$customer.state|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$customFieldLabel.customer_cf2}</th>
				<td>{$customer.custom_field2|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.country}</th>
				<td>{$customer.country|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$customFieldLabel.customer_cf3}</th>
				<td>{$customer.custom_field3|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.enabled}</th>
				<td>{$customer.wording_for_enabled|htmlsafe}</td>
				<td class="td_sep"></td>
				<th>{$customFieldLabel.customer_cf4}</th>
				<td>{$customer.custom_field4|htmlsafe}</td>
			</tr>
		</table>
	</div>

	<div class="si_cust_account">
		<h4>{$LANG.summary_of_accounts}</h4>
		<table>
			<tr>
				<th>{$LANG.total_invoices}</th>
				<td class="si_right">{$stuff.total|number_format:2}</td>
			</tr>
			<tr>
				<th><a href="index.php?module=payments&view=manage&c_id={$customer.id|urlencode}">{$LANG.total_paid}</a></th>
				<td class="si_right">{$stuff.paid|number_format:2}</td>
			</tr>
			<tr>
				<th>{$LANG.total_owing}</th>
				<td class="si_right"><u>{$stuff.owing|number_format:2}</u></td>
			</tr>
		</table>
	</div>

	<div class="si_cust_card">
		<h4>{$LANG.credit_card_details}</h4>
		<table>
			<tr>
				<th>{$LANG.credit_card_holder_name}</th>
				<td>{$customer.credit_card_holder_name|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.credit_card_number}</th>
				<td>{$customer.credit_card_number|regex_replace:'/^............/':"************"|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.credit_card_expiry_month}</th>
				<td>{$customer.credit_card_expiry_month|htmlsafe}</td>
			</tr>
			<tr>
				<th>{$LANG.credit_card_expiry_year}</th>
				<td>{$customer.credit_card_expiry_year|htmlsafe}</td>
			</tr>
		</table>
	</div>
	
	<div class="si_clear"></div>

	<div class="si_cust_notes">
		<h4>{$LANG.notes}</h4>
		{$customer.notes|outhtml}
	</div>

	<div class="si_cust_invoices">
		<h4>{$LANG.invoice_listings}</h4>
		<table>
			<thead>
				<tr class="tr_head">
					<th class="first">{$LANG.id}</th>
					<th>{$LANG.date_created}</th>
					<th>{$LANG.total}</th>
					<th>{$LANG.paid}</th>
					<th>{$LANG.owing}</th>
				</tr>
			</thead>
			<tbody>
			{foreach from=$invoices item=invoice}
				<tr class="index_table">
					<td class="first"><a href="index.php?module=invoices&amp;view=quick_view&id={$invoice.id|urlencode}">{$invoice.index_id|htmlsafe}</a></td>
					<td>{$invoice.date|htmlsafe}</td>
					<td>{$invoice.total|number_format:2}</td>
					<td>{$invoice.paid|number_format:2}</td>
					<td>{$invoice.owing|number_format:2}</td>
				</tr>
			{/foreach}
			</tbody>
		</table>
	</div>
</div>

<div class="si_toolbar si_toolbar_form">
	<a href="./index.php?module=customers&amp;view=details&amp;id={$customer.id|urlencode}&amp;action=edit" class="positive"><img src="./images/common/tick.png" alt="" />{$LANG.edit}</a>
</div>
{/if}


{* ##################################################################################################### *}



{if $smarty.get.action == 'edit' }

<form name="frmpost" action="index.php?module=customers&amp;view=save&amp;id={$customer.id|urlencode}" method="post" id="frmpost" onsubmit="return checkForm(this);">
<div class="si_form" id="si_form_cust_edit">

	<table align="center">
		<tr>
			<th>{$LANG.customer_name}
				<a class="cluetip" href="#" rel="index.php?module=documentation&amp;view=view&amp;page=help_required_field" title="{$LANG.Required_Field}">
					<img src="./images/common/required-small.png" alt="" />
				</a>
			</th>
			<td><input type="text" name="name" value="{$customer.name|htmlsafe}" size="50" id="name" class="validate[required]" /></td>
		</tr>
		<tr>
			<th>{$LANG.attention_short}
				<a rel="index.php?module=documentation&amp;view=view&amp;page=help_customer_contact" href="#" class="cluetip" title="{$LANG.customer_contact}">
					<img src="./images/common/help-small.png" alt="" />
				</a>
			</th>
			<td><input type="text" name="attention" value="{$customer.attention|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.street}</th>
			<td><input type="text" name="street_address" value="{$customer.street_address|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.street2}
				<a class="cluetip" href="#" rel="index.php?module=documentation&amp;view=view&amp;page=help_street2" title="{$LANG.street2}"> 
					<img src="./images/common/help-small.png" alt="" />
				</a>
			</th>
			<td><input type="text" name="street_address2" value="{$customer.street_address2|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.city}</th>
			<td><input type="text" name="city" value="{$customer.city|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.zip}</th>
			<td><input type="text" name="zip_code" value="{$customer.zip_code|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.state}</th>
			<td><input type="text" name="state" value="{$customer.state|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.country}</th>
			<td><input type="text" name="country" value="{$customer.country|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.phone}</th>
			<td><input type="text" name="phone" value="{$customer.phone|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.mobile_phone}</th>
			<td><input type="text" name="mobile_phone" value="{$customer.mobile_phone|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.fax}</th>
			<td><input type="text" name="fax" value="{$customer.fax|htmlsafe}" size="50" /></td>
		</tr>
		<tr>
			<th>{$LANG.email}</th>
			<td>
				<input type="text" name="email" value="{$customer.email|htmlsafe}" size="50" /></td
		></tr>
		<tr>
			<th>{$LANG.credit_card_holder_name}</th>
			<td>
				<input
					type="text" name="credit_card_holder_name"
					value="{$customer.credit_card_holder_name|htmlsafe}" size="25"
				 />
			</td>
		</tr>
		<tr>
			<th>{$LANG.credit_card_number}</th>
			<td>
						{$LANG.credit_card_number_encrypted}
			</td>
		</tr>
		<tr>
			<th>{$LANG.credit_card_number_new}</th>
			<td>
				<input
					type="text" name="credit_card_number_new"
					value="{$customer.credit_card_holder_name_new|htmlsafe}" size="25"
				 />
			</td>
		</tr>
		<tr>
			<th>{$LANG.credit_card_expiry_month}</th>
			<td>
				<input
					type="text" name="credit_card_expiry_month"
					value="{$customer.credit_card_expiry_month|htmlsafe}" size="5"
				 />
			</td>
		</tr>
		<tr>
			<th>{$LANG.credit_card_expiry_year}</th>
			<td>
				<input
					type="text" name="credit_card_expiry_year"
					value="{$customer.credit_card_expiry_year|htmlsafe}" size="5"
				 />
			</td>
		</tr>
		<tr>
			<th>{$customFieldLabel.customer_cf1|htmlsafe}
				<a
					class="cluetip"
					href="#"
					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
					title="{$LANG.Custom_Fields}"
				> 
			 <img src="./images/common/help-small.png" alt="" /></a>
			</th>
			<td>
				<input type="text" name="custom_field1" value="{$customer.custom_field1|htmlsafe}" size="50" />
			</td>
		</tr>
		<tr>
			<th>{$customFieldLabel.customer_cf2|htmlsafe}
				<a
					class="cluetip"
					href="#"
					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
					title="{$LANG.Custom_Fields}"
				> 
			 <img src="./images/common/help-small.png" alt="" /></a>
			</th>
			<td>
				<input type="text" name="custom_field2" value="{$customer.custom_field2|htmlsafe}" size="50" />
			</td>
		</tr>
		<tr>
			<th>{$customFieldLabel.customer_cf3|htmlsafe} 
				<a
					class="cluetip"
					href="#"
					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
					title="{$LANG.Custom_Fields}"
				> 
			<img src="./images/common/help-small.png" alt="" /></a>
			</th>
			<td>
				<input type="text" name="custom_field3" value="{$customer.custom_field3|htmlsafe}" size="50" />
			</td>
		</tr>
		<tr>
			<th>{$customFieldLabel.customer_cf4|htmlsafe}
				<a
					class="cluetip"
					href="#"
					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
					title="{$LANG.Custom_Fields}"
				> 
			 <img src="./images/common/help-small.png" alt="" /></a>
			</th>
			<td>
				<input type="text" name="custom_field4" value="{$customer.custom_field4|htmlsafe}" size="50" />
			</td>
		</tr>
		<tr>
			<th>{$LANG.notes}</th>
			<td><textarea  name="notes"  class="editor" rows="8" cols="50">{$customer.notes|outhtml}</textarea></td>
		</tr>
		{*
			{showCustomFields categorieId="2" itemId=$smarty.get.customer }
		*}
		<tr>
			<th>{$LANG.enabled}</th>
			<td>
				{html_options name=enabled options=$enabled selected=$customer.enabled}
			</td>
		</tr>
	</table>
		
	<div class="si_toolbar si_toolbar_form">
		<button type="submit" class="positive" name="save_customer" value="{$LANG.save_customer}"><img class="button_img" src="./images/common/tick.png" alt="" />{$LANG.save}</button>
		<a href="./index.php?module=customers&amp;view=manage" class="negative"><img src="./images/common/cross.png" alt="" />{$LANG.cancel}</a>
	</div>

</div>

<input type="hidden" name="op" value="edit_customer">
</form>
{/if}
\ No newline at end of file
+{*
+/*
+* Script: details.tpl
+* 	 Customer details template
+*
+* License:
+*	 GPL v3 or above
+*
+* Website:
+*	http://www.simpleinvoices.org
+*/
+*}
+
+{if $smarty.get.action == 'view' }
+<div class="si_form si_form_view" id="si_form_cust">
+
+	<div class="si_cust_info">
+		<table>
+			<tr>
+				<th>{$LANG.customer_name}</th>
+				<td>{$customer.name}</td>
+				<td class="td_sep"></td>
+				<th>{$LANG.phone}</th>
+				<td>{$customer.phone|htmlsafe}</td>
+			</tr>
+			<tr>
+				<th>{$LANG.attention_short}</th>
+				<td>{$customer.attention|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$LANG.mobile_phone}</th>
+				<td>{$customer.mobile_phone|htmlsafe}</td>
+			</tr>
+			<tr>
+				<th>{$LANG.street}</th>
+				<td>{$customer.street_address|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$LANG.fax}</th>
+				<td>{$customer.fax|htmlsafe}</td>
+			</tr>
+			<tr>
+				<th>{$LANG.street2}</th>
+				<td>{$customer.street_address2|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$LANG.email}</th>
+				<td><a href="mailto:{$customer.email|htmlsafe}">{$customer.email|htmlsafe}</a></td>
+			</tr>
+			<tr>
+				<th>{$LANG.city}</th>
+				<td>{$customer.city|htmlsafe}</td>
+				<td colspan="3"></td>
+			</tr>
+			<tr>
+				<th>{$LANG.zip}</th>
+				<td>{$customer.zip_code|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$customFieldLabel.customer_cf1}</th>
+				<td>{$customer.custom_field1|htmlsafe}</td>
+			</tr>
+			<tr>
+				<th>{$LANG.state}</th>
+				<td>{$customer.state|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$customFieldLabel.customer_cf2}</th>
+				<td>{$customer.custom_field2|htmlsafe}</td>
+			</tr>
+			<tr>
+				<th>{$LANG.country}</th>
+				<td>{$customer.country|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$customFieldLabel.customer_cf3}</th>
+				<td>{$customer.custom_field3|htmlsafe}</td>
+			</tr>
+			<tr>
+				<th>{$LANG.enabled}</th>
+				<td>{$customer.wording_for_enabled|htmlsafe}</td>
+				<td class="td_sep"></td>
+				<th>{$customFieldLabel.customer_cf4}</th>
+				<td>{$customer.custom_field4|htmlsafe}</td>
+			</tr>
+		</table>
+	</div>
+
+<div id="tabs_customer">
+	<ul class="anchors">
+		<li><a href="#section-1" target="_top">{$LANG.summary_of_accounts}</a></li>
+		<li><a href="#section-2" target="_top">{$LANG.credit_card_details}</a></li>
+		<li><a href="#section-3" target="_top">{$LANG.unpaid_invoices}</a></li>
+		<li><a href="#section-4" target="_top">{$LANG.customer} {$LANG.invoice_listings}</a></li>
+		<li><a href="#section-5" target="_top">{$LANG.notes}</a></li>
+	</ul>
+	<div id="section-1" class="fragment">
+		<div class="si_cust_account">
+		    <table>
+			<tr>
+			    <th>{$LANG.total_invoices}</th>
+			    <td class="si_right">{$stuff.total|number_format:2}</td>
+			</tr>
+			<tr>
+			    <th><a href="index.php?module=payments&view=manage&c_id={$customer.id|urlencode}">{$LANG.total_paid}</a></th>
+			    <td class="si_right">{$stuff.paid|number_format:2}</td>
+			</tr>
+			<tr>
+			    <th>{$LANG.total_owing}</th>
+			    <td class="si_right"><u>{$stuff.owing|number_format:2}</u></td>
+			</tr>
+		    </table>
+		</div>
+	</div>
+
+	<div id="section-2" class="fragment">
+
+		<div class="si_cust_card">
+		    <table>
+			<tr>
+			    <th>{$LANG.credit_card_holder_name}</th>
+			    <td>{$customer.credit_card_holder_name|htmlsafe}</td>
+			</tr>
+			<tr>
+			    <th>{$LANG.credit_card_number}</th>
+			    <td>{$customer.credit_card_number|regex_replace:'/^............/':"************"|htmlsafe}</td>
+			</tr>
+			<tr>
+			    <th>{$LANG.credit_card_expiry_month}</th>
+			    <td>{$customer.credit_card_expiry_month|htmlsafe}</td>
+			</tr>
+			<tr>
+			    <th>{$LANG.credit_card_expiry_year}</th>
+			    <td>{$customer.credit_card_expiry_year|htmlsafe}</td>
+			</tr>
+		    </table>
+		</div>
+        </div>
+	
+	<div id="section-3" class="fragment">
+		<div class="si_cust_invoices">
+		    <table>
+			<thead>
+			    <tr class="tr_head">
+				<th class="first">
+			<!--6 Payment -->{$LANG.actions}
+				</th>
+				<th>{$LANG.id}</th>
+				<th>{$LANG.date_created}</th>
+				<th>{$LANG.total}</th>
+				<th>{$LANG.paid}</th>
+				<th>{$LANG.owing}</th>
+			    </tr>
+			</thead>
+			<tbody>
+			{foreach from=$invoices item=invoice}
+			    <tr class="index_table">
+				<td class="first">
+			<!--6 Payment --><a title="{$LANG.process_payment_for} {$invoice.preference} {$invoice.id}"  href='index.php?module=payments&view=process&id={$invoice.id}&op=pay_selected_invoice'><img src='images/common/money_dollar.png' class='action' /></a>
+				<a href="index.php?module=invoices&amp;view=quick_view&id={$invoice.id|urlencode}"><img src='images/common/view.png' class='action' /></a>
+				</td>
+				<td ><a href="index.php?module=invoices&amp;view=quick_view&id={$invoice.id|urlencode}">{$invoice.index_id|htmlsafe}</a></td>
+				<td>{$invoice.date|htmlsafe}</td>
+				<td>{$invoice.total|number_format:2}</td>
+				<td>{$invoice.paid|number_format:2}</td>
+				<td>{$invoice.owing|number_format:2}</td>
+			    </tr>
+			{/foreach}
+			</tbody>
+		    </table>
+		</div>
+	</div>
+	<div id="section-4" class="fragment">
+		<div class="si_cust_invoices">
+		    <table>
+			<thead>
+			    <tr class="tr_head">
+				<th class="first">{$LANG.id}</th>
+				<th>{$LANG.date_created}</th>
+				<th>{$LANG.total}</th>
+				<th>{$LANG.paid}</th>
+				<th>{$LANG.owing}</th>
+			    </tr>
+			</thead>
+			<tbody>
+			{foreach from=$invoices item=invoice}
+			    <tr class="index_table">
+				<td class="first"><a href="index.php?module=invoices&amp;view=quick_view&id={$invoice.id|urlencode}">{$invoice.index_id|htmlsafe}</a></td>
+				<td>{$invoice.date|htmlsafe}</td>
+				<td>{$invoice.total|number_format:2}</td>
+				<td>{$invoice.paid|number_format:2}</td>
+				<td>{$invoice.owing|number_format:2}</td>
+			    </tr>
+			{/foreach}
+			</tbody>
+		    </table>
+		</div>
+	</div>
+	<div id="section-5" class="fragment">
+
+		<div class="si_cust_notes">
+		    {$customer.notes|outhtml}
+		</div>
+    	</div>
+</div>
+
+<div class="si_toolbar si_toolbar_form">
+	<a href="./index.php?module=customers&amp;view=details&amp;id={$customer.id|urlencode}&amp;action=edit" class="positive"><img src="./images/common/tick.png" alt="" />{$LANG.edit}</a>
+</div>
+</div>
+{/if}
+
+
+{* ##################################################################################################### *}
+
+
+
+{if $smarty.get.action == 'edit' }
+
+<form name="frmpost" action="index.php?module=customers&amp;view=save&amp;id={$customer.id|urlencode}" method="post" id="frmpost" onsubmit="return checkForm(this);">
+<div class="si_form" id="si_form_cust_edit">
+
+	<table align="center">
+		<tr>
+			<th>{$LANG.customer_name}
+				<a class="cluetip" href="#" rel="index.php?module=documentation&amp;view=view&amp;page=help_required_field" title="{$LANG.Required_Field}">
+					<img src="./images/common/required-small.png" alt="" />
+				</a>
+			</th>
+			<td><input type="text" name="name" value="{$customer.name|htmlsafe}" size="50" id="name" class="validate[required]" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.attention_short}
+				<a rel="index.php?module=documentation&amp;view=view&amp;page=help_customer_contact" href="#" class="cluetip" title="{$LANG.customer_contact}">
+					<img src="./images/common/help-small.png" alt="" />
+				</a>
+			</th>
+			<td><input type="text" name="attention" value="{$customer.attention|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.street}</th>
+			<td><input type="text" name="street_address" value="{$customer.street_address|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.street2}
+				<a class="cluetip" href="#" rel="index.php?module=documentation&amp;view=view&amp;page=help_street2" title="{$LANG.street2}"> 
+					<img src="./images/common/help-small.png" alt="" />
+				</a>
+			</th>
+			<td><input type="text" name="street_address2" value="{$customer.street_address2|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.city}</th>
+			<td><input type="text" name="city" value="{$customer.city|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.zip}</th>
+			<td><input type="text" name="zip_code" value="{$customer.zip_code|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.state}</th>
+			<td><input type="text" name="state" value="{$customer.state|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.country}</th>
+			<td><input type="text" name="country" value="{$customer.country|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.phone}</th>
+			<td><input type="text" name="phone" value="{$customer.phone|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.mobile_phone}</th>
+			<td><input type="text" name="mobile_phone" value="{$customer.mobile_phone|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.fax}</th>
+			<td><input type="text" name="fax" value="{$customer.fax|htmlsafe}" size="50" /></td>
+		</tr>
+		<tr>
+			<th>{$LANG.email}</th>
+			<td>
+				<input type="text" name="email" value="{$customer.email|htmlsafe}" size="50" /></td
+		></tr>
+		<tr>
+			<th>{$LANG.credit_card_holder_name}</th>
+			<td>
+				<input
+					type="text" name="credit_card_holder_name"
+					value="{$customer.credit_card_holder_name|htmlsafe}" size="25"
+				 />
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.credit_card_number}</th>
+			<td>
+						{$LANG.credit_card_number_encrypted}
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.credit_card_number_new}</th>
+			<td>
+				<input
+					type="text" name="credit_card_number_new"
+					value="{$customer.credit_card_holder_name_new|htmlsafe}" size="25"
+				 />
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.credit_card_expiry_month}</th>
+			<td>
+				<input
+					type="text" name="credit_card_expiry_month"
+					value="{$customer.credit_card_expiry_month|htmlsafe}" size="5"
+				 />
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.credit_card_expiry_year}</th>
+			<td>
+				<input
+					type="text" name="credit_card_expiry_year"
+					value="{$customer.credit_card_expiry_year|htmlsafe}" size="5"
+				 />
+			</td>
+		</tr>
+		<tr>
+			<th>{$customFieldLabel.customer_cf1|htmlsafe}
+				<a
+					class="cluetip"
+					href="#"
+					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
+					title="{$LANG.Custom_Fields}"
+				> 
+			 <img src="./images/common/help-small.png" alt="" /></a>
+			</th>
+			<td>
+				<input type="text" name="custom_field1" value="{$customer.custom_field1|htmlsafe}" size="50" />
+			</td>
+		</tr>
+		<tr>
+			<th>{$customFieldLabel.customer_cf2|htmlsafe}
+				<a
+					class="cluetip"
+					href="#"
+					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
+					title="{$LANG.Custom_Fields}"
+				> 
+			 <img src="./images/common/help-small.png" alt="" /></a>
+			</th>
+			<td>
+				<input type="text" name="custom_field2" value="{$customer.custom_field2|htmlsafe}" size="50" />
+			</td>
+		</tr>
+		<tr>
+			<th>{$customFieldLabel.customer_cf3|htmlsafe} 
+				<a
+					class="cluetip"
+					href="#"
+					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
+					title="{$LANG.Custom_Fields}"
+				> 
+			<img src="./images/common/help-small.png" alt="" /></a>
+			</th>
+			<td>
+				<input type="text" name="custom_field3" value="{$customer.custom_field3|htmlsafe}" size="50" />
+			</td>
+		</tr>
+		<tr>
+			<th>{$customFieldLabel.customer_cf4|htmlsafe}
+				<a
+					class="cluetip"
+					href="#"
+					rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields"
+					title="{$LANG.Custom_Fields}"
+				> 
+			 <img src="./images/common/help-small.png" alt="" /></a>
+			</th>
+			<td>
+				<input type="text" name="custom_field4" value="{$customer.custom_field4|htmlsafe}" size="50" />
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.notes}</th>
+			<td><textarea  name="notes"  class="editor" rows="8" cols="50">{$customer.notes|outhtml}</textarea></td>
+		</tr>
+		{*
+			{showCustomFields categorieId="2" itemId=$smarty.get.customer }
+		*}
+		<tr>
+			<th>{$LANG.enabled}</th>
+			<td>
+				{html_options name=enabled options=$enabled selected=$customer.enabled}
+			</td>
+		</tr>
+	</table>
+		
+	<div class="si_toolbar si_toolbar_form">
+		<button type="submit" class="positive" name="save_customer" value="{$LANG.save_customer}"><img class="button_img" src="./images/common/tick.png" alt="" />{$LANG.save}</button>
+		<a href="./index.php?module=customers&amp;view=manage" class="negative"><img src="./images/common/cross.png" alt="" />{$LANG.cancel}</a>
+	</div>
+
+</div>
+
+<input type="hidden" name="op" value="edit_customer">
+</form>
+{/if}
+
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index ff70c48a5..21afbdd4a 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -3,7 +3,7 @@
 
 	<div id="si_footer">
 		<div class="si_wrap">
-			{$LANG.thank_you_inv}<a href="http://www.simpleinvoices.org">{$LANG.simple_invoices}</a> | <a href="https://plus.google.com/u/0/communities/102476804981627142204">{$LANG.forum}</a> | <a href="http://www.simpleinvoices.org/blog">{$LANG.blog}</a>
+			{$LANG.thank_you_inv}<a href="http://www.simpleinvoices.org">{$LANG.simple_invoices}</a> | <a href="http://www.simpleinvoices.org/+">{$LANG.forum}</a> | <a href="http://www.simpleinvoices.org/blog">{$LANG.blog}</a>
 		</div>
 	</div>
 
diff --git a/templates/default/invoices/details.tpl b/templates/default/invoices/details.tpl
index 6058c60b4..13ceb34f0 100644
--- a/templates/default/invoices/details.tpl
+++ b/templates/default/invoices/details.tpl
@@ -228,6 +228,7 @@
 						<input class="si_right" id="unit_price{$line|htmlsafe}" name="unit_price{$line|htmlsafe}" size="7" value="{$invoiceItem.unit_price|siLocal_number_clean}" />
 					</td>
 				</tr>
+					{$invoiceItem.html}
 				<tr class="details si_hide">
 					<td>
 					</td>
diff --git a/templates/default/invoices/quick_view.tpl b/templates/default/invoices/quick_view.tpl
index b2ce0df4c..8c42c44c8 100644
--- a/templates/default/invoices/quick_view.tpl
+++ b/templates/default/invoices/quick_view.tpl
@@ -234,6 +234,26 @@
 							<td class="si_right">{$preference.pref_currency_sign}{$invoiceItem.unit_price|siLocal_number}</td>
 							<td class="si_right">{$preference.pref_currency_sign}{$invoiceItem.gross_total|siLocal_number}</td>
 					</tr>
+					{if $invoiceItem.attribute != null}
+                            <tr class="si_product_attribute">
+                                <td></td>
+                                <td>
+                                <table>
+                                    <tr class="si_product_attribute">
+                                    {foreach from=$invoiceItem.attribute_json key=k item=v}
+                                        <td class="si_product_attribute">
+                                            {if $v.type == 'decimal'}
+                                              {$v.name}: {$preference.pref_currency_sign|htmlsafe}{$v.value|siLocal_number} ;
+                                             {else}
+                                               {$v.name}: {$v.value} ;
+                                            {/if}
+                                        </td>
+                                    {/foreach}
+                                    </tr>
+                                </table>
+                                </td>
+                            </tr>
+					{/if}
 					
 					{if $invoiceItem.description != null}
 					<tr class="show-itemised tr_desc" >
diff --git a/templates/default/menu.tpl b/templates/default/menu.tpl
index f451d3a7e..df6366514 100644
--- a/templates/default/menu.tpl
+++ b/templates/default/menu.tpl
@@ -92,6 +92,16 @@
 	    			{ if $subPageActive == "inventory_view"} <li><a class="active active_subpage" href="#">{$LANG.view}</a></li>{/if}
 		    		{ if $subPageActive == "inventory_edit"} <li><a class="active active_subpage" href="#">{$LANG.edit}</a></li>{/if}
 			    	{ if $subPageActive == "inventory_add"} <li><a class="active active_subpage" href="#">{$LANG.add}</a></li>{/if}
+            {/if}
+            {if $defaults.product_attributes}
+    			<li><a { if $pageActive == "inventory"} class="active"{/if} href="index.php?module=product_attribute&amp;view=manage">{$LANG.product_attributes}</a></li>
+	    			{ if $subPageActive == "inventory_view"} <li><a class="active active_subpage" href="#">{$LANG.view}</a></li>{/if}
+		    		{ if $subPageActive == "inventory_edit"} <li><a class="active active_subpage" href="#">{$LANG.edit}</a></li>{/if}
+			    	{ if $subPageActive == "inventory_add"} <li><a class="active active_subpage" href="#">{$LANG.add}</a></li>{/if}
+    			<li><a { if $pageActive == "inventory"} class="active"{/if} href="index.php?module=product_value&amp;view=manage">{$LANG.product_values}</a></li>
+	    			{ if $subPageActive == "inventory_view"} <li><a class="active active_subpage" href="#">{$LANG.view}</a></li>{/if}
+		    		{ if $subPageActive == "inventory_edit"} <li><a class="active active_subpage" href="#">{$LANG.edit}</a></li>{/if}
+			    	{ if $subPageActive == "inventory_add"} <li><a class="active active_subpage" href="#">{$LANG.add}</a></li>{/if}
             {/if}
 		</ul>
 	</div>
diff --git a/templates/default/product_attribute/add.tpl b/templates/default/product_attribute/add.tpl
new file mode 100755
index 000000000..3383e9d7e
--- /dev/null
+++ b/templates/default/product_attribute/add.tpl
@@ -0,0 +1,63 @@
+
+{* if customer is updated or saved.*} 
+
+{if $smarty.post.name != "" && $smarty.post.submit != null } 
+{$refresh_total}
+
+<br />
+<br />
+{$display_block} 
+<br />
+<br />
+
+{else}
+{* if  name was inserted *} 
+	{if $smarty.post.submit !=null} 
+		<div class="validation_alert"><img src="./images/common/important.png" alt="" />
+		You must enter a name for the product attribute</div>
+		<hr />
+	{/if}
+<form name="frmpost" action="index.php?module=product_attribute&amp;view=add" method="post">
+
+<h3>Add product attribute</h3>
+
+<hr />
+
+
+<table align="center">
+<tr>
+	<td class="details_screen">Attribute name</td>
+	<td><input type="text" name="name" value="{$smarty.post.name}" size="25" /></td>
+</tr>
+		<tr>
+			<th>{$LANG.type}</th>
+			<td>
+                <select name="type_id">
+                    {foreach from=$types key=k item=v}
+        				<option value="{$v.id}">{$LANG[$v.name]}</option>
+                    {/foreach}
+                </select>
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.enabled}</th>
+			<td>
+				{html_options class=edit name=enabled options=$enabled selected=1}
+			</td>
+		</tr>
+		<tr>
+			<th>{$LANG.visible}</th>
+			<td>
+				{html_options class=edit name=visible options=$enabled selected=1}
+			</td>
+		</tr>
+</table>
+
+<hr />
+<div style="text-align:center;">
+	<input type="submit" name="submit" value="Insert Product Attribute" />
+	<input type="hidden" name="op" value="insert_product_attribute" />
+</div>
+</form>
+	
+{/if}
diff --git a/templates/default/product_attribute/details.tpl b/templates/default/product_attribute/details.tpl
new file mode 100755
index 000000000..acccdabf5
--- /dev/null
+++ b/templates/default/product_attribute/details.tpl
@@ -0,0 +1,78 @@
+<!--Modified code to display apostrophes in text box output 05/02/2008-Gates-->
+<form name="frmpost"
+	action="index.php?module=product_attribute&amp;view=save&amp;id={$smarty.get.id}"
+	method="post">
+
+
+{if $smarty.get.action== 'view' }
+	<b>Product Attribute :: <a href="index.php?module=product_attribute&amp;view=details&amp;id={$product_attribute.id}&amp;action=edit">{$LANG.edit}</a></b>
+	<hr />
+
+	
+	<table align="center">
+		<tr>
+  			<td class="details_screen">{$LANG.id}</td><td>{$product_attribute.id}</td>
+                </tr>
+		<tr>	
+			<td class="details_screen">{$LANG.name}</td><td>{$product_attribute.name}</td>
+        </tr>
+		<tr>
+			<th>{$LANG.type}</th>
+			<td>{$product_attribute.type|capitalize|htmlsafe}</td>
+		</tr>
+		<tr>
+			<th>{$LANG.enabled}</th>
+			<td>{$product_attribute.wording_for_enabled|htmlsafe}</td>
+		</tr>
+		<tr>
+			<th>{$LANG.visible}</th>
+			<td>{$product_attribute.wording_for_visible|htmlsafe}</td>
+		</tr>
+		</table>
+		<hr />
+
+<a href="index.php?module=product_attribute&amp;view=details&amp;id={$product_attribute.id}&amp;action=edit">{$LANG.edit}</a>
+
+{/if}
+
+{if $smarty.get.action== 'edit' }
+
+<b>Product Attribute</b>
+	<hr />
+
+        <table align="center">
+                <tr>
+                        <td class="details_screen">{$LANG.id}</td><td>{$product_attribute.id}</td>
+                </tr>
+                <tr>
+                        <td class="details_screen">{$LANG.name}</td><td><input type="text" name="name" value="{$product_attribute.name}" size="50" /></td>
+                </tr>
+		<tr>
+			<th>{$LANG.type}</th>
+			<td>
+                <select name="type_id">
+                    {foreach from=$types key=k item=v}
+        				<option value="{$v.id}" {if $product_attribute.type_id == $v.id} selected {/if}>{$v.name|capitalize}</option>
+                    {/foreach}
+                </select>
+			</td>
+		</tr>
+                <tr>
+		<th>{$LANG.enabled}</th>
+		<td>
+			{html_options name=enabled options=$enabled selected=$product_attribute.enabled}
+		</td>
+                </tr>
+                <tr>
+		<th>{$LANG.visible}</th>
+		<td>
+			{html_options name=visible options=$enabled selected=$product_attribute.visible}
+		</td>
+                </tr>
+                </table>
+		<hr />
+
+<input type="submit" name="save_product_attribute" value="{$LANG.save}" />
+<input type="hidden" name="op" value="edit_product_attribute" />
+{/if}
+</form>
diff --git a/templates/default/product_attribute/manage.tpl b/templates/default/product_attribute/manage.tpl
new file mode 100755
index 000000000..c3abc5264
--- /dev/null
+++ b/templates/default/product_attribute/manage.tpl
@@ -0,0 +1,24 @@
+{*
+/*
+* Script: manage.tpl
+* 	 Invoice Preferences manage template
+*
+* Authors:
+*	 Justin Kelly, Ben Brown
+*
+* Last edited:
+* 	 2007-09-22
+*
+* License:
+*	 GPL v2 or above
+*/
+*}
+{if preferences == null}
+<P><em>{$LANG.no_preferences}.</em></p>
+{else}
+<h3>Manage Product Attributes :: <a href="index.php?module=product_attribute&view=add">Add Attribute</a></h3>
+<hr />
+<table id="manageGrid" style="display:none"></table>
+
+ {include file='../modules/product_attribute/manage.js.php'}
+{/if}
diff --git a/templates/default/product_attribute/save.tpl b/templates/default/product_attribute/save.tpl
new file mode 100755
index 000000000..3fbaa40a4
--- /dev/null
+++ b/templates/default/product_attribute/save.tpl
@@ -0,0 +1,4 @@
+<br />
+{$display_block}
+{$refresh_total}
+<br />
diff --git a/templates/default/product_value/add.tpl b/templates/default/product_value/add.tpl
new file mode 100755
index 000000000..50732a488
--- /dev/null
+++ b/templates/default/product_value/add.tpl
@@ -0,0 +1,54 @@
+{if $smarty.post.value != "" && $smarty.post.submit != null } 
+{$refresh_total}
+
+<br />
+<br />
+{$display_block} 
+<br />
+<br />
+
+{else}
+{* if  name was inserted *} 
+	{if $smarty.post.submit !=null} 
+		<div class="validation_alert"><img src="./images/common/important.png" alt="" />
+		You must enter a value</div>
+		<hr />
+	{/if}
+<form name="frmpost" action="index.php?module=product_value&amp;view=add" method="post">
+
+<h3>Add product value</h3>
+
+<hr />
+
+
+<table align="center">
+<tr>
+	<td class="details_screen">Attribute</td>
+	<td>
+            <select name="attribute_id">
+            {foreach from=$product_attributes item=product_attribute}
+                <option value="{$product_attribute.id}">{$product_attribute.name}</option>
+            {/foreach}
+            </select>
+	</td>
+</tr>
+<tr>
+	<td class="details_screen">Value</td>
+	<td><input type="text" name="value" value="{$smarty.post.value}" size="25" /></td>
+</tr>
+		<tr>
+			<th>{$LANG.enabled}</th>
+			<td>
+				{html_options class=edit name=enabled options=$enabled selected=1}
+			</td>
+		</tr>
+</table>
+<!-- </div> -->
+<hr />
+<div style="text-align:center;">
+	<input type="submit" name="submit" value="Insert Product Value" />
+	<input type="hidden" name="op" value="insert_product_value" />
+</div>
+</form>
+
+{/if}
diff --git a/templates/default/product_value/details.tpl b/templates/default/product_value/details.tpl
new file mode 100755
index 000000000..e18c79469
--- /dev/null
+++ b/templates/default/product_value/details.tpl
@@ -0,0 +1,66 @@
+<form name="frmpost"
+	action="index.php?module=product_value&amp;view=save&amp;id={$smarty.get.id}"
+	method="post">
+
+
+{if $smarty.get.action== 'view' }
+	<b>Product Values :: <a href="index.php?module=product_value&amp;view=details&amp;id={$product_value.id}&amp;action=edit">{$LANG.edit}</a></b>
+	<hr />
+
+	
+	<table align="center">
+		<tr>
+  			<td class="details_screen">{$LANG.id}</td><td>{$product_value.id}</td>
+                </tr>
+		<tr>	
+			<td class="details_screen">{$LANG.attribute}</td><td>{$product_attribute}</td>
+		</tr>
+		<tr>	
+			<td class="details_screen">{$LANG.value}</td><td>{$product_value.value}</td>
+		</tr>
+		<tr>
+			<th>{$LANG.enabled}</th>
+			<td>{$product.wording_for_enabled|htmlsafe}</td>
+		</tr>
+		</table>
+		<hr />
+
+<a href="index.php?module=product_value&amp;view=details&amp;id={$product_value.id}&amp;action=edit">{$LANG.edit}</a>
+
+{/if}
+
+{if $smarty.get.action== 'edit' }
+
+<b>Preferences</b>
+	<hr />
+
+	<table align="center">
+		<tr>
+			<td class="details_screen">{$LANG.id}</td><td>{$product_value.id}</td>
+		</tr>
+		<tr>
+			<td  class="details_screen">{$LANG.attribute}</td>
+			<td>
+		            <select name="attribute_id">
+			            {foreach from=$product_attributes item=product_attribute}
+			                <option {if $product_attributes == $product_value.attribute_id}selected{/if}value="{$product_attribute.id}">{$product_attribute.name}</option>
+			            {/foreach}
+		            </select>
+			</td>
+		<tr>
+			<td class="details_screen">Value</td><td><input type="text" name="value" value="{$product_value.value}" size="50" /></td>
+		</tr>
+		<th>{$LANG.enabled}</th>
+		<td>
+			{html_options name=enabled options=$enabled selected=$product_attribute.enabled}
+		</td>
+                </tr>
+                <tr>
+
+	</table>
+	<hr />
+
+<input type="submit" name="save_product_value" value="{$LANG.save}" />
+<input type="hidden" name="op" value="edit_product_value" />
+{/if}
+</form>
diff --git a/templates/default/product_value/manage.tpl b/templates/default/product_value/manage.tpl
new file mode 100755
index 000000000..46ff25a2d
--- /dev/null
+++ b/templates/default/product_value/manage.tpl
@@ -0,0 +1,18 @@
+{*
+/*
+* Script: manage.tpl
+* 	 Invoice Preferences manage template
+*
+* License:
+*	 GPL v2 or above
+*/
+*}
+{if preferences == null}
+<P><em>{$LANG.no_preferences}.</em></p>
+{else}
+<h3>Manage Product Value :: <a href="index.php?module=product_value&view=add">Add Product Value</a></h3>
+<hr />
+<table id="manageGrid" style="display:none"></table>
+
+ {include file='../modules/product_value/manage.js.php'}
+{/if}
diff --git a/templates/default/product_value/save.tpl b/templates/default/product_value/save.tpl
new file mode 100755
index 000000000..3fbaa40a4
--- /dev/null
+++ b/templates/default/product_value/save.tpl
@@ -0,0 +1,4 @@
+<br />
+{$display_block}
+{$refresh_total}
+<br />
diff --git a/templates/default/products/add.tpl b/templates/default/products/add.tpl
index f5f8221c6..c58032e14 100755
--- a/templates/default/products/add.tpl
+++ b/templates/default/products/add.tpl
@@ -16,6 +16,14 @@
 
 <form name="frmpost" action="index.php?module=products&view=add" method="POST" id="frmpost" onsubmit="return checkForm(this);">
 <div class="si_form">
+    <div id="tabs_customer">
+	<ul class="anchors">
+		<li><a href="#section-1" target="_top">{$LANG.details}</a></li>
+		<li><a href="#section-2" target="_top">{$LANG.custom_fields}</a></li>
+		<li><a href="#section-3" target="_top">{$LANG.notes}</a></li>
+	</ul>
+    </div>
+	<div id="section-1" class="fragment">
 
 	<table>
 		<tr>
@@ -51,6 +59,16 @@
 			</select>
 			</td>
 		</tr>
+		<tr>
+			<th>{$LANG.enabled}</th>
+			<td>
+				{html_options class=edit name=enabled options=$enabled selected=1}
+			</td>
+		</tr>
+	</table>
+        </div>
+	<div id="section-2" class="fragment">
+    <table>
 		<tr>
 			<th>{$customFieldLabel.product_cf1|htmlsafe} 
 				<a class="cluetip" href="#"	rel="index.php?module=documentation&amp;view=view&amp;page=help_custom_fields" title="{$LANG.custom_fields}"><img src="./images/common/help-small.png" alt="" /></a>
@@ -75,19 +93,53 @@
 			</th>
 			<td><input type="text" class="edit" name="custom_field4" value="{$smarty.post.custom_field4|htmlsafe}" size="50" /></td>
 		</tr>
+        {if $defaults.product_attributes}
+            <tr>
+                <th class="details_screen">{$LANG.product_attributes}</th>
+                <td>
+                </td>
+            </tr>
+            {foreach from=$attributes item=attribute}
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" name="attribute{$attribute.id}" value="true"/>
+                    {$attribute.name}
+                    </th>
+                </tr>
+            {/foreach}
+        {/if}
+	</table>
+        </div>
+	<div id="section-3" class="fragment">
+    <table>
 		<tr>
 			<th>{$LANG.notes}</th>
 			<td><textarea input type="text" class="editor" name='notes' rows="8" cols="50">{$smarty.post.notes|unescape}</textarea></td>
 		</tr>
-		<tr>
-			<th>{$LANG.enabled}</th>
-			<td>
-				{html_options class=edit name=enabled options=$enabled selected=1}
-			</td>
-		</tr>
-		{*	{showCustomFields categorieId="3" itemId=""} *}
+            <tr>
+                <th class="details_screen">{$LANG.note_attributes}</th>
+                <td>
+                </td>
+            </tr>
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" name="notes_as_description" value='true'/>
+                    {$LANG.note_as_description}
+                    </th>
+                </tr>
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" name="show_description" value='true'/>
+                    {$LANG.note_expand}
+                    </th>
+                </tr>
 	</table>
 
+        </div>
+        </div>
 	<div class="si_toolbar si_toolbar_form">
 			<button type="submit" class="positive" name="id" value="{$LANG.save}">
 			    <img class="button_img" src="./images/common/tick.png" alt="" /> 
diff --git a/templates/default/products/details.tpl b/templates/default/products/details.tpl
index 9804669f0..2b09a70b0 100755
--- a/templates/default/products/details.tpl
+++ b/templates/default/products/details.tpl
@@ -49,10 +49,49 @@
 			{*
 				{showCustomFields categorieId="3" itemId=$smarty.get.id } 
 			*}
+        {if $defaults.product_attributes}
+            <tr>
+                <th class="details_screen">{$LANG.product_attributes}</th>
+                <td>
+                </td>
+            </tr>
+            {foreach from=$attributes item=attribute}
+                {assign var="i" value=$attribute.id}
+
+                {if $attribute.enabled == '1' OR $product.attribute_decode[$i] == 'true'}
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute"> 
+                    <input type="checkbox" disabled="disabled" name="attribute{$i}" {if $product.attribute_decode[$i] == 'true'} checked {/if} value="true"/>
+                    {$attribute.name}
+                    </th>
+                </tr>
+                {/if}
+            {/foreach}
+        {/if}
 		<tr>
 			<th>{$LANG.notes}</th>
 			<td>{$product.notes|unescape}</td>
 		</tr>
+            <tr>
+                <th class="details_screen">{$LANG.note_attributes}</th>
+                <td>
+                </td>
+            </tr>
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox"  disabled="disabled" name="notes_as_description" {if $product.notes_as_description== 'Y'} checked {/if} value='true'/>
+                    {$LANG.note_as_description}
+                    </th>
+                </tr>
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" disabled="disabled" name="show_description"  {if $product.show_description == 'Y'} checked {/if} value='true'/>
+                    {$LANG.note_expand}
+                    </th>
+                </tr>
 		<tr>
 			<th>{$LANG.product_enabled}</th>
 			<td>{$product.wording_for_enabled|htmlsafe}</td>
@@ -134,12 +173,49 @@
 		</th>
 		<td><input type="text" name="custom_field4" size="50" value="{$product.custom_field4|htmlsafe}" /></td>
 	</tr>
-	{*	{showCustomFields categorieId="3" itemId=$smarty.get.id } *}
+        {if $defaults.product_attributes}
+            <tr>
+                <th class="details_screen">{$LANG.product_attributes}</th>
+                <td>
+                </td>
+            </tr>
+            {foreach from=$attributes item=attribute}
+                {assign var="i" value=$attribute.id}
+                {if $attribute.enabled == '1' OR $product.attribute_decode[$i] == 'true'}
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" name="attribute{$i}" {if $product.attribute_decode[$i] } == 'true'} checked{/if} value="true"/>
+                    {$attribute.name}
+                    </th>
+                </tr>
+                {/if}
+            {/foreach}
+        {/if}
 	<tr>
 		<th>{$LANG.notes}</th>
 		<td><textarea name="notes" class="editor" rows="8" cols="50">{$product.notes|unescape}</textarea></td>
 	</tr>
 	<tr>
+            <tr>
+                <th class="details_screen">{$LANG.note_attributes}</th>
+                <td>
+                </td>
+            </tr>
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" name="notes_as_description" {if $product.notes_as_description== 'Y'} checked {/if} value='true'/>
+                    {$LANG.note_as_description}
+                    </th>
+                </tr>
+                <tr>
+                    <td></td>
+                    <th class="details_screen product_attribute">
+                    <input type="checkbox" name="show_description"  {if $product.show_description == 'Y'} checked {/if} value='true'/>
+                    {$LANG.note_expand}
+                    </th>
+                </tr>
 		<th>{$LANG.product_enabled}</th>
 		<td>
 			{html_options name=enabled options=$enabled selected=$product.enabled}
diff --git a/templates/default/system_defaults/manage.tpl b/templates/default/system_defaults/manage.tpl
index e03289ae9..5e7d255e3 100755
--- a/templates/default/system_defaults/manage.tpl
+++ b/templates/default/system_defaults/manage.tpl
@@ -67,5 +67,15 @@
 			<td><a href='index.php?module=system_defaults&amp;view=edit&amp;submit=inventory'><img src="images/common/edit.png" title="{$LANG.edit}" alt="{$LANG.edit}" /></a></td>
 			<td>{$defaultInventory|htmlsafe}</td>
 		</tr>
+		<tr>
+			<th>{$LANG.product_attributes}</th>
+			<td><a href='index.php?module=system_defaults&amp;view=edit&amp;submit=product_attributes'><img src="images/common/edit.png" title="{$LANG.edit}" alt="{$LANG.edit}" /></a></td>
+			<td>{$defaultProductAttributes|htmlsafe}</td>
+		</tr>
+		<tr>
+			<th>{$LANG.large_dataset}</th>
+			<td><a href='index.php?module=system_defaults&amp;view=edit&amp;submit=large_dataset'><img src="images/common/edit.png" title="{$LANG.edit}" alt="{$LANG.edit}" /></a></td>
+			<td>{$defaultLargeDataset|htmlsafe}</td>
+		</tr>
 	</table>
 </div> 
diff --git a/templates/invoices/default/style.css b/templates/invoices/default/style.css
index c0aa9e603..23aa99c22 100755
--- a/templates/invoices/default/style.css
+++ b/templates/invoices/default/style.css
@@ -36,3 +36,7 @@ tr {margin: 0px;      padding: 0px;}
 {
 	border-bottom: 3px double #555;
 }
+.si_product_attribute
+{
+    padding-right:20px;
+}
diff --git a/templates/invoices/default/template.tpl b/templates/invoices/default/template.tpl
index 2e326ebc4..6c3cbdb07 100755
--- a/templates/invoices/default/template.tpl
+++ b/templates/invoices/default/template.tpl
@@ -215,6 +215,28 @@
 				<td class="" align="right">{$preference.pref_currency_sign|htmlsafe}{$invoiceItem.unit_price|siLocal_number}</td>
 				<td class="" align="right">{$preference.pref_currency_sign|htmlsafe}{$invoiceItem.gross_total|siLocal_number}</td>
 			</tr>
+					{if $invoiceItem.attribute != null}
+                            <tr class="si_product_attribute">
+                                <td></td>
+                                <td>
+                                <table>
+                                    <tr class="si_product_attribute">
+                                    {foreach from=$invoiceItem.attribute_json key=k item=v}
+                                       {if $v.visible ==true }
+                                        <td class="si_product_attribute">
+                                            {if $v.type == 'decimal'}
+                                              {$v.name}: {$preference.pref_currency_sign|htmlsafe}{$v.value|siLocal_number};
+                                             {else if $v.value !=''}
+                                               {$v.name}: {$v.value};
+                                            {/if}
+                                        </td>
+                                        {/if}
+                                    {/foreach}
+                                    </tr>
+                                </table>
+                                </td>
+                            </tr>
+					{/if}
 			{if $invoiceItem.description != null}
 			<tr class="">
 				<td class=""></td>