mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
This commit is contained in:
@@ -838,7 +838,11 @@ class wawi_bestellung extends basis_db
|
||||
$oe_kurzbz = $row->oe_kurzbz;
|
||||
}
|
||||
}
|
||||
|
||||
// wenn kurzbz länger ist -> abschneiden
|
||||
if(mb_strlen($oe_kurzbz)>3)
|
||||
{
|
||||
$oe_kurzbz = mb_substr($oe_kurzbz, 0,3);
|
||||
}
|
||||
$oe_kurzbz = mb_strtoupper($oe_kurzbz);
|
||||
$akt_timestamp=time();
|
||||
$akt_datum=getdate($akt_timestamp);
|
||||
@@ -855,9 +859,8 @@ class wawi_bestellung extends basis_db
|
||||
{
|
||||
if($row = $this->db_fetch_object())
|
||||
{ $bnum = $row->max + 1;
|
||||
$bnum = sprintf("%03s",$bnum); }
|
||||
else
|
||||
$bnum = '000';
|
||||
$bnum = sprintf("%03s",$bnum);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -866,6 +869,7 @@ class wawi_bestellung extends basis_db
|
||||
}
|
||||
|
||||
$kostenstelle_kz = mb_strtoupper($kostenstelle_kz);
|
||||
|
||||
$bnum=sprintf("%s%s%s%s",$oe_kurzbz,$akt_year,$kostenstelle_kz,$bnum);
|
||||
return $bnum;
|
||||
}
|
||||
|
||||
+2
-1
@@ -1326,6 +1326,7 @@ if($aktion == 'suche')
|
||||
foreach($detail->result as $det)
|
||||
{
|
||||
$brutto=($det->menge * ($det->preisprove +($det->preisprove * ($det->mwst/100))));
|
||||
|
||||
getDetailRow($i, $det->bestelldetail_id, $det->sort, $det->menge, $det->verpackungseinheit, $det->beschreibung, $det->artikelnummer, $det->preisprove, $det->mwst, sprintf("%01.2f",$brutto), $bestellung->bestellung_id);
|
||||
$summe+=$brutto;
|
||||
$i++;
|
||||
@@ -1607,7 +1608,7 @@ if($aktion == 'suche')
|
||||
echo "<a id='aufteilung_link' class='cursor' ><img src='../skin/images/right.png'>Aufteilung anzeigen / ausblenden</a>\n";
|
||||
echo "<br>";
|
||||
echo "<div id='aufteilung'>\n";
|
||||
echo "<table border=0 width='70%' class='aufteilung'>";
|
||||
echo "<table border=0 width='75%' class='aufteilung'>";
|
||||
echo "<tr>\n";
|
||||
$help = 0;
|
||||
$anteil = 0;
|
||||
|
||||
Reference in New Issue
Block a user