Przeglądaj źródła

Fix code style in Billing

Piotr Labudda 11 lat temu
rodzic
commit
b6df3e1f5f
2 zmienionych plików z 24 dodań i 13 usunięć
  1. 22 11
      SE/se-lib/Billing.php
  2. 2 2
      SE/se-lib/Billing_html.php

+ 22 - 11
SE/se-lib/Billing.php

@@ -369,19 +369,30 @@ if($NN) return $NN.$NR_RACH_MASS_PAY.$ID_BILLING_NUMBERS.$ID_BILLING_USERS ;
 		$this->check_perms();
 
 		//TODO check if has perms for that...
-		$sql7= "select BILLS_FVAT.ID, count(BILLS_FVAT_POS.ID) as count_BILLS_FVAT_POS_ID, BILLS_FVAT_POS.ID_BILLS_FVAT, BILLS_FVAT.ID_CURRENCY, 
-		sum((BILLS_FVAT_POS.AMMOUNT * BILLS_FVAT_POS.PRICE) * ( 1 + BILLS_FVAT_POS.VAT / 100))
-		 as WARTOSC ,BILLS_FVAT.ID_BILLING_NUMBERS , BILLS_FVAT.OPEN , BILLS_FVAT.FK_ZAKSIEG ,
-		BILLS_FVAT.IF_KORV , BILLING_NUMBERS.TIMESTAMP , BILLING_NUMBERS.ID_BILLING_PREFIXES , BILLING_NUMBERS.NUMBER ,BILLING_NUMBERS.ID as BILLING_NUMBERS_ID
-		, BILLS_FVAT.SELL_DATE 	, BILLING_NUMBERS.ID_BILLING_USERS
-		from BILLS_FVAT
-		 left join BILLS_FVAT_POS on BILLS_FVAT.ID=BILLS_FVAT_POS.ID_BILLS_FVAT  
-		 left join BILLING_NUMBERS on BILLING_NUMBERS.ID=BILLS_FVAT.ID_BILLING_NUMBERS
-		where   BILLS_FVAT.ID_BILLING_USERS='".$this->set_client_filter."' group by BILLS_FVAT.ID order by BILLS_FVAT.ID ";
+		$sql7= "select BILLS_FVAT.ID
+				, count(BILLS_FVAT_POS.ID) as count_BILLS_FVAT_POS_ID
+				, BILLS_FVAT_POS.ID_BILLS_FVAT
+				, BILLS_FVAT.ID_CURRENCY
+				, sum((BILLS_FVAT_POS.AMMOUNT * BILLS_FVAT_POS.PRICE) * ( 1 + BILLS_FVAT_POS.VAT / 100)) as WARTOSC
+				, BILLS_FVAT.ID_BILLING_NUMBERS
+				, BILLS_FVAT.OPEN
+				, BILLS_FVAT.FK_ZAKSIEG
+				, BILLS_FVAT.IF_KORV
+				, BILLING_NUMBERS.TIMESTAMP
+				, BILLING_NUMBERS.ID_BILLING_PREFIXES
+				, BILLING_NUMBERS.NUMBER
+				, BILLING_NUMBERS.ID as BILLING_NUMBERS_ID
+				, BILLS_FVAT.SELL_DATE
+				, BILLING_NUMBERS.ID_BILLING_USERS
+			from BILLS_FVAT
+				left join BILLS_FVAT_POS on BILLS_FVAT.ID=BILLS_FVAT_POS.ID_BILLS_FVAT
+				left join BILLING_NUMBERS on BILLING_NUMBERS.ID=BILLS_FVAT.ID_BILLING_NUMBERS
+			where BILLS_FVAT.ID_BILLING_USERS='".$this->set_client_filter."' group by BILLS_FVAT.ID order by BILLS_FVAT.ID
+		";
 		DEBUG_S(3,'zap_sql_do_fv',$sql7,__FILE__,__FUNCTION__,__LINE__);
 		$result7 = $this->db->query($sql7);
-		while($h=$this->db->fetch_assoc($result7)) {
-			$result7_arr[]=$h;
+		while ($h = $this->db->fetch_assoc($result7)) {
+			$result7_arr[] = $h;
 		}
 		DEBUG_S(3,'lista_faktur',array($sql7,$result7_arr),__FILE__,__FUNCTION__,__LINE__);
 		return $result7_arr;

+ 2 - 2
SE/se-lib/Billing_html.php

@@ -45,7 +45,7 @@ class Billing_html extends Billing {
 				    echo"</a>&nbsp;|&nbsp;<a href=\"edit.php?mod=make_billing&form=html_faktura_korekta_exec&adm=edit&uid=$uid&fpos=&dz=$dz&close=0&doc=$row[ID_BILLING_NUMBERS]&doctype=1&MAKE_KOREKTA_DOC=1&TRG_ID_BILLING_NUMBERS_TYPE=3&TRG_ID_BILLING_PREFIXES=0&docedit=1\">";
 				    echo"<img border=\"0\" src=\"icon/doc10.gif\" width=\"16\" height=\"16\" alt=\"UWAGA WYSTAWIANIE KOREKTY DO DOKUMENTU\">";
 				    echo"</a>&nbsp;";
-			         } else { 
+			         } else {
 				   echo "Dokonano korekty ";
 			//	    echo"<img border=\"0\" src=\"icon/off.gif\" width=\"16\" height=\"16\" alt=\"Dokonano korekty faktury\">";
 				   // echo"<a href=\"edit.php?mod=make_billing&form=html_faktura&adm=edit&uid=$uid&fpos=&dz=$dz&close=0&doc=$row[ID_BILLING_NUMBERS]&doctype=1\">";
@@ -108,7 +108,7 @@ class Billing_html extends Billing {
 			    echo"</tr>
 			";
 			    $lp++;
-			} //while
+			}
 			echo"</table>
 			";
 	}