details: https://code.tryton.org/tryton/commit/e2059cb104e2
branch: default
user: Cédric Krier <[email protected]>
date: Wed Dec 03 09:18:28 2025 +0100
description:
Replace non-ascii "N°" by "No" in report templates
msgmerge complaints about non-ascii msgid
diffstat:
modules/account_invoice/invoice.fodt | 6 +++---
modules/purchase/purchase.fodt | 6 +++---
modules/purchase_request_quotation/quotation.fodt | 4 ++--
modules/sale/sale.fodt | 6 +++---
modules/stock/customer_return_restocking_list.fodt | 4 ++--
modules/stock/delivery_note.fodt | 2 +-
modules/stock/internal_shipment.fodt | 4 ++--
modules/stock/picking_list.fodt | 6 +++---
modules/stock/supplier_restocking_list.fodt | 4 ++--
modules/stock_shipment_customs/commercial_invoice.fodt | 2 +-
10 files changed, 22 insertions(+), 22 deletions(-)
diffs (200 lines):
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/account_invoice/invoice.fodt
--- a/modules/account_invoice/invoice.fodt Wed Dec 03 08:47:20 2025 +0100
+++ b/modules/account_invoice/invoice.fodt Wed Dec 03 09:18:28 2025 +0100
@@ -703,7 +703,7 @@
<text:p text:style-name="P7"><text:placeholder
text:placeholder-type="text"><invoice.party_tax_identifier.type_string></text:placeholder>:
<text:placeholder
text:placeholder-type="text"><invoice.party_tax_identifier.code></text:placeholder></text:p>
<text:p text:style-name="P7"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><if test="invoice.type ==
'in'"></text:placeholder></text:p>
- <text:p text:style-name="P8"><text:span text:style-name="T1">Supplier
Invoice N°:</text:span><text:span text:style-name="T1"><text:placeholder
text:placeholder-type="text"><invoice.number and ' ' +
invoice.number or ''></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P8"><text:span text:style-name="T1">Supplier
Invoice No:</text:span><text:span text:style-name="T1"><text:placeholder
text:placeholder-type="text"><invoice.number and ' ' +
invoice.number or ''></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><if test="invoice.type ==
'out'"></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><choose
test=""></text:placeholder></text:p>
@@ -714,7 +714,7 @@
<text:p text:style-name="P9">Pro forma Invoice</text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><otherwise
test=""></text:placeholder></text:p>
- <text:p text:style-name="P9">Invoice N°:<text:placeholder
text:placeholder-type="text"><invoice.number and ' ' +
invoice.number or ''></text:placeholder></text:p>
+ <text:p text:style-name="P9">Invoice No:<text:placeholder
text:placeholder-type="text"><invoice.number and ' ' +
invoice.number or ''></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
@@ -1097,4 +1097,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/purchase/purchase.fodt
--- a/modules/purchase/purchase.fodt Wed Dec 03 08:47:20 2025 +0100
+++ b/modules/purchase/purchase.fodt Wed Dec 03 09:18:28 2025 +0100
@@ -689,10 +689,10 @@
<text:p text:style-name="P30">Draft Purchase Order</text:p>
<text:p text:style-name="P20"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="P20"><text:soft-page-break/><text:placeholder
text:placeholder-type="text"><when test="purchase.state ==
'quotation'"></text:placeholder></text:p>
- <text:p text:style-name="P30">Request for Quotation N°: <text:placeholder
text:placeholder-type="text"><purchase.full_number></text:placeholder></text:p>
+ <text:p text:style-name="P30">Request for Quotation No: <text:placeholder
text:placeholder-type="text"><purchase.full_number></text:placeholder></text:p>
<text:p text:style-name="P20"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="P20"><text:placeholder
text:placeholder-type="text"><otherwise
test=""></text:placeholder></text:p>
- <text:p text:style-name="P30">Purchase Order N°: <text:placeholder
text:placeholder-type="text"><purchase.full_number></text:placeholder></text:p>
+ <text:p text:style-name="P30">Purchase Order No: <text:placeholder
text:placeholder-type="text"><purchase.full_number></text:placeholder></text:p>
<text:p text:style-name="P20"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="P20"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:section text:style-name="Sect1" text:name="Section1">
@@ -951,4 +951,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2
modules/purchase_request_quotation/quotation.fodt
--- a/modules/purchase_request_quotation/quotation.fodt Wed Dec 03 08:47:20
2025 +0100
+++ b/modules/purchase_request_quotation/quotation.fodt Wed Dec 03 09:18:28
2025 +0100
@@ -721,7 +721,7 @@
<text:p text:style-name="P50"><text:soft-page-break/>Draft <text:span
text:style-name="T3">Quotation</text:span></text:p>
<text:p text:style-name="P51"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="P51"><text:placeholder
text:placeholder-type="text"><otherwise
test=""></text:placeholder></text:p>
- <text:p text:style-name="P49"><text:span text:style-name="T2">Purchase
</text:span>Request for Quotation N°: <text:placeholder
text:placeholder-type="text"><quotation.number></text:placeholder></text:p>
+ <text:p text:style-name="P49">Purchase Request for Quotation No:
<text:placeholder
text:placeholder-type="text"><quotation.number></text:placeholder></text:p>
<text:p text:style-name="P43"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="P44"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:section text:style-name="Sect1" text:name="Section1">
@@ -792,4 +792,4 @@
<text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/sale/sale.fodt
--- a/modules/sale/sale.fodt Wed Dec 03 08:47:20 2025 +0100
+++ b/modules/sale/sale.fodt Wed Dec 03 09:18:28 2025 +0100
@@ -703,10 +703,10 @@
<text:p text:style-name="P30">Draft Sale Order</text:p>
<text:p text:style-name="P21"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="P21"><text:placeholder
text:placeholder-type="text"><when test="sale.state ==
'quotation'"></text:placeholder></text:p>
- <text:p text:style-name="P30"><text:soft-page-break/>Quotation N°:
<text:placeholder
text:placeholder-type="text"><sale.full_number></text:placeholder></text:p>
+ <text:p text:style-name="P30"><text:soft-page-break/>Quotation No:
<text:placeholder
text:placeholder-type="text"><sale.full_number></text:placeholder></text:p>
<text:p text:style-name="P21"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="P21"><text:placeholder
text:placeholder-type="text"><otherwise
test=""></text:placeholder></text:p>
- <text:p text:style-name="P30">Sale Order N°: <text:placeholder
text:placeholder-type="text"><sale.full_number></text:placeholder></text:p>
+ <text:p text:style-name="P30">Sale Order No: <text:placeholder
text:placeholder-type="text"><sale.full_number></text:placeholder></text:p>
<text:p text:style-name="P21"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="P22"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:section text:style-name="Sect1" text:name="Section1">
@@ -961,4 +961,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2
modules/stock/customer_return_restocking_list.fodt
--- a/modules/stock/customer_return_restocking_list.fodt Wed Dec 03
08:47:20 2025 +0100
+++ b/modules/stock/customer_return_restocking_list.fodt Wed Dec 03
09:18:28 2025 +0100
@@ -540,7 +540,7 @@
<text:p text:style-name="P19"><text:span text:style-name="T6">Cancelled
</text:span>Restocking List</text:p>
<text:p text:style-name="P21"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><otherwise></text:placeholder></text:p>
- <text:p text:style-name="P18">Restocking List <text:span
text:style-name="T6">N°: </text:span><text:span
text:style-name="T6"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P18">Restocking List No: <text:span
text:style-name="T6"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:p text:style-name="P20"><text:span
text:style-name="T1">Reference:</text:span><text:span text:style-name="T5">
</text:span><text:span text:style-name="T5"><text:placeholder
text:placeholder-type="text"><shipment.origins or
''></text:placeholder></text:span><text:span
text:style-name="T5"><text:placeholder text:placeholder-type="text"><',
' if (shipment.origins and shipment.reference) else
''></text:placeholder></text:span><text:span
text:style-name="T5"><text:placeholder
text:placeholder-type="text"><shipment.reference or
''></text:placeholder></text:span></text:p>
@@ -609,4 +609,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/stock/delivery_note.fodt
--- a/modules/stock/delivery_note.fodt Wed Dec 03 08:47:20 2025 +0100
+++ b/modules/stock/delivery_note.fodt Wed Dec 03 09:18:28 2025 +0100
@@ -544,7 +544,7 @@
<text:p text:style-name="P19"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><choose></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><when test="shipment.state in
['packed', 'done']"></text:placeholder></text:p>
- <text:p text:style-name="P24">Delivery Note <text:span
text:style-name="T3">N°: </text:span><text:span
text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P24">Delivery Note No: <text:span
text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><when test="shipment.state ==
'cancelled'"></text:placeholder></text:p>
<text:p text:style-name="P25"><text:span text:style-name="T3">Cancelled
</text:span>Delivery Note</text:p>
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/stock/internal_shipment.fodt
--- a/modules/stock/internal_shipment.fodt Wed Dec 03 08:47:20 2025 +0100
+++ b/modules/stock/internal_shipment.fodt Wed Dec 03 09:18:28 2025 +0100
@@ -540,7 +540,7 @@
<text:p text:style-name="P15"><text:placeholder
text:placeholder-type="text"><line></text:placeholder></text:p>
<text:p text:style-name="P15"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
<text:p text:style-name="P15"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
- <text:p text:style-name="P9"><text:span
text:style-name="T5"><text:placeholder
text:placeholder-type="text"><shipment.state_string></text:placeholder></text:span><text:span
text:style-name="T5"><text:s/>Internal Shipment </text:span><text:span
text:style-name="T6">N°: </text:span><text:span
text:style-name="T6"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P9"><text:span
text:style-name="T5"><text:placeholder
text:placeholder-type="text"><shipment.state_string></text:placeholder></text:span><text:span
text:style-name="T5"><text:s/>Internal Shipment No: </text:span><text:span
text:style-name="T6"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:span
text:style-name="T1">Reference:</text:span><text:span text:style-name="T3">
</text:span><text:span text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.reference or
''></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:span text:style-name="T1">>From
Location:</text:span> <text:placeholder
text:placeholder-type="text"><shipment.from_location.rec_name></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:span text:style-name="T1">To
Location:</text:span> <text:placeholder
text:placeholder-type="text"><shipment.to_location.rec_name></text:placeholder></text:p>
@@ -607,4 +607,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/stock/picking_list.fodt
--- a/modules/stock/picking_list.fodt Wed Dec 03 08:47:20 2025 +0100
+++ b/modules/stock/picking_list.fodt Wed Dec 03 09:18:28 2025 +0100
@@ -533,13 +533,13 @@
<text:p text:style-name="P20"><text:span text:style-name="T4">Draft
</text:span>Picking List</text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><when test="shipment.state ==
'assigned'"></text:placeholder></text:p>
- <text:p text:style-name="P20">Picking List <text:span
text:style-name="T4">N°: </text:span><text:span
text:style-name="T4"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P20">Picking List No: <text:span
text:style-name="T4"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><when test="shipment.state ==
'cancelled'"></text:placeholder></text:p>
<text:p text:style-name="P20"><text:span text:style-name="T4">Cancelled
</text:span>Picking List</text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><otherwise></text:placeholder></text:p>
- <text:p text:style-name="P19"><text:span text:style-name="T4">Done
</text:span>Picking List <text:span text:style-name="T4">N°:
</text:span><text:span text:style-name="T4"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P19"><text:span text:style-name="T4">Done
</text:span>Picking List No: <text:span text:style-name="T4"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:span
text:style-name="T1">Reference:</text:span><text:span text:style-name="T3">
</text:span><text:span text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.origins or
''></text:placeholder></text:span><text:span
text:style-name="T3"><text:placeholder text:placeholder-type="text"><',
' if (shipment.origins and shipment.reference) else
''></text:placeholder></text:span><text:span
text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.reference or
''></text:placeholder></text:span></text:p>
@@ -609,4 +609,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2 modules/stock/supplier_restocking_list.fodt
--- a/modules/stock/supplier_restocking_list.fodt Wed Dec 03 08:47:20
2025 +0100
+++ b/modules/stock/supplier_restocking_list.fodt Wed Dec 03 09:18:28
2025 +0100
@@ -531,7 +531,7 @@
<text:p text:style-name="P19"><text:span text:style-name="T4">Cancelled
</text:span>Restocking List</text:p>
<text:p text:style-name="P20"><text:placeholder
text:placeholder-type="text"></when></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"><otherwise></text:placeholder></text:p>
- <text:p text:style-name="P18">Restocking List <text:span
text:style-name="T4">N°: </text:span><text:span
text:style-name="T4"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P18">Restocking List No: <text:span
text:style-name="T4"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></otherwise></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:placeholder
text:placeholder-type="text"></choose></text:placeholder></text:p>
<text:p text:style-name="Standard"><text:span
text:style-name="T1">Reference:</text:span><text:span text:style-name="T3">
</text:span><text:span text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.origins or
''></text:placeholder></text:span><text:span
text:style-name="T3"><text:placeholder text:placeholder-type="text"><',
' if (shipment.origins and shipment.reference) else
''></text:placeholder></text:span><text:span
text:style-name="T3"><text:placeholder
text:placeholder-type="text"><shipment.reference or
''></text:placeholder></text:span></text:p>
@@ -600,4 +600,4 @@
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff -r 6ec84dbcdde9 -r e2059cb104e2
modules/stock_shipment_customs/commercial_invoice.fodt
--- a/modules/stock_shipment_customs/commercial_invoice.fodt Wed Dec 03
08:47:20 2025 +0100
+++ b/modules/stock_shipment_customs/commercial_invoice.fodt Wed Dec 03
09:18:28 2025 +0100
@@ -693,7 +693,7 @@
<text:p text:style-name="P45"><text:placeholder
text:placeholder-type="text"><for each="shipment in
records"></text:placeholder></text:p>
<text:p text:style-name="P45"><text:placeholder
text:placeholder-type="text"><replace
text:p="set_lang(shipment.company.party.lang)"></text:placeholder></text:p>
<text:p text:style-name="P44"><text:placeholder
text:placeholder-type="text"><replace
text:p="shipment.set_lang(shipment.company.party.lang)"></text:placeholder></text:p>
- <text:p text:style-name="P5"><text:span text:style-name="T3">Commercial
</text:span><text:span text:style-name="T2">Invoice N°:</text:span><text:span
text:style-name="T2"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+ <text:p text:style-name="P5"><text:span text:style-name="T3">Commercial
Invoice No: </text:span><text:span text:style-name="T2"><text:placeholder
text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
<text:section text:style-name="Sect1" text:name="Section1">
<text:p text:style-name="P61">Sender</text:p>
<text:p text:style-name="P35"><text:placeholder
text:placeholder-type="text"><shipment.company.rec_name></text:placeholder></text:p>
