X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=fdb8a17561e50956ca7e81c38f3cf5e773b0898b;hb=859b3b76ad84d15236194dd0152b821b3a2d2ca7;hp=f9d49d788ff02e834a8cf82a18847885c1aaabd5;hpb=9b1b5c83a37376d2076334952db1d1f739a26d1c;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index f9d49d78..fdb8a175 100644
--- 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;
 
@@ -221,8 +225,7 @@ class BoxReports
 					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");
@@ -231,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);
@@ -301,11 +311,18 @@ class BoxReports
 
 				case 'INVOICE':
 					$IV = $type_shortcuts[ST_SALESINVOICE];
+					$ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
+					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
+						".TB_PREF."debtor_trans.type) AS TNO, concat('$IV ', ".TB_PREF."debtor_trans.$ref,' ', ".TB_PREF."debtors_master.name) as IName
+						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
+
+				case 'CREDIT':
 					$CN = $type_shortcuts[ST_CUSTCREDIT];
 					$ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
 					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+						".TB_PREF."debtor_trans.type) AS TNO, concat('$CN ', ".TB_PREF."debtor_trans.$ref,' ', ".TB_PREF."debtors_master.name) as IName
+						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE type=".ST_CUSTCREDIT." AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				case 'DELIVERY':
@@ -354,16 +371,18 @@ class BoxReports
 				case 'RECEIPT':
 					$BD = $type_shortcuts[ST_BANKDEPOSIT];
 					$CP = $type_shortcuts[ST_CUSTPAYMENT];
-					$CN = $type_shortcuts[ST_CUSTCREDIT];
 					$ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
 					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', if (type=".ST_CUSTPAYMENT.", ' $CP ', ' $CN ')), ".TB_PREF."debtors_master.name) as IName
+						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), ".TB_PREF."debtors_master.name) as IName
 						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_BANKDEPOSIT." OR type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				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