Merged last changes from stable.

[fa-stable.git] / reporting / includes / reports_classes.inc

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 92e5a9eb70b34f7292689a5c56e939f4d737bf93..fdb8a17561e50956ca7e81c38f3cf5e773b0898b 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -165,7 +165,7 @@ class BoxReports
        function get_ctrl($name, $type)
        {
                global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no,
-                       $def_print_destination, $type_shortcuts;
+                       $def_print_destination, $def_print_orientation, $type_shortcuts;
 
                $st = '';
                        switch ($type)
@@ -212,8 +212,12 @@ class BoxReports
                                                $date = $_POST[$name];
                                        $st = "<input type='text' name='$name' value='$date'>";
                                        if ($use_date_picker)
+                                       {
+                                               $calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? 
+                                                       "$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
                                                $st .= "<a href=\"javascript:date_picker(document.forms[0].$name);\">"
-                                               . "     <img src='$path_to_root/themes/default/images/cal.gif' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+                                               . "     <img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+                                       }       
                                        return $st;
                                        break;
 
@@ -230,6 +234,13 @@ class BoxReports
                                                $def = 1;
                                        return array_selector($name, $def, $sel);
 
+                               case 'ORIENTATION':
+                                       $sel = array(_("Portrait"), _("Landscape"));
+                                       $def = 0;
+                                       if (isset($def_print_orientation) && $def_print_orientation == 1)
+                                               $def = 1;
+                                       return array_selector($name, $def, $sel);
+
                                case 'COMPARE':
                                        $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
                                        return array_selector($name, null, $sel);
@@ -369,6 +380,9 @@ class BoxReports
                                case 'ITEMS':
                                        return stock_manufactured_items_list($name);
 
+                               case 'ITEMS_P':
+                                       return stock_purchasable_items_list($name, null, true);
+                               
                                case 'WORKORDER':
                                        $sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-',
                                                ".TB_PREF."stock_master.description) as IName