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

Diff of /papo/forms/payOrder.neb

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

revision 1.9 by charlie, Fri May 30 21:32:44 2003 UTC revision 1.10 by styxman, Mon Jun 2 23:06:06 2003 UTC
# Line 28  Line 28 
28      </condition>      </condition>
29    </datasource>    </datasource>
30    
31    <datasource name="providerSearchDataSource" database="papo"    <datasource name="providerSearchDataSource" database="papo"
32                table="_entity_data, _alien_entity_data, _persona_data, _provider_data,                table="_entity_data, _alien_entity_data, _persona_data, _provider_data,
33                       entity_type_uid_conf, _entity_uid_data"                       entity_type_uid_conf, _entity_uid_data"
34                order_by="_entity_data.name">                order_by="_entity_data.name">
35      <condition>      <condition>
# Line 77  Line 77 
77      </condition>      </condition>
78    </datasource>    </datasource>
79    
80    <datasource name="invTaxTotDataSource" database="papo"    <datasource name="invTaxTotDataSource" database="papo"
81                table="alien_document, alien_document_tax">                table="alien_document, alien_document_tax">
82      <condition>      <condition>
83        <eq>        <eq>
84          <cfield name="alien_document.id"/>          <cfield name="alien_document.id"/>
85          <cfield name="alien_document_tax.alien_document"/>          <cfield name="alien_document_tax.alien_document"/>
86        </eq>        </eq>
87      </condition>      </condition>
88    </datasource>    </datasource>
89    
90    <datasource name="productInvoiceDataSource" database="papo"    <datasource name="productInvoiceDataSource" database="papo"
91      table="_entity_data, alien_document, alien_item, alien_product_item, alien_item_tax"      table="_entity_data, alien_document, alien_item, alien_product_item, alien_item_tax"
92      order_by="alien_product_item.id">      order_by="alien_product_item.id">
93      <condition>      <condition>
94        <and>        <and>
95          <eq>          <eq>
96            <!-- Aqui se refiere al cliente  -->            <!-- Aqui se refiere al cliente  -->
# Line 124  Line 124 
124            </eq>            </eq>
125          </or>          </or>
126       </and>       </and>
127      </condition>      </condition>
128    </datasource>    </datasource>
129    
130    <datasource name="payTotDataSource" database="papo"    <datasource name="payTotDataSource" database="papo"
131      table="_entity_data, alien_document, alien_document_proceeding">      table="_entity_data, alien_document, alien_document_proceeding">
132      <condition>      <condition>
133        <and>        <and>
134          <eq>          <eq>
135            <!-- Aqui se refiere al cliente  -->            <!-- Aqui se refiere al cliente  -->
136            <cfield name="_entity_data.id"/>            <cfield name="_entity_data.id"/>
137            <cfield name="alien_document.sender"/>            <cfield name="alien_document.sender"/>
138          </eq>          </eq>
139          <eq>          <eq>
# Line 144  Line 144 
144            <or>            <or>
145              <eq>              <eq>
146                <cfield name="alien_document.alien_document_type"/>                <cfield name="alien_document.alien_document_type"/>
147                <cconst value="2"/>                <cconst value="2"/>
148              </eq>              </eq>
149              <eq>              <eq>
150                <cfield name="alien_document.alien_document_type"/>                <cfield name="alien_document.alien_document_type"/>
151                <cconst value="5"/>                <cconst value="5"/>
152              </eq>              </eq>
153            </or>            </or>
154          </and>          </and>
155        </and>        </and>
156      </condition>      </condition>
157    </datasource>    </datasource>
158    
159    <datasource database="papo" name="alienDocumentDataSource" table="alien_document"    <datasource database="papo" name="alienDocumentDataSource" table="alien_document"
160      order_by="date" />      order_by="date" />
161    
162    <datasource database="papo" name="ownDocumentDataSource" table="own_document"    <datasource database="papo" name="ownDocumentDataSource" table="own_document"
163      order_by="date" />      order_by="date" />
164    
165    <datasource name="proceedingDataSource" database="papo" table="proceeding"/>    <datasource name="proceedingDataSource" database="papo" table="proceeding"/>
166    
167    <datasource name="alienDocumentProceedingDataSource" database="papo"    <datasource name="alienDocumentProceedingDataSource" database="papo"
168      table="alien_document_proceeding"/>      table="alien_document_proceeding"/>
169    
170    <datasource name="currencyMovementDataSource" database="papo"    <datasource name="currencyMovementDataSource" database="papo"
# Line 189  Line 189 
189      alienDocumentProceedingBlock.clear()      alienDocumentProceedingBlock.clear()
190      ownDocumentBlock.clear()      ownDocumentBlock.clear()
191      ownPosDocumentBlock.clear()      ownPosDocumentBlock.clear()
192      setFocus(tmpBlock.tmpDateEntry)      setFocus(tmpBlock.tmpDateEntry)
193    </trigger>    </trigger>
194    
195    <trigger name="searchTrigger" type="NAMED"><![CDATA[    <trigger name="searchTrigger" type="NAMED"><![CDATA[
196          
197  tmpInvToPayedBlock.clear()  tmpInvToPayedBlock.clear()
198  invoiceToPayBlock.clear()  invoiceToPayBlock.clear()
199    
# Line 202  rs = onlyProviderDataSource.createResult Line 202  rs = onlyProviderDataSource.createResult
202  provider = 0  provider = 0
203  if rs.firstRecord():  if rs.firstRecord():
204      provider = rs.current.getField('_table')      provider = rs.current.getField('_table')
205        
206  if provider:  if provider:
207      import gnue.common.GConditions as GConditions      import gnue.common.GConditions as GConditions
208      import hack      import hack
# Line 218  if provider: Line 218  if provider:
218      eq = GConditions.GCeq(condPay)      eq = GConditions.GCeq(condPay)
219      GConditions.GCField(eq,"_entity_data._table")      GConditions.GCField(eq,"_entity_data._table")
220      GConditions.GCConst(eq,str(provider))      GConditions.GCConst(eq,str(provider))
221        
222      # Calculo del total facturado por Productos      # Calculo del total facturado por Productos
223      productInvoiceResultSet = productInvoiceDataSource.createResultSet(condProductInvoice)      productInvoiceResultSet = productInvoiceDataSource.createResultSet(condProductInvoice)
224      more = productInvoiceResultSet.firstRecord()      more = productInvoiceResultSet.firstRecord()
# Line 239  if provider: Line 239  if provider:
239              lBonus = hack.a2f(productInvoiceResultSet.current.getField("alien_item.bonus"),2)              lBonus = hack.a2f(productInvoiceResultSet.current.getField("alien_item.bonus"),2)
240              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("alien_item.discount"),2)              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("alien_item.discount"),2)
241              item = round(lQty * lUnitPrice - lBonus - lDiscount,2)              item = round(lQty * lUnitPrice - lBonus - lDiscount,2)
242              itemTaxTotal = 0                      itemTaxTotal = 0
243              currItem = productInvoiceResultSet.current.getField("alien_item.id")              currItem = productInvoiceResultSet.current.getField("alien_item.id")
244              while productInvoiceResultSet.current.getField("alien_item.id") == currItem and more:              while productInvoiceResultSet.current.getField("alien_item.id") == currItem and more:
245                  itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("alien_item_tax.amount"),2)                  itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("alien_item_tax.amount"),2)
# Line 250  if provider: Line 250  if provider:
250          while odt_more:          while odt_more:
251              invoiceTotal += hack.a2f(odt_rs.current.getField("alien_document_tax.amount"),2)              invoiceTotal += hack.a2f(odt_rs.current.getField("alien_document_tax.amount"),2)
252              odt_more = odt_rs.nextRecord()              odt_more = odt_rs.nextRecord()
253                    
254          tmpInvToPayedBlock.amountEntry = str(invoiceTotal)          tmpInvToPayedBlock.amountEntry = str(invoiceTotal)
255          tmpInvToPayedBlock.payedEntry = "0.0"          tmpInvToPayedBlock.payedEntry = "0.0"
256    
# Line 284  if provider: Line 284  if provider:
284              total += hack.a2f(invoiceToPayBlock.invoiceBox.payEntry,2)              total += hack.a2f(invoiceToPayBlock.invoiceBox.payEntry,2)
285    
286  invoiceToPayBlock.invoiceBox.totalEntry = str(round(total,2))  invoiceToPayBlock.invoiceBox.totalEntry = str(round(total,2))
287        
288    ]]></trigger>    ]]></trigger>
289    
290    <trigger type="NAMED" name="totalTrigger"><![CDATA[    <trigger type="NAMED" name="totalTrigger"><![CDATA[
# Line 298  for recNum in range(rc): Line 298  for recNum in range(rc):
298      total += hack.a2f(invoiceToPayBlock.invoiceBox.payEntry,2)      total += hack.a2f(invoiceToPayBlock.invoiceBox.payEntry,2)
299    
300  invoiceToPayBlock.invoiceBox.totalEntry = str(round(total,2))  invoiceToPayBlock.invoiceBox.totalEntry = str(round(total,2))
301                
302      ]]></trigger>      ]]></trigger>
303      
304    <trigger type="NAMED" name="writeAllTrigger"><![CDATA[    <trigger type="NAMED" name="writeAllTrigger"><![CDATA[
305  import hack  import hack
306  import string  import string
# Line 373  try: Line 373  try:
373      for recNum in range(rc):      for recNum in range(rc):
374          invoiceToPayBlock.jumpRecord(recNum)          invoiceToPayBlock.jumpRecord(recNum)
375          if hack.a2f(invoiceToPayBlock.invoiceBox.payEntry,2) > 0:          if hack.a2f(invoiceToPayBlock.invoiceBox.payEntry,2) > 0:
376              line = "| "              line = "| "
377              line += printing.printField(invoiceToPayBlock.invoiceBox.numberEntry,14,'r') + " | "              line += printing.printField(invoiceToPayBlock.invoiceBox.numberEntry,14,'r') + " | "
378              line += printing.printField(invoiceToPayBlock.invoiceBox.dateEntry,20,'r') + " | "              line += printing.printField(invoiceToPayBlock.invoiceBox.dateEntry,20,'r') + " | "
379              line += printing.printField(invoiceToPayBlock.invoiceBox.amountEntry,20,'r') + " | "              line += printing.printField(invoiceToPayBlock.invoiceBox.amountEntry,20,'r') + " | "
380              line += printing.printField(invoiceToPayBlock.invoiceBox.payEntry,20,'r') + " |"              line += printing.printField(invoiceToPayBlock.invoiceBox.payEntry,20,'r') + " |"
381              table.append(line)              table.append(line)
382    
383      line = "  "      line = "  "
384      line += printing.printField(" ",14) + "   "      line += printing.printField(" ",14) + "   "
385      line += printing.printField(" ",20) + "   "      line += printing.printField(" ",20) + "   "
386      line += printing.printTitle(" ",20) + " | "      line += printing.printTitle(" ",20) + " | "
# Line 393  except DBError, err: Line 393  except DBError, err:
393      errStr = ["número de factura","Orden de Pago","procedimientos",      errStr = ["número de factura","Orden de Pago","procedimientos",
394                "movimientos de monedas","moviminetos de porcedimientos"]                "movimientos de monedas","moviminetos de porcedimientos"]
395      genericBox("Hay problemas para grabar los "+errStr[error]+"\n",['Aceptar'])      genericBox("Hay problemas para grabar los "+errStr[error]+"\n",['Aceptar'])
396        
397  callTrigger('cancelTrigger')    callTrigger('cancelTrigger')
398      ]]></trigger>      ]]></trigger>
399    
400      <trigger name="providerSearchTrigger" type="NAMED"><![CDATA[      <trigger name="providerSearchTrigger" type="NAMED"><![CDATA[
# Line 408  callTrigger('endWaitingModeTrigger') Line 408  callTrigger('endWaitingModeTrigger')
408  recordCount = providerResultBlock.getRecordCount()  recordCount = providerResultBlock.getRecordCount()
409    
410  if recordCount > 1:  if recordCount > 1:
411        
412      def callback (returnValue):      def callback (returnValue):
413          global block          global block
414          if returnValue >= 0:          if returnValue >= 0:
# Line 416  if recordCount > 1: Line 416  if recordCount > 1:
416              alienDocumentSearchBlock.providerSearchBox.providerCodeEntry = str(providerResultBlock.providerCodeEntry)              alienDocumentSearchBlock.providerSearchBox.providerCodeEntry = str(providerResultBlock.providerCodeEntry)
417              alienDocumentSearchBlock.providerSearchBox.providerNameEntry = str(providerResultBlock.providerNameEntry)              alienDocumentSearchBlock.providerSearchBox.providerNameEntry = str(providerResultBlock.providerNameEntry)
418              alienDocumentSearchBlock.providerSearchBox.providerEntry = str(providerResultBlock.providerEntry)              alienDocumentSearchBlock.providerSearchBox.providerEntry = str(providerResultBlock.providerEntry)
419                
420      runForm ('providerSelect.gfd', {'data': providerResultBlock, 'callback': callback})      runForm ('providerSelect.gfd', {'data': providerResultBlock, 'callback': callback})
421  elif recordCount == 1:  elif recordCount == 1:
422      providerResultBlock.jumpRecord(0)      providerResultBlock.jumpRecord(0)
# Line 459  if hack.a2f(invoiceToPayBlock.invoiceBox Line 459  if hack.a2f(invoiceToPayBlock.invoiceBox
459    
460      currencyDataBlock.payOrderBox.dateEntry = str(tmpBlock.tmpDateEntry)      currencyDataBlock.payOrderBox.dateEntry = str(tmpBlock.tmpDateEntry)
461      currencyDataBlock.payOrderBox.numberEntry = str(ownPosDocumentBlock.documentNumberEntry)      currencyDataBlock.payOrderBox.numberEntry = str(ownPosDocumentBlock.documentNumberEntry)
462        
463      currencyDataBlock.providerBox.providerCodeEntry = str(alienDocumentSearchBlock.providerSearchBox.providerCodeEntry)      currencyDataBlock.providerBox.providerCodeEntry = str(alienDocumentSearchBlock.providerSearchBox.providerCodeEntry)
464      currencyDataBlock.providerBox.providerNameEntry = str(alienDocumentSearchBlock.providerSearchBox.providerNameEntry)      currencyDataBlock.providerBox.providerNameEntry = str(alienDocumentSearchBlock.providerSearchBox.providerNameEntry)
465        
466      currencyDataBlock.providerBox.totalEntry = str(invoiceToPayBlock.invoiceBox.totalEntry)      currencyDataBlock.providerBox.totalEntry = str(invoiceToPayBlock.invoiceBox.totalEntry)
467        
468      setFocus(currencyTypeBlock.currencyBox.payEntry)      setFocus(currencyTypeBlock.currencyBox.payEntry)
469    
470      ]]></trigger>      ]]></trigger>
   
   <trigger type="NAMED" name="currencyTypeTrigger">  
     <![CDATA[  
 import hack  
       
 total = hack.a2f(invoiceToPayBlock.invoiceBox.totalEntry,2)  
 rc = currencyTypeBlock.getRecordCount()  
 for recNum in range(rc):  
     currencyTypeBlock.jumpRecord(recNum)  
     if hack.a2f(currencyTypeBlock.currencyBox.payEntry,2) > 0:  
         total -= round(hack.a2f(currencyTypeBlock.currencyBox.payEntry,2) * hack.a2f(currencyTypeBlock.currencyBox.rateEntry,2),2)  
471    
472  rc = currencyTypeBlock.getRecordCount()  <!--  para la parametrizaci'on: param= invoiceToPayBlock.invoiceBox.totalEntry (total a pagar?) //-->
473  for recNum in range(rc):    <trigger type="NAMED" name="currencyTypeTrigger"><![CDATA[
474      currencyTypeBlock.jumpRecord(recNum)      import hack
475      if hack.a2f(currencyTypeBlock.currencyBox.rateEntry,2) > 0:  
476          monto = round(total / hack.a2f(currencyTypeBlock.currencyBox.rateEntry,2),2)      rn= currencyTypeBlock.getCurrentRecordNumber()
477          currencyTypeBlock.currencyBox.amountEntry = str(currencyTypeBlock.currencyBox.formatEntry) % monto  
478            total = hack.a2f(invoiceToPayBlock.invoiceBox.totalEntry,2)
479      ]]>      rc = currencyTypeBlock.getRecordCount()
480    </trigger>      for recNum in range(rc):
481            currencyTypeBlock.jumpRecord(recNum)
482            if hack.a2f(currencyTypeBlock.currencyBox.payEntry,2) > 0:
483                total -= round(hack.a2f(currencyTypeBlock.currencyBox.payEntry,2) * hack.a2f(currencyTypeBlock.currencyBox.rateEntry),2)
484    
485        rc = currencyTypeBlock.getRecordCount()
486        for recNum in range(rc):
487            currencyTypeBlock.jumpRecord(recNum)
488            if hack.a2f(currencyTypeBlock.currencyBox.rateEntry,2) > 0:
489                monto = round(total / hack.a2f(currencyTypeBlock.currencyBox.rateEntry,2),2)
490                currencyTypeBlock.currencyBox.amountEntry = str(currencyTypeBlock.currencyBox.formatEntry) % monto
491        currencyTypeBlock.jumpRecord(rn)
492      ]]></trigger>
493    
494    <trigger type="NAMED" name="endTypeTrigger">    <trigger type="NAMED" name="endTypeTrigger">
495      <![CDATA[      <![CDATA[
496    
497  import hack  import hack
498        
499  callTrigger('currencyTypeTrigger')  callTrigger('currencyTypeTrigger')
500    
501  total = hack.a2f(invoiceToPayBlock.invoiceBox.totalEntry,2)  total = hack.a2f(invoiceToPayBlock.invoiceBox.totalEntry,2)
# Line 508  if total != 0: Line 509  if total != 0:
509      genericBox("La Orden de pago no esta totalmente pagada\n",['Aceptar'])      genericBox("La Orden de pago no esta totalmente pagada\n",['Aceptar'])
510  else:  else:
511      callTrigger('writeAllTrigger')      callTrigger('writeAllTrigger')
512        
513      ]]>      ]]>
514    </trigger>    </trigger>
515    
516    <neb:Sub neb:src="wait.nebc"/>    <neb:Sub neb:src="wait.nebc"/>
517    
518    <page name="Búsqueda de Facturas de Proveedor">    <page name="Búsqueda de Facturas de Proveedor">
519    
520      <block name="providerResultBlock" datasource="providerSearchDataSource">      <block name="providerResultBlock" datasource="providerSearchDataSource">
521        <entry name="providerEntry" field="_entity_data.id"        <entry name="providerEntry" field="_entity_data.id"
522          hidden="" x="1" y="1" width="12"/>              hidden="" x="1" y="1" width="12"/>
523        <entry name="providerTypeEntry" field="_entity_uid_data.entity_uid_type"        <entry name="providerTypeEntry" field="_entity_uid_data.entity_uid_type"
524            hidden="" x="1" y="1" width="12"/>
525          <entry name="providerCodeEntry" field="_entity_uid_data.uid"
526          hidden="" x="1" y="1" width="12"/>          hidden="" x="1" y="1" width="12"/>
527        <entry name="providerCodeEntry" field="_entity_uid_data.uid"        <entry name="providerNameEntry" field="_entity_data.name"
528          hidden="" x="1" y="1" width="12"/>                      hidden="" x="1" y="1" width="20"/>
       <entry name="providerNameEntry" field="_entity_data.name"  
         hidden="" x="1" y="1" width="20"/>      
