Index: custom/admin_templates/widgets/widget_edit.tpl
===================================================================
--- custom/admin_templates/widgets/widget_edit.tpl	(revision 14059)
+++ custom/admin_templates/widgets/widget_edit.tpl	(working copy)
@@ -72,8 +72,7 @@
 			<inp2:m_RenderElement name="inp_edit_options" prefix="widget" field="Type" title="la_fld_Type" has_empty="1"/>
 
 		<!--##
-			<inp2:m_RenderElement name="inp_edit_date" prefix="widget" field="CreatedOn" title="la_fld_CreatedOn"/>
-			<inp2:m_RenderElement name="inp_edit_time" prefix="widget" field="BirthTime" title="la_fld_BirthTime"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="widget" field="CreatedOn" title="la_fld_CreatedOn"/>			
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>
 		##-->
 
Index: custom/units/widgets/widgets_config.php
===================================================================
--- custom/units/widgets/widgets_config.php	(revision 14059)
+++ custom/units/widgets/widgets_config.php	(working copy)
@@ -205,7 +205,6 @@
 					'Phone' => Array ('title' => 'la_col_Phone'),
 					'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
 					'Description' => Array ('title' => 'la_col_Description'),
-	//				'BirthTime' => Array ('title' => 'la_col_BirthTime', 'filter_block' => 'grid_date_range_filter'),
 					'VirtualActionField' => Array ('title' => 'la_col_Action', 'data_block' => 'grid_delete_td'),
 				),
 			),
Index: in-bulletin/install/english.lang
===================================================================
--- in-bulletin/install/english.lang	(revision 14059)
+++ in-bulletin/install/english.lang	(working copy)
@@ -107,6 +107,7 @@
 			<PHRASE Label="la_title_Editing_Comment" Module="In-Bulletin" Type="1">RWRpdGluZyBDb21tZW50</PHRASE>
 			<PHRASE Label="la_title_Editing_Poll" Module="In-Bulletin" Type="1">RWRpdGluZyBQb2xs</PHRASE>
 			<PHRASE Label="la_title_In-Bulletin" Module="In-Bulletin" Type="1">VG9waWNz</PHRASE>
+			<PHRASE Label="la_title_NewComment" Module="In-Bulletin" Type="1">TmV3IENvbW1lbnQ=</PHRASE>
 			<PHRASE Label="la_title_NewPoll" Module="In-Bulletin" Type="1">TmV3IFBvbGw=</PHRASE>
 			<PHRASE Label="la_title_NewTopic" Module="In-Bulletin" Type="1">TmV3IFRvcGlj</PHRASE>
 			<PHRASE Label="la_title_New_Answer" Module="In-Bulletin" Type="1">TmV3IEFuc3dlcg==</PHRASE>
Index: in-bulletin/install/install_data.sql
===================================================================
--- in-bulletin/install/install_data.sql	(revision 14059)
+++ in-bulletin/install/install_data.sql	(working copy)
@@ -83,24 +83,24 @@
 INSERT INTO ItemTypes VALUES (3, 'In-Bulletin', 'bb', 'Topic', 'TopicText', 'OwnerId', 'Views', 'CachedRating', 'la_ItemTab_Topics', 1, '', 'clsTopic', 'Topic');
 INSERT INTO ItemTypes VALUES (30, 'In-Bulletin', 'posting', 'Posting', 'Subject', 'CreatedById', NULL, NULL, 'la_ItemTab_Posts', 0, '', '', 'Post');
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'la_PermName_Topic.View_desc', 'la_PermName_Topic.View_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'la_PermName_Topic.Add_desc', 'la_PermName_Topic.Add_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'la_PermName_Topic.Add.Pending_desc', 'la_PermName_Topic.Add.Pending_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'la_PermName_Topic.Delete_desc', 'la_PermName_Topic.Delete_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'la_PermName_Topic.Modify_desc', 'la_PermName_Topic.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'la_PermName_Topic.Reply.Delete_desc', 'la_PermName_Topic.Reply.Delete_desc', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'la_PermName_Topic.Reply.View_desc', 'la_PermName_Topic.Reply.View_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'la_PermName_Topic.Reply.Add_desc', 'la_PermName_Topic.Reply.Add_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'la_PermName_Topic.Reply.Modify_desc', 'la_PermName_Topic.Reply.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'la_PermName_Topic.Rate_desc', 'la_PermName_Topic.Rate_desc', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'la_PermName_Topic.Review_desc', 'la_PermName_Topic.Review_desc', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'la_PermName_Topic.Reply.Owner.Modify_desc', 'la_PermName_Topic.Reply.Owner.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'la_PermName_Topic.Reply.Owner.Delete_desc', 'la_PermName_Topic.Reply.Owner.Delete_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'la_PermName_Topic.Owner.Delete_desc', 'la_PermName_Topic.Owner.Delete_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'la_PermName_Topic.Modify.Pending_desc', 'la_PermName_Topic.Modify.Pending_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'la_PermName_Topic.Owner.Modify.Pending_desc', 'la_PermName_Topic.Owner.Modify.Pending_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'la_PermName_Topic.Owner.Modify_desc', 'la_PermName_Topic.Owner.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'la_PermName_Topic.Lock_desc', 'la_PermName_Topic.Lock_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'la_PermName_Topic.View_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'la_PermName_Topic.Add_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'la_PermName_Topic.Add.Pending_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'la_PermName_Topic.Delete_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'la_PermName_Topic.Modify_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'la_PermName_Topic.Reply.Delete_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'la_PermName_Topic.Reply.View_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'la_PermName_Topic.Reply.Add_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'la_PermName_Topic.Reply.Modify_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'la_PermName_Topic.Rate_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'la_PermName_Topic.Review_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'la_PermName_Topic.Reply.Owner.Modify_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'la_PermName_Topic.Reply.Owner.Delete_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'la_PermName_Topic.Owner.Delete_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'la_PermName_Topic.Modify.Pending_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'la_PermName_Topic.Owner.Modify.Pending_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'la_PermName_Topic.Owner.Modify_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'la_PermName_Topic.Lock_desc', 'In-Bulletin');
 
 INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT count(*) FROM <%prefix%>Topic WHERE Status=1', NULL, 'la_prompt_ActiveTopics', 0, 1);
 INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT COUNT(*) AS TotalTopics FROM <%prefix%>Topic', NULL, 'la_prompt_TopicsTotal', 0, 2);
