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

Diff of /papo/forms/ctaCteProvider.neb

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

revision 1.2 by apronotti, Wed May 28 15:12:46 2003 UTC revision 1.3 by charlie, Tue Jun 3 01:30:44 2003 UTC
# Line 7  Line 7 
7    
8    <datasource name="invoiceToPayDataSource" cache="1"/>    <datasource name="invoiceToPayDataSource" cache="1"/>
9    
10      <datasource name="miProviderDataSource" database="papo"
11        table="_entity_data">
12        <condition>
13          <and>
14            <null>
15              <cfield name="_entity_data._end_t"/>
16            </null>
17          </and>
18        </condition>
19      </datasource>
20    
21    <datasource name="providerSearchDataSource" database="papo"    <datasource name="providerSearchDataSource" database="papo"
22                table="_entity_data, _alien_entity_data, _persona_data, _provider_data,  _entity_uid_data"                table="_entity_data, _alien_entity_data, _persona_data, _provider_data,  _entity_uid_data"
23                order_by="_entity_data.name">                order_by="_entity_data.name">
# Line 56  Line 67 
67      </condition>      </condition>
68    </datasource>    </datasource>
69    
70    <datasource name="invTaxTotDataSource" database="papo"    <datasource name="alienDocumentDataSource" database="papo"
71                table="alien_document, alien_document_tax">                table="_entity_data, alien_document, _document_type_data"
72      <condition>                order_by="alien_document.date">
       <eq>  
         <cfield name="alien_document.id"/>  
         <cfield name="alien_document_tax.alien_document"/>  
       </eq>  
     </condition>  
   </datasource>  
   
   <datasource name="productInvoiceDataSource" database="papo"  
               table="_entity_data, alien_document, alien_item, alien_product_item, alien_item_tax"  
               order_by="alien_product_item.id">  
73      <condition>      <condition>
74        <and>        <and>
75          <eq>          <eq>
76            <!-- Aqui se refiere al cliente  -->            <!-- Aqui se refiere al cliente  -->
77            <cfield name="_entity_data._table"/>            <cfield name="_entity_data.id"/>
78            <cfield name="alien_document.sender"/>            <cfield name="alien_document.sender"/>
79          </eq>          </eq>
80          <eq>          <eq>
81            <cfield name="alien_document.id"/>            <cfield name="_document_type_data._table"/>
           <cfield name="alien_item.alien_document"/>  
         </eq>  
         <eq>  
           <cfield name="alien_item.id"/>  
           <cfield name="alien_product_item.alien_item"/>  
         </eq>  
         <eq>  
           <cfield name="alien_item.id"/>  
           <cfield name="alien_item_tax.alien_item"/>  
         </eq>  
         <eq>  
82            <cfield name="alien_document.alien_document_type"/>            <cfield name="alien_document.alien_document_type"/>
           <cconst value="2"/>  
83          </eq>          </eq>
84            <or>
85              <eq>
86                <cfield name="alien_document.alien_document_type"/>
87                <cconst value="2"/> <!-- Factura tipo A -->
88              </eq>
89              <eq>
90                <cfield name="alien_document.alien_document_type"/>
91                <cconst value="10"/> <!-- Factura tipo B -->
92              </eq>
93              <eq>
94                <cfield name="alien_document.alien_document_type"/>
95                <cconst value="11"/> <!-- Factura tipo C -->
96              </eq>
97              <eq>
98                <cfield name="alien_document.alien_document_type"/>
99                <cconst value="18"/> <!-- Nota Credito tipo A -->
100              </eq>
101              <eq>
102                <cfield name="alien_document.alien_document_type"/>
103                <cconst value="19"/> <!-- Nota Credito tipo B -->
104              </eq>
105              <eq>
106                <cfield name="alien_document.alien_document_type"/>
107                <cconst value="20"/> <!-- Notra Credito tipo C -->
108              </eq>
109            </or>
110       </and>       </and>
111      </condition>      </condition>
112    </datasource>    </datasource>
113    
   <datasource name="payTotDataSource" database="papo" table="_entity_data, alien_document, alien_document_proceeding">  
     <condition>  
       <and>  
         <eq>  
           <!-- Aqui se refiere al cliente  -->  
           <cfield name="_entity_data._table"/>  
           <cfield name="alien_document.sender"/>  
         </eq>  
         <eq>  
           <cfield name="alien_document.id"/>  
           <cfield name="alien_document_proceeding.alien_document"/>  
         </eq>  
         <and>  
           <or>  
             <eq>  
               <cfield name="alien_document.alien_document_type"/>  
               <cconst value="2"/>  
             </eq>  
             <eq>  
               <cfield name="alien_document.alien_document_type"/>  
               <cconst value="5"/>  
             </eq>  
           </or>  
         </and>  
       </and>  
     </condition>  
   </datasource>  
   
   <datasource database="papo" name="alienDocumentDataSource" table="alien_document"  
     order_by="date" />  
   
   <datasource name="proceedingDataSource" database="papo" table="proceeding"/>  
   
