wip deposit shows net value

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

@@ -13,12 +13,22 @@
     /
   = number_to_currency(order_article.total_price, :unit => "")
 %td
-  = number_to_currency(order_article.price.gross_price, :unit => "")
+  - if  FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
+    = number_to_currency(order_article.price.gross_price_without_deposit, :unit => "")
+    :plain
+      /
+    = number_to_currency(order_article.total_gross_price_without_deposit, :unit => "")
+  -else
+    = number_to_currency(order_article.price.gross_price, :unit => "")
+    :plain
+      /
+    = number_to_currency(order_article.total_gross_price, :unit => "")
+%td= number_to_percentage(order_article.price.tax) unless order_article.price.tax.zero?
+%td
+  = number_to_currency(order_article.price.deposit, :unit => "") unless order_article.price.deposit.zero?
   :plain
     /
-  = number_to_currency(order_article.total_gross_price, :unit => "")
-%td= number_to_percentage(order_article.price.tax) unless order_article.price.tax.zero?
-%td= number_to_currency(order_article.price.deposit, :unit => "") unless order_article.price.deposit.zero?
+  = number_to_currency(order_article.total_deposit_price, :unit => "") unless order_article.price.deposit.zero?
 %td
   = link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true,
     class: 'btn btn-mini' unless order_article.order.closed?

app/views/finance/balancing/_summary.haml

@@ -6,22 +6,26 @@
     %tr
       %td= t('.net_amount')
       %td.numeric= number_to_currency(order.sum(:net))
-    %tr
-      %td= t('.gross_amount')
-      %td.numeric= number_to_currency(order.sum(:gross))
-    %tr
-      %td= t('.fc_amount')
-      %td.numeric= number_to_currency(order.sum(:fc))
     - if FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
+      %tr
+        %td= t('.gross_amount')
+        %td.numeric= number_to_currency(order.sum(:gross_without_deposit))
       %tr
         %td= t('.deposit')
         %td.numeric= number_to_currency(order.sum(:deposit))
       %tr
-        %td= t('.gross_deposit')
-        %td.numeric= number_to_currency(order.sum(:gross_deposit))
+        %td= t('.net_deposit')
+        %td.numeric= number_to_currency(order.sum(:net_deposit))
       %tr
         %td= t('.fc_deposit')
         %td.numeric= number_to_currency(order.sum(:fc_deposit))
+    - else
+      %tr
+        %td= t('.gross_amount')
+        %td.numeric= number_to_currency(order.sum(:gross))
+    %tr
+      %td= t('.fc_amount')
+      %td.numeric= number_to_currency(order.sum(:fc))
     %tr
       %td= t('.groups_amount')
       %td.numeric= number_to_currency(order.sum(:groups))

app/views/orders/_articles.html.haml

@@ -6,6 +6,8 @@
       %th= t '.prices'
       - if order.stockit?
         %th= t '.units_ordered'
+      - if FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
+        %th= t '.deposit'
       - else
         %th= 'Members'
         %th= t '.units_full'
@@ -19,7 +21,10 @@
         %td{:colspan => "9"}
       - order_articles.each do |order_article|
         - net_price = order_article.price.price
-        - gross_price = order_article.price.gross_price
+        - if FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
+          - gross_price = order_article.price.gross_price_without_deposit
+        - else
+          - gross_price = order_article.price.gross_price
         - unit_quantity = order_article.price.unit_quantity
         - units = order_article.units
         - total_net += units * unit_quantity * net_price
@@ -28,6 +33,8 @@
           %td.name=h order_article.article.name
           %td= order_article.article.unit
           %td= "#{number_to_currency(net_price)} / #{number_to_currency(gross_price)}"
+          - if FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
+            %td= "#{number_to_currency(order_article.price.deposit)}"
           - if order.stockit?
             %td= units
           - else