From 1476a7ac0675d765dd4e516301a48f05f151c704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Oct 2022 15:37:36 +0200 Subject: [PATCH] Improve layout of General Ledger report - repeat 3 header rows for table with lines - use horizontal page - remove state column - display in title if it contains draft issue11722 review427781003 --- general_ledger.fodt | 1247 ++++++++++++++++++++----------------------- 1 file changed, 582 insertions(+), 665 deletions(-) diff --git a/general_ledger.fodt b/general_ledger.fodt index a023603de1..3e43d02a95 100644 --- a/general_ledger.fodt +++ b/general_ledger.fodt @@ -1,127 +1,137 @@ - - LibreOffice/6.4.3.2$Linux_X86_64 LibreOffice_project/40$Build-22008-06-07T15:26:412008-08-27T17:03:361PT0S + + LibreOffice/7.3.5.2$Linux_X86_64 LibreOffice_project/30$Build-22008-06-07T15:26:412008-08-27T17:03:361PT0S - 30268 + 24130 0 - 26301 + 48129 22994 true false view2 - 4452 - 34941 + 19627 + 29242 0 - 30268 - 26300 - 53261 + 24130 + 48128 + 47122 0 0 false 100 false + false false false - true - true - true - 0 - true - true - - false - false - false - false - false false - false + false + true + true + true + true + true + false + 0 + false + false + false + false + false + true + false + false + false + false + false + true true true - false false + false false - false - false false false false - false - false - true - false - true - true - 2070049 - false - - false - true - false - false - false - true + false + true false - false - false + false true - 3965027 - + false + false + false + true + 0 + 1 + true + false + + high-resolution + false + + + false + false true + false + true + true + false + true + + true + 4069242 + + true + false + true + true + 0 + + false + false + false + false + false + true + false + false + false + false + true + false + false + + false 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 - 0 + false + false false false - - - false + false + false + false + false + 2070049 + false + false + false + false + false + false + true + true + false @@ -130,25 +140,26 @@ - - - - - + + + + + + - + - + - + @@ -160,18 +171,18 @@ - - + + - + - + @@ -180,17 +191,17 @@ - + - + - + @@ -226,67 +237,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -294,22 +371,22 @@ - + - + - + - + - + @@ -317,238 +394,140 @@ - + - + - + - - + + - - + + - - + + - + + + + + + + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -561,153 +540,133 @@ - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + @@ -715,8 +674,23 @@ + + + + + + + + + + + + + + + - + @@ -726,18 +700,21 @@ + + + - + - + Company: <company.rec_name> - General Ledger + General Ledger<if test="not context.get('posted')"> Draft</if> Print Date: <format_date(datetime.date.today(), user.language)>at <datetime.datetime.now().strftime('%H:%M:%S')> @@ -749,12 +726,12 @@ - + User: <user.rec_name> - 3/3 + 1/3 @@ -771,170 +748,143 @@ - General Ledger - Fiscal Year: <fiscalyear.rec_name> - <if test="start_period or end_period"> - From Period: <start_period.name if start_period else ''>To <end_period.name if end_period else ''> - </if> - <if test="from_date or to_date"> - From Date: <format_date(from_date, user.language) if from_date else ''>To <format_date(to_date, user.language) if to_date else ''> - </if> - <for each="account in accounts"> - - - - + General Ledger<if test="not context.get('posted')"> Draft</if> + Fiscal Year: <fiscalyear.rec_name> + <if test="start_period or end_period"> + From Period: <start_period.name if start_period else ''>To <end_period.name if end_period else ''> + </if> + <if test="from_date or to_date"> + From Date: <format_date(from_date, user.language) if from_date else ''>To <format_date(to_date, user.language) if to_date else ''> + </if> + <for each="account in accounts"> + <choose test=""> + <when test="account.general_ledger_balance"> + + + + - - Name + + Name - - - - <account.rec_name> + + <account.rec_name> - - - - <choose test=""> + + Balance - - - - - - - - - - - <when test="account.general_ledger_balance"> + + - - - - - - - - - - - Balance + + - - - + + <format_currency(account.end_balance, user.language, company.currency)> - - + + - - <format_currency(account.end_balance, user.language, company.currency)> - - - - - - - - - + + - - - </when> - - - - - - - - - - - - <otherwise test=""> - - - - - - - - - - - - Date - - - Move - - - Debit - - - Credit - - - Balance - - - Descr. - - - Origin - - - State - - - - + + </when> + <otherwise test=""> + + + + + + + + + + Name + + + + + + + + + + + <account.rec_name> + + + + + + + + + + + Date + + + Move + + + Debit + + + Credit + + + Balance + + + Description + + + Origin + + + + + Balance - - + + - - + + - - <format_currency(account.start_balance, user.language, company.currency)> + + <format_currency(account.start_balance, user.language, company.currency)> - - + + - - - - - + + - - - <for each="line in account.lines"> + + + <for each="line in account.lines"> @@ -942,121 +892,88 @@ - - - - <format_date(line.date, user.language)> + + + <format_date(line.date, user.language)> - - <line.move.rec_name> + + <line.move.rec_name> - - <format_currency(line.debit, user.language, company.currency)> + + <format_currency(line.debit, user.language, company.currency)> - - <format_currency(line.credit, user.language, company.currency)> + + <format_currency(line.credit, user.language, company.currency)> - - <format_currency(line.balance, user.language, company.currency)> + + <format_currency(line.balance, user.language, company.currency)> - - <line.description or ''><line.move_description or ''> + + <line.description or ''><line.move_description or ''> - - <getattr(line.origin, 'rec_name', '')> + + <getattr(line.origin, 'rec_name', '')> - - <line.state_string> - - - - - </for> - - - - - - - - - - + + + </for> + + + + + + + + + + Total - - <format_currency(account.end_debit - account.start_debit, user.language, company.currency)> + + <format_currency(account.end_debit - account.start_debit, user.language, company.currency)> - - <format_currency(account.end_credit - account.start_credit, user.language, company.currency)> + + <format_currency(account.end_credit - account.start_credit, user.language, company.currency)> - - <format_currency((account.end_debit - account.end_credit) - (account.start_debit - account.start_credit), user.language, company.currency)> + + <format_currency((account.end_debit - account.end_credit) - (account.start_debit - account.start_credit), user.language, company.currency)> - - + + - - - - - + + - - + + Balance - - + + - - + + - - <format_currency(account.end_balance, user.language, company.currency)> + + <format_currency(account.end_balance, user.language, company.currency)> - - + + - - + + - - - - - - - </otherwise> - - - - - - - - - - - - </choose> - - - - - - - - - </for> + </otherwise> + </choose> + </for> \ No newline at end of file