Index: in-commerce/admin_templates/orders/orders_edit_billing.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_billing.tpl	(revision 14059)
+++ in-commerce/admin_templates/orders/orders_edit_billing.tpl	(working copy)
@@ -196,8 +196,8 @@
 			</inp2:m_if>
 
 			<inp2:m_if check="ord_Field" name="GiftCertificateId">
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateCode" title="la_fld_Gift_Certificate_Number" />
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateDiscount" title="la_fld_Gift_Certificate_Amount_Applied" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateCode" title="la_fld_GiftCertificateNumber" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateDiscount" title="la_fld_GiftCertificateAmountApplied" />
 			</inp2:m_if>
 
 
Index: in-commerce/admin_templates/orders/orders_edit_preview.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_preview.tpl	(revision 14059)
+++ in-commerce/admin_templates/orders/orders_edit_preview.tpl	(working copy)
@@ -362,11 +362,11 @@
 
 		<inp2:m_if check="ord_Field" field="GiftCertificateId">
 			<tr>
-				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Number"/>:</td>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_GiftCertificateNumber"/>:</td>
 				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateCode"/></td>
 			</tr>
 			<tr>
-				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Amount_Applied"/>:</td>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_CertificateAmountApplied"/>:</td>
 				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateDiscount"/></td>
 			</tr>
 		</inp2:m_if>
Index: in-commerce/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_shipping.tpl	(revision 14059)
+++ in-commerce/admin_templates/orders/orders_edit_shipping.tpl	(working copy)
@@ -105,7 +105,9 @@
 					<input onclick="submit_event('ord','OnQuietPreSave');"  class="simple" type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;<br>
 				</inp2:m_DefineElement>
 
-				<!-- <inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20" /> -->
+				<!--## TODO looks like this field is NOT used in Admin - check on implementation of this field here
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20" />
+				##-->
 
 				<inp2:m_DefineElement name="order_shipping_type">
 					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
Index: in-commerce/admin_templates/orders/orders_pending_list.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_pending_list.tpl	(revision 14059)
+++ in-commerce/admin_templates/orders/orders_pending_list.tpl	(working copy)
@@ -36,19 +36,20 @@
 						}
 				 ) );
 
-				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 
-//				 a_toolbar.AddButton( new ToolBarSeparator('sep5') );
-
-				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
 							print_orders('ord.pending', 'in-commerce/orders/orders_print');
 						}
-				 ) );
+				) );
 
-				//  a_toolbar.AddButton( new ToolBarButton('pdf', '<inp2:m_phrase label="la_ToolTip_Pdf" escape="1"/>', function() {
-				//			submit_event('ord.pending','OnGeneratePDF');
-				//		}
-				//  ) );
+				<!--##
+				// TODO there is code for this in OrderEventHandler, but missing PDF template
+				a_toolbar.AddButton( new ToolBarButton('pdf', '<inp2:m_phrase label="la_ToolTip_Pdf" escape="1"/>', function() {
+							submit_event('ord.pending','OnGeneratePDF');
+						}
+				) );
+				##-->
 
 				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
Index: in-commerce/admin_templates/products/access_pricing_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/access_pricing_edit.tpl	(revision 14059)
+++ in-commerce/admin_templates/products/access_pricing_edit.tpl	(working copy)
@@ -34,17 +34,12 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessDuration" title="la_fld_AccessDuration" size="4"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="pr" field="AccessUnit" title="la_fld_AccessDurationUnit" size="20"/>
 
-	<!--	<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessRebillDate" title="la_fld_AccessRebillDate" size="5"/> -->
-
-			<!-- Customization healtheconomics.org -->
-
-	<!--
+			<!--## TODO check on implementation (came from customization healtheconomics.org) 
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessRebillDate" title="la_fld_AccessRebillDate" size="5"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="pr" field="DurationType" title="la_fld_DurationType"/>
 			<inp2:m_RenderElement name="inp_edit_date" prefix="pr" field="AccessExpiration" title="la_fld_AccessExpiration"/>
-	-->
-
-			<!-- //Customization healtheconomics.org -->
-
+			## -->
+			
 			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Description" title="la_fld_Description" size="30"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="la_fld_Price" size="4"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="IsPrimary" title="la_fld_Primary"/>
