870a871
>         ,campaign.name
883a885
>         ,banksyst.campaign campaign
901a904
>         and o.campaign_id=campaign.campaign_id(+)
910a914,915
>     dict['document__program']=[r[72] or '']
> 
933a939
> 
2046a2053
>             ,campaign.name
2054c2061,2062
<              banksyst.addinfo a
---
>              banksyst.addinfo a,
>              banksyst.campaign
2064c2072,2073
<              and l.lease_id=e.lease_id(+)""",(lease_id))
---
>              and l.lease_id=e.lease_id(+)
>              and l.campaign_id=campaign.campaign_id(+)""",(lease_id))
2127a2137
>     dict['document__program'] = [d[60] or '']
2583,2595c2593,2616
<     cur.execute("""select
<         c.ctype lessee_ctype, c.reg_no reg_no, l.vtype otype, l.price price,
<         l.product product, l.downpayment downpay, l.sales_person_name sales_person_name,l.sel_kasko_price_code
<         ,l.sel_lkf_price_code
<         ,to_number(ic.premium, '9999.99')      --kasko
<         ,to_number(ic1.premium, '9999.99')     --TPL
<         ,ic.payment_type kasko_pymt_type
<         ,ic1.payment_type tpl_pymt_type
<         ,l.lease_oid
<         ,l.banksalesperson
<         ,cl.description banksalesperson_name
<         from banksyst.lease_view l, banksyst.customer c, banksyst.insurance_quotes ic, banksyst.insurance_quotes ic1,
<         banksyst.classif cl
---
>     cur.execute("""
>         select c.ctype lessee_ctype,
>             c.reg_no reg_no,
>             l.vtype otype,
>             l.price price,
>             l.product product,
>             l.downpayment downpay,
>             l.sales_person_name sales_person_name,
>             l.sel_kasko_price_code,
>             l.sel_lkf_price_code,
>             to_number(ic.premium, '9999.99'), --kasko
>             to_number(ic1.premium, '9999.99'), --TPL 10
>             ic.payment_type kasko_pymt_type,
>             ic1.payment_type tpl_pymt_type,
>             l.lease_oid,
>             l.banksalesperson,
>             cl.description banksalesperson_name, --15
>             campaign.name program
>         from banksyst.lease_view l,
>             banksyst.customer c,
>             banksyst.insurance_quotes ic,
>             banksyst.insurance_quotes ic1,
>             banksyst.classif cl,
>             banksyst.campaign campaign
2602c2623,2624
<         and cl.code(+)=l.banksalesperson""",(lease_id,))
---
>             and cl.code(+) = l.banksalesperson
>             and l.campaign_id=campaign.campaign_id(+)""",(lease_id,))
2623a2646,2647
>     dict['document__program']=[d['program'] or '']
> 
2667c2691,2695
<         from banksyst.lease l, banksyst.addinfo ad, banksyst.customer c, banksyst.extra_fields e, banksyst.lease_conditions lc
---
>         ,campaign.name as program
>         from banksyst.lease l, banksyst.addinfo ad,
>         banksyst.customer c, banksyst.extra_fields e,
>         banksyst.lease_conditions lc,
>         banksyst.campaign campaign
2671a2700
>         and l.campaign_id=campaign.campaign_id(+)
2676a2706,2707
>     dict['document__program'] = [d['program'][0]]
> 
2812a2844
>         ,campaign.name
2817c2849,2850
<         banksyst.extra_fields e
---
>         banksyst.extra_fields e,
>         banksyst.campaign campaign
2824a2858
>         and l.campaign_id=campaign.campaign_id(+)
2838a2873
> 
2893a2929
>     dict['document__program'] = [d[75] or '']
3374a3411
>             ,campaign.name
3380c3417,3418
<             banksyst.extra_fields e
---
>             banksyst.extra_fields e,
>             banksyst.campaign campaign
3387a3426
>             and l.campaign_id=campaign.campaign_id(+)
3446a3486,3487
>     dict['document__program'] = [d[77] or '']
> 
6705,6740c6746,6804
<     cur.execute("""select
<          l.lease_id contract_no
<         ,c.cre_id
<         ,l.lessee_id
<         ,l.cre_type
<         ,l.lease_manager_name
<         ,l.make 		--5
<         ,l.model
<         ,l.myear
<         ,c.price
<         ,c.currency
<         ,l.cd_total_exposure	--10
<         ,l.cd_collateral_gap
<         ,c.product
<         ,c.downpayment
<         ,banksyst.is_residual_or_balloon(c.product, c.residual_value, c.balloon_makse) residual_value
<         ,decode(c.interest_type,'FIX','Fixed interest','FLOAT','6M Euribor','FLOAT3M','3M Euribor','Current Euribor') interest_type --15
<         ,c.payment_period
<         ,decode(c.payment_freq,1,'monthly',3,'quarterly',6,'semiannual',12,'annual')
<         ,c.contract_fee_sum
<         ,c.contract_fee_sum-c.nordea_base_contract_fee-nvl(c.vendor_fee2,0) vendor_fee
<         ,nvl(c.vendor_fee2,0)	--20
<         ,decode(c.sel_kasko,'Y','Y','N')
<         ,decode(c.sel_lkf,'Y','Y','N')
<         ,decode(c.sel_gas_card,'Y','Y','N')
<         ,l.cd_change_descr
<         ,l.cd_change_fee	--25
<         ,c.sales_margin
<         ,c.sales_margin+c.nordea_margin
<         ,cu.fullname lessee_name
<         ,cu.reg_no reg_no
<         ,l.navision_id
<         ,cu.pep
<         ,cu.aml_category
<         ,l.lease_oid
<         from banksyst.lease_view l, banksyst.cre_conditions c, banksyst.customer cu
---
>     cur.execute("""
>         select l.lease_id contract_no,
>             c.cre_id,
>             l.lessee_id,
>             l.cre_type,
>             l.lease_manager_name,
>             l.make, --5
>             l.model,
>             l.myear,
>             c.price,
>             c.currency,
>             l.cd_total_exposure, --10
>             l.cd_collateral_gap,
>             c.product,
>             c.downpayment,
>             banksyst.is_residual_or_balloon(c.product, c.residual_value, c.balloon_makse) residual_value,
>             decode(
>                 c.interest_type,
>                 'FIX',
>                 'Fixed interest',
>                 'FLOAT',
>                 '6M Euribor',
>                 'FLOAT3M',
>                 '3M Euribor',
>                 'Current Euribor'
>             ) interest_type, --15
>             c.payment_period,
>             decode(
>                 c.payment_freq,
>                 1,
>                 'monthly',
>                 3,
>                 'quarterly',
>                 6,
>                 'semiannual',
>                 12,
>                 'annual'
>             ),
>             c.contract_fee_sum,
>             c.contract_fee_sum - c.nordea_base_contract_fee - nvl(c.vendor_fee2, 0) vendor_fee,
>             nvl(c.vendor_fee2, 0), --20
>             decode(c.sel_kasko, 'Y', 'Y', 'N'),
>             decode(c.sel_lkf, 'Y', 'Y', 'N'),
>             decode(c.sel_gas_card, 'Y', 'Y', 'N'),
>             l.cd_change_descr,
>             l.cd_change_fee, --25
>             c.sales_margin,
>             c.sales_margin + c.nordea_margin,
>             cu.fullname lessee_name,
>             cu.reg_no reg_no,
>             l.navision_id, --30
>             cu.pep,
>             cu.aml_category,
>             l.lease_oid,
>             campaign.name
>         from banksyst.lease_view l,
>             banksyst.cre_conditions c,
>             banksyst.customer cu,
>             banksyst.campaign campaign
6743a6808
>             and l.campaign_id=campaign.campaign_id(+)
6752a6818
> 
6757a6824,6825
>     dict['document__program']=[d[34] or '']
> 
6894c6962,6964
<         from banksyst.lease_view l, banksyst.cre_conditions c, banksyst.customer cu
---
>         ,campaign.name
>         from banksyst.lease_view l, banksyst.cre_conditions c, banksyst.customer cu,
>         banksyst.campaign campaign
6897a6968
>          and l.campaign_id=campaign.campaign_id(+)
6912a6984
>     dict['document__program']=[d[35] or '']
7116c7188,7192
<         from banksyst.lease_view l, banksyst.cre_conditions c, banksyst.customer cu
---
>         ,campaign.name
>         from banksyst.lease_view l,
>         banksyst.cre_conditions c,
>         banksyst.customer cu,
>         banksyst.campaign campaign
7119a7196
>          and l.campaign_id=campaign.campaign_id(+)
7168a7246,7248
> 
>     dict['document__program']=[r[33] or '']
> 
8460a8541
>                 ,campaign.name
8466c8547,8548
<                 banksyst.credit_committee cc
---
>                 banksyst.credit_committee cc,
>                 banksyst.campaign campaign
8472a8555
>                and l.campaign_id=campaign.campaign_id(+)
8494c8577,8578
<                 o.sales_id
---
>                 o.sales_id,
>                 campaign.name
8498c8582,8583
<                 banksyst.customer c
---
>                 banksyst.customer c,
>                 banksyst.campaign campaign
8501a8587
>                and o.campaign_id=campaign.campaign_id(+)
8517a8604,8605
>     dict['document__program']=[d_data[16] or '']
> 
9330c9418,9423
<         from banksyst.lease_view l, banksyst.classif cl, banksyst.extra_fields e, banksyst.addinfo ai
---
>         ,campaign.name
>         from banksyst.lease_view l,
>         banksyst.classif cl,
>         banksyst.extra_fields e,
>         banksyst.addinfo ai,
>         banksyst.campaign campaign
9336c9429,9430
<         AND ai.type_id(+) = 'ADD_PASSPORT_NO'""",(lease_id))
---
>         AND ai.type_id(+) = 'ADD_PASSPORT_NO'
>         and l.campaign_id=campaign.campaign_id(+)""",(lease_id))
9357a9452
>     dict['document__program']=[d[54] or '']
11101d11195
<         ,l.cd_change_descr
11226,11227d11319
<     dict['document__change_descr']=[d[24] or '']
< 
11633a11726
>                         ,campaign.name
11640a11734
>                      , banksyst.campaign campaign
11646a11741
>                     and o.campaign_id=campaign.campaign_id(+)
11666a11762,11763
>     dict['document__program'] = [d[38] or '']
> 
14634c14731,14732
<             e.lt_seller_offer
---
>             e.lt_seller_offer,
>             campaign.name
14641c14739,14740
<             banksyst.lease_view lw
---
>             banksyst.lease_view lw,
>             banksyst.campaign campaign
14648a14748
>             l.campaign_id=campaign.campaign_id(+) AND
14673a14774,14775
>     dict['document__program']=[d[42] or '']
> 
15140a15243
>          ,campaign.name
15145c15248,15249
<         banksyst.classif cls_ig
---
>         banksyst.classif cls_ig,
>         banksyst.campaign campaign
15152a15257
>         and l.campaign_id=campaign.campaign_id(+)
15220a15326
>     dict['document__program'] = [d[83] or '']
15603a15710
>                         ,campaign.name
15609a15717
>                         , banksyst.campaign campaign
15615a15724
>                     and o.campaign_id=campaign.campaign_id(+)
15630a15740
> 
15631a15742
>     dict['document__program']=[d[29] or '']
16270c16381,16382
<                        l.dependent_count
---
>                        l.dependent_count,
>                        campaign.name as program
16274c16386,16387
<                      banksyst.classif cl
---
>                      banksyst.classif cl,
>                      banksyst.campaign campaign
16280c16393,16394
<                   AND c.customer_id(+)=l.lessee_id""",(lease_id,))
---
>                   AND c.customer_id(+)=l.lessee_id
>                   and l.campaign_id=campaign.campaign_id(+)""",(lease_id,))
16282a16397,16399
>     dict={}
>     dict['document__program']=[d['program'][0]]
> 
16422d16538
<     dict={}
16489a16606
>             ,campaign.name as program
16494c16611,16612
<             banksyst.classif cl
---
>             banksyst.classif cl,
>             banksyst.campaign campaign
16501c16619,16620
<             and c.customer_id(+)=l.lessee_id""",
---
>             and c.customer_id(+)=l.lessee_id
>             and l.campaign_id=campaign.campaign_id(+)""",
16656a16776
>     dict['document__program']=[d['program'][0]]
17108a17229
> 
17296,17297c17417
<         c.city  --70
<         ,
---
>         c.city,  --70
17300c17420,17422
<         lo.residual_value_spec_cond
---
>         lo.residual_value_spec_cond,
>         campaign.name
> 
17314c17436,17437
<         banksyst.price_view pv
---
>         banksyst.price_view pv,
>         banksyst.campaign campaign
17333a17457
>     and l.campaign_id=campaign.campaign_id(+)
17341a17466,17468
>     dict['document__program'] = [r[74] or '']
> 
> 
18159a18287
>                         , campaign.name
18166a18295
>                        , banksyst.campaign campaign
18173a18303
>                      and l.campaign_id=campaign.campaign_id(+)
18198c18328
< 
---
>     dict['document__program']=[d[38] or '']
18907a19038
>                         , campaign.name
18913a19045
>                         , banksyst.campaign campaign
18920a19053
>                       and l.campaign_id=campaign.campaign_id(+)
18937a19071,19072
> 
>     dict['document__program']=[d[31] or '']