projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed supplier payment to accept amount in foreign currency instead of exchange...
[fa-stable.git]
/
reporting
/
includes
/
reports_classes.inc
diff --git
a/reporting/includes/reports_classes.inc
b/reporting/includes/reports_classes.inc
index 7606f3cf4c85e4660d81443db1894d459902ea27..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,
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)
$st = '';
switch ($type)
@@
-212,8
+212,12
@@
class BoxReports
$date = $_POST[$name];
$st = "<input type='text' name='$name' value='$date'>";
if ($use_date_picker)
$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);\">"
$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;
return $st;
break;
@@
-221,8
+225,7
@@
class BoxReports
return yesno_list($name);
case 'PAYMENT_LINK':
return yesno_list($name);
case 'PAYMENT_LINK':
- $sel = array(_("No payment Link"), "PayPal");
- return array_selector($name, null, $sel);
+ return payment_services($name, null);
case 'DESTINATION':
$sel = array(_("PDF/Printer"), "Excel");
case 'DESTINATION':
$sel = array(_("PDF/Printer"), "Excel");
@@
-231,6
+234,13
@@
class BoxReports
$def = 1;
return array_selector($name, $def, $sel);
$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);
case 'COMPARE':
$sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
return array_selector($name, null, $sel);
@@
-370,6
+380,9
@@
class BoxReports
case 'ITEMS':
return stock_manufactured_items_list($name);
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
case 'WORKORDER':
$sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-',
".TB_PREF."stock_master.description) as IName