114    <datasource name="alienDocumentProceedingDataSource" database="papo" table="alien_document_proceeding"/>    <datasource name="alienDocumentProceedingDataSource" database="papo" table="alien_document_proceeding"/>
115    
   <datasource name="currencyMovementDataSource" database="papo"  
               table="movement, currency_movement">  
     <condition>  
       <eq>  
         <cfield name="movement.id"/>  
         <cfield name="currency_movement.movement"/>  
       </eq>  
     </condition>  
   </datasource>  
   
116    <trigger name="cancelTrigger" type="NAMED">    <trigger name="cancelTrigger" type="NAMED">
117      alienDocumentSearchBlock.processRollback()      alienDocumentSearchBlock.clear()
118      invoiceToPayBlock.processRollback()      invoiceToPayBlock.clear()
119    </trigger>    </trigger>
120    
121    <trigger name="searchTrigger" type="NAMED"><![CDATA[    <trigger name="searchTrigger" type="NAMED"><![CDATA[
122          callTrigger('startWaitingModeTrigger')
123  tmpInvToPayedBlock.processRollback()  tmpInvToPayedBlock.clear()
124  invoiceToPayBlock.processRollback()  invoiceToPayBlock.clear()
125    
126  total = 0.0  total = 0.0
127  if str(alienDocumentSearchBlock.providerSearchBox.providerEntry):  rs = miProviderDataSource.createResultSet({'_entity_data.id':str(alienDocumentSearchBlock.providerSearchBox.providerEntry)})
128    provider = 0
129    if rs.firstRecord():
130        provider = rs.current.getField('_table')
131        
132    if provider:
133      import gnue.common.GConditions as GConditions      import gnue.common.GConditions as GConditions
134      import hack      import hack
135    
136      condProductInvoice = GConditions.GCondition()      documentType = { '2':'A', '10':'B', '11':'C', '18':'A', '19':'B', '20':'C' }
     condServiceInvoice = GConditions.GCondition()  
     condPay = GConditions.GCondition()  
   
     eq = GConditions.GCeq(condProductInvoice)  
     GConditions.GCField(eq,"_entity_data._table")  
     GConditions.GCConst(eq,str(alienDocumentSearchBlock.providerSearchBox.providerEntry))  
   
     eq = GConditions.GCeq(condPay)  
     GConditions.GCField(eq,"_entity_data._table")  
     GConditions.GCConst(eq,str(alienDocumentSearchBlock.providerSearchBox.providerEntry))  
       
     # Calculo del total facturado por Productos  
     productInvoiceResultSet = productInvoiceDataSource.createResultSet(condProductInvoice)  
     more = productInvoiceResultSet.firstRecord()  
   
137    
138        # Calculo del total facturado por Productos
139        alienDocumentResultSet = alienDocumentDataSource.createResultSet({"_entity_data._table":str(provider)})
140        more = alienDocumentResultSet.firstRecord()
141      while more:      while more:
142          invoiceTotal = 0          monto = hack.a2f(alienDocumentResultSet.current.getField("alien_document.tax_total"),2) + hack.a2f(alienDocumentResultSet.current.getField("alien_document.net_total"),2)
         currAlienDoc = productInvoiceResultSet.current.getField("alien_document.id")  
         invoiceToPayBlock.invoiceBox.idEntry = str(productInvoiceResultSet.current.getField("alien_document.id"))  
         while productInvoiceResultSet.current.getField("alien_document.id") == currAlienDoc and more:  
             lQty = hack.a2f(productInvoiceResultSet.current.getField("alien_product_item.qty"))  
             lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("alien_product_item.unit_price"))  
             lBonus = hack.a2f(productInvoiceResultSet.current.getField("alien_item.bonus"))  
             lDiscount = hack.a2f(productInvoiceResultSet.current.getField("alien_item.discount"))  
             item = lQty * lUnitPrice - lBonus - lDiscount  
             itemTaxTotal = 0          
             currItem = productInvoiceResultSet.current.getField("alien_item.id")  
             while productInvoiceResultSet.current.getField("alien_item.id") == currItem and more:  
                 itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("alien_item_tax.amount"))  
                 more = productInvoiceResultSet.nextRecord()  
             invoiceTotal += item + itemTaxTotal  
         odt_rs = invTaxTotDataSource.createResultSet({"alien_document.id":currAlienDoc})  
         odt_more = odt_rs.firstRecord()  
         while odt_more:  
             invoiceTotal += hack.a2f(odt_rs.current.getField("alien_document_tax.amount"))  
             odt_more = odt_rs.nextRecord()  
                   
         invoiceToPayBlock.invoiceBox.numberEntry = str(productInvoiceResultSet.current.getField("alien_document.number"))  
         invoiceToPayBlock.invoiceBox.dateEntry = str(productInvoiceResultSet.current.getField("alien_document.date"))  
         invoiceToPayBlock.invoiceBox.amountEntry = str(invoiceTotal)  
         total = total + invoiceTotal  
         invoiceToPayBlock.invoiceBox.payedEntry = "0.0"  
         tmpInvToPayedBlock.newRecord()  
   
     # Busco las que ya han sido pagadas  
     rs = payTotDataSource.createResultSet(condPay)  
     more = rs.firstRecord()  
     while more:  
         rc = tmpInvToPayedBlock.getRecordCount()  
         for recNum in range(rc):  
             tmpInvToPayedBlock.jumpRecord(recNum)  
             if hack.a2f(tmpInvToPayedBlock.idEntry) == hack.a2f(rs.current.getField("alien_document_proceeding.alien_document")):  
                 tmpInvToPayedBlock.payedEntry = str(  
                     hack.a2f(tmpInvToPayedBlock.payedEntry) + \  
                     hack.a2f(rs.current.getField("alien_document_proceeding.amount") ) )  
         more = rs.nextRecord()  
143    
144            pagado = 0.0
145            proceedingResultSet = alienDocumentProceedingDataSource.createResultSet({'alien_document':str(alienDocumentResultSet.current.getField("alien_document.id"))})
146            rs = proceedingResultSet.firstRecord()
147            while rs:
148                pagado += hack.a2f(proceedingResultSet.current.getField("amount"),2)
149                rs = proceedingResultSet.nextRecord()
150    
151            if pagado != monto:
152                if not invoiceToPayBlock.getCurrentRecord().isEmpty():
153                    invoiceToPayBlock.newRecord()
154    
155                if alienDocumentResultSet.current.getField("alien_document.alien_document_type") < 15:
156                    invoiceToPayBlock.invoiceBox.docEntry = "Fac"
157                    multi = 1
158                else:
159                    invoiceToPayBlock.invoiceBox.docEntry = "NC "
160                    multi = -1
161                
162                invoiceToPayBlock.invoiceBox.typeEntry = documentType[str(alienDocumentResultSet.current.getField("alien_document.alien_document_type"))]
163                invoiceToPayBlock.invoiceBox.numberEntry = str(alienDocumentResultSet.current.getField("alien_document.number"))
164                invoiceToPayBlock.invoiceBox.dateEntry = str(alienDocumentResultSet.current.getField("alien_document.date"))
165                invoiceToPayBlock.invoiceBox.payedEntry = str(pagado)
166                invoiceToPayBlock.invoiceBox.amountEntry = str(monto)
167                invoiceToPayBlock.invoiceBox.remainEntry = str(monto - pagado)
168    
169                total += round((monto - pagado) * multi,2)
170                
171            more = alienDocumentResultSet.nextRecord()
172            
173  invoiceToPayBlock.invoiceBox.totalEntry = str(total)  invoiceToPayBlock.invoiceBox.totalEntry = str(total)
174        callTrigger('endWaitingModeTrigger')
175          
176    ]]></trigger>    ]]></trigger>
177    
178    <trigger name="printTrigger" type="NAMED"><![CDATA[    <trigger name="printTrigger" type="NAMED"><![CDATA[
179                
180  tmpInvToPayedBlock.processRollback()  callTrigger('showInvoiceToPayTrigger')
 invoiceToPayBlock.processRollback()  
181    
182  total = 0.0  total = 0.0
183  if str(alienDocumentSearchBlock.providerSearchBox.providerEntry):  rc = invoiceToPayedBlock.getRecordCount()
184    
185    if rc > 0:
186      callTrigger('startWaitingModeTrigger')      callTrigger('startWaitingModeTrigger')
187      import gnue.common.GConditions as GConditions      import printing
188      import hack      import hack
     import string  
     
     def printField (field,size):  
         if str(field).strip() == "None":  
             field = ""  
         return str(field).ljust(size)  
   
     def printTitle (field,size):  
         return str(field).center(size)  
   
     condProductInvoice = GConditions.GCondition()  
     condServiceInvoice = GConditions.GCondition()  
     condPay = GConditions.GCondition()  
   
     eq = GConditions.GCeq(condProductInvoice)  
     GConditions.GCField(eq,"_entity_data._table")  
     GConditions.GCConst(eq,str(alienDocumentSearchBlock.providerSearchBox.providerEntry))  
   
     eq = GConditions.GCeq(condPay)  
     GConditions.GCField(eq,"_entity_data._table")  
     GConditions.GCConst(eq,str(alienDocumentSearchBlock.providerSearchBox.providerEntry))  
       
     # Calculo del total facturado por Productos  
     productInvoiceResultSet = productInvoiceDataSource.createResultSet(condProductInvoice)  
     more = productInvoiceResultSet.firstRecord()  
189    
190      table = []      table = []
191      line = "\n\nListado de Cuenta Corrientes de Proveedores\n\n\n"      line = "\n\nListado de Cuenta Corrientes de Clientes\n\n\n"
192      table.append(line)      table.append(line)
       
     line = printTitle("Documento",12)  
     line += printTitle("Numero",15)  
     line += printTitle("Fecha",15)  
     line += printTitle("Importe",15)  
     table.append(line)  
   
193    
194      while more:      line = printing.printTitle("Documento",14) + '|'
195          invoiceTotal = 0      line += printing.printTitle("Fecha",11) + '|'
196          currAlienDoc = productInvoiceResultSet.current.getField("alien_document.id")      line += printing.printTitle("Monto",15) + '|'
197          line = printField(productInvoiceResultSet.current.getField("alien_document.id"),12)      line += printing.printTitle("Pagado",15) + '|'
198          while productInvoiceResultSet.current.getField("alien_document.id") == currAlienDoc and more:      line += printing.printTitle("Saldo",15)
199              lQty = hack.a2f(productInvoiceResultSet.current.getField("alien_product_item.qty"))      table.append(line)
             lUnitPrice = hack.a2f(productInvoiceResultSet.current.getField("alien_product_item.unit_price"))  
             lBonus = hack.a2f(productInvoiceResultSet.current.getField("alien_item.bonus"))  
             lDiscount = hack.a2f(productInvoiceResultSet.current.getField("alien_item.discount"))  
             item = lQty * lUnitPrice - lBonus - lDiscount  
             itemTaxTotal = 0          
             currItem = productInvoiceResultSet.current.getField("alien_item.id")  
             while productInvoiceResultSet.current.getField("alien_item.id") == currItem and more:  
                 itemTaxTotal += hack.a2f(productInvoiceResultSet.current.getField("alien_item_tax.amount"))  
                 more = productInvoiceResultSet.nextRecord()  
             invoiceTotal += item + itemTaxTotal  
         odt_rs = invTaxTotDataSource.createResultSet({"alien_document.id":currAlienDoc})  
         odt_more = odt_rs.firstRecord()  
         while odt_more:  
             invoiceTotal += hack.a2f(odt_rs.current.getField("alien_document_tax.amount"))  
             odt_more = odt_rs.nextRecord()  
                   
         line += printField(productInvoiceResultSet.current.getField("alien_document.number"),15)  
         line += printField(productInvoiceResultSet.current.getField("alien_document.date"),15)  
   
         total = total + invoiceTotal  
200    
201          line += printField(string.rjust("%0.2f".strip() % hack.a2f(invoiceTotal),14),14)      for recNum in range(rc):
202            invoiceToPayedBlock.jumpRecord(recNum)
203            line = printing.printField(invoiceToPayedBlock.invoiceBox.docEntry,4)
204            line += printing.printField(invoiceToPayedBlock.invoiceBox.typeEntry,2)
205            line += printing.printField(invoiceToPayedBlock.invoiceBox.numberEntry,8) + '|'
206            line += printing.printField(invoiceToPayedBlock.invoiceBox.dateEntry,11) + '|'
207            line += printing.printField(invoiceToPayedBlock.invoiceBox.amountEntry,15,'r') + '|'
208            line += printing.printField(invoiceToPayedBlock.invoiceBox.payedEntry,15,'r') + '|'
209            line += printing.printField(invoiceToPayedBlock.invoiceBox.remainEntry,15,'r')
210          table.append(line)          table.append(line)
211            
212      callTrigger('endWaitingModeTrigger')      callTrigger('endWaitingModeTrigger')
213      hack.previewPrint(table)      printing.previewPrint(table)
       
   ]]></trigger>  
   
   <trigger type="NAMED" name="totalTrigger"><![CDATA[  
   
 import hack  
 rc = invoiceToPayBlock.getRecordCount()  
 total = 0.0  
   
 for recNum in range(rc):  
     invoiceToPayBlock.jumpRecord(recNum)  
     total += hack.a2f(invoiceToPayBlock.invoiceBox.payEntry)  
214    
215  invoiceToPayBlock.invoiceBox.totalEntry = str(total)    ]]></trigger>
               
     ]]></trigger>  
     
   <trigger type="NAMED" name="acceptTrigger"><![CDATA[  
 import hack  
   
 proceedingBlock.processRollback()  
 currencyMovementBlock.processRollback()  
 alienDocumentProceedingBlock.processRollback()  
   
 alienDocumentSearchBlock.providerSearchBox.dateEntry = alienDocumentDataSource.getTimeStamp()  
 alienDocumentSearchBlock.providerSearchBox.idEntry.autofillBySequence('alien_document_id_seq')  
 alienDocumentSearchBlock.providerSearchBox.typeEntry = "6"  
   
 proceedingBlock.idEntry.autofillBySequence('proceeding_id_seq')  
 proceedingBlock.dateEntry = proceedingDataSource.getTimeStamp()  
   
 currencyMovementBlock.proceedingEntry = str(proceedingBlock.idEntry)  
 currencyMovementBlock.movementTypeEntry = "" # Revisar com queda esto  
 currencyMovementBlock.currencyTypeEntry = "1"  
 currencyMovementBlock.amountEntry = str(invoiceToPayBlock.invoiceBox.totalEntry)  
   
 alienDocumentProceedingBlock.proceedingEntry = str(proceedingBlock.idEntry)  
 alienDocumentProceedingBlock.alienDocumentEntry = str(alienDocumentSearchBlock.providerSearchBox.idEntry)  
 alienDocumentProceedingBlock.amountEntry = str(invoiceToPayBlock.invoiceBox.totalEntry)  
   
 rc = invoiceToPayBlock.getRecordCount()  
 for recNum in range(rc):  
     invoiceToPayBlock.jumpRecord(recNum)  
     if hack.a2f(invoiceToPayBlock.invoiceBox.payEntry) > 0:  
         alienDocumentProceedingBlock.newRecord()  
         alienDocumentProceedingBlock.proceedingEntry = str(proceedingBlock.idEntry)  
         alienDocumentProceedingBlock.alienDocumentEntry = str(invoiceToPayBlock.invoiceBox.idEntry)  
         alienDocumentProceedingBlock.amountEntry = str(invoiceToPayBlock.invoiceBox.payEntry)  
   
 alienDocumentSearchBlock.commit()  
 callTrigger('cancelTrigger')  
         
     ]]></trigger>  
