← Back to branch summary

~camptocamp/openerp-swiss-localization/better-description-jge

« back to all changes in this revision

Viewing changes to l10n_ch_payment_slip/report/bvr.mako

  • Committer: Vincent Renaville
  • Author(s): nicolas.bessi at camptocamp
  • Date: 2013-07-08 14:51:57 UTC
  • mfrom: (175.3.4 add_related_ccp_account)
  • Revision ID: vincent.renaville@camptocamp.com-20130708145157-9j2rx1auck47nxzu
Tags: V7.1
[FIX] Change addons with new release 7.1
  *) Add ccp account on res_bank but keep retro compatibility with old model.
     If no ccp is set on bank old behavior is kept
     Be aware if you have customize bvr.mako you have to replace acc_number by get_account_number()
  *) Add constraint to avoid wrong entries
  *) Disable invoice reference overwrite
  *) Better bank views
  *) Validating an account invoice does not overwrite invoice reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
l10n_ch_payment_slip/report/bvr.mako
178
178
       <% setLang(inv.partner_id.lang) %>
179
179
       <!--adresses + info block -->
180
180
        <table class="dest_address_bvr"  style="position:absolute;width:230px;word-wrap:break-word">
181
 
 
182
 
               %if inv.partner_id.title:
183
 
               <tr><td>${inv.partner_id.title.name}</tr></td>
184
 
               %endif
185
 
               %if inv.partner_id.name:
186
 
               <tr><td>${inv.partner_id.name}</td></tr>
187
 
               %endif
 
181
          <% commercial_partner = inv.commercial_partner_id if hasattr(inv, 'commercial_partner_id') else inv.partner_id %>
 
182
                %if inv.partner_id.id != commercial_partner.id:
 
183
                <tr><td>${commercial_partner.name or ''}</td></tr>
 
184
                <tr><td>${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
 
185
                %else:
 
186
                <tr><td>${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
 
187
                %endif
188
188
               <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
189
189
               <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
190
190
               <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
198
198
           <br/>
199
199
       </div>
200
200
 
201
 
       <div id="cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;height:180mm">
 
201
       <div id="cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;height:180mm;z-index:3500">
202
202
        <!-- Your communication message here -->
203
203
       </div>
204
204
    %if company.bvr_background:
209
209
         <table class="slip_add">
210
210
           <tr><td>${_space(_get_ref(inv))}</td></tr>
211
211
           <tr><td>
212
 
               %if title:
213
 
               ${inv.partner_id.title.name or ''|entity}&nbsp;
214
 
               %endif
215
 
               ${inv.partner_id.name |entity}</td></tr>
 
212
            %if inv.partner_id.id != commercial_partner.id:
 
213
                ${commercial_partner.name or ''|entity}
 
214
            %else:
 
215
                ${inv.partner_id.name |entity}
 
216
            %endif
 
217
            </td></tr>
216
218
           <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
217
219
           <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
218
220
           <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
226
228
       %endif
227
229
 
228
230
 
229
 
       <div id="slip_bank_acc" class="slip_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.acc_number or ''}</div>
 
231
       <div id="slip_bank_acc" class="slip_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.get_account_number() or ''}</div>
230
232
 
231
233
       <div id="slip_amount" class="slip_amount"><span >${"&nbsp;".join(_space(('%.2f' % inv.amount_total)[:-3], 1))}</span>  <span style="padding-left:6mm">${"&nbsp;".join(_space(('%.2f' % inv.amount_total)[-2:], 1))}</span></div>
232
234
 
247
249
       <div id="slip2_address_b" class="slip2_address_b">
248
250
           <table class="slip_add">
249
251
               <tr><td>
250
 
                   %if title:
251
 
                   ${inv.partner_id.title.name or ''|entity}
252
 
                   %endif
253
 
                   ${inv.partner_id.name |entity}</td></tr>
 
252
                %if inv.partner_id.id != commercial_partner.id:
 
253
                    ${commercial_partner.name or ''|entity}
 
254
                %else:
 
255
                    ${inv.partner_id.name |entity}
 
256
                %endif
 
257
               </td></tr>
254
258
               <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
255
259
               <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
256
260
               <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
257
 
           </table></td>
 
261
           </table>
258
262
       </div>
259
263
 
260
264
       %if inv.partner_bank_id.print_partner:
261
265
       <div id="slip2_comp" class="slip2_comp">
262
266
           <table class="slip_add">
263
 
               <tr><td>${user.company_id.partner_id.name}</td></tr>
264
 
               <tr><td>${user.company_id.partner_id.street}</td></tr>
265
 
               <tr><td></td></tr>
266
 
               <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
 
267
            <tr><td>${user.company_id.partner_id.name}</td></tr>
 
268
            <tr><td>${user.company_id.partner_id.street}</td></tr>
 
269
            <tr><td></td></tr>
 
270
            <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
267
271
           </table>
268
272
       </div>
269
273
       %endif
275
279
         </div>
276
280
       %endif
277
281
 
278
 
       <div id="slip2_bank_acc" class="slip2_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.acc_number or ''}</div>
 
282
       <div id="slip2_bank_acc" class="slip2_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.get_account_number() or ''}</div>
279
283
    <!--- scaner code bar -->
280
284
  <div id="ocrbb">
281
285
    <%
286
290
       tt += [v for v in _get_ref(inv)]
287
291
       tt.append('+')
288
292
       tt.append('&nbsp;')
289
 
       tt += [v for v in inv.partner_bank_id.acc_number.split('-')[0]+(str(inv.partner_bank_id.acc_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.acc_number.split\
 
293
       tt += [v for v in inv.partner_bank_id.get_account_number().split('-')[0]+(str(inv.partner_bank_id.get_account_number().split('-')[1])).rjust(6,'0')+inv.partner_bank_id.get_account_number().split\
290
294
('-')[2]]
291
295
       tt.append('&gt;')
292
296
    %>