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

27.02.26

Browse Source
This commit is contained in:
laurentbarontini
2026-02-27 06:12:39 +01:00
parent cd2a82f61c
commit 92210a381a
3 changed files with 100 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/purchase_trade/purchase.py
View File

@@ -36,6 +36,7 @@ TRIGGERS = [
('discharge', 'Discharge NOR'),
('arrival', 'Arrival date'),
('delmonth', 'Delivery month'),
('deldate', 'Delivery date'),
]
class DocType(ModelSQL,ModelView):

20
modules/purchase_trade/sale.py
View File

@@ -278,6 +278,16 @@ class Sale(metaclass=PoolMeta):
return amount_to_currency_words(self.lines[0].unit_price)
else:
return ''
@property
def report_delivery(self):
del_date = ''
if self.lines:
if self.estimated_date:
delivery_date = [dd.estimated_date for dd in self.estimated_date if dd.trigger=='deldate']
if delivery_date:
del_date = delivery_date[0]
return del_date
@property
def report_shipment(self):
@@ -287,7 +297,15 @@ class Sale(metaclass=PoolMeta):
if shipment:
info = 'B/L ' + shipment.bl_number
if shipment.container and shipment.container[0].container_no:
info += ' ' + shipment.container[0].container_no
id = 1
for cont in shipment.container:
if id == 1:
info += ' Containers'
if cont.container_no:
info += ' ' + cont.container_no
else:
info += ' unnamed'
id += 1
if shipment.note:
info += ' ' + shipment.note
return info

