Replace getattr by hasattr in report
(grafted from 1a0574d67704d7acbd7c224d906a4be12aaf3423) --HG-- branch : 8.0
This commit is contained in:
@@ -913,7 +913,7 @@
|
||||
<text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><line.description or ''></text:placeholder></text:p>
|
||||
</table:table-cell>
|
||||
<table:table-cell table:style-name="Lines.G6" office:value-type="string">
|
||||
<text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><getattr(line.origin, 'rec_name', '')></text:placeholder></text:p>
|
||||
<text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><line.origin and line.origin.rec_name or ''></text:placeholder></text:p>
|
||||
</table:table-cell>
|
||||
</table:table-row>
|
||||
<text:soft-page-break/>
|
||||
|
||||
@@ -84,7 +84,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<py:def function="TaxCategory(tax)">
|
||||
<cbc:ID py:if="tax.unece_category_code">${tax.unece_category_code}</cbc:ID>
|
||||
<cbc:Percent py:if="tax.type == 'percentage'">${format((tax.rate * 100).normalize(), 'f')}</cbc:Percent>
|
||||
<cbc:TaxExemptionReasonCode py:if="getattr(tax, 'vatex_code', None)">${tax.vatex_code}</cbc:TaxExemptionReasonCode>
|
||||
<cbc:TaxExemptionReasonCode py:if="hasattr(tax, 'vatex_code') and tax.vatex_code">${tax.vatex_code}</cbc:TaxExemptionReasonCode>
|
||||
<cbc:TaxExemptionReason py:if="tax.legal_notice">${tax.legal_notice}</cbc:TaxExemptionReason>
|
||||
<cac:TaxScheme py:if="tax.unece_code">
|
||||
<cbc:ID>${tax.unece_code}</cbc:ID>
|
||||
|
||||
@@ -45,7 +45,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<ram:ApplicableTradeTax>
|
||||
<ram:CalculatedAmount py:if="amount" py:attrs="{'currencyID': this.invoice.currency.code}">${amount * this.type_sign}</ram:CalculatedAmount>
|
||||
<ram:TypeCode py:if="tax.unece_code">${tax.unece_code}</ram:TypeCode>
|
||||
<ram:ExemptionReasonCode py:if="getattr(tax, 'vatex_code', None)">${tax.vatex_code}</ram:ExemptionReasonCode>
|
||||
<ram:ExemptionReasonCode py:if="hasattr(tax, 'vatex_code') and tax.vatex_code">${tax.vatex_code}</ram:ExemptionReasonCode>
|
||||
<ram:ExemptionReason py:if="tax.legal_notice">${tax.legal_notice}</ram:ExemptionReason>
|
||||
<ram:BasisAmount py:if="base">${base * this.type_sign}</ram:BasisAmount>
|
||||
<ram:CategoryCode py:if="tax.unece_category_code">${tax.unece_category_code}</ram:CategoryCode>
|
||||
|
||||
@@ -710,7 +710,7 @@
|
||||
<text:p text:style-name="Text_20_body">Date: <text:placeholder text:placeholder-type="text"><format_date(shipment.effective_date or shipment.planned_date) if (shipment.effective_date or shipment.planned_date) else ''></text:placeholder></text:p>
|
||||
<text:p text:style-name="P54">Terms of Trade: <text:placeholder text:placeholder-type="text"><shipment.incoterm.name if shipment.incoterm else ''></text:placeholder></text:p>
|
||||
<text:p text:style-name="P37">Reason for Export: <text:placeholder text:placeholder-type="text"><get_reason(shipment)></text:placeholder></text:p>
|
||||
<text:p text:style-name="P57">Carrier: <text:placeholder text:placeholder-type="text"><shipment.carrier.rec_name if getattr(shipment, 'carrier', None) else ''></text:placeholder></text:p>
|
||||
<text:p text:style-name="P57">Carrier: <text:placeholder text:placeholder-type="text"><shipment.carrier.rec_name if hasattr(shipment, 'carrier') and shipment.carrier else ''></text:placeholder></text:p>
|
||||
<text:p text:style-name="P57">Shipping reference: <text:placeholder text:placeholder-type="text"><shipment.shipping_reference></text:placeholder></text:p>
|
||||
</text:section>
|
||||
<text:section text:style-name="Sect2" text:name="Section4">
|
||||
|
||||
Reference in New Issue
Block a user