Zbiór zmian 259

Data:

2009-01-28 14:27:17 (17 years ago)

Autor:

marek

Opis:

fixes #67

Lokalizacja:

trunk/BazaReklam/Raporty

Pliki:

• fakturaKatowicePoznan.rdlc (zmodyfikowane) (2 diffs)
• fakturaReversed2.rdlc (zmodyfikowane) (2 diffs)

trunk/BazaReklam/Raporty/fakturaKatowicePoznan.rdlc

@@ -2540 +2540 @@
                           <ZIndex>16</ZIndex>
                           <CanGrow>true</CanGrow>
-                          <Value>=iif(IsNothing(First(Fields!waluta_miano.Value, "Faktura")),Sum(Fields!BRUTTO.Value, "FakturaDetails2"),Sum(Fields!NETTO.Value, "FakturaDetails2"))</Value>
+                          <Value>=iif(IsNothing(First(Fields!waluta_miano.Value, "Faktura")),Sum(Fields!NETTO.Value * (1+Fields!S_VAT.Value), "FakturaDetails2"),Sum(Fields!NETTO.Value, "FakturaDetails2"))</Value>
                         </Textbox>
                       </ReportItems>
@@ -3640 +3640 @@
                           <ZIndex>56</ZIndex>
                           <CanGrow>true</CanGrow>
-                          <Value>=iif(First(Fields!S_VAT.Value, "FakturaDetails2")&lt;&gt;0,Sum(Fields!BRUTTO.Value, "FakturaDetails2"),0)</Value>
+                          <Value>=iif(First(Fields!S_VAT.Value, "FakturaDetails2")&lt;&gt;0,Sum(Fields!NETTO.Value * (1+Fields!S_VAT.Value), "FakturaDetails2"),0)</Value>
                         </Textbox>
                       </ReportItems>

trunk/BazaReklam/Raporty/fakturaReversed2.rdlc

@@ -2540 +2540 @@
                           <ZIndex>16</ZIndex>
                           <CanGrow>true</CanGrow>
-                          <Value>=iif(IsNothing(First(Fields!waluta_miano.Value, "Faktura")),Sum(Fields!BRUTTO.Value, "FakturaDetails2"),Sum(Fields!NETTO.Value, "FakturaDetails2"))</Value>
+                          <Value>=iif(IsNothing(First(Fields!waluta_miano.Value, "Faktura")),Sum(Fields!NETTO.Value * (1+Fields!S_VAT.Value), "FakturaDetails2"),Sum(Fields!NETTO.Value, "FakturaDetails2"))</Value>
                         </Textbox>
                       </ReportItems>
@@ -3640 +3640 @@
                           <ZIndex>56</ZIndex>
                           <CanGrow>true</CanGrow>
-                          <Value>=iif(First(Fields!S_VAT.Value, "FakturaDetails2")&lt;&gt;0,Sum(Fields!BRUTTO.Value, "FakturaDetails2"),0)</Value>
+                          <Value>=iif(First(Fields!S_VAT.Value, "FakturaDetails2")&lt;&gt;0,Sum(Fields!NETTO.Value * (1+Fields!S_VAT.Value), "FakturaDetails2"),0)</Value>
                         </Textbox>
                       </ReportItems>