154
modules/sale/sale.fodt
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
<office:meta><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><dc:title>Invoice no</dc:title><dc:description/><dc:subject/><meta:initial-creator>willen</meta:initial-creator><meta:creation-date>2026-02-26T13:52:00Z</meta:creation-date><dc:date>2026-02-27T05:47:38.343000000</dc:date><meta:print-date>2025-12-17T14:25:00Z</meta:print-date><meta:editing-cycles>7</meta:editing-cycles><meta:editing-duration>PT28M8S</meta:editing-duration><meta:document-statistic meta:table-count="8" meta:image-count="3" meta:object-count="0" meta:page-count="2" meta:paragraph-count="40" meta:word-count="177" meta:character-count="1534" meta:non-whitespace-character-count="1390"/><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="" xlink:href="ICT_sale_template.odt/Normal.dotm"/></office:meta>
<office:meta><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><dc:title>Invoice no</dc:title><dc:description/><dc:subject/><meta:initial-creator>willen</meta:initial-creator><meta:creation-date>2026-02-26T13:52:00Z</meta:creation-date><dc:date>2026-02-27T06:05:06.484000000</dc:date><meta:print-date>2025-12-17T14:25:00Z</meta:print-date><meta:editing-cycles>9</meta:editing-cycles><meta:editing-duration>PT29M56S</meta:editing-duration><meta:document-statistic meta:table-count="8" meta:image-count="3" meta:object-count="0" meta:page-count="2" meta:paragraph-count="40" meta:word-count="182" meta:character-count="1583" meta:non-whitespace-character-count="1434"/><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="" xlink:href="ICT_sale_template.odt/Normal.dotm"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
<config:config-item config:name="ViewAreaTop" config:type="long">40658</config:config-item>
<config:config-item config:name="ViewAreaTop" config:type="long">37599</config:config-item>
<config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
<config:config-item config:name="ViewAreaWidth" config:type="long">24236</config:config-item>
<config:config-item config:name="ViewAreaHeight" config:type="long">11721</config:config-item>
@@ -13,12 +13,12 @@
<config:config-item-map-indexed config:name="Views">
<config:config-item-map-entry>
<config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
<config:config-item config:name="ViewLeft" config:type="long">10469</config:config-item>
<config:config-item config:name="ViewTop" config:type="long">42757</config:config-item>
<config:config-item config:name="ViewLeft" config:type="long">15041</config:config-item>
<config:config-item config:name="ViewTop" config:type="long">44309</config:config-item>
<config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
<config:config-item config:name="VisibleTop" config:type="long">40658</config:config-item>
<config:config-item config:name="VisibleTop" config:type="long">37599</config:config-item>
<config:config-item config:name="VisibleRight" config:type="long">24234</config:config-item>
<config:config-item config:name="VisibleBottom" config:type="long">52377</config:config-item>
<config:config-item config:name="VisibleBottom" config:type="long">49318</config:config-item>
<config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
<config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
<config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -91,7 +91,7 @@
<config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
<config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item>
<config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item>
<config:config-item config:name="Rsid" config:type="int">2082766</config:config-item>
<config:config-item config:name="Rsid" config:type="int">2091355</config:config-item>
<config:config-item config:name="RsidRoot" config:type="int">1846560</config:config-item>
<config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item>
<config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
@@ -161,7 +161,7 @@
<office:styles>
<style:default-style style:family="graphic">
<style:graphic-properties draw:stroke="solid" svg:stroke-width="0.071cm" svg:stroke-color="#1c334e" svg:stroke-linecap="butt" draw:fill-color="#4f81bd" fo:wrap-option="wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb" style:flow-with-text="false"/>
<style:paragraph-properties fo:line-height="115%" fo:text-align="start" style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
<style:paragraph-properties fo:line-height="115%" fo:text-align="start" style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
<style:tab-stops/>
</style:paragraph-properties>
<style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="11pt" fo:letter-spacing="normal" fo:language="fr" fo:country="FR" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="11pt" style:language-asian="fr" style:country-asian="FR" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none"/>
@@ -612,16 +612,16 @@
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001ea414" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P24" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P25" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
<style:tab-stops>
<style:tab-stop style:position="3.184cm"/>
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001fc7ce" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P25" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P26" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
@@ -630,10 +630,10 @@
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="P27" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001fc7ce" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P28" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
@@ -642,16 +642,10 @@
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="P29" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
<style:tab-stops>
<style:tab-stop style:position="3.184cm"/>
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="P30" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
@@ -660,27 +654,36 @@
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P31" style:family="paragraph" style:parent-style-name="Normal">
<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
<style:text-properties fo:language="en" fo:country="US" text:display="none"/>
</style:style>
<style:style style:name="P32" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="">
<style:paragraph-properties style:page-number="auto" fo:break-before="page"/>
</style:style>
<style:style style:name="P33" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001fc7ce" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P34" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:style style:name="P31" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
<style:tab-stops>
<style:tab-stop style:position="3.184cm"/>
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001fc7ce" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
<style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P35" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="MP0">
<style:style style:name="P32" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:paragraph-properties>
<style:tab-stops>
<style:tab-stop style:position="3.184cm"/>
<style:tab-stop style:position="16.766cm"/>
</style:tab-stops>
</style:paragraph-properties>
</style:style>
<style:style style:name="P33" style:family="paragraph" style:parent-style-name="Normal">
<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
<style:text-properties fo:language="en" fo:country="US" text:display="none"/>
</style:style>
<style:style style:name="P34" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="">
<style:paragraph-properties style:page-number="auto" fo:break-before="page"/>
</style:style>
<style:style style:name="P35" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
<style:text-properties style:font-name="Calibri" fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001fe95b" style:font-size-asian="9pt" style:font-name-complex="Calibri" style:font-size-complex="9pt"/>
</style:style>
<style:style style:name="P36" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="MP0">
<style:paragraph-properties style:page-number="auto" fo:break-before="page"/>
</style:style>
<style:style style:name="T1" style:family="text">
@@ -734,6 +737,9 @@
<style:style style:name="T17" style:family="text">
<style:text-properties officeooo:rsid="001fc7ce"/>
</style:style>
<style:style style:name="T18" style:family="text">
<style:text-properties style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
<style:graphic-properties style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" fo:background-color="transparent" draw:fill="none" draw:fill-color="#ffffff" fo:padding="0cm" fo:border="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
</style:style>
@@ -3785,7 +3791,7 @@
<text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
</text:sequence-decls>
<text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P35"/>
<text:p text:style-name="P36"/>
<table:table table:name="Table1" table:style-name="Table1">
<table:table-column table:style-name="Table1.A"/>
<table:table-row>
@@ -3848,9 +3854,9 @@
<table:table-column table:style-name="Table4.B"/>
<table:table-row>
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
<text:p text:style-name="P26"/>
<text:p text:style-name="P26">Growth</text:p>
<text:p text:style-name="P26"/>
<text:p text:style-name="P28"/>
<text:p text:style-name="P28">Growth</text:p>
<text:p text:style-name="P28"/>
</table:table-cell>
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
<text:p text:style-name="P22"/>
@@ -3859,20 +3865,20 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
<text:p text:style-name="P26">Quality</text:p>
<text:p text:style-name="P26"/>
<text:p text:style-name="P28">Quality</text:p>
<text:p text:style-name="P28"/>
</table:table-cell>
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
<text:p text:style-name="P23"><text:span text:style-name="T16">B/L </text:span><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;sale.report_shipment&gt;</text:placeholder></text:span></text:p>
<text:p text:style-name="P23"><text:span text:style-name="T16"><text:placeholder text:placeholder-type="text">&lt;sale.report_shipment&gt;</text:placeholder></text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
<text:p text:style-name="P26">Quantity</text:p>
<text:p text:style-name="P26"/>
<text:p text:style-name="P28">Quantity</text:p>
<text:p text:style-name="P28"/>
</table:table-cell>
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
<text:p text:style-name="P34">ABOUT <text:placeholder text:placeholder-type="text">&lt;sum(line.quantity for line in sale.lines)&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else &apos;&apos;&gt;</text:placeholder><text:span text:style-name="T17">(</text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;sale.report_qt&gt;</text:placeholder></text:span><text:span text:style-name="T17">)</text:span></text:p>
<text:p text:style-name="P24">ABOUT <text:placeholder text:placeholder-type="text">&lt;sum(line.quantity for line in sale.lines)&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else &apos;&apos;&gt;</text:placeholder><text:s/><text:span text:style-name="T17">(</text:span><text:span text:style-name="T17"><text:placeholder text:placeholder-type="text">&lt;sale.report_qt&gt;</text:placeholder></text:span><text:span text:style-name="T17">)</text:span></text:p>
</table:table-cell>
</table:table-row>
</table:table>
@@ -3883,10 +3889,10 @@
<table:table-column table:style-name="Table5.B"/>
<table:table-row>
<table:table-cell table:style-name="Table5.A1" office:value-type="string">
<text:p text:style-name="P27">Price</text:p>
<text:p text:style-name="P29">Price</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table5.A1" office:value-type="string">
<text:p text:style-name="P33"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else &apos;&apos;&gt;</text:placeholder><text:span text:style-name="T17">(</text:span><text:placeholder text:placeholder-type="text">&lt;sale.report_price&gt;</text:placeholder><text:span text:style-name="T17">)</text:span></text:p>
<text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else &apos;&apos;&gt;</text:placeholder><text:s/><text:span text:style-name="T17">(</text:span><text:placeholder text:placeholder-type="text">&lt;sale.report_price&gt;</text:placeholder><text:span text:style-name="T17">)</text:span></text:p>
</table:table-cell>
</table:table-row>
</table:table>
@@ -3897,12 +3903,12 @@
<table:table-column table:style-name="Table6.B"/>
<table:table-row>
<table:table-cell table:style-name="Table6.A1" office:value-type="string">
<text:p text:style-name="P27"/>
<text:p text:style-name="P29"/>
<text:p text:style-name="Global_20_Dunavant"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T10">Delivery</text:span></text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Table6.A1" office:value-type="string">
<text:p text:style-name="P24"/>
<text:p text:style-name="P24"><text:s/><text:span text:style-name="T15">PROMPT</text:span></text:p>
<text:p text:style-name="P25"/>
<text:p text:style-name="P35"><text:s/><text:span text:style-name="T18"><text:placeholder text:placeholder-type="text">&lt;sale.report_delivery if sale.report_delivery else &apos;PROMPT&apos;&gt;</text:placeholder></text:span></text:p>
</table:table-cell>
</table:table-row>
</table:table>
@@ -3914,74 +3920,74 @@
<table:table-column table:style-name="Table7.B"/>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P26"/>
<text:p text:style-name="P26">Terms</text:p>
<text:p text:style-name="P28"/>
<text:p text:style-name="P28">Terms</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P25"/>
<text:p text:style-name="P26"/>
<text:p text:style-name="P9"><text:placeholder text:placeholder-type="text">&lt;sale.report_terms&gt;</text:placeholder></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P26"/>
<text:p text:style-name="P28"/>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P30"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"/></text:span></text:p>
<text:p text:style-name="P32"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"/></text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P28"/>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P26"/>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P25"/>
<text:p text:style-name="P28">Payment</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P32"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.rec_name if sale.payment_term else &apos;100% CASH AGAINST DOCUMENTS&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T12"><text:s/></text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P26">Payment</text:p>
<text:p text:style-name="P28"/>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P30"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.rec_name if sale.payment_term else &apos;100% CASH AGAINST DOCUMENTS&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T12"><text:s/></text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P26"/>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P25"/>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P26">Arbitration &amp; Rules</text:p>
<text:p text:style-name="P28">Arbitration &amp; Rules</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table7.A1" office:value-type="string">
<text:p text:style-name="P10">- ALL DISPUTES RELATING TO THIS CONTRACT WILL BE RESOLVED THROUGH ARBITRATION IN ACCORDANCE WITH THE BYLAWS OF THE INTERNATIONAL COTTON ASSOCIATION, LIMITED. THIS AGREEMENT INCORPORATES THE BYLAWS WHICH SET OUT THE ASSOCIATION’S ARBITRATION PROCEDURE. </text:p>
<text:p text:style-name="P25">- EITHER PARTY MUST NOT TAKE ANY LEGAL ACTION OVER A DISPUTE SUITABLE FOR ARBITRATION, OTHER THAN TO OBTAIN SECURITY FOR ANY CLAIM, UNLESS THEY HAVE FIRST OBTAINED AN ARBITRATION AWARD FROM THE INTERNATIONAL COTTON ASSOCIATION, LIMITED AND EXHAUSTED ALL MEANS OF APPEAL ALLOWED BY THE ASSOCIATION’S BYLAWS.</text:p>
<text:p text:style-name="P26">- EITHER PARTY MUST NOT TAKE ANY LEGAL ACTION OVER A DISPUTE SUITABLE FOR ARBITRATION, OTHER THAN TO OBTAIN SECURITY FOR ANY CLAIM, UNLESS THEY HAVE FIRST OBTAINED AN ARBITRATION AWARD FROM THE INTERNATIONAL COTTON ASSOCIATION, LIMITED AND EXHAUSTED ALL MEANS OF APPEAL ALLOWED BY THE ASSOCIATION’S BYLAWS.</text:p>
</table:table-cell>
</table:table-row>
</table:table>
<text:p text:style-name="P31"/>
<text:p text:style-name="P33"/>
<table:table table:name="Table8" table:style-name="Table8">
<table:table-column table:style-name="Table8.A"/>
<table:table-column table:style-name="Table8.B"/>
<table:table-row>
<table:table-cell table:style-name="Table8.A1" office:value-type="string">
<text:p text:style-name="P28"/>
<text:p text:style-name="P30"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">THE SELLERS</text:span></text:span></text:p>
<text:p text:style-name="P30"/>
<text:p text:style-name="P32"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">THE SELLERS</text:span></text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Table8.A1" office:value-type="string">
<text:p text:style-name="P28"/>
<text:p text:style-name="P30"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">THE BUYERS</text:span></text:span></text:p>
<text:p text:style-name="P30"/>
<text:p text:style-name="P32"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">THE BUYERS</text:span></text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Table8.A1" office:value-type="string">
<text:p text:style-name="P22">ICT TRADING SA</text:p>
<text:p text:style-name="P30"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T14"><draw:frame draw:style-name="fr1" draw:name="Immagine 3" text:anchor-type="as-char" svg:y="0cm" svg:width="3.157cm" style:rel-width="scale" svg:height="3.087cm" style:rel-height="scale" draw:z-index="0"><draw:image draw:mime-type="image/png">
<text:p text:style-name="P32"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T14"><draw:frame draw:style-name="fr1" draw:name="Immagine 3" text:anchor-type="as-char" svg:y="0cm" svg:width="3.157cm" style:rel-width="scale" svg:height="3.087cm" style:rel-height="scale" draw:z-index="0"><draw:image draw:mime-type="image/png">
<office:binary-data>iVBORw0KGgoAAAANSUhEUgAAAQ8AAAEJCAIAAAAFFDV0AAAAAXNSR0IArs4c6QAA/8pJREFU
eF7sfQeAXGd19etletned7Wr3VXvsootW+69gk2HQIAkJIEUElJ+SAKBhBJqEhICxEAcsDHF
vcmybFlW72V7r7PT5/X2n++NJBsjxZZtjAx+DPKW2Zk37333u/eee+65tOu6lH84jsMwDL61
@@ -5608,7 +5614,7 @@
</draw:frame></text:span></text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Table8.A1" office:value-type="string">
<text:p text:style-name="P30"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T11"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span></text:span></text:p>
<text:p text:style-name="P32"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T11"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span></text:span></text:p>
</table:table-cell>
</table:table-row>
</table:table>