[gnue-contrib] r290 - address/forms
[email protected] Thu, 3 Feb 2011 03:42:03 -0600 (CST)
| Newsgroups | gmane.comp.cms.gnue.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: reinhard
Date: 2011-02-03 03:42:02 -0600 (Thu, 03 Feb 2011)
New Revision: 290
Modified:
address/forms/address.gfd
Log:
Some updates.
Modified: address/forms/address.gfd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- address/forms/address.gfd 2009-10-06 14:49:09 UTC (rev 289)
+++ address/forms/address.gfd 2011-02-03 09:42:02 UTC (rev 290)
@@ -137,6 +137,11 @@
<field name=3D"eFilter1" field=3D"filter1" datatype=3D"boolea=
n"/>
<field name=3D"eFilter2" field=3D"filter2" datatype=3D"boolea=
n"/>
<field name=3D"eFilter3" field=3D"filter3" datatype=3D"boolea=
n"/>
+ <field name=3D"eFilter4" field=3D"filter4" datatype=3D"boolea=
n"/>
+ <field name=3D"eFilter5" field=3D"filter5" datatype=3D"boolea=
n"/>
+ <field name=3D"eFilter6" field=3D"filter6" datatype=3D"boolea=
n"/>
+ <field name=3D"eFilter7" field=3D"filter7" datatype=3D"boolea=
n"/>
+ <field name=3D"eFilter8" field=3D"filter8" datatype=3D"boolea=
n"/>
=20
<field name=3D"eCorp_film" field=3D"corp_film" datatype=3D"boolea=
n" />
<field name=3D"eEvent" field=3D"event" datatype=3D"boolea=
n" />
@@ -175,7 +180,7 @@
<field name=3D"FID" field=3D"company.id" />
<field name=3D"FA/Firma1" field=3D"company.name1"/>
<field name=3D"FA/Firma2" field=3D"company.name2"/>
- <field name=3D"FA/Stra=C3=9Fe" field=3D"company.street"/>
+ <field name=3D"FA/Strasse" field=3D"company.street"/>
<field name=3D"FA/PLZ" field=3D"company.zip"/>
<field name=3D"FA/Ort" field=3D"company.city"/>
<field name=3D"FA/Telefon" field=3D"company.phone"/>
@@ -195,6 +200,11 @@
<field name=3D"ASP/Filter1" field=3D"contact.filter1"/>
<field name=3D"ASP/Filter2" field=3D"contact.filter2"/>
<field name=3D"ASP/Filter3" field=3D"contact.filter3"/>
+ <field name=3D"ASP/Filter4" field=3D"contact.filter4"/>
+ <field name=3D"ASP/Filter5" field=3D"contact.filter5"/>
+ <field name=3D"ASP/Filter6" field=3D"contact.filter6"/>
+ <field name=3D"ASP/Filter7" field=3D"contact.filter7"/>
+ <field name=3D"ASP/Filter8" field=3D"contact.filter8"/>
</block>
</logic>
=20
@@ -261,29 +271,40 @@
</vbox>
=20
<vbox>
- <entry field=3D"ePhone1" label=3D"Telefon:"/>
- <entry field=3D"ePhone2" label=3D"Mobil:"/>
- <entry field=3D"eFax" label=3D"Fax:"/>
- <entry field=3D"eMail" label=3D"E-Mail:"/>
+ <vbox>
+ <entry field=3D"ePhone1" label=3D"Telefon:"/>
+ <entry field=3D"ePhone2" label=3D"Mobil:"/>
+ <entry field=3D"eFax" label=3D"Fax:"/>
+ <entry field=3D"eMail" label=3D"E-Mail:"/>
+ </vbox>
<hbox>
- <vbox label=3D"SKMT">
- <entry field=3D"eFilter1" label=3D"SKMT-Temp"/>
- <entry field=3D"eFilter2" label=3D"SKMT-Mailing=
"/>
- <entry field=3D"eFilter3" label=3D"SKMT-dScope"=
/>
- </vbox>
+ <hbox label=3D"SKMT">
+ <vbox>
+ <entry field=3D"eFilter1" label=3D"SKMT-Temp"=
/>
+ <entry field=3D"eFilter2" label=3D"SKMT-Maili=
ng"/>
+ <entry field=3D"eFilter3" label=3D"SKMT-dScop=
e"/>
+ <entry field=3D"eFilter4" label=3D"Mailing-Na=
chsendung"/>
+ </vbox>
+ <vbox>
+ <entry field=3D"eFilter5" label=3D"XMP-Temp"/=
>
+ <entry field=3D"eFilter6" label=3D"SKMT-Filte=
r6"/>
+ <entry field=3D"eFilter7" label=3D"SKMT-Filte=
r7"/>
+ <entry field=3D"eFilter8" label=3D"Keine eMai=
lings!"/>
+ </vbox>
+ </hbox>
<hbox label=3D"DMG">
- <vbox>
- <entry field=3D"eCorp_film" label=3D"Corporate Fi=
lm"/>
- <entry field=3D"eEvent" label=3D"Event"/>
- <entry field=3D"eWerbung" label=3D"Werbung"/>
- <entry field=3D"ePproduct" label=3D"Post Product=
ion"/>
- </vbox>
- <vbox>
- <entry field=3D"eAdaptionen" label=3D"Adaption"/>
- <entry field=3D"eVermietung" label=3D"Vermietung"/=
>
- <entry field=3D"eTV" label=3D"TV"/>
- <entry field=3D"eReserve" label=3D"Reserve"/>
- </vbox>
+ <vbox>
+ <entry field=3D"eCorp_film" label=3D"Corporate =
Film"/>
+ <entry field=3D"eEvent" label=3D"Event"/>
+ <entry field=3D"eWerbung" label=3D"Werbung"/>
+ <entry field=3D"ePproduct" label=3D"Post Produ=
ction"/>
+ </vbox>
+ <vbox>
+ <entry field=3D"eAdaptionen" label=3D"Adaption"/=
>
+ <entry field=3D"eVermietung" label=3D"Vermietung=
"/>
+ <entry field=3D"eTV" label=3D"TV"/>
+ <entry field=3D"eReserve" label=3D"Reserve"/>
+ </vbox>
</hbox>
</hbox>
</vbox>
@@ -322,23 +343,37 @@
params =3D {}
activateDialog('dlg_search_company', params, True)
if params.has_key('prm_result') and params['prm_result'] is not None:
- blk_company.search_record(id=3Dparams['prm_result'])
+ try:
+ blk_company.search_record(id=3Dparams['prm_result'])
+ except:
+ blk_company.set_filter()
+ blk_company.search_record(id=3Dparams['prm_result'])
</action>
=20
<action name=3D"act_search_contact">
params =3D {}
activateDialog('dlg_search_contact', params, True)
if params.has_key('prm_company') and params['prm_company'] is not Non=
e:
- blk_company.search_record(id=3Dparams['prm_company'])
- blk_contact.search_record(id=3Dparams['prm_contact'])
+ try:
+ blk_company.search_record(id=3Dparams['prm_company'])
+ blk_contact.search_record(id=3Dparams['prm_contact'])
+ except:
+ blk_company.set_filter()
+ blk_company.search_record(id=3Dparams['prm_company'])
+ blk_contact.search_record(id=3Dparams['prm_contact'])
</action>
=20
<action name=3D"act_search_phone">
params =3D {}
activateDialog('dlg_search_phone', params, True)
if params.has_key('prm_company') and params['prm_company'] is not Non=
e:
- blk_company.search_record(id=3Dparams['prm_company'])
- blk_contact.search_record(id=3Dparams['prm_contact'])
+ try:
+ blk_company.search_record(id=3Dparams['prm_company'])
+ blk_contact.search_record(id=3Dparams['prm_contact'])
+ except:
+ blk_company.set_filter()
+ blk_company.search_record(id=3Dparams['prm_company'])
+ blk_contact.search_record(id=3Dparams['prm_contact'])
blk_company.contact_count.value =3D blk_contact.get_record_count()
</action>
=20
@@ -372,7 +407,7 @@
fieldnames =3D [
u"FA/Firma1",
u"FA/Firma2",
- u"FA/Stra=C3=9Fe",
+ u"FA/Strasse",
u"FA/PLZ",
u"FA/Ort",
u"FA/Telefon",
@@ -391,7 +426,12 @@
u"ASP/EMail",
u"ASP/Filter1",
u"ASP/Filter2",
- u"ASP/Filter3"]
+ u"ASP/Filter3",
+ u"ASP/Filter4",
+ u"ASP/Filter5",
+ u"ASP/Filter6",
+ u"ASP/Filter7",
+ u"ASP/Filter8"]
=20
valid_masters =3D [row['id'] for row in blk_company.get_data(['id'])]
=20