Code cleaning and readme update

8 years ago · 81bbcb5bf1
6 changed files with 43 additions and 132 deletions
--- a/account_financial_report_qweb/README.rst
+++ b/account_financial_report_qweb/README.rst
@ -7,9 +7,12 @@ account_financial_report_qweb
 =============================

 This module adds a set of financial reports. They are accessible under
-Accunting / Reporting / PDF Reports.
+Accunting / Reporting / OCA Reports.

 - General ledger
+- Trial Balance
+- Open Items
+- Aged Partner Balance

 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
   :alt: Try me on Runbot
@ -20,13 +23,13 @@ Known issues / Roadmap

 Some reports are being worked on and will be available at some point:

- Aged parter report
+- Trial Balance

 Bug Tracker
 ===========

 Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/{project_repo}/issues>`_. In case of trouble, please
+<https://github.com/OCA/account-financial-reporting/issues>`_. In case of trouble, please
 check there if your issue has already been reported. If you spotted it first,
 help us smashing it by providing a detailed and welcomed feedback.

@ -53,6 +56,7 @@ Contributors
 * Ciro Urselli <c.urselli@apuliasoftware.it>
 * Francesco Apruzzese <opencode@e-ware.org>
 * Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+* Julien Coux <julien.coux@camptocamp.com>

 Much of the work in this module was done at a sprint in Sorrento, Italy in
 April 2016.
--- a/account_financial_report_qweb/openerp.py
+++ b/account_financial_report_qweb/openerp.py
@ -25,9 +25,7 @@
        'wizard/general_ledger_wizard_view.xml',
        'wizard/open_items_wizard_view.xml',
        'wizard/balance_common_wizard_view.xml',
-        'wizard/partner_balance_wizard_view.xml',
        'wizard/trial_balance_wizard_view.xml',
-        'wizard/balance_sheet_wizard_view.xml',
        'menuitems.xml',
        'reports.xml',
        'report/templates/aged_partner_balance.xml',
--- a/account_financial_report_qweb/menuitems.xml
+++ b/account_financial_report_qweb/menuitems.xml
@ -13,31 +13,28 @@
            parent="menu_oca_reports"
            action="action_general_ledger_wizard"
            id="menu_general_ledger_wizard"
+            sequence="10"
            />

-        <menuitem icon="STOCK_PRINT" name="Partner Balance"
-            parent="menu_oca_reports" action="action_account_partner_balance_wizard_view"
-            groups="account.group_account_manager,account.group_account_user" id="menu_account_partner_balance_report"/>
-        <menuitem icon="STOCK_PRINT" name="Trial Balance"
-            parent="menu_oca_reports" action="action_account_trial_balance_wizard_view"
-            groups="account.group_account_manager,account.group_account_user" id="menu_account_trial_balance_report"/>
-        <menuitem icon="STOCK_PRINT" name="Balance Sheet"
-            parent="menu_oca_reports" action="action_account_balance_sheet_wizard_view"
-            groups="account.group_account_manager,account.group_account_user" id="menu_account_sheet_balance_report"/>
-        <menuitem icon="STOCK_PRINT" name="Profit &amp; Loss"
-              parent="menu_oca_reports" action="action_account_profit_loss_wizard_view"
-              groups="account.group_account_manager,account.group_account_user" id="menu_account_profit_loss_report"/>
+        <menuitem
+            parent="menu_oca_reports"
+            action="action_account_trial_balance_wizard_view"
+            id="menu_account_trial_balance_report"
+            sequence="20"
+            />

        <menuitem
            parent="menu_oca_reports"
-            action='action_open_items_wizard'
-            id='menu_open_items_wizard'
+            action="action_open_items_wizard"
+            id="menu_open_items_wizard"
+            sequence="30"
            />

        <menuitem
            parent="menu_oca_reports"
-            action='action_aged_partner_balance_wizard'
-            id='menu_aged_partner_balance_wizard'
+            action="action_aged_partner_balance_wizard"
+            id="menu_aged_partner_balance_wizard"
+            sequence="40"
            />

    </data>
--- a/account_financial_report_qweb/reports.xml
+++ b/account_financial_report_qweb/reports.xml
@ -2,6 +2,8 @@
 <openerp>
    <data>

+        <!-- PDF REPORTS -->
+
        <report
          id="action_report_general_ledger_qweb"
          model="report_general_ledger_qweb"
@ -11,15 +13,6 @@
          file="account_financial_report_qweb.report_general_ledger_qweb"
          />

-        <report
-          id="action_report_general_ledger_xlsx"
-          model="report_general_ledger_qweb"
-          string="General Ledger"
-          report_type="xlsx"
-          name="account_financial_report_qweb.report_general_ledger_xlsx"
-          file="account_financial_report_qweb.report_general_ledger_xlsx"
-          />
-
        <report
          id="action_report_open_items_qweb"
          model="report_open_items_qweb"
