/[papo]/papo/report/productInvoice-4_and_half.grd
ViewVC logotype

Diff of /papo/report/productInvoice-4_and_half.grd

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3 by mhepp, Mon Jul 7 22:18:24 2003 UTC revision 1.4 by mhepp, Thu Jul 24 17:03:21 2003 UTC
# Line 119  Line 119 
119        </condition>        </condition>
120      </datasource>      </datasource>
121    
122      <datasource name="invoiceItemsDataSource" database="papo" table="own_document, own_item, own_product_item, own_item_tax,      <datasource name="invoiceItemsDataSource" database="papo"
123                                                                       _price_data, _product_data"        table="own_document, own_item, own_product_item, own_item_tax as
124        master="productInvoicesDataSource" masterlink="own_document.id" detaillink="own_item.own_document">   iva_tax,own_item_tax as iva_rni_tax,
125     _price_data, _product_data" master="productInvoicesDataSource" masterlink="own_document.id" detaillink="own_item.own_document">
126        <condition>        <condition>
127          <and>          <and>
128            <eq>            <eq>
# Line 134  Line 135 
135            </eq>            </eq>
136            <eq>            <eq>
137              <cfield name="own_item.id"/>              <cfield name="own_item.id"/>
138              <cfield name="own_item_tax.own_item"/>              <cfield name="iva_tax.own_item"/>
139              </eq>
140              <eq>
141                <cfield name="iva_tax.tax"/>
142                <cconst value="1"/> <!-- IVA -->
143              </eq>
144              <eq>
145                <cfield name="own_item.id"/>
146                <cfield name="iva_rni_tax.own_item"/>
147              </eq>
148              <eq>
149                <cfield name="iva_rni_tax.tax"/>
150                <cconst value="2"/> <!-- IVA RNI-->
151            </eq>            </eq>
152            <eq>            <eq>
153              <cfield name="_price_data.id"/>              <cfield name="_price_data.id"/>
# Line 188  Line 201 
201                  <out:col><field name="_product_data.canonical_name"/></out:col>                  <out:col><field name="_product_data.canonical_name"/></out:col>
202                  <out:col><field name="own_product_item.unit_price"/></out:col>                  <out:col><field name="own_product_item.unit_price"/></out:col>
203                  <out:col><field name="own_product_item.qty*own_product_item.unit_price"/></out:col>                  <out:col><field name="own_product_item.qty*own_product_item.unit_price"/></out:col>
204                  <out:col><field name="round(own_item_tax.amount*2/3,2)"/></out:col>                  <out:col><field name="round(iva_tax.amount,2)"/></out:col>
205                  <out:col><field name="round(own_item_tax.amount/3,2)"/></out:col>                  <out:col><field name="round(iva_rni_tax.amount,2)"/></out:col>
206                  <out:col><field name="round (own_product_item.unit_price*own_product_item.qty+own_item_tax.amount, 2)"/></out:col>                  <out:col><field name="round (own_product_item.unit_price*own_product_item.qty+iva_tax.amount, 2)"/></out:col>
207                </out:row>                </out:row>
208              </section>              </section>
209    
210              <out:row type="subtotal" level="2">              <out:row type="subtotal" level="2">
211                <out:col><summ function="sum" section="detalles" field="own_product_item.qty*own_product_item.unit_price"/></out:col>                <out:col><summ function="sum" section="detalles" field="own_product_item.qty*own_product_item.unit_price"/></out:col>
212                <out:col><summ function="sum" section="detalles" field="round(own_item_tax.amount*2/3,2)"/></out:col>                <out:col><summ function="sum" section="detalles" field="round(iva_tax.amount,2)"/></out:col>
213                <out:col><summ function="sum" section="detalles" field="round(own_item_tax.amount/3,2)"/></out:col>                <out:col><summ function="sum" section="detalles" field="round(iva_rni_tax.amount,2)"/></out:col>
214                <out:col><summ function="sum"                <out:col><summ function="sum"
215                section="detalles" field="round (own_product_item.unit_price* own_product_item.qty + own_item_tax.amount, 2)"/></out:col>                section="detalles" field="round (own_product_item.unit_price* own_product_item.qty + iva_tax.amount, 2)"/></out:col>
216              </out:row>              </out:row>
217            </section>            </section>
218          </out:table>          </out:table>

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26