/[papo]/papo/forms/productProviderInvoice.neb
ViewVC logotype

Diff of /papo/forms/productProviderInvoice.neb

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

revision 1.30 by apronotti, Tue Jul 29 18:29:34 2003 UTC revision 1.31 by apronotti, Tue Jul 29 21:33:10 2003 UTC
# Line 568  Line 568 
568      </condition>      </condition>
569    </datasource>    </datasource>
570    
   <datasource name="alienIvaTaxItemDataSource" database="papo"  
     table="alien_item_tax">  
   </datasource>  
   
571    <datasource name="alienIvaNITaxDataSource" database="papo"    <datasource name="alienIvaNITaxDataSource" database="papo"
572      detaillink="alien_document_tax.alien_document" master="alienDocumentDataSource"      detaillink="alien_document_tax.alien_document" master="alienDocumentDataSource"
573      masterlink="id" table="alien_document_tax">      masterlink="id" table="alien_document_tax">
# Line 880  Line 876 
876      else:      else:
877        from gnue.common.GDataObjects import ConnectionError as DBError        from gnue.common.GDataObjects import ConnectionError as DBError
878        try:        try:
879            import hack
880    
881            alienIvaTaxBlock.alienIvaTaxAmountEntry = hack.a2f(alienDocumentBlock.taxTotalEntry)
882            alienIvaTaxBlock.alienIvaTaxedAmountEntry = hack.a2f(alienDocumentBlock.netTotalEntry,2)
883    
884          postChangeAdvance = 0          postChangeAdvance = 0
885          alienDocumentBlock.ownEntityIdEntry  = str(ownPosBlock.ownPosEntityIdEntry)          alienDocumentBlock.ownEntityIdEntry  = str(ownPosBlock.ownPosEntityIdEntry)
886          alienDocumentBlock.postChanges()          alienDocumentBlock.postChanges()
887    
         otherTaxBlock.postChanges()  
           
888          postChangeAdvance = 1          postChangeAdvance = 1
889          proceedingBlock.clear()          proceedingBlock.clear()
890          proceedingBlock.dateEntry = proceedingDataSource.getTimeStamp()          proceedingBlock.dateEntry = proceedingDataSource.getTimeStamp()
# Line 1811  Line 1810 
1810           hidden="" default="0.00"/>           hidden="" default="0.00"/>
1811          <entry name="otherTaxIdEntry" field="alien_document_tax.tax" readonly="" x="47" y="22" width="12" hidden="" default="3"/>          <entry name="otherTaxIdEntry" field="alien_document_tax.tax" readonly="" x="47" y="22" width="12" hidden="" default="3"/>
1812        </block>        </block>
1813          <block name="alienIvaTaxBlock" datasource="alienIvaTaxDataSource" restrictInsert="">
1814            <entry name="alienIvaTaxAmountEntry" field="alien_document_tax.amount" x="47" y="22" width="12" hidden=""/>
1815            <entry name="alienIvaTaxedAmountEntry" field="alien_document_tax.taxed_amount" x="47" y="22" width="12" hidden=""/>
1816            <entry name="alienTaxIdEntry" field="alien_document_tax.tax" readonly="" x="47" y="22" width="12" hidden="" default="1"/>
1817          </block>
1818    
1819  <!-- \/\/\/\/ Estos bloques los hice con la idea de grabar los totales -->  <!-- \/\/\/\/ Estos bloques los hice con la idea de grabar los totales -->
1820    
 <!--       <block name="alienIvaTaxBlock" datasource="alienIvaTaxDataSource" restrictInsert=""> -->  
 <!--         <entry name="alienIvaTaxAmountEntry" field="alien_document_tax.amount" x="47" y="22" width="12" hidden=""/> -->  
 <!--         <entry name="alienIvaTaxedAmountEntry" field="alien_document_tax.taxed_amount" x="47" y="22" width="12" hidden=""/> -->  
 <!--       </block> -->  
1821  <!--       <block name="alienIvaNITaxBlock" datasource="alienIvaNITaxDataSource" restrictInsert=""> -->  <!--       <block name="alienIvaNITaxBlock" datasource="alienIvaNITaxDataSource" restrictInsert=""> -->
1822  <!--         <entry name="alienIvaNITaxAmountEntry" field="alien_document_tax.amount" x="47" y="22" width="12" hidden=""/> -->  <!--         <entry name="alienIvaNITaxAmountEntry" field="alien_document_tax.amount" x="47" y="22" width="12" hidden=""/> -->
1823  <!--         <entry name="alienIvaNITaxedAmountEntry" field="alien_document_tax.taxed_amount" x="47" y="22" width="12" hidden=""/> -->  <!--         <entry name="alienIvaNITaxedAmountEntry" field="alien_document_tax.taxed_amount" x="47" y="22" width="12" hidden=""/> -->

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31

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