Projektnummer pro Beleg auch für Debitoren- und Kreditorenbuchungen.

diff --git a/SL/AP.pm b/SL/AP.pm
index 33d09f16caf9ea6deca4b55889acb5e5e62daf1a..d90a53f5ce4cf83d67417527d3f27d6c650f8e34 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -185,7 +185,8 @@ sub post_transaction {
     $query = qq|UPDATE ap SET
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,
     $query = qq|UPDATE ap SET
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,

-                curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?
+                curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,
+                globalproject_id = ?

                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),
                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),


@@ -194,7 +195,8 @@ sub post_transaction {
                   $form->{netamount},
                   $form->{currency}, $form->{notes},
                   conv_i($form->{department_id}), $form->{storno},
                   $form->{netamount},
                   $form->{currency}, $form->{notes},
                   conv_i($form->{department_id}), $form->{storno},

-                  $form->{storno_id}, $form->{id});
+                  $form->{storno_id}, conv_i($form->{globalproject_id}),
+                  $form->{id});

     do_query($form, $dbh, $query, @values);
 
     # add individual transactions
     do_query($form, $dbh, $query, @values);
 
     # add individual transactions

diff --git a/SL/AR.pm b/SL/AR.pm
index 01a2ee6f5de20f1c991602bed25e1e9bcc84c3c8..ef42e69c60307605ecb9a3616a2a4a9f8f7e3e74 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -156,11 +156,12 @@ sub post_transaction {
            invnumber = ?, ordnumber = ?, transdate = ?, customer_id = ?,
            taxincluded = ?, amount = ?, duedate = ?, paid = ?,
            netamount = ?, curr = ?, notes = ?, department_id = ?,
            invnumber = ?, ordnumber = ?, transdate = ?, customer_id = ?,
            taxincluded = ?, amount = ?, duedate = ?, paid = ?,
            netamount = ?, curr = ?, notes = ?, department_id = ?,

-           employee_id = ?, storno = ?, storno_id = ?
+           employee_id = ?, storno = ?, storno_id = ?, globalproject_id = ?

          WHERE id = ?|;
     my @values = ($form->{invnumber}, $form->{ordnumber}, conv_date($form->{transdate}), conv_i($form->{customer_id}), $form->{taxincluded} ? 't' : 'f', $form->{amount},
                   conv_date($form->{duedate}), $form->{paid}, $form->{netamount}, $form->{currency}, $form->{notes}, conv_i($form->{department_id}),
          WHERE id = ?|;
     my @values = ($form->{invnumber}, $form->{ordnumber}, conv_date($form->{transdate}), conv_i($form->{customer_id}), $form->{taxincluded} ? 't' : 'f', $form->{amount},
                   conv_date($form->{duedate}), $form->{paid}, $form->{netamount}, $form->{currency}, $form->{notes}, conv_i($form->{department_id}),

-                  conv_i($form->{employee_id}), $form->{storno} ? 't' : 'f', $form->{storno_id}, conv_i($form->{id}));
+                  conv_i($form->{employee_id}), $form->{storno} ? 't' : 'f', $form->{storno_id},
+                  conv_i($form->{globalproject_id}), conv_i($form->{id}));

     do_query($form, $dbh, $query, @values);
 
     # add individual transactions for AR, amount and taxes
     do_query($form, $dbh, $query, @values);
 
     # add individual transactions for AR, amount and taxes

diff --git a/SL/Form.pm b/SL/Form.pm
index e9197143506c25b4ff6ce99493202c80ce841cbf..418d3cf62f539abd7a9c76d47ea97e90e4df5ce3 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2929,6 +2929,7 @@ sub create_links {
            a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
            a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,

+           a.globalproject_id,

            c.name AS $table,
            d.description AS department,
            e.name AS employee
            c.name AS $table,
            d.description AS department,
            e.name AS employee

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index e98a1cfecfdc8409cb218cf4730c9ad2f33125be..f19363d4cae12cec488924b210ef203f51eb82cf 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -401,6 +401,12 @@ sub form_header {
   $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
   $form->{javascript} .= qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
 
   $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
   $form->{javascript} .= qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
 

+  my $globalprojectnumber =
+    NTI($cgi->popup_menu('-name' => "globalproject_id",
+                         '-values' => \@project_values,
+                         '-labels' => \%project_labels,
+                         '-default' => $form->{"globalproject_id"} ));
+

   $form->header;
   my $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
   $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
   $form->header;
   my $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
   $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;


@@ -486,6 +492,10 @@ sub form_header {
                 <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
               </tr>
                 <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
               </tr>

+              <tr>
+                <th align=right nowrap>| . $locale->text('Project Number') . qq|</th>
+                <td>$globalprojectnumber</td>
+              </tr>

             </table>
           </td>
         </tr>
             </table>
           </td>
         </tr>

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index b225370f90891b527bf9d2a6fdc98fff92239194..8a04ac5172b3c662131c41a773738de95a551ebf 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -436,6 +436,12 @@ sub form_header {
     qq|<script type="text/javascript" src="js/show_vc_details.js"></script>| .
     qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
 
     qq|<script type="text/javascript" src="js/show_vc_details.js"></script>| .
     qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
 

+  my $globalprojectnumber =
+    NTI($cgi->popup_menu('-name' => "globalproject_id",
+                         '-values' => \@project_values,
+                         '-labels' => \%project_labels,
+                         '-default' => $form->{"globalproject_id"} ));
+

   $form->header;
   $onload = qq|focus()|;
   $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
   $form->header;
   $onload = qq|focus()|;
   $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;


@@ -523,6 +529,10 @@ sub form_header {
                 <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
               </tr>
                 <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
               </tr>

+              <tr>
+                <th align=right nowrap>| . $locale->text('Project Number') . qq|</th>
+                <td>$globalprojectnumber</td>
+              </tr>

      </table>
           </td>
         </tr>
      </table>
           </td>
         </tr>

diff --git a/doc/changelog b/doc/changelog
index 81f3fba6aed367973dac724d191b1be8fdd034a0..0abf480905a0d53391466c72f78e49219f8acbd6 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -2,6 +2,9 @@
 # Veränderungen von Lx-Office ERP #
 ###################################
 
 # Veränderungen von Lx-Office ERP #
 ###################################
 

+- Projektnummer pro Beleg läßt sich auch für Debitoren- und
+  Kreditorenbuchungen angeben.
+

 - Bei den Berichten für Verkaus- und Einkaufsrechnungen wird auch auf die
   positionsbezogenen Projektnummern für Debitoren- und Kreditorenbuchungen
   gefiltert.
 - Bei den Berichten für Verkaus- und Einkaufsrechnungen wird auch auf die
   positionsbezogenen Projektnummern für Debitoren- und Kreditorenbuchungen
   gefiltert.