No more " und keine abgeschnittenen Zeichen nach " Geprüft: Versandort, Transpor...

[kivitendo-erp.git] / SL / IS.pm

diff --git a/SL/IS.pm b/SL/IS.pm
index 62cbf5369ba6ed92df8506e92d26cc0895b61d56..f3c7855d17196f052f579aab13ec1aafe235ee76 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -143,7 +143,7 @@ sub invoice_details {
        partnotes serialnumber reqdate sellprice listprice netprice
        discount p_discount discount_sub nodiscount_sub
        linetotal  nodiscount_linetotal tax_rate projectnumber
        partnotes serialnumber reqdate sellprice listprice netprice
        discount p_discount discount_sub nodiscount_sub
        linetotal  nodiscount_linetotal tax_rate projectnumber

-       price_factor price_factor_name);
+       price_factor price_factor_name partsgroup);

 
   my @tax_arrays =
     qw(taxbase tax taxdescription taxrate taxnumber);
 
   my @tax_arrays =
     qw(taxbase tax taxdescription taxrate taxnumber);


@@ -196,6 +196,7 @@ sub invoice_details {
       push @{ $form->{invdate} },           $form->{"invdate"};
       push @{ $form->{price_factor} },      $price_factor->{formatted_factor};
       push @{ $form->{price_factor_name} }, $price_factor->{description};
       push @{ $form->{invdate} },           $form->{"invdate"};
       push @{ $form->{price_factor} },      $price_factor->{formatted_factor};
       push @{ $form->{price_factor_name} }, $price_factor->{description};

+      push @{ $form->{partsgroup} },        $form->{"partsgroup_$i"};

 
       if ($form->{lizenzen}) {
         if ($form->{"licensenumber_$i"}) {
 
       if ($form->{lizenzen}) {
         if ($form->{"licensenumber_$i"}) {


@@ -950,6 +951,8 @@ sub post_invoice {
   $amount = $netamount + $tax;
 
   # save AR record
   $amount = $netamount + $tax;
 
   # save AR record

+  #erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb
+

   $query = qq|UPDATE ar set
                 invnumber   = ?, ordnumber     = ?, quonumber     = ?, cusordnumber  = ?,
                 transdate   = ?, orddate       = ?, quodate       = ?, customer_id   = ?,
   $query = qq|UPDATE ar set
                 invnumber   = ?, ordnumber     = ?, quonumber     = ?, cusordnumber  = ?,
                 transdate   = ?, orddate       = ?, quodate       = ?, customer_id   = ?,


@@ -961,7 +964,8 @@ sub post_invoice {
                 employee_id = ?, salesman_id   = ?, storno_id     = ?, storno        = ?,
                 cp_id       = ?, marge_total   = ?, marge_percent = ?, 
                 globalproject_id               = ?, delivery_customer_id             = ?,
                 employee_id = ?, salesman_id   = ?, storno_id     = ?, storno        = ?,
                 cp_id       = ?, marge_total   = ?, marge_percent = ?, 
                 globalproject_id               = ?, delivery_customer_id             = ?,

-                transaction_description        = ?, delivery_vendor_id               = ?
+                transaction_description        = ?, delivery_vendor_id               = ?,
+               donumber    = ?

               WHERE id = ?|;
   @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
              conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}), 
               WHERE id = ?|;
   @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
              conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}), 


@@ -974,6 +978,7 @@ sub post_invoice {
                 conv_i($form->{"cp_id"}),            1 * $form->{marge_total} ,      1 * $form->{marge_percent},
                 conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}), 
                        $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
                 conv_i($form->{"cp_id"}),            1 * $form->{marge_total} ,      1 * $form->{marge_percent},
                 conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}), 
                        $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),

+                      $form->{"donumber"}, #das entsprechende feld lieferscheinnummer aus der html-form 12.02.09 jb

                 conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
   
                 conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
   


@@ -1384,6 +1389,8 @@ sub retrieve_invoice {
     my $id = conv_i($form->{id});
 
     # retrieve invoice
     my $id = conv_i($form->{id});
 
     # retrieve invoice

+    #erweiterung um das entsprechende feld lieferscheinnummer (a.donumber) in der html-maske anzuzeigen 12.02.2009 jb
+

     $query =
       qq|SELECT
            a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
     $query =
       qq|SELECT
            a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,


@@ -1395,7 +1402,7 @@ sub retrieve_invoice {
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
            a.transaction_description,
            a.marge_total, a.marge_percent,
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
            a.transaction_description,
            a.marge_total, a.marge_percent,

-           e.name AS employee
+           e.name AS employee, a.donumber

          FROM ar a
          LEFT JOIN employee e ON (e.id = a.employee_id)
          WHERE a.id = ?|;
          FROM ar a
          LEFT JOIN employee e ON (e.id = a.employee_id)
          WHERE a.id = ?|;