Skip to content

Commit 5f065dd

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #181 into 14.0
Signed-off-by pedrobaeza
2 parents 9dcf60f + ba5c831 commit 5f065dd

File tree

2 files changed

+54
-17
lines changed

2 files changed

+54
-17
lines changed

‎l10n_de_skr03_mis_reports/data/mis_report_bs.xml‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -665,17 +665,34 @@
665665
<field name="auto_expand_accounts_style_id" ref="style_l10n_de_level3_accounts" />
666666
<field name="sequence">570</field>
667667
</record>
668+
<record model="mis.report.kpi" id="mis_report_bs_gewinn_des_jahres">
669+
<field name="report_id" ref="mis_report_bs" />
670+
<field name="name">gewinn_des_jahres</field>
671+
<field name="description">5. Gewinn des Jahres</field>
672+
<field
673+
name="expression"
674+
>bale[('user_type_id', '=', ref('account.data_unaffected_earnings').id)] + bale['|', ('user_type_id', '=', ref('account.data_account_type_revenue').id),('user_type_id', '=', ref('account.data_account_type_expenses').id)]-balu['|', ('user_type_id', '=', ref('account.data_account_type_revenue').id),('user_type_id', '=', ref('account.data_account_type_expenses').id)]</field>
675+
<field name="type">num</field>
676+
<field name="compare_method">pct</field>
677+
<field name="style_id" ref="style_l10n_de_level3" />
678+
<field name="auto_expand_accounts" eval="True" />
679+
<field
680+
name="auto_expand_accounts_style_id"
681+
ref="style_l10n_de_level3_accounts"
682+
/>
683+
<field name="sequence">575</field>
684+
</record>
668685
<record model="mis.report.kpi" id="mis_report_bs_total_gewinnruecklage">
669686
<field name="report_id" ref="mis_report_bs" />
670687
<field name="name">total_gewinnruecklage</field>
671688
<field name="description">Total III. Gewinnrücklage</field>
672689
<field
673690
name="expression"
674-
>+ ruecklage_gesetzlich + ruecklage_eigene_anteile + ruecklage_satzung + ruecklage_andere_gewinne</field>
675-
<field name="type">num</field>
676-
<field name="compare_method">pct</field>
677-
<field name="style_id" ref="style_l10n_de_level1_total" />
678-
<field name="sequence">580</field>
691+
>+ ruecklage_gesetzlich + ruecklage_eigene_anteile + ruecklage_satzung + ruecklage_andere_gewinne + gewinn_des_jahres</field>
692+
<field name="type">num</field>
693+
<field name="compare_method">pct</field>
694+
<field name="style_id" ref="style_l10n_de_level1_total" />
695+
<field name="sequence">580</field>
679696
</record>
680697
<record model="mis.report.kpi" id="mis_report_bs_gewinn_verlustvortrag">
681698
<field name="report_id" ref="mis_report_bs" />

‎l10n_de_skr04_mis_reports/data/mis_report_bs.xml‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -651,17 +651,34 @@
651651
<field name="auto_expand_accounts_style_id" ref="style_l10n_de_level3_accounts" />
652652
<field name="sequence">570</field>
653653
</record>
654+
<record model="mis.report.kpi" id="mis_report_bs_gewinn_des_jahres">
655+
<field name="report_id" ref="mis_report_bs" />
656+
<field name="name">gewinn_des_jahres</field>
657+
<field name="description">5. Gewinn des Jahres</field>
658+
<field
659+
name="expression"
660+
>bale[('user_type_id', '=', ref('account.data_unaffected_earnings').id)] + bale['|', ('user_type_id', '=', ref('account.data_account_type_revenue').id),('user_type_id', '=', ref('account.data_account_type_expenses').id)]-balu['|', ('user_type_id', '=', ref('account.data_account_type_revenue').id),('user_type_id', '=', ref('account.data_account_type_expenses').id)]</field>
661+
<field name="type">num</field>
662+
<field name="compare_method">pct</field>
663+
<field name="style_id" ref="style_l10n_de_level3" />
664+
<field name="auto_expand_accounts" eval="True" />
665+
<field
666+
name="auto_expand_accounts_style_id"
667+
ref="style_l10n_de_level3_accounts"
668+
/>
669+
<field name="sequence">575</field>
670+
</record>
654671
<record model="mis.report.kpi" id="mis_report_bs_total_gewinnruecklage">
655672
<field name="report_id" ref="mis_report_bs" />
656673
<field name="name">total_gewinnruecklage</field>
657674
<field name="description">Total III. Gewinnrücklage</field>
658675
<field
659676
name="expression"
660-
>+ ruecklage_gesetzlich + ruecklage_eigene_anteile + ruecklage_satzung + ruecklage_andere_gewinne</field>
661-
<field name="type">num</field>
662-
<field name="compare_method">pct</field>
663-
<field name="style_id" ref="style_l10n_de_level1_total" />
664-
<field name="sequence">580</field>
677+
>+ ruecklage_gesetzlich + ruecklage_eigene_anteile + ruecklage_satzung + ruecklage_andere_gewinne + gewinn_des_jahres</field>
678+
<field name="type">num</field>
679+
<field name="compare_method">pct</field>
680+
<field name="style_id" ref="style_l10n_de_level1_total" />
681+
<field name="sequence">580</field>
665682
</record>
666683
<record model="mis.report.kpi" id="mis_report_bs_gewinn_verlustvortrag">
667684
<field name="report_id" ref="mis_report_bs" />
@@ -823,13 +840,16 @@
823840
<field
824841
name="description"
825842
>4. Verbindlichkeiten aus Lieferungen u. Leistungen</field>
826-
<field name="expression">bals[330%,331%,332%,333%,333%,334%]</field>
827-
<field name="type">num</field>
828-
<field name="compare_method">pct</field>
829-
<field name="style_id" ref="style_l10n_de_level2" />
830-
<field name="auto_expand_accounts" eval="True" />
831-
<field name="auto_expand_accounts_style_id" ref="style_l10n_de_level3_accounts" />
832-
<field name="sequence">720</field>
843+
<field name="expression">bals[330%,331%,332%,333%,334%]</field>
844+
<field name="type">num</field>
845+
<field name="compare_method">pct</field>
846+
<field name="style_id" ref="style_l10n_de_level2" />
847+
<field name="auto_expand_accounts" eval="True" />
848+
<field
849+
name="auto_expand_accounts_style_id"
850+
ref="style_l10n_de_level3_accounts"
851+
/>
852+
<field name="sequence">720</field>
833853
</record>
834854
<record model="mis.report.kpi" id="mis_report_bs_verbindlichkeiten_wechsel">
835855
<field name="report_id" ref="mis_report_bs" />

0 commit comments

Comments
 (0)