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

Diff of /papo/forms/receipt.gfd

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

revision 1.8 by charlie, Fri Dec 6 19:23:04 2002 UTC revision 1.9 by apronotti, Wed Dec 11 22:14:43 2002 UTC
# Line 161  Line 161 
161            </or>            </or>
162          </and>          </and>
163        </and>        </and>
      </and>  
164      </condition>      </condition>
165    </datasource>    </datasource>
166    
# Line 249  if str(ownDocumentBlock.clientRecipientB Line 248  if str(ownDocumentBlock.clientRecipientB
248              itemTaxTotal = 0                      itemTaxTotal = 0        
249              currItem = productInvoiceResultSet.current.getField("own_item.id")              currItem = productInvoiceResultSet.current.getField("own_item.id")
250              while productInvoiceResultSet.current.getField("own_item.id") == currItem and more:              while productInvoiceResultSet.current.getField("own_item.id") == currItem and more:
251                  itemTaxTotal += item * (hack.a2f(productInvoiceResultSet.current.getField("own_item_tax.amount"))/100)                  itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("own_item_tax.amount"))
252                  more = productInvoiceResultSet.nextRecord()                  more = productInvoiceResultSet.nextRecord()
253              invoiceTotal += item + itemTaxTotal              invoiceTotal += item + itemTaxTotal
254          odt_rs = invTaxTotDataSource.createResultSet({"own_document.id":currOwnDoc})          odt_rs = invTaxTotDataSource.createResultSet({"own_document.id":currOwnDoc})
# Line 280  if str(ownDocumentBlock.clientRecipientB Line 279  if str(ownDocumentBlock.clientRecipientB
279              currentItem= serviceInvoiceResultSet.current.getField ("own_item.id")              currentItem= serviceInvoiceResultSet.current.getField ("own_item.id")
280              itemTaxTotal = 0                      itemTaxTotal = 0        
281              while serviceInvoiceResultSet.current.getField ("own_item.id") == currentItem and more:              while serviceInvoiceResultSet.current.getField ("own_item.id") == currentItem and more:
282                  taxAmount = hack.a2f(serviceInvoiceResultSet.current.getField ("own_item_tax.amount"))                  itemTaxTotal += hack.a2f(serviceInvoiceResultSet.current.getField ("own_item_tax.amount"))
                 itemTaxTotal += round(item * (taxAmount/100), 2)  
283                  more = serviceInvoiceResultSet.nextRecord ()                  more = serviceInvoiceResultSet.nextRecord ()
284              invoiceTotal += item + itemTaxTotal              invoiceTotal += item + itemTaxTotal
285                                            

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9

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