Index: in-commerce/admin_templates/products/option_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/option_edit.tpl	(revision 14059)
+++ in-commerce/admin_templates/products/option_edit.tpl	(working copy)
@@ -270,7 +270,7 @@
 
 	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 		<inp2:m_inc param="tab_index" by="1"/>
-		<td class="label-cell">&nbsp;</td>
+		<td class="label-cell"><inp2:m_phrase label="$title"/>:</td>
 		<td class="control-mid">&nbsp;</td>
 		<td class="control-cell">
 			<input type="hidden" value="" name="<inp2:po_InputName field="Values"/>" id="<inp2:po_InputName field="Values"/>">
@@ -312,7 +312,7 @@
 			<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Listable" title="la_fld_Listable"/>-->
 			<inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" has_empty="1" empty_value="0" title="la_fld_OptionType" onchange="update_type(this.value)"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Priority" title="la_fld_Priority" size="2"/>
-			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="la_fld_Values" size="2"/>
+			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="la_fld_OptionValues" size="2"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-commerce/admin_templates/products/products_access.tpl
===================================================================
--- in-commerce/admin_templates/products/products_access.tpl	(revision 14059)
+++ in-commerce/admin_templates/products/products_access.tpl	(working copy)
@@ -85,12 +85,17 @@
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessGroupId" title="la_fld_AccessGroup" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
-			<!-- <inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="PayPalRecurring" title="la_fld_IsPayPalRecurring"/> -->
-
-			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="p" field="AccessDuration" title="la_fld_AccessDuration" size="4" /> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessDurationType" title="la_fld_AccessDurationType" size="20"/> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessStart" title="la_fld_AccessStart" size="10" /> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessEnd" title="la_fld_AccessEnd" size="10" /> -->
+			
+			<!--## TODO check on implementation of this field
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="PayPalRecurring" title="la_fld_IsPayPalRecurring"/>
+			##-->
+			
+			<!--## TODO check on implementation of these fields 
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="AccessDuration" title="la_fld_AccessDuration" size="4" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessDurationType" title="la_fld_AccessDurationType" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessStart" title="la_fld_AccessStart" size="10" />
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessEnd" title="la_fld_AccessEnd" size="10" />
+			##-->
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-commerce/admin_templates/reports/reports.tpl
===================================================================
--- in-commerce/admin_templates/reports/reports.tpl	(revision 14059)
+++ in-commerce/admin_templates/reports/reports.tpl	(working copy)
@@ -88,8 +88,10 @@
 		</td>
 	</tr>
 
-	<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rep" field="Recursive" title="la_fld_Recursive"/>
-	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rep" field="SkipEmpty" title="la_fld_SkipEmpty"/>-->
+	<!--## TODO Commented out for now, but we have DB Fields! 
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rep" field="Recursive" title="la_fld_Recursive"/>
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rep" field="SkipEmpty" title="la_fld_SkipEmpty"/>
+	##-->
 
 	<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
Index: in-commerce/install/english.lang
===================================================================
--- in-commerce/install/english.lang	(revision 14059)
+++ in-commerce/install/english.lang	(working copy)
@@ -335,6 +335,8 @@
 			<PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
 			<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
 			<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
+			<PHRASE Label="la_fld_GiftCertificateAmountApplied" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBhbW91bnQ=</PHRASE>
+			<PHRASE Label="la_fld_GiftCertificateNumber" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBudW1iZXI=</PHRASE>
 			<PHRASE Label="la_fld_GroundDelivery" Module="In-Commerce" Type="1">R3JvdW5kIERlbGl2ZXJ5</PHRASE>
 			<PHRASE Label="la_fld_Groups" Module="In-Commerce" Type="1">VXNlciBHcm91cHMgU2VsZWN0aW9u</PHRASE>
 			<PHRASE Label="la_fld_Instructions" Module="In-Commerce" Type="1">SW5zdHJ1Y3Rpb25z</PHRASE>
@@ -366,6 +368,7 @@
 			<PHRASE Label="la_fld_OptionsSelectionMode" Module="In-Commerce" Type="1">T3B0aW9ucyBTZWxlY3Rpb24gTW9kZQ==</PHRASE>
 			<PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
 			<PHRASE Label="la_fld_OptionValue" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVl</PHRASE>
+			<PHRASE Label="la_fld_OptionValues" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVlcw==</PHRASE>
 			<PHRASE Label="la_fld_OrderId" Module="In-Commerce" Type="1">T3JkZXIgSUQ=</PHRASE>
 			<PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
 			<PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
@@ -424,6 +427,7 @@
 			<PHRASE Label="la_fld_ShippingFax" Module="In-Commerce" Type="1">U2hpcHBpbmcgRmF4</PHRASE>
 			<PHRASE Label="la_fld_ShippingMode" Module="In-Commerce" Type="1">QWxsb3dlZCBTaGlwcGluZyBUeXBlcw==</PHRASE>
 			<PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingOption" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9u</PHRASE>
 			<PHRASE Label="la_fld_ShippingOptions" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9ucw==</PHRASE>
 			<PHRASE Label="la_fld_ShippingPhone" Module="In-Commerce" Type="1">U2hpcHBpbmcgUGhvbmU=</PHRASE>
 			<PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
@@ -551,8 +555,12 @@
 			<PHRASE Label="la_NZD" Module="In-Commerce" Type="1">TmV3IFplYWxhbmQgRG9sbGFy</PHRASE>
 			<PHRASE Label="la_OMR" Module="In-Commerce" Type="1">UmlhbCBPbWFuaQ==</PHRASE>
 			<PHRASE Label="la_OnlineStore" Module="In-Commerce" Type="1">T25saW5lIFN0b3Jl</PHRASE>
