/[papo]/papo/forms/ctaCteClient.gfd
ViewVC logotype

Diff of /papo/forms/ctaCteClient.gfd

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

revision 1.6 by styxman, Tue Apr 15 20:19:09 2003 UTC revision 1.7 by styxman, Thu Apr 17 16:54:57 2003 UTC
# Line 63  Line 63 
63    <!-- Origen de datos que srive para calcular el total facturado -->    <!-- Origen de datos que srive para calcular el total facturado -->
64    
65    <datasource name="productInvoiceDataSource" database="papo"    <datasource name="productInvoiceDataSource" database="papo"
66                table="_entity_data, own_document, own_item, own_product_invoice_item, _price_data, own_item_tax"                table="_entity_data, own_document, own_item, own_product_item, _price_data, own_item_tax"
67                order_by="own_product_invoice_item.id">                order_by="own_product_item.id">
68      <condition>      <condition>
69        <and>        <and>
70          <eq>          <eq>
# Line 78  Line 78 
78          </eq>          </eq>
79          <eq>          <eq>
80            <cfield name="own_item.id"/>            <cfield name="own_item.id"/>
81            <cfield name="own_product_invoice_item.own_item"/>            <cfield name="own_product_item.own_item"/>
82          </eq>          </eq>
83          <eq>          <eq>
84            <cfield name="own_product_invoice_item.price"/>            <cfield name="own_product_item.price"/>
85            <cfield name="_price_data.id"/>            <cfield name="_price_data.id"/>
86          </eq>          </eq>
87          <eq>          <eq>
# Line 161  Line 161 
161    
162     <datasource  name="ownItemDataSource" database="papo" detaillink="own_item.own_document"     <datasource  name="ownItemDataSource" database="papo" detaillink="own_item.own_document"
163       master="ownDocumentDataSource" masterlink="id"       master="ownDocumentDataSource" masterlink="id"
164       table="own_item, own_product_invoice_item, own_item_tax">       table="own_item, own_product_item, own_item_tax">
165      <condition>      <condition>
166        <and>        <and>
167          <eq>          <eq>
168            <cfield name="own_item.id"/>            <cfield name="own_item.id"/>
169            <cfield name="own_product_invoice_item.own_item"/>            <cfield name="own_product_item.own_item"/>
170          </eq>          </eq>
171           <eq>           <eq>
172             <cfield name="own_item.id"/>             <cfield name="own_item.id"/>
# Line 231  if str(ownDocumentBlock.clientRecipientB Line 231  if str(ownDocumentBlock.clientRecipientB
231          invoiceToPayedBlock.invoiceBox.dateEntry = str(productInvoiceResultSet.current.getField("own_document.date"))          invoiceToPayedBlock.invoiceBox.dateEntry = str(productInvoiceResultSet.current.getField("own_document.date"))
232    
233          while productInvoiceResultSet.current.getField("own_document.id") == currOwnDoc and more:          while productInvoiceResultSet.current.getField("own_document.id") == currOwnDoc and more:
234              lQty = hack.a2f(productInvoiceResultSet.current.getField("own_product_invoice_item.qty"))              lQty = hack.a2f(productInvoiceResultSet.current.getField("own_product_item.qty"))
235              lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("_price_data.unit_price"))              lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("_price_data.unit_price"))
236              lBonus = hack.a2f(productInvoiceResultSet.current.getField("own_item.bonus"))              lBonus = hack.a2f(productInvoiceResultSet.current.getField("own_item.bonus"))
237              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("own_item.discount"))              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("own_item.discount"))
# Line 312  if str(ownDocumentBlock.clientRecipientB Line 312  if str(ownDocumentBlock.clientRecipientB
312          line += printField(productInvoiceResultSet.current.getField("own_document.date"),15)          line += printField(productInvoiceResultSet.current.getField("own_document.date"),15)
313    
314          while productInvoiceResultSet.current.getField("own_document.id") == currOwnDoc and more:          while productInvoiceResultSet.current.getField("own_document.id") == currOwnDoc and more:
315              lQty = hack.a2f(productInvoiceResultSet.current.getField("own_product_invoice_item.qty"))              lQty = hack.a2f(productInvoiceResultSet.current.getField("own_product_item.qty"))
316              lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("_price_data.unit_price"))              lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("_price_data.unit_price"))
317              lBonus = hack.a2f(productInvoiceResultSet.current.getField("own_item.bonus"))              lBonus = hack.a2f(productInvoiceResultSet.current.getField("own_item.bonus"))
318              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("own_item.discount"))              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("own_item.discount"))

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

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