Revert "Belege runden, und Rundungsdifferenzen auf Extrakonten buchen."

This reverts commit 422f2f17365ea7879c14b902c5db1e4cd7023e48.

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 96c4b0f1fff0bf67b844187013dbf12eae92f743..d8f35068655af13244f5af68a803c32c6d8997b6 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -91,8 +91,6 @@ __PACKAGE__->meta->columns(
   revtrans                                  => { type => 'boolean', default => 'false' },
   rfqnumber                                 => { type => 'text' },
   rmanumber                                 => { type => 'text' },
   revtrans                                  => { type => 'boolean', default => 'false' },
   rfqnumber                                 => { type => 'text' },
   rmanumber                                 => { type => 'text' },

-  rndgain_accno_id                          => { type => 'integer' },
-  rndloss_accno_id                          => { type => 'integer' },

   sales_delivery_order_show_delete          => { type => 'boolean', default => 'true' },
   sales_order_show_delete                   => { type => 'boolean', default => 'true' },
   sales_purchase_order_ship_missing_column  => { type => 'boolean', default => 'false' },
   sales_delivery_order_show_delete          => { type => 'boolean', default => 'true' },
   sales_order_show_delete                   => { type => 'boolean', default => 'true' },
   sales_purchase_order_ship_missing_column  => { type => 'boolean', default => 'false' },

diff --git a/SL/Form.pm b/SL/Form.pm
index fbcbe56f3b6ff9c8d605e38a083d5c4f97a2e6f5..d712c94b15ab5df5abc2923313b1d8a491f54278 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2886,9 +2886,7 @@ sub create_links {
            d.closedto, d.revtrans,
            (SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
            (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
            d.closedto, d.revtrans,
            (SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
            (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,

-           (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-           (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id) AS rndgain_accno,
-           (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id) AS rndloss_accno
+           (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno

          FROM defaults d|;
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;
          FROM defaults d|;
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;


@@ -2901,9 +2899,7 @@ sub create_links {
             current_date AS transdate, d.closedto, d.revtrans,
             (SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
             (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
             current_date AS transdate, d.closedto, d.revtrans,
             (SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
             (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,

-            (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-            (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id) AS rndgain_accno,
-            (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id) AS rndloss_accno
+            (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno

           FROM defaults d|;
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;
           FROM defaults d|;
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;

diff --git a/SL/IS.pm b/SL/IS.pm
index caa2c34695a42dbbeea79a4af2cb1402f42794cb..10892dec1091047f5c2d1c71a0a6ee73d5df9c52 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -968,14 +968,7 @@ SQL
     }
   }
 
     }
   }
 

-  # Invoice Summary includes Rounding
-  my $rounding = $form->round_amount(
-    $form->round_amount($netamount + $tax, 2, 1) - $form->round_amount($netamount + $tax, 2), 2
-  );
-  my $rnd_accno = $rounding == 0 ? 0
-                : $rounding > 0  ? $form->{rndgain_accno}
-                :                  $form->{rndloss_accno};
-  $form->{amount}{ $form->{id} }{ $form->{AR} } = $form->round_amount($netamount + $tax, 2, 1);
+  $form->{amount}{ $form->{id} }{ $form->{AR} } = $netamount + $tax;

   $form->{paid} =
     $form->round_amount($form->{paid} * $form->{exchangerate} + $diff, 2);
 
   $form->{paid} =
     $form->round_amount($form->{paid} * $form->{exchangerate} + $diff, 2);
 


@@ -1080,14 +1073,6 @@ SQL
         do_query($form, $dbh, $query, @values);
       }
     }
         do_query($form, $dbh, $query, @values);
       }
     }

-    if (!$payments_only && ($rnd_accno != 0)) {
-      $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, tax_id, taxkey, project_id, chart_link)
-             VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, (SELECT id FROM tax WHERE taxkey=0), 0, ?, (SELECT link FROM chart WHERE accno = ?))|;
-      @values = (conv_i($trans_id), $rnd_accno, $rounding, conv_date($form->{invdate}), conv_i($project_id), $rnd_accno);
-      do_query($form, $dbh, $query, @values);
-      $rnd_accno = 0;
-    }

   }
 
   # deduct payment differences from diff
   }
 
   # deduct payment differences from diff


@@ -1252,7 +1237,7 @@ SQL
     return;
   }
 
     return;
   }
 

-  $amount = $form->round_amount( $netamount + $tax, 2, 1);
+  $amount = $netamount + $tax;

 
   # save AR record
   #erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb
 
   # save AR record
   #erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb


@@ -1897,9 +1882,7 @@ sub retrieve_invoice {
          (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id)    AS income_accno,
          (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id)   AS expense_accno,
          (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id)    AS fxgain_accno,
          (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id)    AS income_accno,
          (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id)   AS expense_accno,
          (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id)    AS fxgain_accno,

-         (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno,
-         (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id)   AS rndgain_accno,
-         (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id)   AS rndloss_accno
+         (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno

          ${query_transdate}
        FROM defaults d|;
 
          ${query_transdate}
        FROM defaults d|;
 

diff --git a/SL/OE.pm b/SL/OE.pm
index 61af6211c5e9d18f96a5ccb34fe82b0a180b660c..7cd5de158a744b5e6dcbaa6201dae1be31325218 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -690,7 +690,7 @@ SQL
   my $tax = 0;
   map { $tax += $form->round_amount($taxaccounts{$_}, 2) } keys %taxaccounts;
 
   my $tax = 0;
   map { $tax += $form->round_amount($taxaccounts{$_}, 2) } keys %taxaccounts;
 

-  $amount = $form->round_amount($netamount + $tax, 2, 1);
+  $amount = $form->round_amount($netamount + $tax, 2);

   $netamount = $form->round_amount($netamount, 2);
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
   $netamount = $form->round_amount($netamount, 2);
 
   if ($form->{currency} eq $form->{defaultcurrency}) {


@@ -956,9 +956,7 @@ sub retrieve {
                      (SELECT c.accno FROM chart c WHERE d.income_accno_id    = c.id) AS income_accno,
                      (SELECT c.accno FROM chart c WHERE d.expense_accno_id   = c.id) AS expense_accno,
                      (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id    = c.id) AS fxgain_accno,
                      (SELECT c.accno FROM chart c WHERE d.income_accno_id    = c.id) AS income_accno,
                      (SELECT c.accno FROM chart c WHERE d.expense_accno_id   = c.id) AS expense_accno,
                      (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id    = c.id) AS fxgain_accno,

-                     (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id    = c.id) AS fxloss_accno,
-                     (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id   = c.id) AS rndgain_accno,
-                     (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id   = c.id) AS rndloss_accno
+                     (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id    = c.id) AS fxloss_accno

               $query_add
               FROM defaults d|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query);
               $query_add
               FROM defaults d|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query);

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 62c645a6f260961cd3a0398cba4f8604800f098c..09a671e933c23d0c1c0a360b517cc2cd42218407 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -590,7 +590,7 @@ sub delete_account {
   $form->{title} = $locale->text('Delete Account');
 
   foreach my $id (
   $form->{title} = $locale->text('Delete Account');
 
   foreach my $id (

-    qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id rndgain_accno_id rndloss_accno_id)
+    qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)

     ) {
     if ($form->{id} == $form->{$id}) {
       $form->error($locale->text('Cannot delete default account!'));
     ) {
     if ($form->{id} == $form->{$id}) {
       $form->error($locale->text('Cannot delete default account!'));

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 37981eb5d35ec78b53daa8e87d689b535ae4ba80..3a3d433bba670a39cc095a05fb69c0a13a917d08 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -463,11 +463,6 @@ sub form_footer {
     }
   }
 
     }
   }
 

-  $form->{rounding} = $form->round_amount(
-    $form->round_amount($form->{invtotal}, 2, 1) - $form->round_amount($form->{invtotal}, 2), 2
-  );
-  $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1 );
-

   # follow ups
   if ($form->{id}) {
     $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];
   # follow ups
   if ($form->{id}) {
     $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 11e220a68f499be6bd2a7b4e206c01f5a7c52a77..86f0298f75828b428ac15302fa8129639f59a7bb 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -539,6 +539,9 @@ sub form_footer {
               </tr> |;
       }
     }
               </tr> |;
       }
     }

+
+#    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this
+

   } else {
     foreach my $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {
   } else {
     foreach my $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {


@@ -560,10 +563,6 @@ sub form_footer {
     }
   }
 
     }
   }
 

