Lieferscheinnummer (donumber) auch in Rechnungen übergeben und als Druckvariable...

diff --git a/SL/IS.pm b/SL/IS.pm
index d011a08..f3c7855 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -951,6 +951,8 @@ sub post_invoice {
   $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   = ?,
@@ -962,7 +964,8 @@ sub post_invoice {
                 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"}), 
@@ -975,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"}),
+                      $form->{"donumber"}, #das entsprechende feld lieferscheinnummer aus der html-form 12.02.09 jb
                 conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
   
@@ -1385,6 +1389,8 @@ sub 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,
@@ -1396,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,
-           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 = ?|;

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index ad90daf..1a123ed 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -241,7 +241,7 @@ sub prepare_invoice {
   if ($form->{id}) {
 
     map { $form->{$_} =~ s/\"/"/g }
-      qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
+      qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes donumber); #frage: muss hier donumber angegeben werden? hier werden doch nur die alten quots wieder ausgemerzt, ist das noch nötig? 12.02.2009 jb
 
     #     # get pricegroups for parts
     #     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@ -695,6 +695,8 @@ print qq|       </table>
              $employees
         $salesman
 |;
+
+#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb
 if ($form->{type} eq "credit_note") {
 print qq|     <tr>
                <th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
@@ -717,6 +719,10 @@ print qq|     <tr>
                <th align="right">| . $locale->text('Due Date') . qq|</th>
                 $button2
              </tr>
+             <tr>
+               <th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
+               <td><input name="donumber" size="11" value="$form->{donumber}"></td>
+             </tr>
              <tr>
                <th align="right">| . $locale->text('Delivery Date') . qq|</th>
                 $button3

diff --git a/locale/de/is b/locale/de/is
index f7a2442..c793b86 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -104,6 +104,7 @@ $self->{texts} = {
   'Delivered'                   => 'Geliefert',
   'Delivery Date'               => 'Lieferdatum',
   'Delivery Order'              => 'Lieferschein',
+  'Delivery Order Number'       => 'Lieferscheinnummer',
   'Department'                  => 'Abteilung',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Description'                 => 'Beschreibung',
@@ -246,6 +247,7 @@ $self->{texts} = {
   'Quotation Number'            => 'Angebotsnummer',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',
+  'ROP'                         => 'Mindestlagerbestand',
   'Receipt, payment, reconciliation' => 'Zahlungseingang, Zahlungsausgang, Kontenabgleich',
   'Record in'                   => 'Buchen auf',
   'Release From Stock'          => 'Lagerausgang',

diff --git a/sql/Pg-upgrade2/ar_add_donumber.sql b/sql/Pg-upgrade2/ar_add_donumber.sql
new file mode 100644 (file)
index 0000000..e699899
--- /dev/null
+++ b/sql/Pg-upgrade2/ar_add_donumber.sql
@@ -0,0 +1,5 @@
+-- @tag: ar_add_donumber
+-- @description: Die Lieferscheinnummer wird bei Rechnungen bisher nicht uebernommen. Das aendert sich mit diesem Update. Hierfuer muss allerdings die Rechnungstabelle ar um einen entsprechenden Eintrag erweitert werden. (donumber in ar)
+-- @depends: COA_Account_Settings001 USTVA_abstraction COA_Account_Settings002 chart_category_to_sgn employee_no_limits dunning_invoices_per_dunning_level gl_storno oe_is_salesman transaction_description tax_description_without_percentage_skr04 dunning_dunning_id ar_ap_storno_id dunning_config_interest_rate invalid_taxkeys_2 chart_names2 history_erp_snumbers marge_initial USTVA_at tax_report_table_name
+alter table ar add column donumber text;
+