+			<PHRASE Label="la_opt_AutoGroupShipments" Module="In-Commerce" Type="1">QXV0by1ncm91cCBzaGlwbWVudHM=</PHRASE>
+			<PHRASE Label="la_opt_Date" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
 			<PHRASE Label="la_opt_Exchange" Module="In-Commerce" Type="1">RXhjaGFuZ2U=</PHRASE>
+			<PHRASE Label="la_opt_Interval" Module="In-Commerce" Type="1">SW50ZXJ2YWw=</PHRASE>
 			<PHRASE Label="la_opt_List" Module="In-Commerce" Type="1">TGlzdGluZw==</PHRASE>
+			<PHRASE Label="la_opt_ManualGroupShipments" Module="In-Commerce" Type="1">R3JvdXAgc2hpcG1lbnRzIG1hbnVhbGx5</PHRASE>
 			<PHRASE Label="la_opt_PermanentCookie" Module="In-Commerce" Type="1">UGVybWFuZW50IENvb2tpZQ==</PHRASE>
 			<PHRASE Label="la_opt_PostalMail" Module="In-Commerce" Type="1">UG9zdGFsIE1haWw=</PHRASE>
 			<PHRASE Label="la_opt_PriceCalculationByOptimal" Module="In-Commerce" Type="1">T3B0aW1hbCBQcmljZQ==</PHRASE>
@@ -560,6 +568,7 @@
 			<PHRASE Label="la_opt_Refund" Module="In-Commerce" Type="1">UmVmdW5k</PHRASE>
 			<PHRASE Label="la_opt_Selection" Module="In-Commerce" Type="1">U2VsZWN0aW9u</PHRASE>
 			<PHRASE Label="la_opt_Session" Module="In-Commerce" Type="1">U2Vzc2lvbg==</PHRASE>
+			<PHRASE Label="la_opt_Verified" Module="In-Commerce" Type="1">VmVyaWZpZWQ=</PHRASE>
 			<PHRASE Label="la_opt_Warranty" Module="In-Commerce" Type="1">V2FycmFudHk=</PHRASE>
 			<PHRASE Label="la_OrderMainNumberDigits" Module="In-Commerce" Type="1">T3JkZXIgbWFpbiBudW1iZXIgZGlnaXRz</PHRASE>
 			<PHRASE Label="la_OrderSecNumberDigits" Module="In-Commerce" Type="1">T3JkZXIgc3VibnVtYmVyIGRpZ2l0cw==</PHRASE>
@@ -770,6 +779,7 @@
 			<PHRASE Label="la_Text_Option" Module="In-Commerce" Type="1">T3B0aW9u</PHRASE>
 			<PHRASE Label="la_Text_Orders" Module="In-Commerce" Type="1">T3JkZXJz</PHRASE>
 			<PHRASE Label="la_Text_Other" Module="In-Commerce" Type="1">T3RoZXI=</PHRASE>
+			<PHRASE Label="la_text_Others" Module="In-Commerce" Type="1">T3RoZXJz</PHRASE>
 			<PHRASE Label="la_Text_PricingCalculation" Module="In-Commerce" Type="1">UHJpY2UgQnJha2V0IENhbGN1bGF0aW9u</PHRASE>
 			<PHRASE Label="la_text_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
 			<PHRASE Label="la_Text_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
@@ -797,7 +807,6 @@
 			<PHRASE Label="la_title_Adding_File" Module="In-Commerce" Type="1">QWRkaW5nIEZpbGU=</PHRASE>
 			<PHRASE Label="la_title_Adding_Option" Module="In-Commerce" Type="1">QWRkaW5nIE9wdGlvbg==</PHRASE>
 			<PHRASE Label="la_title_Adding_Order" Module="In-Commerce" Type="1">QWRkaW5nIE9yZGVy</PHRASE>
-			<PHRASE Label="la_title_Adding_Order_Item" Module="In-Commerce" Type="1">QWRkaW5nIE9yZGVyIEl0ZW0=</PHRASE>
 			<PHRASE Label="la_title_Adding_PriceBracket" Module="In-Commerce" Type="1">QWRkaW5nIFByaWNlIEJyYWNrZXQ=</PHRASE>
 			<PHRASE Label="la_title_Adding_Product" Module="In-Commerce" Type="1">QWRkaW5nIFByb2R1Y3Q=</PHRASE>
 			<PHRASE Label="la_title_AffiliatePayments" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnRz</PHRASE>
@@ -926,6 +935,7 @@
 			<PHRASE Label="la_tooltip_new_shipping" Module="In-Commerce" Type="1">TmV3IFNoaXBwaW5nIHR5cGU=</PHRASE>
 			<PHRASE Label="la_tooltip_new_Zone" Module="In-Commerce" Type="1">TmV3IFpvbmU=</PHRASE>
 			<PHRASE Label="la_ToolTip_PayOut" Module="In-Commerce" Type="1">UGF5IE91dA==</PHRASE>
+			<PHRASE Label="la_Tooltip_Pdf" Module="In-Commerce" Type="1">UERG</PHRASE>
 			<PHRASE Label="la_tooltip_PlaceOrder" Module="In-Commerce" Type="1">UGxhY2UgT3JkZXI=</PHRASE>
 			<PHRASE Label="la_Tooltip_Process" Module="In-Commerce" Type="1">UHJvY2Vzcw==</PHRASE>
 			<PHRASE Label="la_Tooltip_ResetToBilling" Module="In-Commerce" Type="1">UmVzZXQgVG8gQmlsbGluZw==</PHRASE>