-  $form->{rounding} = $form->round_amount(
-    $form->round_amount($form->{invtotal}, 2, 1) - $form->round_amount($form->{invtotal}, 2)
-  );
-  $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1);

   $form->{oldinvtotal} = $form->{invtotal};
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
   $form->{oldinvtotal} = $form->{invtotal};
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();

diff --git a/locale/de/all b/locale/de/all
index 393f4412600d43202417b824f67381ee01849ae5..796aa9ca02ed1367eb99e74ec60dfd91d859c65f 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2320,9 +2320,6 @@ $self->{texts} = {
   'Risk'                        => 'Risiko',
   'Risk levels'                 => 'Risikograde',
   'Risks'                       => 'Risikograde',
   'Risk'                        => 'Risiko',
   'Risk levels'                 => 'Risikograde',
   'Risks'                       => 'Risikograde',

-  'Rounding'                    => 'Rundung',
-  'Rounding Gain'               => 'Rundungserträge',
-  'Rounding Loss'               => 'Rundungsaufwendungen',

   'Row'                         => 'Zeile',
   'Row #1: amount has to be different from zero.' => 'Zeile #1: Der Wert darf nicht 0 sein.',
   'Row number'                  => 'Zeilennummer',
   'Row'                         => 'Zeile',
   'Row #1: amount has to be different from zero.' => 'Zeile #1: Der Wert darf nicht 0 sein.',
   'Row number'                  => 'Zeilennummer',

diff --git a/locale/en/all b/locale/en/all
index e371413d77e2ff1eac39161c642e84b5ec5e36df..bf275f642068e412e32a431747e2c374a799f0c2 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -1787,9 +1787,6 @@ $self->{texts} = {
   'Revenues EU without UStId'   => '',
   'Review of Aging list'        => '',
   'Right'                       => '',
   'Revenues EU without UStId'   => '',
   'Review of Aging list'        => '',
   'Right'                       => '',

-  'Rounding'                    => '',
-  'Rounding Gain'               => '',
-  'Rounding Loss'               => '',

   'Row #1: amount has to be different from zero.' => '',
   'Row number'                  => '',
   'Row was created from current record' => '',
   'Row #1: amount has to be different from zero.' => '',
   'Row number'                  => '',
   'Row was created from current record' => '',

diff --git a/sql/Pg-upgrade2/defaults_add_rnd_accno_ids.sql b/sql/Pg-upgrade2/defaults_add_rnd_accno_ids.sql
deleted file mode 100644 (file)
index deee948..0000000
--- a/sql/Pg-upgrade2/defaults_add_rnd_accno_ids.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- @tag: defaults_add_rnd_accno_ids
--- @description: adds new columns 'rndgain_accno_id' and 'rndloss_accno_id' in table defaults, used to book roundings
--- @depends: release_3_1_0
-ALTER TABLE defaults ADD COLUMN rndgain_accno_id Integer;
-ALTER TABLE defaults ADD COLUMN rndloss_accno_id Integer;
-

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 12a284c25d6f88ecf9d7762a088a04bd23c931b2..2bcaa0d30c80bc0206611b6d40649a6feeba15f8 100644 (file)
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -27,8 +27,6 @@ $(function() {
 <input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
 <input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
 <input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
 <input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
 <input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
 <input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">

-<input type="hidden" name="rndgain_accno_id"   value="[% HTML.escape(rndgain_accno_id) %]">
-<input type="hidden" name="rndloss_accno_id"   value="[% HTML.escape(rndloss_accno_id) %]">

 
 <fieldset>
   <legend>
 
 <fieldset>
   <legend>

diff --git a/templates/webpages/client_config/_default_accounts.html b/templates/webpages/client_config/_default_accounts.html
index bb92517f266cc470e4ab5098d7a23844f38ec50b..51c9d2eedc1ae251992e0847148f6dc06509858d 100644 (file)
--- a/templates/webpages/client_config/_default_accounts.html
+++ b/templates/webpages/client_config/_default_accounts.html
@@ -30,16 +30,6 @@
    <td>[% L.chart_picker('defaults.fxloss_accno_id', SELF.defaults.fxloss_accno_id, category='E,A', choose=1, style=style) %]<td>
   </tr>
 
    <td>[% L.chart_picker('defaults.fxloss_accno_id', SELF.defaults.fxloss_accno_id, category='E,A', choose=1, style=style) %]<td>
   </tr>
 

-  <tr>
-   <td align="right">[% LxERP.t8("Rounding Gain") %]</td>
-   <td>[% L.chart_picker('defaults.rndgain_accno_id', SELF.defaults.rndgain_accno_id, category='I,A', choose=1, style=style) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">[% LxERP.t8("Rounding Loss") %]</td>
-   <td>[% L.chart_picker('defaults.rndloss_accno_id', SELF.defaults.rndloss_accno_id,  category='E,A', choose=1, style=style) %]</td>
-  </tr>
-

   <tr>
    <td align="right">[% LxERP.t8("Current assets account") %]</td>
    <td>[% L.chart_picker('defaults.ar_paid_accno_id', SELF.defaults.ar_paid_accno_id, type='AR_paid', choose=1, style=style) %]<td>
   <tr>
    <td align="right">[% LxERP.t8("Current assets account") %]</td>
    <td>[% L.chart_picker('defaults.ar_paid_accno_id', SELF.defaults.ar_paid_accno_id, type='AR_paid', choose=1, style=style) %]<td>

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 7980bcac443bf3136bcb65ad74509af78a10cc7a..d91527cf5efae4a4a67c95ac83b714d719540f6d 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -107,13 +107,6 @@
        </tr>
 [%- END %]
 
        </tr>
 [%- END %]
 

-[%- IF rounding %]
-        <tr>
-          <th align='right'>[% 'Rounding' | $T8 %]</th>
-          <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>
-        </tr>
-[%- END %]
-

 [%# tax %]
 [% FOREACH item = taxaccounts_array %]
 [% SET description_ref = item _ '_description' %]
 [%# tax %]
 [% FOREACH item = taxaccounts_array %]
 [% SET description_ref = item _ '_description' %]


@@ -131,6 +124,7 @@
        </tr>
   [%- END %]
 [%- END %]
        </tr>
   [%- END %]
 [%- END %]

+

         <tr>
          <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         <tr>
          <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index f9a8879c6db9d1f470e0b674c8a7ab2f9a45f75d..c84b85bba16ff05775356f5f3ec51e5999be8fb4 100644 (file)
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -162,8 +162,6 @@
           <td>
             <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
             <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
           <td>
             <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
             <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">

-            <input type="hidden" name="rndgain_accno" value="[% rndgain_accno %]">
-            <input type="hidden" name="rndloss_accno" value="[% rndloss_accno %]">

           </td>
         </tr>
 [%- IF show_exchangerate %]
           </td>
         </tr>
 [%- IF show_exchangerate %]

diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index fbeb52992a4fb86782db7f2b6e834cce75130129..0956f204f4d473009e3f05abd259998d62405b5f 100644 (file)
--- a/templates/webpages/oe/form_footer.html
+++ b/templates/webpages/oe/form_footer.html
@@ -107,12 +107,6 @@
                 <th align='right'>[% 'Subtotal' | $T8 %]</th>
                 <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
               </tr>
                 <th align='right'>[% 'Subtotal' | $T8 %]</th>
                 <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
               </tr>

-[%- END %]
-[%- IF rounding %]
-              <tr>
-                <th align='right'>[% 'Rounding' | $T8 %]</th>
-                <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>
-              </tr>

 [%- END %]
               [% tax %]
               <tr>
 [%- END %]
               [% tax %]
               <tr>