From 7a29151bdd2be3a29c829ab3c0221eaca82ed253 Mon Sep 17 00:00:00 2001
From: Roland Rusch <roland@rusch.lu>
Date: Wed, 19 Jul 2023 22:15:36 +0200
Subject: [PATCH 1/3] #8 Positions-Menge wird immer auf 1 aufgerundet
---
www/themes/new/templates/popup.tpl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/www/themes/new/templates/popup.tpl b/www/themes/new/templates/popup.tpl
index f6c45b8b..315a67dc 100644
--- a/www/themes/new/templates/popup.tpl
+++ b/www/themes/new/templates/popup.tpl
@@ -195,7 +195,7 @@ background-color:red;
/*
function fillArtikel(id,menge)
{
- if(menge < 1)
+ if(menge <= 0)
menge=1;
strSource = "./index.php";
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)
{
- if(menge < 1)
+ if(menge <= 0)
menge=1;
var tmp = id.split(' ');
@@ -250,7 +250,7 @@ function fillArtikel(id,menge)
function fillArtikelBestellung(id,menge)
{
- if(menge < 1)
+ if(menge <= 0)
menge=1;
var vpe = 1;
@@ -297,7 +297,7 @@ function fillArtikelBestellung(id,menge)
function fillArtikelProduktion(id,menge)
{
- if(menge < 1)
+ if(menge <= 0)
menge=1;
var tmp = id.split(' ');
@@ -325,7 +325,7 @@ function fillArtikelLieferschein(id,menge)
id = tmp[0];
//wenn ab Menge dabei steht
- if(menge < 1)
+ if(menge <= 0)
menge=1;
strSource = "./index.php";
@@ -343,7 +343,7 @@ function fillArtikelLieferschein(id,menge)
function fillArtikelInventur(id,menge)
{
- if(menge < 1)
+ if(menge <= 0)
menge=1;
var tmp = id.split(' ');
From 1daf87697643a991e413e7df6797575533b4ce81 Mon Sep 17 00:00:00 2001
From: Roland Rusch <roland@rusch.lu>
Date: Thu, 20 Jul 2023 00:18:33 +0200
Subject: [PATCH 2/3] #8 Positions-Menge wird immer auf 1 aufgerundet
---
phpwf/plugins/class.yui.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/phpwf/plugins/class.yui.php b/phpwf/plugins/class.yui.php
index 598cf87d..ae18c0e8 100644
--- a/phpwf/plugins/class.yui.php
+++ b/phpwf/plugins/class.yui.php
@@ -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
From fd0a5a5d4cead6df258024ed5e8734fd5032bc71 Mon Sep 17 00:00:00 2001
From: Roland Rusch <roland@rusch.lu>
Date: Fri, 4 Aug 2023 15:12:06 +0200
Subject: [PATCH 3/3] #8 Positions-Menge wird immer auf 1 aufgerundet
---
phpwf/plugins/class.yui.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/phpwf/plugins/class.yui.php b/phpwf/plugins/class.yui.php
index ae18c0e8..c15023bf 100644
--- a/phpwf/plugins/class.yui.php
+++ b/phpwf/plugins/class.yui.php
@@ -1542,7 +1542,7 @@ class YUI {
if(!empty($positionsIds)) {
$positions = $this->app->DB->SelectArr(
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`
%s
WHERE b.`%s` = %d AND b.id IN (%s)",
@@ -2601,7 +2601,7 @@ class YUI {
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
LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.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,
- round(b.menge) as menge,
+ trim(b.menge)+0 as menge,
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_gutschrift, ".$this->app->erp->FormatMenge('b.menge_gutschrift')." ,'-') as `Menge Gutschrift`,
@@ -2678,7 +2678,7 @@ class YUI {
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,
b.id as id
@@ -2695,7 +2695,7 @@ class YUI {
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
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(b.bezeichnunglieferant,1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),b.bezeichnunglieferant)))
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
LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id
WHERE b.$module='$id'";