From 876d1e6df2bacc8697f619351390eff84b811f56 Mon Sep 17 00:00:00 2001
From: ragu <ragu@gnu-systems.net>
Date: Fri, 16 Sep 2022 16:33:52 +0200
Subject: [PATCH] parts storno fix

---
 .../main/css/{local_style_2.css => local_style20220915.css} | 0
 copri4/main/src/Mod/DBtank.pm                               | 6 +++++-
 copri4/main/src/Mod/Pricing.pm                              | 2 ++
 copri4/main/src/Tpl/TransPositionen.pm                      | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename copri4/main/css/{local_style_2.css => local_style20220915.css} (100%)

diff --git a/copri4/main/css/local_style_2.css b/copri4/main/css/local_style20220915.css
similarity index 100%
rename from copri4/main/css/local_style_2.css
rename to copri4/main/css/local_style20220915.css
diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm
index fcbd3de..76c8622 100755
--- a/copri4/main/src/Mod/DBtank.pm
+++ b/copri4/main/src/Mod/DBtank.pm
@@ -1036,8 +1036,12 @@ sub insert_contentoid {
    }
   }
   elsif($key =~ /template_id|cc_id|ct_id|ca_id/ && $insert->{table} =~ /contentpos|contentadrpos|contenttranspos/){
-     $columns .= "$key,";
+    $columns .= "$key,";
+    if(!looks_like_number($insert->{$key})){
+     $values .= "null,";
+    }else{
      $values .= "'$insert->{$key}',";
+    }
   }
  }
 
diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm
index 1ec5966..0cfd16e 100755
--- a/copri4/main/src/Mod/Pricing.pm
+++ b/copri4/main/src/Mod/Pricing.pm
@@ -456,6 +456,8 @@ sub price2calc {
        $total = $einzel * $menge;
  }
 
+ $total = $total * $ctpos->{int01} if($ctpos->{int01});
+
  if($ctpos->{int07} && $ctpos->{int07} > 0 && $menge > 0){
         $discount = "-" . $ctpos->{int07};
         if($ctpos->{int08} && $ctpos->{int08} == 1){
diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm
index 6fd2372..f6fefbd 100755
--- a/copri4/main/src/Tpl/TransPositionen.pm
+++ b/copri4/main/src/Tpl/TransPositionen.pm
@@ -586,7 +586,7 @@ EOF
      print $q->div({-style=>"padding:0.5em;font-size:0.81em;width:98%;text-align:right;"},"<span style='color:red;'>$opos</span> $vibuchen_mtime Gebucht $ctt->{int01} € \"$ctt->{state}\"") if($ctt->{state});      
    }
 
-  if( -f "$varenv{pdfinvoice}/$praefix-$ctt->{ct_name}.pdf"){
+  if( -f "$varenv{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){
     #print $q->div({-style=>"padding:0.5em;font-size:0.81em;width:98%;text-align:right;"}, "Download: ", $q->a({-href=>"$varenv{metahost}/pdf/$praefix-$ctt->{ct_name}.pdf", -target=>'_blank'},"$praefix-$ctt->{ct_name}.pdf")); 
     print $q->div({-style=>'padding:0.5em;font-size:0.81em;width:98%;text-align:right;'}, "Download: ", $q->a({-href=>"$varenv{wwwhost}/FileOut?file=$praefix-$ctt->{ct_name}.pdf&sessionid=$coo", -target=>"_blank" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}), "Rechnung $ctt->{ct_name}.pdf"),"\n";
   }