Index: in-commerce/install/install_data.sql
===================================================================
--- in-commerce/install/install_data.sql	(revision 14059)
+++ in-commerce/install/install_data.sql	(working copy)
@@ -321,13 +321,13 @@
 INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 3, 131);
 INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 1, 131);
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'la_PermName_Product.Rate_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'la_PermName_Product.Review_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', ' la_PermName_Product.Review_Pending_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'la_PermName_Product.Add_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'la_PermName_Product.Delete_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'la_PermName_Product.Modify_desc', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'la_PermName_Product.View_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'In-Commerce');
 
 INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId});
 INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId});
Index: in-commerce/install/upgrades.sql
===================================================================
--- in-commerce/install/upgrades.sql	(revision 14059)
+++ in-commerce/install/upgrades.sql	(working copy)
@@ -196,3 +196,6 @@
 # ===== v 5.1.1-B2 =====
 
 # ===== v 5.1.1-RC1 =====
+
+# ===== v 5.1.2-B1 =====
+DELETE FROM Phrase WHERE PhraseKey = 'LA_TITLE_ADDING_ORDER_ITEM';
Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php
===================================================================
--- in-commerce/units/affiliate_payments/affiliate_payments_config.php	(revision 14059)
+++ in-commerce/units/affiliate_payments/affiliate_payments_config.php	(working copy)
@@ -52,15 +52,12 @@
 
 					'IDField'			=>	'AffiliatePaymentId',
 
-					'TitlePresets'		=>	Array(
-												'default'	=>	Array(	'new_status_labels'		=> Array('apayments'=>'!la_title_Adding_Affiliate_Payment!'),
-																		'edit_status_labels'	=> Array('apayments'=>'!la_title_Editing_Affiliate_Payment!'),
-																		'new_titlefield'		=> Array('apayments'=>'!la_title_New_Affiliate_Payment!'),
-																),
-												'payments_log'	=>	Array('prefixes' => Array('apayments.log_List'), 'format' => "!la_title_AffiliatePayments!"),
+					'TitlePresets' => Array (
+						'payments_log' => Array (
+							'prefixes' => Array ('apayments.log_List'), 'format' => "!la_title_AffiliatePayments!",
+						),
+					),
 
-											),
-
 					'Sections'			=>	Array(
 						'in-commerce:paymentlog'		=>	Array(
 							'parent'		=>	'in-commerce',
Index: in-commerce/units/gateways/gateways_config.php
===================================================================
--- in-commerce/units/gateways/gateways_config.php	(revision 14059)
+++ in-commerce/units/gateways/gateways_config.php	(working copy)
@@ -51,10 +51,13 @@
 					'IDField'			=>	'GWConfigFieldId',
 					'TableName'			=>	TABLE_PREFIX.'GatewayConfigFields',
 
-					'ListSQLs'			=>	Array	(''=>'SELECT * FROM %s',
-													), // key - special, value - list select sql
-					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %s',
-																		),
+					'ListSQLs' => Array (
+						'' => 'SELECT * FROM %s',
+					), // key - special, value - list select sql
+					
+					'ItemSQLs' => Array (
+						''=>'SELECT * FROM %s',
+					),
 
 					'Fields' => Array (
 						'GWConfigFieldId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ),
@@ -65,21 +68,7 @@
 			            'GatewayId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ),
 					),
 
-					'VirtualFields'	=> 	Array	(
-													'Value' => Array('type' => 'string', 'default' => ''),
-												),
-
-					'Grids'	=> Array(
-								'Default'		=>	Array(
-																	'Icons' => Array(
-																		'default' => 'icon16_item.png',
-																		'module' => 'core',
-																	),
-																	'Fields' => Array(
-																			'FieldName' => Array( 'title'=>'la_Fields' ),
-																			'Value' => Array( 'title'=>'la_Value' ),
-																		),
-
-																),
-													),
+					'VirtualFields' => Array (
+						'Value' => Array('type' => 'string', 'default' => ''),
+					),				
 	);
\ No newline at end of file
Index: in-commerce/units/gateways/gw_classes/multicards.php
===================================================================
--- in-commerce/units/gateways/gw_classes/multicards.php	(revision 14059)
+++ in-commerce/units/gateways/gw_classes/multicards.php	(working copy)
@@ -115,7 +115,7 @@
 			$order->Load($order_id);
 
 			$url =  $this->Application->GetVar('user2');
-			echo '<!--success--><a href="'.$url.'">'.$this->Application->Phrase('la_multicards_continue').'</a>';
+			echo '<!--success--><a href="'.$url.'">'.$this->Application->Phrase('lu_text_MulticardsContinue').'</a>';
 
 			return 1;
 		}
Index: in-commerce/units/manufacturers/manufacturers_config.php
===================================================================
--- in-commerce/units/manufacturers/manufacturers_config.php	(revision 14059)
+++ in-commerce/units/manufacturers/manufacturers_config.php	(working copy)
@@ -32,23 +32,21 @@
 					'StatusField'		=>	Array (),
 					'TableName'			=>	TABLE_PREFIX.'Manufacturers',
 
