Index: trunk/kernel/admin_templates/img/icons/icon46_payment_types.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_manufacturers.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_products.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/core/kernel/utility/factory.php
===================================================================
diff -u -N -r4762 -r4794
--- trunk/core/kernel/utility/factory.php	(.../factory.php)	(revision 4762)
+++ trunk/core/kernel/utility/factory.php	(.../factory.php)	(revision 4794)
@@ -294,6 +294,10 @@
 		{
 			$dependencies =& $this->Dependencies[$depended_class];
 
+			if ($class_name == 'kFormatter') {
+				echo '';
+			}
+			
 			$conditions = Array();
 			$conditions['exists'] = is_array($dependencies) && in_array($this->realClasses[$class_name], $dependencies);
 			$conditions['same_class'] = $this->realClasses[$class_name] == $depended_class;
Index: trunk/kernel/admin_templates/img/icons/icon46_orders.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_affiliates.gif
===================================================================
diff -u -N -r2399 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_payment_log.gif
===================================================================
diff -u -N -r2458 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_download_log.gif
===================================================================
diff -u -N -r2343 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_affiliate_payment_types.gif
===================================================================
diff -u -N -r2638 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_shipping.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_currencies.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_discounts.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ
Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r4792 -r4794
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 4792)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 4794)
@@ -221,6 +221,10 @@
 		$config =& $this->configData[$prefix];
 		$event_manager =& $this->Application->recallObject('EventManager');
 
+		if ($prefix == 'formatters') {
+			echo '';
+		}
+		
 		$register_classes = getArrayValue($config,'RegisterClasses');
 		if (!$register_classes) $register_classes = Array();
 		$class_params=Array('ItemClass','ListClass','EventHandlerClass','TagProcessorClass');
@@ -361,7 +365,7 @@
 			if ($config_key == 'AggregateConfigs') {
 				$processed = array_merge($this->postProcessConfig($sub_prefix, 'Clones', 'prefix'), $processed);
 			}
-			else {
+			elseif ($this->ProcessAllConfigs) {
 				$this->parseConfig($sub_prefix);
 			}
 			array_push($processed, $sub_prefix);
Index: trunk/kernel/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r4735 -r4794
--- trunk/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4735)
+++ trunk/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4794)
@@ -318,7 +318,7 @@
 			$block_params = Array('name' => $params['render_as']);
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $priority => $section_name) {
-				if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
+//				if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
 				
 				$tab_data =& $sections_helper->getSectionData($section_name);
 				$block_params['t'] = $tab_data['url']['t'];
Index: trunk/kernel/admin_templates/config/config_email.tpl
===================================================================
diff -u -N -r4674 -r4794
--- trunk/kernel/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 4674)
+++ trunk/kernel/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 4794)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
-<inp2:m_ParseBlock name="section_header" icon="icon46_settings_email" title="!la_title_emailevents!"/>
+<inp2:m_ParseBlock name="section_header" prefix="emailevents.module" icon="icon46_settings_email" title="!la_title_emailevents!"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="emailevents.module" title_preset="email_settings_list" icon="icon46_settings_email"/>
 
Index: trunk/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r4735 -r4794
--- trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4735)
+++ trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4794)
@@ -318,7 +318,7 @@
 			$block_params = Array('name' => $params['render_as']);
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $priority => $section_name) {
-				if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
+//				if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
 				
 				$tab_data =& $sections_helper->getSectionData($section_name);
 				$block_params['t'] = $tab_data['url']['t'];
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r4785 -r4794
--- trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 4785)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 4794)
@@ -298,7 +298,7 @@
 	</tr>
 <inp2:m_blockend/>
 
-<inp2:m_block name="inp_edit_weight" subfield="" class="" is_last=""/>
+<inp2:m_block name="inp_edit_weight" subfield="" class="" is_last="" maxlength=""/>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
Index: trunk/kernel/admin_templates/img/icons/icon46_affiliate_plans.gif
===================================================================
diff -u -N -r2325 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_taxes.gif
===================================================================
diff -u -N -r1566 -r4794
Binary files differ