216    
217      <trigger name="providerSearchTrigger" type="NAMED"><![CDATA[      <trigger name="providerSearchTrigger" type="NAMED"><![CDATA[
218    
# Line 381  elif recordCount == 1: Line 243  elif recordCount == 1:
243    
244    ]]></trigger>    ]]></trigger>
245    
246    <trigger name="startWaitingModeTrigger" type="NAMED"><![CDATA[    <neb:Sub neb:src="wait.nebc"/>
     setStatusText("Procesando ...")  
     try:  
       # gnue version <= 0.4  
       from gnue.forms.GFEvent import GFEvent  
     except ImportError:  
       # gnue version >= 0.5  
       from gnue.common.events.Event import Event as GFEvent  
   
     # busy clock  
     self._object.dispatchEvent(GFEvent('beginWAIT'))  
   ]]></trigger>  
   
   <trigger name="endWaitingModeTrigger" type="NAMED"><![CDATA[  
     try:  
       # gnue version <= 0.4  
       from gnue.forms.GFEvent import GFEvent  
     except ImportError:  
       # gnue version >= 0.5  
       from gnue.common.events.Event import Event as GFEvent  
   
     self._object.dispatchEvent(GFEvent('endWAIT'))  
     setStatusText("Listo")  
   ]]></trigger>  