-					'TitlePresets'		=>	Array (
-												'default'	=>	Array (	'new_status_labels'		=> Array ('manuf' => '!la_title_AddingManufacturer!'),
-																		'edit_status_labels'	=> Array ('manuf' => '!la_title_EditingManufacturer!'),
-																		'new_titlefield'		=> Array ('manuf' => '!la_title_NewManufacturers!'),
-																),
+					'TitlePresets' => Array (
+						'default' => Array (
+							'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'),
+							'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),																		
+						),
+						'manuf_list' => Array (
+							'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!",
+						),
+						'manuf_edit' => Array (
+							'prefixes' => Array ('manuf'),
+							'new_titlefield' => Array ('manuf' => '!la_title_NewManufacturer!'),
+							'format' => "#manuf_status# '#manuf_titlefield#' - !la_title_General!",
+						),
+					),
 
-												'manuf_list' =>Array (	'prefixes'				=> Array ('manuf_List'),
-																			'format'				=>	"!la_title_Manufacturers!",
-																),
-
-												'manuf_edit' =>Array (	'prefixes'				=> Array ('manuf'),
-																			'new_titlefield'		=> Array ('manuf' => '!la_title_NewManufacturer!'),
-																			'format'				=> "#manuf_status# '#manuf_titlefield#' - !la_title_General!",
-																),
-
-											),
-
 					'PermSection'		=>	Array ('main' => 'in-commerce:manufacturers'),
 
 					'Sections'			=>	Array (
Index: in-commerce/units/orders/orders_config.php
===================================================================
--- in-commerce/units/orders/orders_config.php	(revision 14059)
+++ in-commerce/units/orders/orders_config.php	(working copy)
@@ -171,17 +171,9 @@
 
 						'orders_gw_result' => Array ('prefixes' => Array ('ord'), 'format' => "!la_title_OrderGWResult!"),
 
-						'order_items_edit'	=>	Array (	'prefixes'				=>	Array ('ord', 'orditems'),
-														'new_status_labels'		=>	Array ('orditems' => '!la_title_Adding_Order_Item!'),
-														'edit_status_labels'	=>	Array ('orditems' => '!la_title_Editing_Order_Item!'),
-														'new_titlefield'		=>	Array ('orditems' => '!la_title_New_Order_Item!'),
-														'format'				=>	"#ord_status# '#ord_titlefield#' - #orditems_status# '#orditems_titlefield#'",
-												),
+						'orders_export' => Array ('format' => '!la_title_OrdersExport!'),
 
-						'orders_export' =>  Array ('format' => '!la_title_OrdersExport!'),
-
-						'orders_product_edit'	=>	Array ('format' => '!la_title_Editing_Order_Item!'),
-
+						'orders_product_edit' => Array ('format' => '!la_title_Editing_Order_Item!'),
 					),
 
 					'EditTabPresets' => Array (
@@ -399,15 +391,32 @@
 			            'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
 			            'CostTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
 			            'OriginalAmount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
-			            'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'not_null' => 1, 'default' =>0),
-			            'ShippingGroupOption' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_auto_group_shipments', 1 => 'la_manual_group_shipments'), 'default' =>0),
+			            'ShippingOption' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter',
+			            	'options' => Array (
+								0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail',
+							),
+							'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
+						),
+			            'ShippingGroupOption' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,			            	 
+			            	'options' => Array (0 => 'la_opt_AutoGroupShipments', 1 => 'la_opt_ManualGroupShipments'),
+							'not_null' => 1, 'default' => 0,
+						),
 			            'GiftCertificateId' => Array ('type' => 'int', 'default' => null),
 			            'GiftCertificateDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',),
 			            'ShippingInfo' => Array ('type' => 'string', 'default' => NULL),
 			            'CouponId' => Array ('type' => 'int', 'default' => null),
 			            'CouponDiscount' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'),
 			            'DiscountTotal' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'),
-			            'TransactionStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0=> 'la_Invalid', 1 => 'la_Verified', 2 => 'la_Penging'), 'use_phrases' =>1, 'not_null' => 1, 'default' => 2),
+			            'TransactionStatus' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter',
+			            	'options' => Array (0 => 'la_opt_Invalid', 1 => 'la_opt_Verified', 2 => 'la_opt_Penging'),
+							'use_phrases' =>1, 'not_null' => 1, 'default' => 2,
+						),
 						'GWResult1' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
 			            'GWResult2' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
 			            'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),  'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'Login', 'not_null' =>1, 'default' =>0),
Index: in-commerce/units/orders/orders_event_handler.php
===================================================================
--- in-commerce/units/orders/orders_event_handler.php	(revision 14059)
+++ in-commerce/units/orders/orders_event_handler.php	(working copy)
@@ -916,7 +916,11 @@
 
 		$pricing_table = $this->Application->getUnitOption('pr', 'TableName');
 		$pricing_idfield = $this->Application->getUnitOption('pr', 'IDField');
-//		$sql = 'SELECT AccessDuration, AccessUnit, DurationType, AccessExpiration FROM %s WHERE %s = %s';
+		
+		/* TODO check on implementation
+		$sql = 'SELECT AccessDuration, AccessUnit, DurationType, AccessExpiration FROM %s WHERE %s = %s';
+		*/
+
 		$sql = 'SELECT * FROM %s WHERE %s = %s';
 		$pricing_id = $this->GetPricingId($item_id, $item_data);
 		$item_data['PricingId'] = $pricing_id;
