diff --git a/delivery_note.fodt b/delivery_note.fodt index ff27aaba31..38a2ca8c14 100644 --- a/delivery_note.fodt +++ b/delivery_note.fodt @@ -1,24 +1,24 @@ - - LibreOffice/5.4.5.1$Linux_X86_64 LibreOffice_project/40m0$Build-12008-06-07T15:29:022009-03-26T18:33:131PT0S + + LibreOffice/6.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-22008-06-07T15:29:022009-03-26T18:33:131PT0S - 30762 + 28998 0 - 29300 - 27571 + 26301 + 24026 true false view2 - 17431 - 36973 + 4651 + 35512 0 - 30762 - 29298 - 58332 + 28998 + 26300 + 53023 0 0 false @@ -39,9 +39,16 @@ false false + false + false + false false false false + true + true + false + false false false false @@ -54,24 +61,22 @@ false true true - false - false - false + 1813180 false false - false - false true false false - false + true false false false true - 2803237 + 2809848 + + true false true false @@ -80,12 +85,18 @@ true false true + false + false + false 0 false true high-resolution false false + false + false + false false true true @@ -101,7 +112,6 @@ false false - 1813180 false 1 true @@ -123,8 +133,8 @@ - - + + @@ -133,15 +143,15 @@ - - + + - - + + @@ -153,18 +163,18 @@ - - + + - + - + @@ -177,7 +187,7 @@ - + @@ -188,11 +198,19 @@ + + + + + + + + - - + + @@ -200,25 +218,25 @@ - - + + - + - + - + @@ -229,71 +247,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -346,19 +364,19 @@ - + - + - + - + @@ -368,6 +386,14 @@ + + + + + + + + @@ -375,14 +401,14 @@ - - + + - + - + @@ -414,9 +440,11 @@ + <for each="shipment in records"> - <replace text:p="set_lang(shipment.delivery_address.party.lang)"> + + <replace text:p="set_lang(shipment.delivery_address.party.lang)"> <replace text:p="shipment.set_lang(shipment.delivery_address.party.lang)"> <for each="line in shipment.delivery_address.full_address.split('\n')"> <line> diff --git a/internal_shipment.fodt b/internal_shipment.fodt index ff1be2ffe4..8d81f88a61 100644 --- a/internal_shipment.fodt +++ b/internal_shipment.fodt @@ -1,29 +1,30 @@ - - LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2Bertrand Chenal2009-03-26T13:54:482016-08-14T17:42:50.32737860461PT7H26M47S + + LibreOffice/6.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2Bertrand Chenal2009-03-26T13:54:482020-10-24T23:33:19.17812532962PT7H27M11S - 0 + 23186 0 - 43760 - 21691 + 26301 + 24026 true false view2 - 2630 - 5313 + 4651 + 35512 0 - 0 - 43759 - 21689 + 23186 + 26300 + 47210 0 0 false 100 false + false @@ -38,9 +39,16 @@ false false + false + false + false false false false + true + true + false + false false false false @@ -53,23 +61,22 @@ false true true - false - false - false + 1178252 false false - false true false false - false + true false false false true - 2010487 + 2029623 + + true false true true @@ -78,12 +85,18 @@ true false true + false + false + false 0 false true high-resolution false false + false + false + false false true true @@ -99,7 +112,6 @@ false false - 1178252 false 1 true @@ -130,15 +142,15 @@ - - + + - - + + @@ -150,18 +162,18 @@ - + - + - + @@ -179,11 +191,19 @@ + + + + + + + + - - + + @@ -194,8 +214,8 @@ - - + + @@ -204,18 +224,18 @@ - + - + - + @@ -226,92 +246,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -360,15 +380,25 @@ - + - + + + + + + + + + + + @@ -379,14 +409,14 @@ - - + + - + - + @@ -418,9 +448,11 @@ + <for each="shipment in records"> - <if test="shipment.to_location.warehouse and shipment.to_location.warehouse.address"> + + <if test="shipment.to_location.warehouse and shipment.to_location.warehouse.address"> <for each="line in shipment.to_location.warehouse.address.full_address.split('\n')"> <line> </for> @@ -474,7 +506,7 @@ <move.product.rec_name> - <format_number(move.quantity, user.language, digits=move.unit_digits)> <move.uom.symbol> + <format_number(move.quantity, user.language, digits=move.unit_digits)><move.uom.symbol>