Explorar el Código

Fix fv price round BUG in bm_show_document

Piotr Labudda hace 11 años
padre
commit
e502b52923
Se han modificado 2 ficheros con 17 adiciones y 18 borrados
  1. 15 16
      SE/se-lib/Billing.php
  2. 2 2
      SE/se-lib/Billing_html.php

+ 15 - 16
SE/se-lib/Billing.php

@@ -105,23 +105,22 @@ class Billing {
 						$allvat = $this->formatuj_grosze($h->AMMOUNT*$h->PRICE*$h->VAT/100);
 						$netto = $this->formatuj_grosze($h->PRICE*$h->AMMOUNT);
 						
-						$docum->sqix_total[TOTAL][NETTO]+=$h->AMMOUNT*$h->PRICE ; 
-						$docum->sqix_total[TOTAL][BRUTTO]+=($h->AMMOUNT*$h->PRICE)+($h->AMMOUNT*$h->PRICE*$h->VAT/100) ; 
-						$docum->sqix_total[TOTAL][KW_VAT]+=($h->AMMOUNT*$h->PRICE*$h->VAT/100) ; 
-						$docum->sqix_total[$VAT_CLASS][NETTO]+=$h->AMMOUNT*$h->PRICE ; 
-						$docum->sqix_total[$VAT_CLASS][BRUTTO]+=($h->AMMOUNT*$h->PRICE)+($h->AMMOUNT*$h->PRICE*$h->VAT/100) ; 
-						$docum->sqix_total[$VAT_CLASS][KW_VAT]+=($h->AMMOUNT*$h->PRICE*$h->VAT/100) ;
-
-						$docum->razem_netto+=$netto;
+						$docum->sqix_total['TOTAL']['NETTO'] += round($h->AMMOUNT * $h->PRICE, 2);
+						$docum->sqix_total['TOTAL']['BRUTTO'] += round(($h->AMMOUNT * $h->PRICE), 2) + round(($h->AMMOUNT * $h->PRICE * $h->VAT/100), 2);
+						$docum->sqix_total['TOTAL']['KW_VAT'] += round($h->AMMOUNT * $h->PRICE * $h->VAT/100, 2);
+						$docum->sqix_total[$VAT_CLASS]['NETTO'] += round($h->AMMOUNT * $h->PRICE, 2);
+						$docum->sqix_total[$VAT_CLASS]['BRUTTO'] += round($h->AMMOUNT * $h->PRICE, 2) + round($h->AMMOUNT * $h->PRICE * $h->VAT/100, 2);
+						$docum->sqix_total[$VAT_CLASS]['KW_VAT'] += round($h->AMMOUNT * $h->PRICE * $h->VAT/100, 2);
+						$docum->razem_netto += $netto;
 						$docum->razem_vat += $allvat;
-						$docum->razem_brutto=$docum->razem_brutto+$docum->razem_netto;
-
-						$pos[$i]->netto=$netto;
-						$pos[$i]->name=$name;
-						$pos[$i]->pos_number=$i;
-						$pos[$i]->VAT_CLASS=$VAT_CLASS;
-						$pos[$i]->jednostka_miary2=$jednostka_miary2;
-						$pos[$i]->allvat=$allvat;
+						$docum->razem_brutto = $docum->razem_brutto + $docum->razem_netto;
+
+						$pos[$i]->netto = $netto;
+						$pos[$i]->name = $name;
+						$pos[$i]->pos_number = $i;
+						$pos[$i]->VAT_CLASS = $VAT_CLASS;
+						$pos[$i]->jednostka_miary2 = $jednostka_miary2;
+						$pos[$i]->allvat = $allvat;
 
 						$i++;
 				}

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

@@ -642,7 +642,7 @@ $do_rozliczenia = $this->SZUKAJ_NIEROZLICZONEJ_TRANSAKCJI('PRAWO',$fv_naglowek['
 				$echox .="<tr><td width=\"50%\" align=\"center\">";
 				$qr_nip=preg_replace('/-/','',$doc->owner->nip);
 				$qr_nr_rach=$this->bankowy_make_nrach($doc->owner->NR_RACH_MASS_PAY,$doc->header->ID_BILLING_USERS,0);
-				$qr_kwota=$this->formatuj_grosze($doc->docum->sqix_total[TOTAL][BRUTTO])*100;
+				$qr_kwota = $this->formatuj_grosze($doc->docum->sqix_total['TOTAL']['BRUTTO'])*100;
 				while (strlen($qr_kwota)<6) $qr_kwota="0".$qr_kwota;
 				$qr_odbiorca=preg_replace('/\"/','',$doc->owner->name1);
 				$qr_tytul=$doc->result_BILLING_NUMBERS_TYPE['DESC']." nr ".$doc->header->NUMBER."/".$doc->header->ID_BILLING_PREFIXES;
@@ -669,7 +669,7 @@ $do_rozliczenia = $this->SZUKAJ_NIEROZLICZONEJ_TRANSAKCJI('PRAWO',$fv_naglowek['
 				 }
 				$echox .="<tr><td colspan=\"5\"><font size=\"-3\"><hr></td></tr>";
 				$echox .="<tr><td><b>Razem:</b></td><td></td><td>".$this->formatuj_grosze($doc->docum->sqix_total['TOTAL']['NETTO'])."</td><td>".$this->formatuj_grosze($doc->docum->sqix_total['TOTAL']['KW_VAT'])."</td><td>".$this->formatuj_grosze($doc->docum->sqix_total['TOTAL']['BRUTTO'])."</td></tr>";
-				$echox .="<tr><td colspan=5>Do zapłaty należność z podatkiem po zaokrągleniu: <b>".$this->formatuj_grosze($doc->docum->sqix_total[TOTAL][BRUTTO])."</b></td>";
+				$echox .="<tr><td colspan=5>Do zapłaty należność z podatkiem po zaokrągleniu: <b>".$this->formatuj_grosze($doc->docum->sqix_total['TOTAL']['BRUTTO'])."</b></td>";
 				$echox .=$this->tab_bottom();
 				$echox .="</td></tr></table>";
 				$echox .= $this->tab_top(0,"auto");