mirror of
https://github.com/NaN-tic/trytond-stock_delivery_note_jreport.git
synced 2023-12-14 04:12:55 +01:00
Rename zip into postal code
issue9853
This commit is contained in:
parent
896a987976
commit
0b7f7a6f01
|
@ -36,8 +36,8 @@
|
|||
<field name="company-email" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/email-email]]></fieldDescription>
|
||||
</field>
|
||||
<field name="company-zip" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/addresses-addresses/zip-zip]]></fieldDescription>
|
||||
<field name="company-postal_code" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/addresses-addresses/postal_code-postal_code]]></fieldDescription>
|
||||
</field>
|
||||
<field name="company-street" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/addresses-addresses/street-street]]></fieldDescription>
|
||||
|
@ -411,7 +411,7 @@
|
|||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{company-zip}+" "+$F{company-city}+" "+$F{company-country}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{company-postal_code}+" "+$F{company-city}+" "+$F{company-country}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="10" y="17" width="304" height="11" forecolor="#808080" uuid="43bb96d7-9e05-455b-a44b-46f5888e6ab1"/>
|
||||
|
|
|
@ -32,8 +32,8 @@
|
|||
<field name="company-email" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/email-email]]></fieldDescription>
|
||||
</field>
|
||||
<field name="company-zip" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/addresses-addresses/zip-zip]]></fieldDescription>
|
||||
<field name="company-postal_code" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/addresses-addresses/postal_code-postal_code]]></fieldDescription>
|
||||
</field>
|
||||
<field name="company-street" class="java.lang.String">
|
||||
<fieldDescription><![CDATA[/data/record/company-company/party-party/addresses-addresses/street-street]]></fieldDescription>
|
||||
|
@ -315,7 +315,7 @@ $F{delivery_full_address}.replaceAll("&","&")]]></textFieldExpression>
|
|||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{company-zip}+" "+$F{company-city}+" "+$F{company-country}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{company-postal_code}+" "+$F{company-city}+" "+$F{company-country}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="10" y="17" width="304" height="11" forecolor="#808080" uuid="cb768791-31ab-4b1e-b381-3a55242db660"/>
|
||||
|
|
Loading…
Reference in a new issue