529      </block>      </block>
530    
531      <box label="Orden de Pagos" name="payOrderBox" height="4" width="85" x="0" y="0">      <box label="Orden de Pagos" name="payOrderBox" height="4" width="85" x="0" y="0">
# Line 536  else: Line 537  else:
537        <neb:Sub neb:src="posDocument.nebc" documentType="ownDocumentBlock.typeEntry"        <neb:Sub neb:src="posDocument.nebc" documentType="ownDocumentBlock.typeEntry"
538          ownPosDocumentBlock="ownPosDocumentBlock"  documentNumberEntry="documentNumberEntry"          ownPosDocumentBlock="ownPosDocumentBlock"  documentNumberEntry="documentNumberEntry"
539          documentNumberEntryX="55" documentNumberEntryY="1"          documentNumberEntryX="55" documentNumberEntryY="1"
540          searchNextDocumentNumber="searchNextPayOrderNumber">          searchNextDocumentNumber="searchNextPayOrderNumber">
541        </neb:Sub>        </neb:Sub>
542      </box>      </box>
543    
# Line 556  else: Line 557  else:
557          <entry x="1" y="1" field="sender" name="providerEntry" width="30" hidden=""/>          <entry x="1" y="1" field="sender" name="providerEntry" width="30" hidden=""/>
558          <entry x="1" y="1" name="providerCodeEntry" width="20"/>          <entry x="1" y="1" name="providerCodeEntry" width="20"/>
559          <entry x="21" y="1" name="providerNameEntry" width="35"/>          <entry x="21" y="1" name="providerNameEntry" width="35"/>
560          <entry field="date" hidden="" name="dateEntry" style="label" readonly="" typecast="date"          <entry field="date" hidden="" name="dateEntry" style="label" readonly="" typecast="date"
561            rows="1" width="24" x="7" y="7"/>            rows="1" width="24" x="7" y="7"/>
562    
563          <button name="providerSearchButton" trigger="providerSearchTrigger" label="Buscar"          <button name="providerSearchButton" trigger="providerSearchTrigger" label="Buscar"
564            width="10" height="1" x="60" y="1"/>            width="10" height="1" x="60" y="1"/>
565          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"
566            width="10" height="1" x="70" y="1"/>            width="10" height="1" x="70" y="1"/>
567          <button x="60" y="2" trigger="searchTrigger" width="20" label="Facturas a Pagar"          <button x="60" y="2" trigger="searchTrigger" width="20" label="Facturas a Pagar"
568            name="searchBtn" height="1"/>            name="searchBtn" height="1"/>
# Line 578  else: Line 579  else:
579      </block>      </block>
580    
581      <block name="invoiceToPayBlock" datasource="invoiceToPayDataSource">      <block name="invoiceToPayBlock" datasource="invoiceToPayDataSource">
582        <box height="12" label="Facturas A Pagar" name="invoiceBox"        <box height="12" label="Facturas A Pagar" name="invoiceBox"
583          width="85" x="0" y="7">          width="85" x="0" y="7">
584          <label name="numberLbl" text="Numero" x="1" y="1"/>          <label name="numberLbl" text="Numero" x="1" y="1"/>
585          <label name="dateLbl" text="Fecha" x="20" y="1"/>          <label name="dateLbl" text="Fecha" x="20" y="1"/>
# Line 586  else: Line 587  else:
587          <label name="payedLbl" text="Pagado" x="45" y="1"/>          <label name="payedLbl" text="Pagado" x="45" y="1"/>
588          <label name="payLbl" text="A Pagar" x="57" y="1"/>          <label name="payLbl" text="A Pagar" x="57" y="1"/>
589    
590          <entry name="idEntry" field="id" style="label" hidden="" rows="8"          <entry name="idEntry" field="id" style="label" hidden="" rows="8"
591            x="1" y="2" width="1" />            x="1" y="2" width="1" />
592          <entry name="numberEntry" field="number" style="label" rows="8"          <entry name="numberEntry" field="number" style="label" rows="8"
593            x="1" y="2" width="19" readonly=""/>            x="1" y="2" width="19" readonly=""/>
594          <entry name="dateEntry" field="date" style="label" rows="8"          <entry name="dateEntry" field="date" style="label" rows="8"
595            x="20" y="2" width="11" readonly=""/>            x="20" y="2" width="11" readonly=""/>
596          <entry name="amountEntry" field="amount" style="label" rows="8"          <entry name="amountEntry" field="amount" style="label" rows="8"
597            typecast="number" displaymask="%0.2f"            typecast="number" displaymask="%0.2f"
598            x="33" y="2" width="10" readonly=""/>            x="33" y="2" width="10" readonly=""/>
599          <entry name="payedEntry" field="payed" style="label" rows="8"          <entry name="payedEntry" field="payed" style="label" rows="8"
600            x="45" y="2" width="11" readonly="" typecast="number" displaymask="%0.2f"/>            x="45" y="2" width="11" readonly="" typecast="number" displaymask="%0.2f"/>
601          <entry name="payEntry" field="pay"  rows="8" x="57" y="2" width="10"          <entry name="payEntry" field="pay"  rows="8" x="57" y="2" width="10"
602            typecast="number" displaymask="%0.2f">            typecast="number" displaymask="%0.2f">
603            <trigger type="PRE-FOCUSOUT" src="totalTrigger"/>            <trigger type="PRE-FOCUSOUT" src="totalTrigger"/>
604          </entry>          </entry>
605          <scrollbar page="2" x="68" y="2" width="1" height="8"/>          <scrollbar page="2" x="68" y="2" width="1" height="8"/>
606    
607          <label name="totalLbl" text="Total a Pagar" x="70" y="5"/>          <label name="totalLbl" text="Total a Pagar" x="70" y="5"/>
608          <entry name="totalEntry" field="total" x="70" y="6" width="10" readonly=""          <entry name="totalEntry" field="total" x="70" y="6" width="10" readonly=""
609            typecast="number" displaymask="%0.2f"/>            typecast="number" displaymask="%0.2f"/>
610    
611          <button name="acceptButton" trigger="endPayTrigger" label="Fin O.Pago"          <button name="acceptButton" trigger="endPayTrigger" label="Fin O.Pago"
612            width="12" height="1" x="70" y="8"/>            width="12" height="1" x="70" y="8"/>
613          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"
614            width="12" height="1" x="70" y="9"/>            width="12" height="1" x="70" y="9"/>
615        </box>        </box>
616      </block>      </block>
617    
618      <block name="proceedingBlock" datasource="proceedingDataSource">      <block name="proceedingBlock" datasource="proceedingDataSource">
619          <entry name="idEntry" field="id" hidden="" x="1" y="1" width="12"/>              <entry name="idEntry" field="id" hidden="" x="1" y="1" width="12"/>
620          <entry name="dateEntry" field="date" hidden="" x="1" y="1" width="12"/>              <entry name="dateEntry" field="date" hidden="" x="1" y="1" width="12"/>
621      </block>      </block>
622    
623      <block name="alienDocumentProceedingBlock" datasource="alienDocumentProceedingDataSource">      <block name="alienDocumentProceedingBlock" datasource="alienDocumentProceedingDataSource">
624        <entry name="proceedingEntry" field="proceeding" hidden="" x="1" y="1" width="12"/>            <entry name="proceedingEntry" field="proceeding" hidden="" x="1" y="1" width="12"/>
625        <entry name="alienDocumentEntry" field="alien_document" hidden=""        <entry name="alienDocumentEntry" field="alien_document" hidden=""
626          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
627        <entry name="amountEntry" field="amount" hidden="" x="1" y="1" width="12"/>            <entry name="amountEntry" field="amount" hidden="" x="1" y="1" width="12"/>
628      </block>      </block>
629    
630      <block name="currencyMovementBlock" datasource="currencyMovementDataSource">      <block name="currencyMovementBlock" datasource="currencyMovementDataSource">
631        <entry name="proceedingEntry" field="movement.proceeding" hidden=""        <entry name="proceedingEntry" field="movement.proceeding" hidden=""
632          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
633        <entry name="movementTypeEntry" field="movement.movement_type" hidden=""        <entry name="movementTypeEntry" field="movement.movement_type" hidden=""
634          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
635        <entry name="amountEntry" field="movement.amount" hidden="" x="1" y="1" width="12"/>            <entry name="amountEntry" field="movement.amount" hidden="" x="1" y="1" width="12"/>
636        <entry name="currencyTypeEntry" field="currency_movement.currency_type" hidden=""        <entry name="currencyTypeEntry" field="currency_movement.currency_type" hidden=""
637          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
638      </block>      </block>
639    </page>    </page>
640    
# Line 668  else: Line 669  else:
669          <entry name="formatEntry" field="format" rows="6" x="1" y="1" hidden=""/>          <entry name="formatEntry" field="format" rows="6" x="1" y="1" hidden=""/>
670          <entry name="nameEntry" field="name" style="label" rows="6"          <entry name="nameEntry" field="name" style="label" rows="6"
671            x="1" y="2" width="6" readonly=""/>            x="1" y="2" width="6" readonly=""/>
672          <entry name="rateEntry" field="rate" style="label" rows="6" typecast="number"          <entry name="rateEntry" field="rate" style="label" rows="6" typecast="number"
673            displaymask="%4.2f" x="10" y="2" width="10" readonly=""/>            displaymask="%4.2f" x="10" y="2" width="10" readonly=""/>
674          <entry name="amountEntry" field="amount" style="label" rows="6"          <entry name="amountEntry" field="amount" style="label" rows="6"
675            x="21" y="2" width="20" readonly=""/>            x="21" y="2" width="20" readonly=""/>
676          <entry name="payEntry" field="pay" rows="6" x="38" y="2" width="20"          <entry name="payEntry" field="pay" rows="6" x="38" y="2" width="20"
677            typecast="number" displaymask="%10.2f">            typecast="number" displaymask="%10.2f">
678            <trigger type="PRE-FOCUSOUT" src="currencyTypeTrigger"/>            <trigger type="PRE-FOCUSOUT" src="currencyTypeTrigger"/>
679          </entry>          </entry>

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

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