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
===================================================================
--- 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="eFilter1" field="filter1" datatype="boolean"/>
<field name="eFilter2" field="filter2" datatype="boolean"/>
<field name="eFilter3" field="filter3" datatype="boolean"/>
+ <field name="eFilter4" field="filter4" datatype="boolean"/>
+ <field name="eFilter5" field="filter5" datatype="boolean"/>
+ <field name="eFilter6" field="filter6" datatype="boolean"/>
+ <field name="eFilter7" field="filter7" datatype="boolean"/>
+ <field name="eFilter8" field="filter8" datatype="boolean"/>
<field name="eCorp_film" field="corp_film" datatype="boolean" />
<field name="eEvent" field="event" datatype="boolean" />
@@ -175,7 +180,7 @@
<field name="FID" field="company.id" />
<field name="FA/Firma1" field="company.name1"/>
<field name="FA/Firma2" field="company.name2"/>
- <field name="FA/Straße" field="company.street"/>
+ <field name="FA/Strasse" field="company.street"/>
<field name="FA/PLZ" field="company.zip"/>
<field name="FA/Ort" field="company.city"/>
<field name="FA/Telefon" field="company.phone"/>
@@ -195,6 +200,11 @@
<field name="ASP/Filter1" field="contact.filter1"/>
<field name="ASP/Filter2" field="contact.filter2"/>
<field name="ASP/Filter3" field="contact.filter3"/>
+ <field name="ASP/Filter4" field="contact.filter4"/>
+ <field name="ASP/Filter5" field="contact.filter5"/>
+ <field name="ASP/Filter6" field="contact.filter6"/>
+ <field name="ASP/Filter7" field="contact.filter7"/>
+ <field name="ASP/Filter8" field="contact.filter8"/>
</block>
</logic>
@@ -261,29 +271,40 @@
</vbox>
<vbox>
- <entry field="ePhone1" label="Telefon:"/>
- <entry field="ePhone2" label="Mobil:"/>
- <entry field="eFax" label="Fax:"/>
- <entry field="eMail" label="E-Mail:"/>
+ <vbox>
+ <entry field="ePhone1" label="Telefon:"/>
+ <entry field="ePhone2" label="Mobil:"/>
+ <entry field="eFax" label="Fax:"/>
+ <entry field="eMail" label="E-Mail:"/>
+ </vbox>
<hbox>
- <vbox label="SKMT">
- <entry field="eFilter1" label="SKMT-Temp"/>
- <entry field="eFilter2" label="SKMT-Mailing"/>
- <entry field="eFilter3" label="SKMT-dScope"/>
- </vbox>
+ <hbox label="SKMT">
+ <vbox>
+ <entry field="eFilter1" label="SKMT-Temp"/>
+ <entry field="eFilter2" label="SKMT-Mailing"/>
+ <entry field="eFilter3" label="SKMT-dScope"/>
+ <entry field="eFilter4"
label="Mailing-Nachsendung"/>
+ </vbox>
+ <vbox>
+ <entry field="eFilter5" label="XMP-Temp"/>
+ <entry field="eFilter6" label="SKMT-Filter6"/>
+ <entry field="eFilter7" label="SKMT-Filter7"/>
+ <entry field="eFilter8" label="Keine eMailings!"/>
+ </vbox>
+ </hbox>
<hbox label="DMG">
- <vbox>
- <entry field="eCorp_film" label="Corporate Film"/>
- <entry field="eEvent" label="Event"/>
- <entry field="eWerbung" label="Werbung"/>
- <entry field="ePproduct" label="Post Production"/>
- </vbox>
- <vbox>
- <entry field="eAdaptionen" label="Adaption"/>
- <entry field="eVermietung" label="Vermietung"/>
- <entry field="eTV" label="TV"/>
- <entry field="eReserve" label="Reserve"/>
- </vbox>
+ <vbox>
+ <entry field="eCorp_film" label="Corporate Film"/>
+ <entry field="eEvent" label="Event"/>
+ <entry field="eWerbung" label="Werbung"/>
+ <entry field="ePproduct" label="Post Production"/>
+ </vbox>
+ <vbox>
+ <entry field="eAdaptionen" label="Adaption"/>
+ <entry field="eVermietung" label="Vermietung"/>
+ <entry field="eTV" label="TV"/>
+ <entry field="eReserve" label="Reserve"/>
+ </vbox>
</hbox>
</hbox>
</vbox>
@@ -322,23 +343,37 @@
params = {}
activateDialog('dlg_search_company', params, True)
if params.has_key('prm_result') and params['prm_result'] is not None:
- blk_company.search_record(id=params['prm_result'])
+ try:
+ blk_company.search_record(id=params['prm_result'])
+ except:
+ blk_company.set_filter()
+ blk_company.search_record(id=params['prm_result'])
</action>
<action name="act_search_contact">
params = {}
activateDialog('dlg_search_contact', params, True)
if params.has_key('prm_company') and params['prm_company'] is not None:
- blk_company.search_record(id=params['prm_company'])
- blk_contact.search_record(id=params['prm_contact'])
+ try:
+ blk_company.search_record(id=params['prm_company'])
+ blk_contact.search_record(id=params['prm_contact'])
+ except:
+ blk_company.set_filter()
+ blk_company.search_record(id=params['prm_company'])
+ blk_contact.search_record(id=params['prm_contact'])
</action>
<action name="act_search_phone">
params = {}
activateDialog('dlg_search_phone', params, True)
if params.has_key('prm_company') and params['prm_company'] is not None:
- blk_company.search_record(id=params['prm_company'])
- blk_contact.search_record(id=params['prm_contact'])
+ try:
+ blk_company.search_record(id=params['prm_company'])
+ blk_contact.search_record(id=params['prm_contact'])
+ except:
+ blk_company.set_filter()
+ blk_company.search_record(id=params['prm_company'])
+ blk_contact.search_record(id=params['prm_contact'])
blk_company.contact_count.value = blk_contact.get_record_count()
</action>
@@ -372,7 +407,7 @@
fieldnames = [
u"FA/Firma1",
u"FA/Firma2",
- u"FA/Straße",
+ 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"]
valid_masters = [row['id'] for row in blk_company.get_data(['id'])]
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