@@ -924,12 +928,10 @@
 		$pricing_info = $this->Conn->GetRow( sprintf($sql, $pricing_table, $pricing_idfield, $pricing_id ) );
 		$unit_secs = Array(1 => 1, 2 => 60, 3 => 3600, 4 => 86400, 5 => 604800, 6 => 2592000, 7 => 31536000);
 
-/*
-		// Customization healtheconomics.org
+		/* TODO check on implementation (code from customization healtheconomics.org)
 		$item_data['DurationType'] = $pricing_info['DurationType'];
-		$item_data['AccessExpiration'] = $pricing_info['AccessExpiration'];
-		// Customization healtheconomics.org --
-*/
+		$item_data['AccessExpiration'] = $pricing_info['AccessExpiration'];		
+		*/
 
 		$item_data['Duration'] = $pricing_info['AccessDuration'] * $unit_secs[ $pricing_info['AccessUnit'] ];
 
Index: in-commerce/units/pricing/pricing_config.php
===================================================================
--- in-commerce/units/pricing/pricing_config.php	(revision 14059)
+++ in-commerce/units/pricing/pricing_config.php	(working copy)
@@ -101,12 +101,22 @@
 			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
 							'not_null' => 1, 'default' => 0,
 						),
-					    'GroupId'		=>	Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
-				  	 // 'AccessRebillDate'				=>	Array ('type'=> 'integer', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default'=>0),
-					 // Customization healtheconomics.org
-					 // 'DurationType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_opt_interval', 2 => 'la_opt_date'), 'not_null' => 1, 'default' => 1),
-					 // 'AccessExpiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter'),
-					 // Customization healtheconomics.org --
+					    'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
+						
+						/* TODO implement these fields in business logic
+						'AccessRebillDate' => Array (
+							'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0,
+						),
+					 	'DurationType' => Array (
+					 		'type' => 'int',
+					 		'formatter' => 'kOptionsFormatter',
+					 		'options' => Array (
+								1 => 'la_opt_Interval', 2 => 'la_opt_Date',
+							),
+					 		'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+						),
+					 	'AccessExpiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter'),
+						*/
 					),
 
 					'VirtualFields'	=> 	Array (
Index: in-commerce/units/products/products_config.php
===================================================================
--- in-commerce/units/products/products_config.php	(revision 14059)
+++ in-commerce/units/products/products_config.php	(working copy)
@@ -490,7 +490,18 @@
 					    'Hits'					=>	Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
 					    'CreatedOn'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 					    'Expire'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
-					    'Type'					=>	Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1=> 'la_product_tangible',  2=> 'la_product_subscription', 4=> 'la_product_downloadable', 3=> 'la_product_service'/*, 6=> 'la_gift_certificate', 5=> 'la_product_package'*/), 'not_null' => 1, 'default' => 1 ),
+					    'Type'					=>	Array (
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,							
+							'options' => Array (
+								PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
+								PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
+								PRODUCT_TYPE_SERVICE => 'la_product_service',
+								PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable', 
+								/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
+							),
+							'not_null' => 1, 'default' => 1,
+						),
 					    'Modified'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 					    'ModifiedById'			=>	Array ('type' => 'int', 'default' => NULL),
 					    'CreatedById'			=>	Array ('type' => 'int', 'required' => 1, 'default' => NULL),
Index: in-commerce/units/reports/reports_tag_processor.php
===================================================================
--- in-commerce/units/reports/reports_tag_processor.php	(revision 14059)
+++ in-commerce/units/reports/reports_tag_processor.php	(working copy)
@@ -106,11 +106,6 @@
 		$object->ID = 1;
 		$object->SetDBField('Metric', $metric);
 
-//		echo '<pre>';
-//		print_r($a_report_options);
-//		echo date('m/d/Y H:i:s', $a_report_options['from']).'<br>';
-//		echo date('m/d/Y H:i:s', $a_report_options['to']).'<br>';
-
 		if (!($a_report_options['from'] && $a_report_options['to'])) {
 			// calculate from & to as extreme order dates
 			$sql = 'SELECT MAX(OrderDate) AS date_to, MIN(OrderDate) AS date_frm
@@ -331,7 +326,7 @@
 				{
 					$a_data[0] = Array(
 						'Metric' => $other_metric,
-						'Name' => $this->Application->Phrase('la_Others'),
+						'Name' => $this->Application->Phrase('la_text_Others'),
 					);
 				}
 			}
Index: in-commerce/units/taxes/taxes_config.php
===================================================================
--- in-commerce/units/taxes/taxes_config.php	(revision 14059)
+++ in-commerce/units/taxes/taxes_config.php	(working copy)
@@ -43,21 +43,22 @@
 						),*/
 					'IDField'			=>	'TaxZoneId',
 					'TitleField'		=>  'Name',
