/[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.33 by apronotti, Thu Jul 31 21:50:27 2003 UTC revision 1.34 by apronotti, Wed Aug 6 19:29:40 2003 UTC
# Line 568  Line 568 
568      </condition>      </condition>
569    </datasource>    </datasource>
570    
   <datasource name="alienIvaNITaxDataSource" database="papo"  
     detaillink="alien_document_tax.alien_document" master="alienDocumentDataSource"  
     masterlink="id" table="alien_document_tax">  
     <condition>  
       <eq>  
         <cfield name="alien_document_tax.tax"/>  
         <cconst value="2"/>  
       </eq>  
     </condition>  
   </datasource>  
   
571  <!--   <datasource database="papo" name="alienDocumentShowDataSource" -->  <!--   <datasource database="papo" name="alienDocumentShowDataSource" -->
572  <!--     table="alien_document, _entity_data as provider, _entity_data as transport" -->  <!--     table="alien_document, _entity_data as provider, _entity_data as transport" -->
573  <!--     order_by="date"> -->  <!--     order_by="date"> -->
# Line 634  Line 623 
623    <datasource database="papo" name="alienDocumentTaxShowDataSource"    <datasource database="papo" name="alienDocumentTaxShowDataSource"
624      table="alien_document_tax"/>      table="alien_document_tax"/>
625    
626      <datasource database="papo" name="alienDocumentIvaShowDataSource"
627        detaillink="alien_document_tax.alien_document" master="alienDocumentShowDataSource"
628        masterlink="id" table="alien_document_tax">
629        <condition>
630          <eq>
631            <cfield name="alien_document_tax.tax"/>
632            <cconst value="1"/>
633          </eq>
634        </condition>
635      </datasource>
636    
637    <datasource name="alienOtherTaxShowDataSource" database="papo"    <datasource name="alienOtherTaxShowDataSource" database="papo"
638      detaillink="alien_document_tax.alien_document" master="alienDocumentShowDataSource"      detaillink="alien_document_tax.alien_document" master="alienDocumentShowDataSource"
639      masterlink="id" table="alien_document_tax">      masterlink="id" table="alien_document_tax">
# Line 885  Line 885 
885        try:        try:
886          import hack          import hack
887    
888          alienIvaTaxBlock.alienIvaTaxAmountEntry = hack.a2f(alienDocumentBlock.taxTotalEntry)          alienIvaTaxBlock.alienIvaTaxAmountEntry = hack.a2f(alienDocumentBlock.ivaTotalEntry,2)
889          alienIvaTaxBlock.alienIvaTaxedAmountEntry = hack.a2f(alienDocumentBlock.netTotalEntry,2)          alienIvaTaxBlock.alienIvaTaxedAmountEntry = hack.a2f(alienDocumentBlock.netTotalEntry,2)
890    
891          postChangeAdvance = 0          postChangeAdvance = 0
# Line 1058  Line 1058 
1058       #alienItemShowBlock.firstRecord()       #alienItemShowBlock.firstRecord()
1059    
1060       totalShowBlock.totalEntry = hack.a2f(totalShowBlock.netoEntry,2) + \       totalShowBlock.totalEntry = hack.a2f(totalShowBlock.netoEntry,2) + \
1061                                   hack.a2f(totalShowBlock.ivaEntry,2)+hack.a2f(otherTaxShowBlock.otherTaxAmountEntry,2)                                   hack.a2f(ivaTotalShowBlock.ivaEntry,2)+hack.a2f(otherTaxShowBlock.otherTaxAmountEntry,2)
1062     else:     else:
1063       totalShowBlock.clear()       totalShowBlock.clear()
1064    </trigger>    </trigger>
# Line 1104  Line 1104 
1104    
1105        alienItemBlock.jumpRecord(index)        alienItemBlock.jumpRecord(index)
1106        alienItemBlock.itemNetoEntry = lItemPrice        alienItemBlock.itemNetoEntry = lItemPrice
1107        alienItemBlock.taxAmountEntry = round((lItemPrice * hack.a2f(alienItemBlock.taxPercentEntry,)/100),2)        alienItemBlock.taxAmountEntry = round((lItemPrice * hack.a2f(alienItemBlock.taxPercentEntry,4)/100),2)
1108        alienItemBlock.itemTotalEntry = round(lItemPrice + hack.a2f(alienItemBlock.taxAmountEntry,2),2)        alienItemBlock.itemTotalEntry = round(lItemPrice + hack.a2f(alienItemBlock.taxAmountEntry,2),2)
1109    
1110        lTTax += hack.a2f(lRecord.getField("alien_item_tax.amount"),2)        lTTax += hack.a2f(lRecord.getField("alien_item_tax.amount"),2)
# Line 1113  Line 1113 
1113        #sum += lQty * lUnitPrice + lTax - lBonus - lDiscount        #sum += lQty * lUnitPrice + lTax - lBonus - lDiscount
1114    
1115      alienDocumentBlock.netTotalEntry = round(lTNeto,2)      alienDocumentBlock.netTotalEntry = round(lTNeto,2)
1116      alienDocumentBlock.taxTotalEntry = round(lTTax,2)      alienDocumentBlock.ivaTotalEntry = lTTax
1117        alienDocumentBlock.taxTotalEntry = lTTax+hack.a2f(otherTaxBlock.otherTaxAmountEntry,2)
1118      alienDocumentBlock.totalEntry = round(lTNeto+lTTax+hack.a2f(otherTaxBlock.otherTaxAmountEntry,2),2)      alienDocumentBlock.totalEntry = round(lTNeto+lTTax+hack.a2f(otherTaxBlock.otherTaxAmountEntry,2),2)
1119      payBlock.cashEntry = hack.a2f(alienDocumentBlock.totalEntry,2)      payBlock.cashEntry = hack.a2f(alienDocumentBlock.totalEntry,2)
1120    
# Line 1342  Line 1343 
1343    
1344    <trigger name="totalChanged" type="NAMED">    <trigger name="totalChanged" type="NAMED">
1345     import hack     import hack
1346    
1347       alienDocumentBlock.taxTotalEntry = hack.a2f(otherTaxBlock.otherTaxAmountEntry,2)+hack.a2f(alienDocumentBlock.ivaTotalEntry,2)
1348      
1349     alienDocumentBlock.totalEntry = hack.a2f(alienDocumentBlock.netTotalEntry,2) + \     alienDocumentBlock.totalEntry = hack.a2f(alienDocumentBlock.netTotalEntry,2) + \
                                    hack.a2f(otherTaxBlock.otherTaxAmountEntry,2) + \  
1350                                     hack.a2f(alienDocumentBlock.taxTotalEntry,2)                                     hack.a2f(alienDocumentBlock.taxTotalEntry,2)
1351     payBlock.cashEntry = str(hack.a2f(alienDocumentBlock.totalEntry,2))     payBlock.cashEntry = str(hack.a2f(alienDocumentBlock.totalEntry,2))
1352     payBlock.ctaCteEntry = 0.00     payBlock.ctaCteEntry = 0.00
# Line 1675  Line 1678 
1678  <!--                default="0.00"/> -->  <!--                default="0.00"/> -->
1679          <label name="totalLbl" text="Neto" x="76" y="21"/>          <label name="totalLbl" text="Neto" x="76" y="21"/>
1680          <entry name="netoEntry" field="alien_document.net_total" readonly="" style="label" x="76" y="22" width="12" default="0.00"/>          <entry name="netoEntry" field="alien_document.net_total" readonly="" style="label" x="76" y="22" width="12" default="0.00"/>
         <label name="ivaLbl" text="IVA" x="65" y="21"/>  
         <entry name="ivaEntry" field="alien_document.tax_total" readonly="" style="label" x="65" y="22" width="12" default="0.00"/>  
1681          <label name="totalLbl" text="Total" x="87" y="21"/>          <label name="totalLbl" text="Total" x="87" y="21"/>
1682          <entry name="totalEntry" readonly="" style="label" x="87" y="22" width="12" default="0.00"/>          <entry name="totalEntry" readonly="" style="label" x="87" y="22" width="12" default="0.00"/>
1683        </block>        </block>
1684          <block datasource="alienDocumentIvaShowDataSource" name="ivaTotalShowBlock">
1685            <label name="ivaLbl" text="IVA" x="65" y="21"/>
1686            <entry name="ivaEntry" field="alien_document_tax.amount" readonly="" style="label" x="65" y="22" width="12" default="0.00"/>
1687          </block>
1688    
1689        <block datasource="nil" name="tmpBlock">        <block datasource="nil" name="tmpBlock">
1690          <button x="51" y="24" trigger="deleteTrigger" width="10" label="Borrar"          <button x="51" y="24" trigger="deleteTrigger" width="10" label="Borrar"
# Line 1831  Line 1836 
1836  <!--         </entry> -->  <!--         </entry> -->
1837    
1838          <label name="ivaLbl" text="IVA" x="64" y="21"/>          <label name="ivaLbl" text="IVA" x="64" y="21"/>
1839          <entry name="taxTotalEntry" field="tax_total" x="64" y="22" width="11" default="0.00">          <entry name="ivaTotalEntry" x="64" y="22" width="11" default="0.00">
1840            <trigger type="Pre-Focusout" src="totalChanged"/>            <trigger type="Pre-Focusout" src="totalChanged"/>
1841          </entry>          </entry>
1842            <entry name="taxTotalEntry" field="tax_total" x="64" y="22" width="11" default="0.00" hidden="">
1843            </entry>
1844          <label name="totalLbl" text="Total" x="87" y="21"/>          <label name="totalLbl" text="Total" x="87" y="21"/>
1845          <entry name="totalEntry" readonly="" style="label" x="87" y="22" width="12" default="0.00"/>          <entry name="totalEntry" readonly="" style="label" x="87" y="22" width="12" default="0.00"/>
1846    

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

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