diff options
| author | Łukasz Wilenski <wooc@gazeta.pl> | 2011-11-26 14:40:33 +0000 |
|---|---|---|
| committer | Łukasz Wilenski <wooc@gazeta.pl> | 2011-11-26 14:40:33 +0000 |
| commit | d7bcb46b2f7cdb922164321672c3f8bca864fdd7 (patch) | |
| tree | 60c095469a383a42e3e2b4d4e7b3f844f44269ab /modules_v3 | |
| parent | a1f3302d701192e207a4b4630aa486ee3cc658b1 (diff) | |
| download | webtrees-d7bcb46b2f7cdb922164321672c3f8bca864fdd7.tar.gz webtrees-d7bcb46b2f7cdb922164321672c3f8bca864fdd7.tar.bz2 webtrees-d7bcb46b2f7cdb922164321672c3f8bca864fdd7.zip | |
#894742 - 1 ASSO printed as @Inn@ in reports
Diffstat (limited to 'modules_v3')
| -rw-r--r-- | modules_v3/family_group_report/report.xml | 20 | ||||
| -rw-r--r-- | modules_v3/individual_ext_report/report.xml | 5 | ||||
| -rw-r--r-- | modules_v3/individual_report/report.xml | 5 |
3 files changed, 24 insertions, 6 deletions
diff --git a/modules_v3/family_group_report/report.xml b/modules_v3/family_group_report/report.xml index 831acac8d5..0478eb9aca 100644 --- a/modules_v3/family_group_report/report.xml +++ b/modules_v3/family_group_report/report.xml @@ -249,10 +249,13 @@ <if condition="@desc=='N'"> <var var="WT_I18N::translate('no')" /> <GedcomValue tag="@fact:PLAC"/> </if> - <if condition="@desc!='Y' and @desc!='N'"> + <if condition="@fact!='ASSO' and @desc!='Y' and @desc!='N'"> <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> </if> </Text> + <Gedcom id="@ASSO"> + <GetPersonName id=""/> + </Gedcom> </TextBox> </if> <if condition="@desc==''"> @@ -406,10 +409,13 @@ <if condition="@desc=='N'"> <var var="WT_I18N::translate('no')" /> <GedcomValue tag="@fact:PLAC"/> <GedcomValue tag="@fact:TEMP" /> </if> - <if condition="@desc!='Y' and @desc!='N'"> + <if condition="@fact!='ASSO' and @desc!='Y' and @desc!='N'"> <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> <GedcomValue tag="@fact:TEMP" /> </if> </Text> + <Gedcom id="@ASSO"> + <GetPersonName id=""/> + </Gedcom> </TextBox> </if> <if condition="@desc==''"> @@ -566,10 +572,13 @@ <if condition="@desc=='N'"> <var var="WT_I18N::translate('no')" /> <GedcomValue tag="@fact:PLAC"/> </if> - <if condition="@desc!='Y' and @desc!='N'"> + <if condition="@fact!='ASSO' and @desc!='Y' and @desc!='N'"> <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> </if> </Text> + <Gedcom id="@ASSO"> + <GetPersonName id=""/> + </Gedcom> </TextBox> </if> <if condition="@desc==''"> @@ -893,10 +902,13 @@ <if condition="@desc=='N'"> <var var="WT_I18N::translate('no')" /> <GedcomValue tag="@fact:PLAC"/> </if> - <if condition="@desc!='Y' and @desc!='N'"> + <if condition="@fact!='ASSO' and @desc!='Y' and @desc!='N'"> <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> </if> </Text> + <Gedcom id="@ASSO"> + <GetPersonName id=""/> + </Gedcom> </TextBox> </if> <if condition="@desc==''"> diff --git a/modules_v3/individual_ext_report/report.xml b/modules_v3/individual_ext_report/report.xml index da92eb3126..9aa74083ba 100644 --- a/modules_v3/individual_ext_report/report.xml +++ b/modules_v3/individual_ext_report/report.xml @@ -179,10 +179,13 @@ <if condition="@desc=='N'"> <var var="WT_I18N::translate('no')" /> <GedcomValue tag="@fact:PLAC"/> </if> - <if condition="@desc!='Y' and @desc!='N'"> + <if condition="@fact!='ASSO' and @desc!='Y' and @desc!='N'"> <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> </if> </Text> + <Gedcom id="@ASSO"> + <GetPersonName id=""/> + </Gedcom> <Gedcom id="@_PGVS"> <if condition="@SEX=='M'"> <Text color="$tcolor" style="fact"> <var var="WT_I18N::translate('Husband')"/></Text> diff --git a/modules_v3/individual_report/report.xml b/modules_v3/individual_report/report.xml index 2643ff97d4..3136f7c2e7 100644 --- a/modules_v3/individual_report/report.xml +++ b/modules_v3/individual_report/report.xml @@ -174,10 +174,13 @@ <if condition="@desc=='N'"> <var var="WT_I18N::translate('no')" /> <GedcomValue tag="@fact:PLAC"/> </if> - <if condition="@desc!='Y' and @desc!='N'"> + <if condition="@fact!='ASSO' and @desc!='Y' and @desc!='N'"> <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> </if> </Text> + <Gedcom id="@ASSO"> + <GetPersonName id=""/> + </Gedcom> <Gedcom id="@_PGVS"> <if condition="@SEX=='M'"> <Text color="$tcolor" style="fact"> <var var="WT_I18N::translate('Husband')"/></Text> |