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

Diff of /papo/forms/payOrder.gfd

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

revision 1.4 by charlie, Fri Dec 6 19:23:04 2002 UTC revision 1.5 by apronotti, Wed Dec 11 22:14:43 2002 UTC
# Line 153  Line 153 
153            </or>            </or>
154          </and>          </and>
155        </and>        </and>
      </and>  
156      </condition>      </condition>
157    </datasource>    </datasource>
158    
# Line 220  if str(alienDocumentSearchBlock.provider Line 219  if str(alienDocumentSearchBlock.provider
219              itemTaxTotal = 0                      itemTaxTotal = 0        
220              currItem = productInvoiceResultSet.current.getField("alien_item.id")              currItem = productInvoiceResultSet.current.getField("alien_item.id")
221              while productInvoiceResultSet.current.getField("alien_item.id") == currItem and more:              while productInvoiceResultSet.current.getField("alien_item.id") == currItem and more:
222                  itemTaxTotal += item * (hack.a2f(productInvoiceResultSet.current.getField("alien_item_tax.amount"))/100)                  itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("alien_item_tax.amount"))
223                  more = productInvoiceResultSet.nextRecord()                  more = productInvoiceResultSet.nextRecord()
224              invoiceTotal += item + itemTaxTotal              invoiceTotal += item + itemTaxTotal
225          odt_rs = invTaxTotDataSource.createResultSet({"alien_document.id":currAlienDoc})          odt_rs = invTaxTotDataSource.createResultSet({"alien_document.id":currAlienDoc})
# Line 252  if str(alienDocumentSearchBlock.provider Line 251  if str(alienDocumentSearchBlock.provider
251              itemTaxTotal = 0                      itemTaxTotal = 0        
252              currItem = serviceInvoiceResultSet.current.getField("alien_item.id")              currItem = serviceInvoiceResultSet.current.getField("alien_item.id")
253              while serviceInvoiceResultSet.current.getField("alien_item.id") == currItem and more:              while serviceInvoiceResultSet.current.getField("alien_item.id") == currItem and more:
254                  itemTaxTotal += item * (hack.a2f(serviceInvoiceResultSet.current.getField("alien_item_tax.amount"))/100)                  itemTaxTotal += hack.a2f(serviceInvoiceResultSet.current.getField("alien_item_tax.amount"))
255                  more = serviceInvoiceResultSet.nextRecord()                  more = serviceInvoiceResultSet.nextRecord()
256              invoiceTotal += item + itemTaxTotal              invoiceTotal += item + itemTaxTotal
257          odt_rs = invTaxTotDataSource.createResultSet({"alien_document.id":currAlienDoc})          odt_rs = invTaxTotDataSource.createResultSet({"alien_document.id":currAlienDoc})

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

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