247    
248    <page name="Cuenta Corriente Proveedores">    <page name="Cuenta Corriente Proveedores">
249    
# Line 415  elif recordCount == 1: Line 254  elif recordCount == 1:
254          <entry name="providerNameEntry" field="_entity_data.name" hidden="" x="1" y="1" width="20"/>              <entry name="providerNameEntry" field="_entity_data.name" hidden="" x="1" y="1" width="20"/>    
255      </block>      </block>
256    
257      <block datasource="alienDocumentDataSource" name="alienDocumentSearchBlock" restrictInsert="">      <block datasource="tmpSearchDataSource" name="alienDocumentSearchBlock" restrictInsert="">
258    
259        <box label="Proveedores" name="providerSearchBox" width="85" height="6" x="1" y="0">        <box label="Proveedores" name="providerSearchBox" width="85" height="6" x="1" y="0">
260    
# Line 455  elif recordCount == 1: Line 294  elif recordCount == 1:
294        <box height="12" label="Cuenta Corriente" name="invoiceBox"        <box height="12" label="Cuenta Corriente" name="invoiceBox"
295          width="85" x="1" y="4">          width="85" x="1" y="4">
296          <label name="numberLbl" text="Numero" x="1" y="1"/>          <label name="numberLbl" text="Numero" x="1" y="1"/>
297          <label name="dateLbl" text="Fecha" x="20" y="1"/>          <label name="dateLbl" text="Fecha" x="26" y="1"/>
298          <label name="amountLbl" text="Monto" x="33" y="1"/>          <label name="amountLbl" text="Monto" x="38" y="1"/>
299          <label name="payedLbl" text="Pagado" x="45" y="1"/>          <label name="payedLbl" text="Pagado" x="49" y="1"/>
300          <label name="payLbl" text="A Pagar" x="57" y="1"/>          <label name="payLbl" text="Saldo" x="60" y="1"/>
301    
302          <entry name="idEntry" field="id" style="label" hidden="" rows="8"          <entry name="docEntry" field="doc" style="label" rows="8"
303            x="1" y="2" width="1" />            x="1" y="2" width="3" readonly=""/>
304            <entry name="typeEntry" field="type" style="label" rows="8"
305              x="4" y="2" width="2" readonly=""/>
306          <entry name="numberEntry" field="number" style="label" rows="8"          <entry name="numberEntry" field="number" style="label" rows="8"
307            x="1" y="2" width="19" readonly=""/>            x="6" y="2" width="19" readonly=""/>
308          <entry name="dateEntry" field="date" style="label" rows="8"          <entry name="dateEntry" field="date" style="label" rows="8"
309            x="20" y="2" width="11" readonly=""/>            x="26" y="2" width="11" readonly=""/>
310          <entry name="amountEntry" field="amount" style="label" rows="8"          <entry name="amountEntry" field="amount" style="label" rows="8"
311            typecast="number" displaymask="%0.2f"            typecast="number" displaymask="%0.2f"
312            x="33" y="2" width="10" readonly=""/>            x="38" y="2" width="10" readonly=""/>
313          <entry name="payedEntry" field="payed" style="label" rows="8"          <entry name="payedEntry" field="payed" style="label" rows="8"
314            x="45" y="2" width="11" readonly="" typecast="number" displaymask="%0.2f"/>            typecast="number" displaymask="%0.2f"
315              x="49" y="2" width="10" readonly=""/>
316            <entry name="remainEntry" field="remain" style="label" rows="8"
317              x="60" y="2" width="10" readonly="" typecast="number" displaymask="%0.2f"/>
318          <scrollbar page="2" x="68" y="2" width="1" height="8"/>          <scrollbar page="2" x="68" y="2" width="1" height="8"/>
319    
320          <entry name="totalEntry" field="total" x="70" y="6" width="10" readonly="" typecast="number" displaymask="%0.2f"/>          <entry name="totalEntry" field="total" x="70" y="6" width="10" readonly="" typecast="number" displaymask="%0.2f"/>
# Line 478  elif recordCount == 1: Line 322  elif recordCount == 1:
322        </box>        </box>
323      </block>      </block>
324    
     <block name="proceedingBlock" datasource="proceedingDataSource">  
         <entry name="idEntry" field="id" hidden="" x="1" y="1" width="12"/>      
         <entry name="dateEntry" field="date" hidden="" x="1" y="1" width="12"/>      
     </block>  
     <block name="alienDocumentProceedingBlock" datasource="alienDocumentProceedingDataSource">  
       <entry name="proceedingEntry" field="proceeding" hidden="" x="1" y="1" width="12"/>      
       <entry name="alienDocumentEntry" field="alien_document" hidden=""  
         x="1" y="1" width="12"/>      
       <entry name="amountEntry" field="amount" hidden="" x="1" y="1" width="12"/>      
     </block>  
     <block name="currencyMovementBlock" datasource="currencyMovementDataSource">  
       <entry name="proceedingEntry" field="movement.proceeding" hidden=""  
         x="1" y="1" width="12"/>      
       <entry name="movementTypeEntry" field="movement.movement_type" hidden=""  
         x="1" y="1" width="12"/>      
       <entry name="amountEntry" field="movement.amount" hidden="" x="1" y="1" width="12"/>      
       <entry name="currencyTypeEntry" field="currency_movement.currency_type" hidden=""  
         x="1" y="1" width="12"/>      
     </block>  
325    </page>    </page>
326    
327    

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

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