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

Diff of /papo/forms/creditNote.neb

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

revision 1.18 by jlenton, Tue Sep 16 19:01:03 2003 UTC revision 1.19 by jlenton, Fri Sep 19 20:57:48 2003 UTC
# Line 198  Line 198 
198            <cfield name="own_item.id"/>            <cfield name="own_item.id"/>
199            <cfield name="own_product_item.own_item"/>            <cfield name="own_product_item.own_item"/>
200          </eq>          </eq>
         <!--          <eq> -->  
         <!--            <cfield name="own_item.id"/> -->  
         <!--            <cfield name="own_item_tax.own_item"/> -->  
         <!--         </eq> -->  
         <!--         <eq> -->  
         <!--            <cfield name="own_item_tax.tax"/> -->  
         <!--            <cconst value="1"/> -->  
         <!--          </eq> -->  
201        </and>        </and>
202      </condition>      </condition>
203    </datasource>    </datasource>
# Line 434  Line 426 
426        lUnitPrice = hack.a2f(lRecord.getField("own_product_item.unit_price"),4)        lUnitPrice = hack.a2f(lRecord.getField("own_product_item.unit_price"),4)
427        lItemPrice = round((lQty * lUnitPrice) - lBonus - lDiscount,2)        lItemPrice = round((lQty * lUnitPrice) - lBonus - lDiscount,2)
428        lTNeto += lItemPrice        lTNeto += lItemPrice
       #lTTax += hack.a2f(lRecord.getField("own_item_tax.amount"),4)  
429    
430      #lTTax = round(lTTax,2)      #lTTax = round(lTTax,2)
431      ownDocumentBlock.netTotalEntry = str(round(lTNeto))      ownDocumentBlock.netTotalEntry = str(round(lTNeto))
# Line 838  Line 829 
829            <trigger name="unitPriceEntryPreFocusout" type="PRE-FOCUSOUT" src="totalCalcTrigger" />            <trigger name="unitPriceEntryPreFocusout" type="PRE-FOCUSOUT" src="totalCalcTrigger" />
830          </entry>          </entry>
831          <entry x="1" y="14" readonly="" field="own_product_item.price" name="priceEntry" width="10" rows="5" hidden=""/>          <entry x="1" y="14" readonly="" field="own_product_item.price" name="priceEntry" width="10" rows="5" hidden=""/>
         <entry x="1" y="14" readonly="" field="own_item_tax.tax" name="taxTypeEntry" width="10" rows="5" default="1" hidden="" typecast="number" displaymask="%0.2f"/>  
       <!--   <entry x="1" y="14" readonly="" field="own_item_tax.amount" name="taxAmountEntry" width="10" rows="5" hidden="" typecast="number" displaymask="%0.2f"/> -->  
832    
833    
834          <label name="ivaLbl" text="IVA" x="66" y="10"/>          <label name="ivaLbl" text="IVA" x="66" y="10"/>

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

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