diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-10-26 10:18:23 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-10-26 10:18:23 +0000 |
| commit | f439cdf5f94928b0bd2cf67d51c015e4a50048dc (patch) | |
| tree | a434f10a285e7dac16613edff3419c5ee4ac6e13 /modules_v3 | |
| parent | 983c7590ec36cebdd95caab76772a878e4054c0a (diff) | |
| download | webtrees-f439cdf5f94928b0bd2cf67d51c015e4a50048dc.tar.gz webtrees-f439cdf5f94928b0bd2cf67d51c015e4a50048dc.tar.bz2 webtrees-f439cdf5f94928b0bd2cf67d51c015e4a50048dc.zip | |
#876341 - Mutually incompatible report parameters
Diffstat (limited to 'modules_v3')
| -rw-r--r-- | modules_v3/address_report/report.xml | 2 | ||||
| -rw-r--r-- | modules_v3/marriage_report/report.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules_v3/address_report/report.xml b/modules_v3/address_report/report.xml index aa5893b4cb..82494bb891 100644 --- a/modules_v3/address_report/report.xml +++ b/modules_v3/address_report/report.xml @@ -68,7 +68,7 @@ <SetVar name="email" value="" /> </if> </if> - <List list="individual" filter1="$addrfilter" filter2="$addrfilter2" filter3="$email" sortby="NAME"> + <List list="individual" filter1="$addrfilter" filter2="$addrfilter2" filter3="$email" filter4="REGEXP /\n[12] ADDR/" sortby="NAME"> <TextBox width="40" height="52" border="1"> <Text style="text"><GedcomValue tag="@id" /></Text> </TextBox> diff --git a/modules_v3/marriage_report/report.xml b/modules_v3/marriage_report/report.xml index b56e289c1a..119d83857f 100644 --- a/modules_v3/marriage_report/report.xml +++ b/modules_v3/marriage_report/report.xml @@ -55,7 +55,7 @@ <Body> <SetVar name="printedFamilies" value="0" /> - <List list="family" filter1="MARR:PLAC CONTAINS $marrplace" filter2="MARR:DATE GTE $marrdate1" filter3="MARR:DATE LTE $marrdate2" sortby="$sortby"> + <List list="family" filter1="MARR:PLAC CONTAINS $marrplace" filter2="MARR:DATE GTE $marrdate1" filter3="MARR:DATE LTE $marrdate2" filter4="REGEXP /\n1 MARR/" sortby="$sortby"> <!-- filter4 should be: filter4="NAME CONTAINS $name", but the family name doesn't exist as a field in the database, so we can't use that. --> <SetVar name="skipFamily" value="no" /> |