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

Diff of /papo/forms/queryDeleteInvoice.neb

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

revision 1.5 by apronotti, Thu Jul 31 21:45:44 2003 UTC revision 1.6 by apronotti, Fri Aug 22 22:47:54 2003 UTC
# Line 407  Line 407 
407    </datasource>    </datasource>
408    
409    <datasource database="papo" name="ownItemShowDataSource"    <datasource database="papo" name="ownItemShowDataSource"
410      table="own_item, own_product_item">      table="own_item, own_product_item, own_item_tax">
411      <condition>      <joinconditions>
412        <eq>        <join type="left">
413          <cfield name="own_item.id"/>          <join type="left">
414          <cfield name="own_product_item.own_item"/>            <left_table name="own_item"/>
415        </eq>            <right_table name="own_product_item"/>
416      </condition>            <condition>
417                <eq>
418                  <cfield name="own_item.id"/>
419                  <cfield name="own_product_item.own_item"/>
420                </eq>
421              </condition>
422            </join>
423            <right_table name="own_item_tax"/>
424            <condition>
425              <eq>
426                <cfield name="own_item.id"/>
427                <cfield name="own_item_tax.own_item"/>
428              </eq>
429            </condition>
430          </join>
431        </joinconditions>
432    </datasource>    </datasource>
433    
434    <datasource database="papo" name="ownItemDeleteDataSource"    <datasource database="papo" name="ownItemDeleteDataSource"
# Line 632  Line 647 
647     if resultBlock.getRecordCount() > 0 and not resultBlock.getCurrentRecord().isEmpty():     if resultBlock.getRecordCount() > 0 and not resultBlock.getCurrentRecord().isEmpty():
648       import hack       import hack
649    
650       #recordCount = ownItemShowBlock.getRecordCount()       recordCount = ownItemShowBlock.getRecordCount()
651       #ownItemShowBlock.firstRecord()       ownItemShowBlock.firstRecord()
652       #for index in range(recordCount):       for index in range(recordCount):
653       #  ownItemShowBlock.jumpRecord(index)         ownItemShowBlock.jumpRecord(index)
654       #  try:         try:
655       #    ownItemShowBlock.taxPercentEntry = hack.a2f(ownItemShowBlock.taxAmountEntry,2) / \           ownItemShowBlock.taxPercentEntry = round(hack.a2f(ownItemShowBlock.taxAmountEntry,2) / \
656       #                                         hack.a2f(ownItemShowBlock.unitPriceEntry,2) / \                                                hack.a2f(ownItemShowBlock.unitPriceEntry,2) / \
657       #                                         hack.a2f(ownItemShowBlock.qtyEntry,2) * 100                                                hack.a2f(ownItemShowBlock.qtyEntry,2) * 100,0)
658       #  except:         except:
659       #    print "Error en el calculo del total"           print "Error en el calculo del total"
660       #    pass           pass
661    
662       ownItemShowBlock.firstRecord()       ownItemShowBlock.firstRecord()
663    
# Line 752  Line 767 
767       recordCount = ownItemShowBlock.getRecordCount()       recordCount = ownItemShowBlock.getRecordCount()
768       ownItemShowBlock.firstRecord()       ownItemShowBlock.firstRecord()
769    
770         if str(ownDocumentShowBlock.isVoidEntry):
771           ownDocumentShowBlock.stateEntry = "ANULADA"
772         else:
773           ownDocumentShowBlock.stateEntry = "Vigente"
774    
775    </trigger>    </trigger>
776    
777    <trigger name="clientTrigger" type="NAMED">    <trigger name="clientTrigger" type="NAMED">
# Line 883  Line 903 
903          <label name="invoiceTypeLbl" text="Tipo" x="48" y="8" />          <label name="invoiceTypeLbl" text="Tipo" x="48" y="8" />
904          <entry name="invoiceTypeEntry" width="4" x="48" y="9" readonly="t" style="label"/>          <entry name="invoiceTypeEntry" width="4" x="48" y="9" readonly="t" style="label"/>
905    
906            <label name="stateLbl" text="Estado" x="56" y="8" />
907            <entry name="stateEntry" style="label" default="Vigente" rows="1" width="22" x="56" y="9"/>
908            <entry name="isVoidEntry" field="own_document.is_void" style="label" rows="1" width="22" x="56" y="9" hidden=""/>
909        </block>        </block>
910    
911        <block datasource="ownDocumentClientShowDataSource" name="ownDocumentClientShowBlock" restrictInsert="t">        <block datasource="ownDocumentClientShowDataSource" name="ownDocumentClientShowBlock" restrictInsert="t">
# Line 937  Line 960 
960          <label name="taxLbl" text="IVA" x="65" y="13" />          <label name="taxLbl" text="IVA" x="65" y="13" />
961          <entry x="65" y="14" name="taxPercentEntry" width="5" rows="7" style="label" typecast="number" displaymask="%0.2f"/>          <entry x="65" y="14" name="taxPercentEntry" width="5" rows="7" style="label" typecast="number" displaymask="%0.2f"/>
962    
963  <!--      <entry x="65" y="14" readonly="" field="own_item_tax.amount" name="taxAmountEntry" width="5" rows="5" hidden=""/> -->       <entry x="65" y="14" readonly="" field="own_item_tax.amount" name="taxAmountEntry" width="5" rows="5" hidden=""/>
964  <!--      <entry x="47" y="4" readonly="" field="own_item_tax.tax" name="taxTypeEntry" width="5" rows="5" default="1" hidden=""/> -->  <!--      <entry x="47" y="4" readonly="" field="own_item_tax.tax" name="taxTypeEntry" width="5" rows="5" default="1" hidden=""/> -->
965    
966          <label name="discountLbl" text="Descuento" x="71" y="13"/>          <label name="discountLbl" text="Descuento" x="71" y="13"/>

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

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