Aenderungen fuer Bug 1004 - Verschoenerungen an der Erzeugnismaske im Bereich Einzelw...

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 710d1ec..378b94b 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1604,11 +1604,11 @@ sub assembly_row {
     . $locale->text('Part Number')
     . qq|</th>|;
   $column_header{description} =
-    qq|<th nowrap width=50%>| . $locale->text('Part Description') . qq|</th>|;
+    qq|<th nowrap width=50% align="left">| . $locale->text('Part Description') . qq|</th>|;
   $column_header{lastcost} =
-    qq|<th nowrap width=50%>| . $locale->text('Purchase Price') . qq|</th>|;
+    qq|<th nowrap width=50%>| . $locale->text('Purchase Prices') . qq|</th>|;
   $column_header{total} =
-    qq|<th align=right nowrap>| . $locale->text('Extended') . qq|</th>|;
+    qq|<th align=right nowrap>| . $locale->text('Sale Prices') . qq|</th>|;
   $column_header{bom}        = qq|<th>| . $locale->text('BOM') . qq|</th>|;
   $column_header{partsgroup} = qq|<th>| . $locale->text('Group') . qq|</th>|;
 
@@ -1632,9 +1632,9 @@ sub assembly_row {
     $form->{"partnumber_$i"} =~ s/\"/&quot;/g;
 
     $linetotal =
-      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2);
+      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4);
     $line_purchase_price  =
-      $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2); #lastcost == purchase_price | ungenaue datenbankfeld-übersetzung
+      $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4); #lastcost == purchase_price | ungenaue datenbankfeld-uebersetzung
     $form->{assemblytotal} += $linetotal;
     $form->{assembly_purchase_price_total}  += $line_purchase_price;
 
@@ -1725,6 +1725,16 @@ sub assembly_row {
   }
 
   print qq|
+       <tr>
+         <td colspan="6"></td>
+         <td>| . $locale->text('Totals') . qq|</td>
+          <td align="right">| . $form->format_amount(\%myconfig, $form->{assembly_purchase_price_total}, 2) .
+       qq|</td>        
+        <td align="right">| . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2) .
+       qq|  </td>
+         </tr>
+          <input type="hidden" name="assembly_rows" value="| . $form->{assembly_rows} . 
+      qq|">
       </table>
     </td>
   </tr>

diff --git a/locale/de/all b/locale/de/all
index f0ff96b..cacd907 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1193,6 +1193,7 @@ $self->{texts} = {
   'Purchase Order'              => 'Lieferantenauftrag',
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Purchase Price'              => 'Einkaufspreis',
+  'Purchase Prices'             => 'Einkaufspreise',
   'Purchase invoices'           => 'Einkaufsrechnungen',
   'Qty'                         => 'Menge',
   'Qty according to delivery order' => 'Menge laut Lieferschein',
@@ -1268,6 +1269,7 @@ $self->{texts} = {
   'Saldo Debit'                 => 'Saldo Soll',
   'Saldo neu'                   => 'Saldo neu',
   'Saldo per'                   => 'Saldo per',
+  'Sale Prices'                 => 'Verkaufspreise',
   'Sales Invoice'               => 'Rechnung',
   'Sales Invoices'              => 'Kundenrechnung',
   'Sales Order'                 => 'Kundenauftrag',
@@ -1603,6 +1605,7 @@ $self->{texts} = {
   'Total'                       => 'Summe',
   'Total Fees'                  => 'Kumulierte Gebühren',
   'Total stock value'           => 'Gesamter Bestandswert',
+  'Totals'                      => 'Summen',
   'Trade Discount'              => 'Rabatt',
   'Trans Id'                    => 'Trans-ID',
   'Trans Type'                  => 'Transfertyp',

diff --git a/locale/de/ic b/locale/de/ic
index d6ded51..1d9d8a3 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -226,7 +226,7 @@ $self->{texts} = {
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
   'Purchase Order'              => 'Lieferantenauftrag',
-  'Purchase Price'              => 'Einkaufspreis',
+  'Purchase Prices'             => 'Einkaufspreise',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
   'Quotation'                   => 'Angebot',
@@ -245,6 +245,7 @@ $self->{texts} = {
   'SAVED'                       => 'Gespeichert',
   'SAVED FOR DUNNING'           => 'Gespeichert',
   'SCREENED'                    => 'Angezeigt',
+  'Sale Prices'                 => 'Verkaufspreise',
   'Sales Invoice'               => 'Rechnung',
   'Sales Order'                 => 'Kundenauftrag',
   'Sales quotation'             => 'Angebot',
@@ -289,6 +290,7 @@ $self->{texts} = {
   'To (time)'                   => 'Bis',
   'Top 100'                     => 'Top 100',
   'Top 100 hinzufuegen'         => 'Top 100 hinzufügen',
+  'Totals'                      => 'Summen',
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
   'Transfer To Stock'           => 'Lagereingang',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',

diff --git a/templates/webpages/ic/form_footer_de.html b/templates/webpages/ic/form_footer_de.html
index 03bc7a4..ebc888a 100644 (file)
--- a/templates/webpages/ic/form_footer_de.html
+++ b/templates/webpages/ic/form_footer_de.html
@@ -1,7 +1,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
   [%- IF item == 'assembly' %]
-  <tr>
+  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
+  <!-- tr>
     <td>
       <table border="0" width="100%">
         <tr>
@@ -11,7 +12,7 @@
       </table>
     </td>
   </tr>
-  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]">
+  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
   [%- END %]
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">

diff --git a/templates/webpages/ic/form_footer_master.html b/templates/webpages/ic/form_footer_master.html
index d69694f..be62104 100644 (file)
--- a/templates/webpages/ic/form_footer_master.html
+++ b/templates/webpages/ic/form_footer_master.html
@@ -1,7 +1,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
   [%- IF item == 'assembly' %]
-  <tr>
+  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
+  <!-- tr>
     <td>
       <table border="0" width="100%">
         <tr>
@@ -11,7 +12,7 @@
       </table>
     </td>
   </tr>
-  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]">
+  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
   [%- END %]
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">