" id="">
@@ -340,7 +340,7 @@
-
+
Index: branches/5.1.x/units/reports/reports_tag_processor.php
===================================================================
diff -u -N -r13100 -r14158
--- branches/5.1.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 13100)
+++ branches/5.1.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 14158)
@@ -1,6 +1,6 @@
ID = 1;
$object->SetDBField('Metric', $metric);
-// echo '';
-// print_r($a_report_options);
-// echo date('m/d/Y H:i:s', $a_report_options['from']).'
';
-// echo date('m/d/Y H:i:s', $a_report_options['to']).'
';
-
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: branches/5.1.x/units/manufacturers/manufacturers_config.php
===================================================================
diff -u -N -r13657 -r14158
--- branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13657)
+++ branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 14158)
@@ -1,6 +1,6 @@
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: branches/5.1.x/admin_templates/reports/reports.tpl
===================================================================
diff -u -N -r13946 -r14158
--- branches/5.1.x/admin_templates/reports/reports.tpl (.../reports.tpl) (revision 13946)
+++ branches/5.1.x/admin_templates/reports/reports.tpl (.../reports.tpl) (revision 14158)
@@ -88,8 +88,10 @@
|