app/views/finance/balancing/_order_article.html.haml

@@ -1,7 +1,6 @@
 %td.closed.name
   = link_to order_article.article.name, '#', 'data-toggle-this' => "#group_order_articles_#{order_article.id}"
 %td= order_article.article.order_number
--# :plain => true destroys deface functionality
 %td{title: units_history_line(order_article, :plain => true)}
   = order_article.units
   = pkg_helper order_article.article_price

app/views/finance/balancing/_results.html.haml

@@ -1,3 +1,2 @@
 %section#results
-  = render 'edit_results_by_articles'
+  = render 'edit_results_by_articles'
-  

app/views/finance/balancing/_summary.haml

@@ -10,7 +10,7 @@
       %td= t('.gross_amount')
       %td.numeric= number_to_currency(order.sum(:gross))
     %tr
-      %td= t('.fc_amount')
+      %td= t('.fc_amount_total')
       %td.numeric= number_to_currency(order.sum(:fc))
     %tr
       %td= t('.groups_amount')

config/locales/de.yml

@@ -860,8 +860,7 @@ de:
       summary:
         changed: Daten wurden verändert!
         duration: von %{starts} bis %{ends}
-        fc_amount: 'FC-Gesamtbetrag:'
+        fc_amount: 'FC-Betrag:'
-        fc_amount_without_deposit: 'FC-Betrag (ohne Pfand):'
         fc_profit: FC Gewinn
         gross_amount: 'Bruttobetrag:'
         groups_amount: 'Gruppenbeträge:'

plugins/automatic_invoices/app/overrides/finance/balancing/_summary/replace_gross_amount.html.haml.deface

@@ -4,7 +4,7 @@
     %td= t('.gross_amount')
     %td.numeric= number_to_currency(order.sum(:gross_without_deposit))
   %tr
-    %td= t('.fc_amount_without_deposit')
+    %td= t('.fc_amount')
     %td.numeric= number_to_currency(order.sum(:fc_without_deposit))
   %tr
     %td= t('.deposit')

plugins/automatic_invoices/app/overrides/helpers/finance/balancing_helper_override.rb

@@ -1,15 +0,0 @@
-if FoodsoftAutomaticInvoices.enabled?
-  Finance::BalancingHelper.class_eval do
-    def balancing_view_partial
-      view = params[:view] || 'edit_results'
-      case view
-      when 'edit_results'
-        'edit_results_by_articles_override'
-      when 'groups_overview'
-        'shared/articles_by/groups'
-      when 'articles_overview'
-        'shared/articles_by/articles'
-      end
-    end
-  end
-end

plugins/automatic_invoices/app/overrides/orders/_articles/insert_deposit_changes.html.haml.deface

@@ -1,4 +1,4 @@
-/ insert_before 'erb:contains("t \'.prices\'")'
+/ insert_before 'erb:contains("order.stockit?")'
 - if FoodsoftAutomaticInvoices.enabled?
   - if FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
     %th= t '.deposit'

plugins/automatic_invoices/app/views/finance/balancing/_edit_results_by_articles_override.html.haml

@@ -1,4 +1,3 @@
--# :javascript destroy deface functionality 
 - content_for :javascript do
   :javascript
     $(function() {