admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Template

Browse Source
This commit is contained in:
laurentbarontini
2026-06-09 14:20:32 +02:00
parent 217344d3d5
commit f722c6fa1c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/purchase_trade/sale.py
View File

@@ -894,6 +894,13 @@ class Sale(metaclass=PoolMeta):
with Transaction().set_context(address_with_party=True): with Transaction().set_context(address_with_party=True):
return self.invoice_address.full_address return self.invoice_address.full_address
@property
def report_melya_buyer_block(self):
return '\n'.join(filter(None, [
'Buyer:',
self.report_melya_buyer_address,
]))
@property @property
def report_melya_incoterm(self): def report_melya_incoterm(self):
parts = [] parts = []

4
modules/sale/sale_melya.fodt
View File

@@ -724,7 +724,6 @@
<style:text-properties style:font-name="Arial1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> <style:text-properties style:font-name="Arial1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
</style:style> </style:style>
<style:style style:name="P72" style:family="paragraph" style:parent-style-name="Standard"> <style:style style:name="P72" style:family="paragraph" style:parent-style-name="Standard">
<style:paragraph-properties fo:clear="left"/>
<style:text-properties style:font-name="Arial mt" fo:font-size="9pt" officeooo:paragraph-rsid="00345fb1" style:font-size-asian="9pt" style:font-size-complex="9pt"/> <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" officeooo:paragraph-rsid="00345fb1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
</style:style> </style:style>
<style:style style:name="P73" style:family="paragraph" style:parent-style-name="Standard"> <style:style style:name="P73" style:family="paragraph" style:parent-style-name="Standard">
@@ -1813,8 +1812,7 @@
<text:p text:style-name="P57"><text:tab/><text:tab/><text:span text:style-name="T39"><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_proforma_number&gt;</text:placeholder></text:span><text:tab/><text:tab/><text:tab/><text:span text:style-name="T39"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang) if sale.sale_date else &apos;&apos;&gt;</text:placeholder></text:span></text:p> <text:p text:style-name="P57"><text:tab/><text:tab/><text:span text:style-name="T39"><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_proforma_number&gt;</text:placeholder></text:span><text:tab/><text:tab/><text:tab/><text:span text:style-name="T39"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang) if sale.sale_date else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
<text:p text:style-name="P70"/> <text:p text:style-name="P70"/>
<text:p text:style-name="P72"/> <text:p text:style-name="P72"/>
<text:p text:style-name="P72">Buyer:</text:p> <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_melya_buyer_block.splitlines()&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_melya_buyer_address.splitlines()&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p> <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
<text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p> <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
<text:p text:style-name="P52"/> <text:p text:style-name="P52"/>