@ -38,14 +31,7 @@
          file="account_financial_report_qweb.report_aged_partner_balance_qweb"
        />

-        <record id="general_ledger_xls_export" model="ir.actions.report.xml">
-          <field name="name">General Ledger XLSX report</field>
-          <field name="model">report_general_ledger_qweb</field>
-          <field name="type">ir.actions.report.xml</field>
-          <field name="report_name">ledger.report.wizard.xlsx</field>
-          <field name="report_type">xlsx</field>
-          <field name="auto" eval="False"/>
-        </record>
+        <!-- PDF REPORTS : paperformat -->

        <record id="report_qweb_paperformat" model="report.paperformat">
            <field name="name">Account financial report qweb paperformat</field>
@ -75,5 +61,25 @@
            <field name="paperformat_id" ref="report_qweb_paperformat"/>
        </record>

+        <!-- XLSX REPORTS -->
+
+        <record id="general_ledger_xls_export" model="ir.actions.report.xml">
+          <field name="name">General Ledger XLSX report</field>
+          <field name="model">report_general_ledger_qweb</field>
+          <field name="type">ir.actions.report.xml</field>
+          <field name="report_name">ledger.report.wizard.xlsx</field>
+          <field name="report_type">xlsx</field>
+          <field name="auto" eval="False"/>
+        </record>
+
+        <report
+          id="action_report_general_ledger_xlsx"
+          model="report_general_ledger_qweb"
+          string="General Ledger"
+          report_type="xlsx"
+          name="account_financial_report_qweb.report_general_ledger_xlsx"
+          file="account_financial_report_qweb.report_general_ledger_xlsx"
+          />
+
    </data>
 </openerp>
--- a/account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml
@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_balance_sheet_wizard_view" model="ir.ui.view">
-            <field name="name">Balance Sheet Wizard</field>
-            <field name="model">account.common.balance.report</field>
-            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account_financial_report_qweb.account_balance_common_wizard_view"/>
-            <field name="arch" type="xml">
-                <data>
-                    <notebook position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </notebook>
-                    <!-- Replicate group here because hiding all tabs except Comparison
-                         does not work well. -->
-                    <notebook position="before">
-                        <group string="Compare with other date range">
-                            <field name="comparison_date_range_id"/>
-                            <field name="comparison_date_start"/>
-                            <field name="comparison_date_end"/>
-                        </group>
-                    </notebook>
-                </data>
-            </field>
-        </record>
-
-        <record id="action_account_balance_sheet_wizard_view" model="ir.actions.act_window">
-            <field name="name">Balance Sheet</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.common.balance.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_balance_sheet_wizard_view"/>
-            <field name="target">new</field>
-            <field name="context">{'balance_common': 'balance_sheet'}</field>
-        </record>
-        <record id="action_account_profit_loss_wizard_view" model="ir.actions.act_window">
-            <field name="name">Profit &amp; Loss</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.common.balance.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_balance_sheet_wizard_view"/>
-            <field name="target">new</field>
-            <field name="context">{'balance_common': 'profit_loss'}</field>
-        </record>
-    </data>
-</openerp>
--- a/account_financial_report_qweb/wizard/partner_balance_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/partner_balance_wizard_view.xml
@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_partner_balance_wizard_view" model="ir.ui.view">
-            <field name="name">Partner Balance Wizard</field>
-            <field name="model">account.common.balance.report</field>
-            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account_financial_report_qweb.account_balance_common_wizard_view"/>
-            <field name="arch" type="xml">
-                <data>
-                    <field name="company_id" position="before">
-                        <label nolabel="1" colspan="4" string="This report is an analysis done by a partner, It is a PDF report containing one line per partner representing the cumulative credit balance"/>
-                    </field>
-                    <field name="debit_credit" position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </field>
-
-                </data>
-            </field>
-        </record>
-
-        <record id="action_account_partner_balance_wizard_view" model="ir.actions.act_window">
-            <field name="name">Partner Balance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.common.balance.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_partner_balance_wizard_view"/>
-            <field name="target">new</field>
-            <field name="context">{'balance_common': 'partner_balance'}</field>
-        </record>
-
-        <record model="ir.values" id="action_account_balance_common_wizard_view_values">
-            <field name="model_id" ref="account.model_account_account"/>
-            <field name="name">Partner Balance</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value"
-                eval="'ir.actions.act_window,' +str(ref('action_account_partner_balance_wizard_view'))"/>
-            <field name="key">action</field>
-            <field name="model">account.account</field>
-        </record>
-
-    </data>
-</openerp>