From 0b1f5377b52297f3efe8de0b8cb8bf6b97352ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 27 Oct 2020 21:12:51 +0100 Subject: [PATCH] Do not set page break on Relatorio paragraph As Relatorio remove the paragraph, we need to add an small empty line to keep the page break on the result. issue9514 review329341002 --- quotation.fodt | 593 +++++++++++++++++++++++++------------------------ 1 file changed, 304 insertions(+), 289 deletions(-) diff --git a/quotation.fodt b/quotation.fodt index d234efd142..f285fc9ae7 100644 --- a/quotation.fodt +++ b/quotation.fodt @@ -1,24 +1,24 @@ - - LibreOffice/6.2.5.2$Linux_X86_64 LibreOffice_project/20$Build-22008-06-07T15:28:222009-01-10T16:03:321PT0S + + LibreOffice/6.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-22008-06-07T15:28:222009-01-10T16:03:321PT0S - 55457 + 21167 0 - 29900 - 20375 + 26301 + 24026 true false view2 - 12617 - 64565 + 4355 + 33754 0 - 55457 - 29898 - 75830 + 21167 + 26300 + 45191 0 0 false @@ -29,98 +29,100 @@ - false - - false - false false - false - false - true - true true - 0 + true true - false - true - false - + 0 + true + true + + false + false + false + false + false + false + false + false + true + true + true + false + false + false + false + false + false + false + false + false + true + false + true true - false - false - true - false - false 947783 - false - false - true - true - false - false - true - true - true - true - true - false + false + false + true + false + false + false + true + false + false + false + true + 6012385 + + true + false + true + false + false + true + true + false + true + false + false + false + 0 + false + true + high-resolution + false + false + false + false + false + false + true + true + true + + true + false + false + true + false + false + false + + false + false + false + 1 true false - false - 1 - 0 - - 0 - true - false - false - - false - false - - false - false - false - - false - true - false - high-resolution - false - true - false false - true - false - - true + 0 false false + + false - false - true - false - false - true - false - true - 5993459 - false - false - false - false - false - false - false - true - false - false - true - false - false - false - true @@ -142,15 +144,15 @@ - - + + - - + + @@ -162,18 +164,18 @@ - + - + - + @@ -194,11 +196,19 @@ + + + + + + + + - - + + @@ -206,8 +216,8 @@ - - + + @@ -216,18 +226,18 @@ - + - + - + @@ -238,70 +248,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -323,224 +333,228 @@ - + + + + + - + - - + + + - - + + + + + + + + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - - - - - - - - - - - - - + - + - + + - + + - + - - + - + - + - + - + - + + - + + - - - - - - - + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + @@ -562,22 +576,22 @@ - - - + + + - - - + + + - + - + @@ -610,34 +624,35 @@ - <for each="quotation in records"> + <for each="quotation in records"> + <replace text:p="set_lang(quotation.supplier.lang)"> - <replace text:p="quotation.set_lang(quotation.supplier.lang)"> - <if test="quotation.supplier_address"> - <for each="line in quotation.supplier_address.full_address.splitlines()"> - <line> - </for> - </if> - <if test="quotation.supplier.tax_identifier"> - <quotation.supplier.tax_identifier.type_string>: <quotation.supplier.tax_identifier.code> - </if> - <choose test=""> - <when test="quotation.state == 'draft'"> - Draft Quotation - </when> - <otherwise test=""> - Purchase Request for Quotation N°: <quotation.number> - </otherwise> - </choose> + <replace text:p="quotation.set_lang(quotation.supplier.lang)"> + <if test="quotation.supplier_address"> + <for each="line in quotation.supplier_address.full_address.splitlines()"> + <line> + </for> + </if> + <if test="quotation.supplier.tax_identifier"> + <quotation.supplier.tax_identifier.type_string>: <quotation.supplier.tax_identifier.code> + </if> + <choose test=""> + <when test="quotation.state == 'draft'"> + Draft Quotation + </when> + <otherwise test=""> + Purchase Request for Quotation N°: <quotation.number> + </otherwise> + </choose> - Revision:<quotation.revision or ''> - Reference: <quotation.reference or ''> - Customer Code: <quotation.supplier.get_multivalue('customer_code', company=quotation.company) or ''> - Date: <format_date(today, quotation.supplier.lang)> - Delivery Address: - <for each="line in quotation.delivery_full_address.splitlines()"> - <line> - </for> + Revision:<quotation.revision or ''> + Reference: <quotation.reference or ''> + Customer Code: <quotation.supplier.get_multivalue('customer_code', company=quotation.company) or ''> + Date: <format_date(today, quotation.supplier.lang)> + Delivery Address: + <for each="line in quotation.delivery_full_address.splitlines()"> + <line> + </for> @@ -646,22 +661,22 @@ - Description + Description - Quantity + Quantity - Unit Price + Unit Price - Expected Supply Date + Expected Supply Date - <for each="quotation_line in quotation.lines"> + <for each="quotation_line in quotation.lines"> @@ -669,30 +684,30 @@ - <for each="line in quotation_line.description.split('\n')"> - <line> - </for> + <for each="line in quotation_line.description.split('\n')"> + <line> + </for> - <(format_number(quotation_line.quantity, quotation.supplier.lang, digits=quotation_line.unit_digits) + (quotation_line.unit and (' ' + quotation_line.unit.symbol) or '')) or ''> + <(format_number(quotation_line.quantity, quotation.supplier.lang, digits=quotation_line.unit_digits) + (quotation_line.unit and (' ' + quotation_line.unit.symbol) or '')) or ''> - <format_currency(quotation_line.unit_price, quotation.supplier.lang, quotation_line.currency, digits=quotation_line.__class__.unit_price.digits[1]) if quotation_line.unit_price else ""> + <format_currency(quotation_line.unit_price, quotation.supplier.lang, quotation_line.currency, digits=quotation_line.__class__.unit_price.digits[1]) if quotation_line.unit_price else ""> - <format_date(quotation_line.supply_date, quotation.supplier.lang) if quotation_line.supply_date else ''> + <format_date(quotation_line.supply_date, quotation.supplier.lang) if quotation_line.supply_date else ''> - </for> + </for> - </for> + </for> - + \ No newline at end of file