s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Bugfixes process offer to invoice

Browse Source
This commit is contained in:
Xenomporio 2022-06-13 19:50:44 +02:00
parent cd5c1cd5b4
commit eff8fce974
3 changed files with 702 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/lib/class.erpapi.php
View File

@ -31961,7 +31961,8 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
if($drucker==$this->app->User->GetEmail())
$from_name = $this->app->User->GetName();
else {
$from_name = $this->app->DB->Select("SELECT absendername FROM firmendaten WHERE absendername!='' AND email!='' AND email='$drucker' LIMIT 1");
// $from_name = $this->app->DB->Select("SELECT absendername FROM firmendaten WHERE absendername!='' AND email!='' AND email='$drucker' LIMIT 1");
$from_name = $this->app->DB->Select("SELECT wert FROM firmendaten_werte WHERE name = 'absendername' LIMIT 1");
if($from_name=="")
$from_name = $this->app->DB->Select("SELECT smtp_fromname FROM emailbackup WHERE smtp_fromname!='' AND smtp_frommail!='' AND smtp_frommail='$drucker' AND geloescht!=1 LIMIT 1");
@ -39443,9 +39444,11 @@ function Firmendaten($field,$projekt="")
$portosorts = null;
$cpos = $pos?count($pos):0;
for($i=0;$i<$cpos;$i++){
/* nur lager artikel in den Lieferschein */
$portoartikel = $portoartikelArr[$pos[$i]];
$portoartikel = !empty($portoartikel)?$portoartikelArr[$pos[(int) $i]]:0;
if($portoartikel==0) {
$this->app->DB->Insert("INSERT INTO lieferschein_position (id) VALUES('')");
$newposid = $this->app->DB->GetInsertID();

2
www/lib/dokumente/class.briefpapier.php
View File

@ -2900,7 +2900,7 @@ class Briefpapier extends SuperFPDF {
// wenn steuerfrei komplett immer 0 steuer anzeigen
$item['tmptax'] = $item['tax'] + 1;
$item['tmptax'] = (float) $item['tax'] + 1;
// standard anzeige mit steuer
if(!$this->ust_spalteausblende){

2
www/lib/dokumente/class.rechnung.php
View File

@ -626,7 +626,7 @@ class RechnungPDF extends BriefpapierCustom {
if($positionenkaufmaenischrunden == 3) {
$netto_gesamt = $value['menge'] * round($value['preis'] - ($value['preis'] / 100 * $value['rabatt']),2);
}else{
$netto_gesamt = $value['menge'] * ($value['preis'] - ($value['preis'] / 100 * $value['rabatt']));
$netto_gesamt = ((float) $value['menge']) * ((float) $value['preis'] - ((float) $value['preis'] / 100.0 * (float) $value['rabatt']));
}
$netto_gesamt_ungerundet = $netto_gesamt;
if($positionenkaufmaenischrunden)