s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from RETROTEC-AG/pr/Positions-Menge_wird_immer_auf_1_aufgerundet

Browse Source 
positions menge wird immer auf 1 aufgerundet bzw gerundet
This commit is contained in:
OpenXE-ERP 2023-08-10 10:31:33 +02:00 committed by GitHub
commit ac723e9fda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpwf/plugins/class.yui.php
View File

@ -1542,7 +1542,7 @@ class YUI {
if(!empty($positionsIds)) { if(!empty($positionsIds)) {
$positions = $this->app->DB->SelectArr( $positions = $this->app->DB->SelectArr(
sprintf( sprintf(
"SELECT b.id, %s AS `preis`, round(b.menge) as menge "SELECT b.id, %s AS `preis`, trim(b.menge)+0 as menge
FROM `%s` AS `b` FROM `%s` AS `b`
%s %s
WHERE b.`%s` = %d AND b.id IN (%s)", WHERE b.`%s` = %d AND b.id IN (%s)",
@ -2581,7 +2581,7 @@ class YUI {
p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge, ".$this->FormatPreis($preiscell)." as preis,b.waehrung, ".$this->FormatPreis('b.rabatt')." as rabatt, "; p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, ".$this->FormatPreis($preiscell)." as preis,b.waehrung, ".$this->FormatPreis('b.rabatt')." as rabatt, ";
$sql .= "b.id as id $sql .= "b.id as id
@ -2601,7 +2601,7 @@ class YUI {
as Artikel, as Artikel,
p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge, if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert, b.id as id p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert, b.id as id
FROM $table b FROM $table b
LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id
WHERE b.$module='$id'"; WHERE b.$module='$id'";
@ -2656,7 +2656,7 @@ class YUI {
p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum,
round(b.menge) as menge, trim(b.menge)+0 as menge,
if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert, if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert,
if(b.menge_eingang, ".$this->app->erp->FormatMenge('b.menge_eingang')." ,'-') as `Eingang`, if(b.menge_eingang, ".$this->app->erp->FormatMenge('b.menge_eingang')." ,'-') as `Eingang`,
if(b.menge_gutschrift, ".$this->app->erp->FormatMenge('b.menge_gutschrift')." ,'-') as `Menge Gutschrift`, if(b.menge_gutschrift, ".$this->app->erp->FormatMenge('b.menge_gutschrift')." ,'-') as `Menge Gutschrift`,
@ -2678,7 +2678,7 @@ class YUI {
as Artikel, as Artikel,
p.abkuerzung as projekt, b.nummer as nummer, round(b.menge) as menge, p.abkuerzung as projekt, b.nummer as nummer, trim(b.menge)+0 as menge,
".$this->FormatPreis(' b.preis')." as preis, ".$this->FormatPreis(' b.preis')." as preis,
b.id as id b.id as id
@ -2695,7 +2695,7 @@ class YUI {
as Artikel, as Artikel,
p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(b.lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge, p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(b.lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge,
b.id as id b.id as id
FROM $table b FROM $table b
@ -2717,7 +2717,7 @@ class YUI {
if(CHAR_LENGTH(b.bezeichnunglieferant)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(CONCAT(b.bezeichnunglieferant,' *'),1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),CONCAT(b.bezeichnunglieferant,' *')), if(CHAR_LENGTH(b.bezeichnunglieferant)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(CONCAT(b.bezeichnunglieferant,' *'),1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),CONCAT(b.bezeichnunglieferant,' *')),
if(CHAR_LENGTH(b.bezeichnunglieferant)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(b.bezeichnunglieferant,1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),b.bezeichnunglieferant))) if(CHAR_LENGTH(b.bezeichnunglieferant)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(b.bezeichnunglieferant,1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),b.bezeichnunglieferant)))
as Artikel, as Artikel,
p.abkuerzung as projekt, a.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge, ".$this->FormatPreis(' b.preis')." as preis, b.waehrung, b.id as id p.abkuerzung as projekt, a.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, ".$this->FormatPreis(' b.preis')." as preis, b.waehrung, b.id as id
FROM $table b FROM $table b
LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id
WHERE b.$module='$id'"; WHERE b.$module='$id'";

12
www/themes/new/templates/popup.tpl
View File

@ -195,7 +195,7 @@ background-color:red;
/* /*
function fillArtikel(id,menge) function fillArtikel(id,menge)
{ {
if(menge < 1) if(menge <= 0)
menge=1; menge=1;
strSource = "./index.php"; strSource = "./index.php";
strData = "module=artikel&action=ajaxwerte&id="+id+"&smodule=[MODULE]&sid=[KID]&menge="+menge; strData = "module=artikel&action=ajaxwerte&id="+id+"&smodule=[MODULE]&sid=[KID]&menge="+menge;
@ -209,7 +209,7 @@ function fillArtikel(id,menge)
function fillArtikel(id,menge) function fillArtikel(id,menge)
{ {
if(menge < 1) if(menge <= 0)
menge=1; menge=1;
var tmp = id.split(' '); var tmp = id.split(' ');
@ -250,7 +250,7 @@ function fillArtikel(id,menge)
function fillArtikelBestellung(id,menge) function fillArtikelBestellung(id,menge)
{ {
if(menge < 1) if(menge <= 0)
menge=1; menge=1;
var vpe = 1; var vpe = 1;
@ -297,7 +297,7 @@ function fillArtikelBestellung(id,menge)
function fillArtikelProduktion(id,menge) function fillArtikelProduktion(id,menge)
{ {
if(menge < 1) if(menge <= 0)
menge=1; menge=1;
var tmp = id.split(' '); var tmp = id.split(' ');
@ -325,7 +325,7 @@ function fillArtikelLieferschein(id,menge)
id = tmp[0]; id = tmp[0];
//wenn ab Menge dabei steht //wenn ab Menge dabei steht
if(menge < 1) if(menge <= 0)
menge=1; menge=1;
strSource = "./index.php"; strSource = "./index.php";
@ -343,7 +343,7 @@ function fillArtikelLieferschein(id,menge)
function fillArtikelInventur(id,menge) function fillArtikelInventur(id,menge)
{ {
if(menge < 1) if(menge <= 0)
menge=1; menge=1;
var tmp = id.split(' '); var tmp = id.split(' ');