Bei Einkaufs- und Verkaufsmasken Felder für Angebots- und Auftragsdatum hinzugefügt.

diff --git a/SL/DBUtils.pm b/SL/DBUtils.pm
index 38acf12af885af2f31bf2c72ff937b09c5e49234..ecb809baf79bbec60ad5ce0235bef4f99fec15f3 100644 (file)
--- a/SL/DBUtils.pm
+++ b/SL/DBUtils.pm
@@ -3,7 +3,7 @@ package SL::DBUtils;
 require Exporter;
 @ISA = qw(Exporter);
 
 require Exporter;
 @ISA = qw(Exporter);
 

-@EXPORT = qw(conv_i conv_date do_query selectrow_query do_statement dump_query);
+@EXPORT = qw(conv_i conv_date conv_dateq do_query selectrow_query do_statement dump_query);

 
 sub conv_i {
   my ($value, $default) = @_;
 
 sub conv_i {
   my ($value, $default) = @_;


@@ -15,6 +15,15 @@ sub conv_date {
   return (defined($value) && "$value" ne "") ? $value : undef;
 }
 
   return (defined($value) && "$value" ne "") ? $value : undef;
 }
 

+sub conv_dateq {
+  my ($value) = @_;
+  if (defined($value) && "$value" ne "") {
+    $value =~ s/\'/\'\'/g;
+    return "'$value'";
+  }
+  return "NULL";
+}
+

 sub do_query {
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
 sub do_query {
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 

diff --git a/SL/IR.pm b/SL/IR.pm
index d79e0fd5d9a10ebe68bc3c04111df7059358bf50..2077e6b0e60aff9a27b719147e04b9815355ec3e 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -35,6 +35,7 @@
 package IR;
 
 use SL::AM;
 package IR;
 
 use SL::AM;

+use SL::DBUtils;

 
 sub post_invoice {
   $main::lxdebug->enter_sub();
 
 sub post_invoice {
   $main::lxdebug->enter_sub();


@@ -624,6 +625,8 @@ sub post_invoice {
              ordnumber = '$form->{ordnumber}',
              quonumber = '$form->{quonumber}',
               transdate = '$form->{invdate}',
              ordnumber = '$form->{ordnumber}',
              quonumber = '$form->{quonumber}',
               transdate = '$form->{invdate}',

+              orddate = | . conv_dateq($form->{"orddate"}) . qq|,
+              quodate = | . conv_dateq($form->{"quodate"}) . qq|,

               vendor_id = $form->{vendor_id},
               amount = $amount,
               netamount = $netamount,
               vendor_id = $form->{vendor_id},
               amount = $amount,
               netamount = $netamount,


@@ -845,6 +848,7 @@ sub retrieve_invoice {
 
     # retrieve invoice
     $query = qq|SELECT a.cp_id, a.invnumber, a.transdate AS invdate, a.duedate,
 
     # retrieve invoice
     $query = qq|SELECT a.cp_id, a.invnumber, a.transdate AS invdate, a.duedate,

+                a.orddate, a.quodate,

                 a.ordnumber, a.quonumber, a.paid, a.taxincluded, a.notes, a.taxzone_id, a.storno, a.gldate,
                a.intnotes, a.curr AS currency
                FROM ap a
                 a.ordnumber, a.quonumber, a.paid, a.taxincluded, a.notes, a.taxzone_id, a.storno, a.gldate,
                a.intnotes, a.curr AS currency
                FROM ap a

diff --git a/SL/IS.pm b/SL/IS.pm
index 615b2eec7ca0243519c653b94b9ef31e9616d84e..12b5b7c2e45a619b0030b85f7f11123cdfb5e136 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -36,6 +36,7 @@ package IS;
 
 use Data::Dumper;
 use SL::AM;
 
 use Data::Dumper;
 use SL::AM;

+use SL::DBUtils;

 
 sub invoice_details {
   $main::lxdebug->enter_sub();
 
 sub invoice_details {
   $main::lxdebug->enter_sub();


@@ -982,6 +983,8 @@ Message: $form->{message}\r| if $form->{message};
               quonumber = '$form->{quonumber}',
               cusordnumber = '$form->{cusordnumber}',
               transdate = '$form->{invdate}',
               quonumber = '$form->{quonumber}',
               cusordnumber = '$form->{cusordnumber}',
               transdate = '$form->{invdate}',

+              orddate = | . conv_dateq($form->{orddate}) . qq|,
+              quodate = | . conv_dateq($form->{quodate}) . qq|,

               customer_id = $form->{customer_id},
               amount = $amount,
               netamount = $netamount,
               customer_id = $form->{customer_id},
               amount = $amount,
               netamount = $netamount,


@@ -1484,6 +1487,7 @@ sub retrieve_invoice {
 
     # retrieve invoice
     $query = qq|SELECT a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
 
     # retrieve invoice
     $query = qq|SELECT a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,

+                a.orddate, a.quodate,

                 a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
                 a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
                a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
                 a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
                 a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
                a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 466d44bd5d2a6bec30bfa96329c74f4af38c11c5..3736fbe2cb09f792dc248143d96bd241819ac019 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -356,6 +356,11 @@ sub form_header {
 
   $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
 
 
   $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
 

+  $jsscript .=
+    $form->write_trigger(\%myconfig, 2,
+                         "orddate", "BL", "trigger_orddate",
+                         "quodate", "BL", "trigger_quodate");
+

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|


@@ -448,6 +453,16 @@ sub form_header {
                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
 <input type=hidden name=quonumber value="$form->{quonumber}">
              </tr>
                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
 <input type=hidden name=quonumber value="$form->{quonumber}">
              </tr>

+        <tr>
+          <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
+          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|"></td>
+          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
+          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|"></td>
+          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+        </tr>

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 0334843f9ddd7cbcbf26b0642b4705dff1bc88c9..4637f6ba3011b3b9dcf18d115abc63850fd344c2 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -582,6 +582,11 @@ sub form_header {
 
   $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
 
 
   $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
 

+  $jsscript .=
+    $form->write_trigger(\%myconfig, 2,
+                         "orddate", "BL", "trigger_orddate",
+                         "quodate", "BL", "trigger_quodate");
+

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|


@@ -748,10 +753,20 @@ print qq|     <tr>
                <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
              </tr>
                <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
              </tr>

+        <tr>
+          <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
+          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|"></td>
+          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+        </tr>

              <tr>
                <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
                <td><input name=quonumber size=11 value="$form->{quonumber}"></td>
              </tr>
              <tr>
                <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
                <td><input name=quonumber size=11 value="$form->{quonumber}"></td>
              </tr>

+        <tr>
+          <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
+          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|"></td>
+          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+        </tr>

              <tr>
                <th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
                <td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
              <tr>
                <th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
                <td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 10e71ac17ae2e3365e226536d55f492c3462607d..f7a52e979f42cd078e6a21dc6d9a29c576511d69 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -2140,10 +2140,12 @@ sub invoice {
 
     # also copy deliverydate from the order
     $form->{deliverydate} = $form->{reqdate} if $form->{reqdate};
 
     # also copy deliverydate from the order
     $form->{deliverydate} = $form->{reqdate} if $form->{reqdate};

+    $form->{orddate} = $form->{transdate};

   } else {
     $form->isblank("quonumber", $locale->text('Quotation Number missing!'));
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
     $form->{ordnumber} = "";
   } else {
     $form->isblank("quonumber", $locale->text('Quotation Number missing!'));
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
     $form->{ordnumber} = "";

+    $form->{quodate} = $form->{transdate};

   }
 
   # if the name changed get new values
   }
 
   # if the name changed get new values

diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 0620af35d283216fc124a816c9d47eeced16702a..d03504429880c5ffc7b0fb7046663e1f078cbb3e 100644 (file)
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -507,6 +507,10 @@ td {
     <td><code>notes</code></td>
     <td>Bemerkungen der Rechnung</td>
    </tr>
     <td><code>notes</code></td>
     <td>Bemerkungen der Rechnung</td>
    </tr>

+   <tr>
+    <td><code>orddate</code></td>
+    <td>Auftragsdatum</td>
+   </tr>

    <tr>
     <td><code>ordnumber</code></td>
     <td>Auftragsnummer, wenn die Rechnung aus einem Auftrag erstellt wurde</td>
    <tr>
     <td><code>ordnumber</code></td>
     <td>Auftragsnummer, wenn die Rechnung aus einem Auftrag erstellt wurde</td>


@@ -515,6 +519,10 @@ td {
     <td><code>payment_terms</code></td>
     <td>Zahlungskonditionen</td>
    </tr>
     <td><code>payment_terms</code></td>
     <td>Zahlungskonditionen</td>
    </tr>

+   <tr>
+    <td><code>quodate</code></td>
+    <td>Angebotsdatum</td>
+   </tr>

    <tr>
     <td><code>quonumber</code></td>
     <td>Angebotsnummer</td>
    <tr>
     <td><code>quonumber</code></td>
     <td>Angebotsnummer</td>

diff --git a/locale/de/ir b/locale/de/ir
index b521636499fb5dc557884d1537acb54d1c5aa57f..2e14867dd56d257b47d084e97c152f3a81976f4e 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -104,6 +104,7 @@ $self->{texts} = {
   'Oct'                         => 'Okt',
   'October'                     => 'Oktober',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'Oct'                         => 'Okt',
   'October'                     => 'Oktober',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',

+  'Order Date'                  => 'Auftragsdatum',

   'Order Date missing!'         => 'Auftragsdatum fehlt!',
   'Order Number'                => 'Auftragsnummer',
   'Order Number missing!'       => 'Auftragsnummer fehlt!',
   'Order Date missing!'         => 'Auftragsdatum fehlt!',
   'Order Number'                => 'Auftragsnummer',
   'Order Number missing!'       => 'Auftragsnummer fehlt!',


@@ -138,6 +139,7 @@ $self->{texts} = {
   'Queue'                       => 'Warteschlange',
   'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Queue'                       => 'Warteschlange',
   'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',

+  'Quotation Date'              => 'Angebotsdatum',

   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',

diff --git a/locale/de/is b/locale/de/is
index 2b4da0fc547594712781cdf4a2b3a958cbe864a1..cd4ca7f2556e06e845cfe1111e39c575a2550973 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -122,6 +122,7 @@ $self->{texts} = {
   'October'                     => 'Oktober',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'Order'                       => 'Auftrag',
   'October'                     => 'Oktober',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'Order'                       => 'Auftrag',

+  'Order Date'                  => 'Auftragsdatum',

   'Order Date missing!'         => 'Auftragsdatum fehlt!',
   'Order Number'                => 'Auftragsnummer',
   'Order Number missing!'       => 'Auftragsnummer fehlt!',
   'Order Date missing!'         => 'Auftragsdatum fehlt!',
   'Order Number'                => 'Auftragsnummer',
   'Order Number missing!'       => 'Auftragsnummer fehlt!',


@@ -160,6 +161,7 @@ $self->{texts} = {
   'Queue'                       => 'Warteschlange',
   'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',
   'Queue'                       => 'Warteschlange',
   'Queued'                      => 'In Warteschlange eingereiht.',
   'Quotation'                   => 'Angebot',

+  'Quotation Date'              => 'Angebotsdatum',

   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number'            => 'Angebotsnummer',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number'            => 'Angebotsnummer',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',

diff --git a/sql/Pg-upgrade2/ap_ar_orddate_quodate.sql b/sql/Pg-upgrade2/ap_ar_orddate_quodate.sql
new file mode 100644 (file)
index 0000000..e3e62f5
--- /dev/null
+++ b/sql/Pg-upgrade2/ap_ar_orddate_quodate.sql
@@ -0,0 +1,7 @@
+-- @tag: ap_ar_orddate_quodate
+-- @description: Spalten für Angebots- und Auftragsdatum bei Einkaufs- und Verkaufsrechnungen
+-- @depends: release_2_4_1
+ALTER TABLE ar ADD COLUMN orddate date;
+ALTER TABLE ar ADD COLUMN quodate date;
+ALTER TABLE ap ADD COLUMN orddate date;
+ALTER TABLE ap ADD COLUMN quodate date;