/[papo]/papo/forms/receipt.gfd
ViewVC logotype

Diff of /papo/forms/receipt.gfd

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

revision 1.22 by charlie, Mon Apr 14 20:16:23 2003 UTC revision 1.23 by styxman, Tue Apr 15 20:19:09 2003 UTC
# Line 3  Line 3 
3    
4  <form title="Carga de Recibos a Clientes" height="13" width="88">  <form title="Carga de Recibos a Clientes" height="13" width="88">
5    
6    <datasource name="clientSearchDataSource" database="papo"    <datasource name="clientSearchDataSource" database="papo"
7                table="_entity_data, _alien_entity_data, _persona_data, _client_data,                table="_entity_data, _alien_entity_data, _persona_data, _client_data,
8                       _price_type_data, entity_type_uid_conf, _entity_uid_type_data,                       _price_type_data, entity_type_uid_conf, _entity_uid_type_data,
9                       _entity_uid_data" order_by="_entity_data.name">                       _entity_uid_data" order_by="_entity_data.name">
10      <condition>      <condition>
11        <and>        <and>
# Line 76  Line 76 
76    
77    <!-- Origen de datos que srive para calcular el total facturado -->    <!-- Origen de datos que srive para calcular el total facturado -->
78    
79    <datasource name="productInvoiceDataSource" database="papo"    <datasource name="productInvoiceDataSource" database="papo"
80                table="_entity_data, own_document, own_item, own_product_item, own_item_tax"                table="_entity_data, own_document, own_item, own_product_invoice_item, own_item_tax"
81                order_by="own_product_item.id">                order_by="own_product_invoice_item.id">
82      <condition>      <condition>
83        <and>        <and>
84          <eq>          <eq>
85            <!-- Aqui se refiere al cliente  -->            <!-- Aqui se refiere al cliente  -->
# Line 92  Line 92 
92          </eq>          </eq>
93          <eq>          <eq>
94            <cfield name="own_item.id"/>            <cfield name="own_item.id"/>
95            <cfield name="own_product_item.own_item"/>            <cfield name="own_product_invoice_item.own_item"/>
96          </eq>          </eq>
97          <eq>          <eq>
98            <cfield name="own_item.id"/>            <cfield name="own_item.id"/>
# Line 113  Line 113 
113            </eq>            </eq>
114          </or>          </or>
115        </and>        </and>
116      </condition>      </condition>
117    </datasource>    </datasource>
118    
119    <datasource name="serviceInvoiceDataSource" database="papo"    <datasource name="serviceInvoiceDataSource" database="papo"
120                table="_entity_data, own_document, own_item, own_service_item, own_item_tax"                table="_entity_data, own_document, own_item, own_service_item, own_item_tax"
121                order_by="own_service_item.id">                order_by="own_service_item.id">
122      <condition>      <condition>
123        <and>        <and>
124          <eq>          <eq>
125            <!-- Aqui se refiere al cliente  -->            <!-- Aqui se refiere al cliente  -->
# Line 140  Line 140 
140          </eq>          </eq>
141          <eq>          <eq>
142            <cfield name="own_document.own_document_type"/>            <cfield name="own_document.own_document_type"/>
143            <cconst value="1"/>            <cconst value="1"/>
144          </eq>          </eq>
145       </and>       </and>
146      </condition>      </condition>
147    </datasource>    </datasource>
148    
149    <datasource name="invTaxTotDataSource" database="papo"    <datasource name="invTaxTotDataSource" database="papo"
150                table="own_document, own_document_tax">                table="own_document, own_document_tax">
151      <condition>      <condition>
152        <eq>        <eq>
153          <cfield name="own_document.id"/>          <cfield name="own_document.id"/>
154          <cfield name="own_document_tax.own_document"/>          <cfield name="own_document_tax.own_document"/>
155        </eq>        </eq>
156      </condition>      </condition>
157    </datasource>    </datasource>
158    
159    
160    <datasource name="payTotDataSource" database="papo" table="_entity_data, own_document, own_document_proceeding">    <datasource name="payTotDataSource" database="papo" table="_entity_data, own_document, own_document_proceeding">
161      <condition>      <condition>
162        <and>        <and>
163          <eq>          <eq>
164            <!-- Aqui se refiere al cliente  -->            <!-- Aqui se refiere al cliente  -->
165            <cfield name="_entity_data._table"/>            <cfield name="_entity_data._table"/>
166            <cfield name="own_document.recipient"/>            <cfield name="own_document.recipient"/>
167          </eq>          </eq>
168          <eq>          <eq>
# Line 173  Line 173 
173            <or>            <or>
174              <eq>              <eq>
175                <cfield name="own_document.own_document_type"/>                <cfield name="own_document.own_document_type"/>
176                <cconst value="1"/>                <cconst value="1"/>
177              </eq>              </eq>
178              <eq>              <eq>
179                <cfield name="own_document.own_document_type"/>                <cfield name="own_document.own_document_type"/>
180                <cconst value="4"/>                <cconst value="4"/>
181              </eq>              </eq>
182            </or>            </or>
183          </and>          </and>
184        </and>        </and>
185      </condition>      </condition>
186    </datasource>    </datasource>
187    
188    <datasource database="papo" name="ownDocumentDataSource" table="own_document"    <datasource database="papo" name="ownDocumentDataSource" table="own_document"
189      order_by="date" />      order_by="date" />
190    
191     <datasource  name="ownItemDataSource" database="papo" detaillink="own_item.own_document"       <datasource  name="ownItemDataSource" database="papo" detaillink="own_item.own_document"
192       master="ownDocumentDataSource" masterlink="id"         master="ownDocumentDataSource" masterlink="id"
193       table="own_item, own_product_item, own_item_tax">       table="own_item, own_product_invoice_item, own_item_tax">
194      <condition>      <condition>
195        <and>        <and>
196          <eq>          <eq>
197            <cfield name="own_item.id"/>            <cfield name="own_item.id"/>
198            <cfield name="own_product_item.own_item"/>            <cfield name="own_product_invoice_item.own_item"/>
199          </eq>          </eq>
200           <eq>           <eq>
201             <cfield name="own_item.id"/>             <cfield name="own_item.id"/>
202             <cfield name="own_item_tax.own_item"/>             <cfield name="own_item_tax.own_item"/>
203          </eq>            </eq>
204          <eq>          <eq>
205             <cfield name="own_item_tax.tax"/>             <cfield name="own_item_tax.tax"/>
206             <cconst value="1"/>             <cconst value="1"/>
207           </eq>             </eq>
208        </and>        </and>
209      </condition>      </condition>
210    </datasource>    </datasource>
# Line 239  total = 0.0 Line 239  total = 0.0
239  if str(ownDocumentBlock.clientRecipientBox.clientEntry):  if str(ownDocumentBlock.clientRecipientBox.clientEntry):
240      import gnue.common.GConditions as GConditions      import gnue.common.GConditions as GConditions
241      import hack      import hack
242        
243      condProductInvoice = GConditions.GCondition()      condProductInvoice = GConditions.GCondition()
244      condServiceInvoice = GConditions.GCondition()      condServiceInvoice = GConditions.GCondition()
245      condPay = GConditions.GCondition()      condPay = GConditions.GCondition()
# Line 255  if str(ownDocumentBlock.clientRecipientB Line 255  if str(ownDocumentBlock.clientRecipientB
255      eq = GConditions.GCeq(condPay)      eq = GConditions.GCeq(condPay)
256      GConditions.GCField(eq,"_entity_data._table")      GConditions.GCField(eq,"_entity_data._table")
257      GConditions.GCConst(eq,str(ownDocumentBlock.clientRecipientBox.clientEntry))      GConditions.GCConst(eq,str(ownDocumentBlock.clientRecipientBox.clientEntry))
258        
259      # Calculo del total facturado por Productos      # Calculo del total facturado por Productos
260      productInvoiceResultSet = productInvoiceDataSource.createResultSet(condProductInvoice)      productInvoiceResultSet = productInvoiceDataSource.createResultSet(condProductInvoice)
261      more = productInvoiceResultSet.firstRecord()      more = productInvoiceResultSet.firstRecord()
# Line 269  if str(ownDocumentBlock.clientRecipientB Line 269  if str(ownDocumentBlock.clientRecipientB
269          tmpInvToPayedBlock.dateEntry = str(productInvoiceResultSet.current.getField("own_document.date"))          tmpInvToPayedBlock.dateEntry = str(productInvoiceResultSet.current.getField("own_document.date"))
270    
271          while productInvoiceResultSet.current.getField("own_document.id") == currOwnDoc and more:          while productInvoiceResultSet.current.getField("own_document.id") == currOwnDoc and more:
272              lQty = hack.a2f(productInvoiceResultSet.current.getField("own_product_item.qty"))              lQty = hack.a2f(productInvoiceResultSet.current.getField("own_product_invoice_item.qty"))
273              lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("own_product_item.unit_price"))              lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("own_product_invoice_item.unit_price"))
274              lBonus = hack.a2f(productInvoiceResultSet.current.getField("own_item.bonus"))              lBonus = hack.a2f(productInvoiceResultSet.current.getField("own_item.bonus"))
275              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("own_item.discount"))              lDiscount = hack.a2f(productInvoiceResultSet.current.getField("own_item.discount"))
276              item = lQty * lUnitPrice - lBonus - lDiscount              item = lQty * lUnitPrice - lBonus - lDiscount
277              itemTaxTotal = 0                      itemTaxTotal = 0
278              currItem = productInvoiceResultSet.current.getField("own_item.id")              currItem = productInvoiceResultSet.current.getField("own_item.id")
279              while productInvoiceResultSet.current.getField("own_item.id") == currItem and more:              while productInvoiceResultSet.current.getField("own_item.id") == currItem and more:
280                  itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("own_item_tax.amount"))                  itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("own_item_tax.amount"))
# Line 285  if str(ownDocumentBlock.clientRecipientB Line 285  if str(ownDocumentBlock.clientRecipientB
285          while odt_more:          while odt_more:
286              invoiceTotal += hack.a2f(odt_rs.current.getField("own_document_tax.amount"))              invoiceTotal += hack.a2f(odt_rs.current.getField("own_document_tax.amount"))
287              odt_more = odt_rs.nextRecord()              odt_more = odt_rs.nextRecord()
288                    
289          tmpInvToPayedBlock.amountEntry = str(invoiceTotal)          tmpInvToPayedBlock.amountEntry = str(invoiceTotal)
290          tmpInvToPayedBlock.payedEntry = "0.0"          tmpInvToPayedBlock.payedEntry = "0.0"
291          tmpInvToPayedBlock.newRecord()          tmpInvToPayedBlock.newRecord()
# Line 302  if str(ownDocumentBlock.clientRecipientB Line 302  if str(ownDocumentBlock.clientRecipientB
302          tmpInvToPayedBlock.idEntry = str(serviceInvoiceResultSet.current.getField("own_document.id"))          tmpInvToPayedBlock.idEntry = str(serviceInvoiceResultSet.current.getField("own_document.id"))
303          tmpInvToPayedBlock.numberEntry = str(serviceInvoiceResultSet.current.getField("own_document.number"))          tmpInvToPayedBlock.numberEntry = str(serviceInvoiceResultSet.current.getField("own_document.number"))
304          tmpInvToPayedBlock.dateEntry = str(serviceInvoiceResultSet.current.getField("own_document.date"))          tmpInvToPayedBlock.dateEntry = str(serviceInvoiceResultSet.current.getField("own_document.date"))
305            
306          while serviceInvoiceResultSet.current.getField ("own_document.id") == currentOwnDocument and more:          while serviceInvoiceResultSet.current.getField ("own_document.id") == currentOwnDocument and more:
307              item = hack.a2f(serviceInvoiceResultSet.current.getField ("own_service_item.amount"))              item = hack.a2f(serviceInvoiceResultSet.current.getField ("own_service_item.amount"))
308              currentItem= serviceInvoiceResultSet.current.getField ("own_item.id")              currentItem= serviceInvoiceResultSet.current.getField ("own_item.id")
309              itemTaxTotal = 0                      itemTaxTotal = 0
310              while serviceInvoiceResultSet.current.getField ("own_item.id") == currentItem and more:              while serviceInvoiceResultSet.current.getField ("own_item.id") == currentItem and more:
311                  itemTaxTotal += hack.a2f(serviceInvoiceResultSet.current.getField ("own_item_tax.amount"))                  itemTaxTotal += hack.a2f(serviceInvoiceResultSet.current.getField ("own_item_tax.amount"))
312                  more = serviceInvoiceResultSet.nextRecord ()                  more = serviceInvoiceResultSet.nextRecord ()
313              invoiceTotal += item + itemTaxTotal              invoiceTotal += item + itemTaxTotal
314                        
315          tmpInvToPayedBlock.amountEntry = str(invoiceTotal)          tmpInvToPayedBlock.amountEntry = str(invoiceTotal)
316          tmpInvToPayedBlock.payedEntry = "0.0"          tmpInvToPayedBlock.payedEntry = "0.0"
317          tmpInvToPayedBlock.newRecord()          tmpInvToPayedBlock.newRecord()
# Line 361  currencyMovementBlock.processRollback() Line 361  currencyMovementBlock.processRollback()
361  ownDocumentProceedingBlock.processRollback()  ownDocumentProceedingBlock.processRollback()
362    
363      ]]></trigger>      ]]></trigger>
364      
365    <trigger type="NAMED" name="acceptTrigger"><![CDATA[    <trigger type="NAMED" name="acceptTrigger"><![CDATA[
366  import hack  import hack
367  import string  import string
# Line 417  for recNum in range(rc): Line 417  for recNum in range(rc):
417          ownDocumentProceedingBlock.proceedingEntry = str(proceedingBlock.idEntry)          ownDocumentProceedingBlock.proceedingEntry = str(proceedingBlock.idEntry)
418          ownDocumentProceedingBlock.ownDocumentEntry = str(invoiceToPayedBlock.invoiceBox.idEntry)          ownDocumentProceedingBlock.ownDocumentEntry = str(invoiceToPayedBlock.invoiceBox.idEntry)
419          ownDocumentProceedingBlock.amountEntry = str(invoiceToPayedBlock.invoiceBox.payEntry)          ownDocumentProceedingBlock.amountEntry = str(invoiceToPayedBlock.invoiceBox.payEntry)
420          line = "| "          line = "| "
421          line += printing.printField(invoiceToPayedBlock.invoiceBox.numberEntry,14,'r') + " | "          line += printing.printField(invoiceToPayedBlock.invoiceBox.numberEntry,14,'r') + " | "
422          line += printing.printField(invoiceToPayedBlock.invoiceBox.dateEntry,20,'r') + " | "          line += printing.printField(invoiceToPayedBlock.invoiceBox.dateEntry,20,'r') + " | "
423          line += printing.printField(invoiceToPayedBlock.invoiceBox.amountEntry,20,'r') + " | "          line += printing.printField(invoiceToPayedBlock.invoiceBox.amountEntry,20,'r') + " | "
424          line += printing.printField(invoiceToPayedBlock.invoiceBox.payEntry,20,'r') + " |"          line += printing.printField(invoiceToPayedBlock.invoiceBox.payEntry,20,'r') + " |"
425          table.append(line)          table.append(line)
426    
427  line = "  "  line = "  "
428  line += printing.printField(" ",14) + "   "  line += printing.printField(" ",14) + "   "
429  line += printing.printField(" ",20) + "   "  line += printing.printField(" ",20) + "   "
430  line += printing.printTitle(" ",20) + " | "  line += printing.printTitle(" ",20) + " | "
# Line 434  table.append(line) Line 434  table.append(line)
434  ownDocumentBlock.commit()  ownDocumentBlock.commit()
435  callTrigger('cancelTrigger')  callTrigger('cancelTrigger')
436  printing.previewPrint(table)  printing.previewPrint(table)
437          
438      ]]></trigger>      ]]></trigger>
439    
440    <trigger type="NAMED" name="totalTrigger"><![CDATA[    <trigger type="NAMED" name="totalTrigger"><![CDATA[
# Line 448  for recNum in range(rc): Line 448  for recNum in range(rc):
448      total += hack.a2f(invoiceToPayedBlock.invoiceBox.payEntry)      total += hack.a2f(invoiceToPayedBlock.invoiceBox.payEntry)
449    
450  invoiceToPayedBlock.invoiceBox.totalEntry = str(total)  invoiceToPayedBlock.invoiceBox.totalEntry = str(total)
451                
452      ]]></trigger>      ]]></trigger>
453    
454      <trigger name="clientSearchTrigger" type="NAMED"><![CDATA[      <trigger name="clientSearchTrigger" type="NAMED"><![CDATA[
# Line 474  invoiceToPayedBlock.invoiceBox.totalEntr Line 474  invoiceToPayedBlock.invoiceBox.totalEntr
474              ownDocumentBlock.clientRecipientBox.clientCodeEntry = str(clientResultBlock.uidEntry)              ownDocumentBlock.clientRecipientBox.clientCodeEntry = str(clientResultBlock.uidEntry)
475              ownDocumentBlock.clientRecipientBox.clientNameEntry = str(clientResultBlock.nameEntry)              ownDocumentBlock.clientRecipientBox.clientNameEntry = str(clientResultBlock.nameEntry)
476              ownDocumentBlock.clientRecipientBox.clientEntry = str(clientResultBlock.idEntry)              ownDocumentBlock.clientRecipientBox.clientEntry = str(clientResultBlock.idEntry)
477                
478          runForm ('clientSelect.gfd', {'data': clientResultBlock, 'callback': callback})          runForm ('clientSelect.gfd', {'data': clientResultBlock, 'callback': callback})
479        elif recordCount == 1:        elif recordCount == 1:
480          clientResultBlock.jumpRecord(0)          clientResultBlock.jumpRecord(0)
# Line 512  invoiceToPayedBlock.invoiceBox.totalEntr Line 512  invoiceToPayedBlock.invoiceBox.totalEntr
512    
513      <!-- Bloque para la búsqueda de clientes -->      <!-- Bloque para la búsqueda de clientes -->
514      <block name="clientResultBlock" datasource="clientSearchDataSource">      <block name="clientResultBlock" datasource="clientSearchDataSource">
515          <entry name="idEntry" field="_entity_data.id" hidden="" x="1" y="1" width="12"/>              <entry name="idEntry" field="_entity_data.id" hidden="" x="1" y="1" width="12"/>
516          <entry name="uidTypeEntry" field="_entity_uid_data.entity_uid_type" hidden="" x="1" y="1" width="12"/>                      <entry name="uidTypeEntry" field="_entity_uid_data.entity_uid_type" hidden="" x="1" y="1" width="12"/>
517          <entry name="uidEntry" field="_entity_uid_data.uid" hidden="" x="1" y="1" width="12"/>                      <entry name="uidEntry" field="_entity_uid_data.uid" hidden="" x="1" y="1" width="12"/>
518          <entry name="nameEntry" field="_entity_data.name" hidden="" x="1" y="1" width="20"/>              <entry name="nameEntry" field="_entity_data.name" hidden="" x="1" y="1" width="20"/>
519      </block>      </block>
520    
521      <block datasource="ownDocumentDataSource" name="ownDocumentBlock">      <block datasource="ownDocumentDataSource" name="ownDocumentBlock">
522        <entry field="id" hidden="" name="idEntry" x="1" y="1"/>        <entry field="id" hidden="" name="idEntry" x="1" y="1"/>
523        <entry field="own_document_type" hidden="" name="typeEntry" x="1" y="1"/>        <entry field="own_document_type" hidden="" name="typeEntry" x="1" y="1"/>
524        <box height="5" label="Datos del Cliente" name="clientRecipientBox" width="85" x="0" y="0">        <box height="5" label="Datos del Cliente" name="clientRecipientBox" width="85" x="0" y="0">
525          
526          <entry x="1" y="1" field="recipient" name="clientEntry" width="30" hidden=""/>          <entry x="1" y="1" field="recipient" name="clientEntry" width="30" hidden=""/>
527          <entry x="1" y="1" name="clientCodeEntry" width="20"/>          <entry x="1" y="1" name="clientCodeEntry" width="20"/>
528          <entry x="21" y="1" name="clientNameEntry" width="35"/>          <entry x="21" y="1" name="clientNameEntry" width="35"/>
529    
530          <entry field="date" name="dateEntry" style="label" readonly="" typecast="date"          <entry field="date" name="dateEntry" style="label" readonly="" typecast="date"
531            rows="1" width="24" x="7" y="7"/>            rows="1" width="24" x="7" y="7"/>
532    
533          <button name="showInvoicesButton" trigger="showInvoiceToPayTrigger"          <button name="showInvoicesButton" trigger="showInvoiceToPayTrigger"
534            label="Facturas Pendientes" width="20" height="1" x="60" y="2"/>            label="Facturas Pendientes" width="20" height="1" x="60" y="2"/>
535          <button name="clientSearchButton" trigger="clientSearchTrigger" label="Buscar"          <button name="clientSearchButton" trigger="clientSearchTrigger" label="Buscar"
536            width="10" height="1" x="60" y="1"/>            width="10" height="1" x="60" y="1"/>
537          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"
538            width="10" height="1" x="70" y="1"/>            width="10" height="1" x="70" y="1"/>
539    
540        </box>        </box>
# Line 549  invoiceToPayedBlock.invoiceBox.totalEntr Line 549  invoiceToPayedBlock.invoiceBox.totalEntr
549      </block>      </block>
550    
551      <block name="invoiceToPayedBlock" datasource="invoiceToPayedDataSource">      <block name="invoiceToPayedBlock" datasource="invoiceToPayedDataSource">
552        <box height="12" label="Facturas Pendientes de Pago" name="invoiceBox"        <box height="12" label="Facturas Pendientes de Pago" name="invoiceBox"
553          width="85" x="0" y="4">          width="85" x="0" y="4">
554          <label name="numberLbl" text="Numero" x="1" y="1"/>          <label name="numberLbl" text="Numero" x="1" y="1"/>
555          <label name="dateLbl" text="Fecha" x="20" y="1"/>          <label name="dateLbl" text="Fecha" x="20" y="1"/>
# Line 558  invoiceToPayedBlock.invoiceBox.totalEntr Line 558  invoiceToPayedBlock.invoiceBox.totalEntr
558          <label name="payLbl" text="A Pagar" x="57" y="1"/>          <label name="payLbl" text="A Pagar" x="57" y="1"/>
559    
560          <entry name="idEntry" field="id" style="label" hidden="" rows="8" x="1" y="2" width="1" />          <entry name="idEntry" field="id" style="label" hidden="" rows="8" x="1" y="2" width="1" />
561          <entry name="numberEntry" field="number" style="label" rows="8"          <entry name="numberEntry" field="number" style="label" rows="8"
562            x="1" y="2" width="10" readonly=""/>            x="1" y="2" width="10" readonly=""/>
563          <entry name="dateEntry" field="date" style="label" rows="8"          <entry name="dateEntry" field="date" style="label" rows="8"
564            x="20" y="2" width="11" readonly=""/>            x="20" y="2" width="11" readonly=""/>
565          <entry name="amountEntry" field="amount" style="label" rows="8"  typecast="number" displaymask="%0.2f"          <entry name="amountEntry" field="amount" style="label" rows="8"  typecast="number" displaymask="%0.2f"
566            x="33" y="2" width="10" readonly=""/>            x="33" y="2" width="10" readonly=""/>
# Line 572  invoiceToPayedBlock.invoiceBox.totalEntr Line 572  invoiceToPayedBlock.invoiceBox.totalEntr
572          <scrollbar page="2" x="68" y="2" width="1" height="8"/>          <scrollbar page="2" x="68" y="2" width="1" height="8"/>
573    
574          <label name="totalLbl" text="Total a Pagar" x="70" y="5"/>          <label name="totalLbl" text="Total a Pagar" x="70" y="5"/>
575          <entry name="totalEntry" field="total" x="70" y="6" width="10" readonly=""          <entry name="totalEntry" field="total" x="70" y="6" width="10" readonly=""
576            typecast="number" displaymask="%0.2f"/>            typecast="number" displaymask="%0.2f"/>
577    
578          <button name="acceptButton" trigger="acceptTrigger" label="Aceptar"          <button name="acceptButton" trigger="acceptTrigger" label="Aceptar"
579            width="10" height="1" x="70" y="8"/>            width="10" height="1" x="70" y="8"/>
580          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"          <button name="cancelButton" trigger="cancelTrigger" label="Cancelar"
581            width="10" height="1" x="70" y="9"/>            width="10" height="1" x="70" y="9"/>
582        </box>        </box>
583      </block>      </block>
584    
585      <block name="proceedingBlock" datasource="proceedingDataSource">      <block name="proceedingBlock" datasource="proceedingDataSource">
586          <entry name="idEntry" field="id" hidden="" x="1" y="1" width="12"/>              <entry name="idEntry" field="id" hidden="" x="1" y="1" width="12"/>
587          <entry name="dateEntry" field="date" hidden="" x="1" y="1" width="12"/>              <entry name="dateEntry" field="date" hidden="" x="1" y="1" width="12"/>
588      </block>      </block>
589      <block name="ownDocumentProceedingBlock" datasource="ownDocumentProceedingDataSource">      <block name="ownDocumentProceedingBlock" datasource="ownDocumentProceedingDataSource">
590        <entry name="proceedingEntry" field="proceeding" hidden="" x="1" y="1" width="12"/>            <entry name="proceedingEntry" field="proceeding" hidden="" x="1" y="1" width="12"/>
591        <entry name="ownDocumentEntry" field="own_document" hidden="" x="1" y="1" width="12"/>            <entry name="ownDocumentEntry" field="own_document" hidden="" x="1" y="1" width="12"/>
592        <entry name="amountEntry" field="amount" hidden="" x="1" y="1" width="12"/>            <entry name="amountEntry" field="amount" hidden="" x="1" y="1" width="12"/>
593      </block>      </block>
594      <block name="currencyMovementBlock" datasource="currencyMovementDataSource">      <block name="currencyMovementBlock" datasource="currencyMovementDataSource">
595        <entry name="proceedingEntry" field="movement.proceeding" hidden=""        <entry name="proceedingEntry" field="movement.proceeding" hidden=""
596          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
597        <entry name="movementTypeEntry" field="movement.movement_type" hidden=""        <entry name="movementTypeEntry" field="movement.movement_type" hidden=""
598          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
599        <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"/>
600        <entry name="currencyTypeEntry" field="currency_movement.currency_type" hidden=""        <entry name="currencyTypeEntry" field="currency_movement.currency_type" hidden=""
601          x="1" y="1" width="12"/>              x="1" y="1" width="12"/>
602      </block>      </block>
603    </page>    </page>
604  </form>  </form>

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23

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