+											
 					'TitlePresets'		=>	Array (
-												'default'	=>	Array (	'new_status_labels'		=> Array ('tax' => '!la_title_AddingTaxZone!'),
-																		'edit_status_labels'	=> Array ('tax' => '!la_title_EditingTaxZone!'),
-																		'new_titlefield'		=> Array ('tax' => '!la_title_NewTaxZone!'),
-																),
-												'taxes_list' =>Array (	'prefixes'				=> Array ('tax_List'),
-																		'format'				=>	"!la_title_Taxes!",
-																),
-												'taxes_edit' =>Array (	'prefixes'				=> Array ('tax'),
-																		'new_titlefield'		=> Array ('tax' => '!la_title_NewTax!'),
-																		'format'				=> "#tax_status# '#tax_titlefield#' - !la_title_General!",
-																),
-
-
-											),
+						'default'	=>	Array (	
+							'new_status_labels' => Array ('tax' => '!la_title_AddingTaxZone!'),
+							'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'),
+						),
+						'taxes_list' => Array (
+							'prefixes' => Array ('tax_List'), 'format' => "!la_title_Taxes!",
+						),
+						'taxes_edit' => Array (
+							'prefixes' => Array ('tax'),
+							'new_titlefield' => Array ('tax' => '!la_title_NewTax!'),
+							'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!",
+						),
+					),
+					
 					'PermSection'		=>	Array ('main' => 'in-commerce:taxes'),
 
 					'Sections'			=>	Array (
Index: in-link/admin_templates/duplicate_checker.tpl
===================================================================
--- in-link/admin_templates/duplicate_checker.tpl	(revision 14059)
+++ in-link/admin_templates/duplicate_checker.tpl	(working copy)
@@ -15,7 +15,7 @@
 					open_popup('l.duplicates', 'OnStoreSelected', 'in-link/duplicate_checker/duplicate_link_view');
 				}
 
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_EditDuplicates" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
Index: in-link/install/install_data.sql
===================================================================
--- in-link/install/install_data.sql	(revision 14059)
+++ in-link/install/install_data.sql	(working copy)
@@ -113,18 +113,18 @@
 
 INSERT INTO ItemTypes VALUES (4, 'In-Link', 'l', 'Link', 'Name', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_Links', 1, 'in-link/admin/addlink.php', 'clsLink', 'Link');
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'la_PermName_Link.Add_desc', 'la_PermName_Link.Add_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'la_PermName_Link.View_desc', 'la_PermName_Link.View_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'la_PermName_Link.Add.Pending_desc', 'la_PermName_Link.Add.Pending_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'la_PermName_Link.Modify_desc', 'la_PermName_Link.Modify_desc', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'la_PermName_Link.Delete_desc', 'la_PermName_Link.Delete_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'la_PermName_Link.Rate_desc', 'la_PermName_Link.Rate_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'la_PermName_Link.Review_desc', 'la_PermName_Link.Review_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'la_PermName_Link.Review_Pending_desc', ' la_PermName_Link.Review_Pending_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'la_PermName_Link.Modify.Pending_desc', 'la_PermName_Link.Modify.Pending_desc', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'la_PermName_Link.Owner.Modify_desc', 'la_PermName_Link.Owner.Modify_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'la_PermName_Link.Owner.Modify.Pending_desc', 'la_PermName_Link.Owner.Modify.Pending_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'la_PermName_Link.Owner.Delete_desc', 'la_PermName_Link.Owner.Delete_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'la_PermName_Link.Add_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'la_PermName_Link.View_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'la_PermName_Link.Add.Pending_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'la_PermName_Link.Modify_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'la_PermName_Link.Delete_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'la_PermName_Link.Rate_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'la_PermName_Link.Review_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'la_PermName_Link.Review_Pending_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'la_PermName_Link.Modify.Pending_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'la_PermName_Link.Owner.Modify_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'la_PermName_Link.Owner.Modify.Pending_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'la_PermName_Link.Owner.Delete_desc', 'In-Link');
 
 INSERT INTO SearchConfig VALUES ('Link', 'OrgId', 0, 0, 'lu_fielddesc_link_orgid', 'lu_field_orgid', 'In-Link', 'la_text_link', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('Link', 'NewItem', 0, 1, 'lu_fielddesc_link_newitem', 'lu_field_newitem', 'In-Link', 'la_text_link', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
Index: in-news/install/english.lang
===================================================================
--- in-news/install/english.lang	(revision 14059)
+++ in-news/install/english.lang	(working copy)
@@ -84,6 +84,7 @@
 			<PHRASE Label="la_Text_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
 			<PHRASE Label="la_title_AddingArticle" Module="In-News" Type="1">QWRkaW5nIEFydGljbGU=</PHRASE>
 			<PHRASE Label="la_title_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_title_ArticlesExport" Module="In-News" Type="1">QXJ0aWNsZXMgRXhwb3J0</PHRASE>
 			<PHRASE Label="la_title_EditingArticle" Module="In-News" Type="1">RWRpdGluZyBBcnRpY2xl</PHRASE>
 			<PHRASE Label="la_title_ImportArticles" Module="In-News" Type="1">SW1wb3J0IEFydGljbGVz</PHRASE>
 			<PHRASE Label="la_title_In-News" Module="In-News" Type="1">TmV3cw==</PHRASE>
Index: in-news/install/install_data.sql
===================================================================
--- in-news/install/install_data.sql	(revision 14059)
+++ in-news/install/install_data.sql	(working copy)
@@ -60,18 +60,18 @@
 
 INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article');
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'la_PermName_News.Add_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'la_PermName_News.View_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'la_PermName_News.Add.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'la_PermName_News.Modify_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'la_PermName_News.Delete_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'la_PermName_News.Rate_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'la_PermName_News.Review_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'la_PermName_News.Review.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'la_PermName_News.Modify.Pending_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'la_PermName_News.Owner.Modify_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'la_PermName_News.Owner.Modify.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'la_PermName_News.Owner.Delete_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'In-News');
 
 INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);