Merge branch 'export-ledger' into production

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/account_financial_report.py
#	indoteknik_custom/models/account_general_ledger.py
#	indoteknik_custom/models/account_report_general_ledger.py
#	indoteknik_custom/views/account_financial_report_view.xml
#	indoteknik_custom/views/account_report_general_ledger_view.xml

2 files changed, 88 insertions, 0 deletions

diff --git a/indoteknik_custom/views/account_financial_report_view.xml b/indoteknik_custom/views/account_financial_report_view.xml
new file mode 100644
index 00000000..7c156599
--- /dev/null
+++ b/indoteknik_custom/views/account_financial_report_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ 
+    <record id="account_financial_report_view_custom" model="ir.ui.view">
+        <field name="name">Common Report</field>
+        <field name="model">accounting.report.xlsx</field>
+        <field name="arch" type="xml">
+        <form string="Report Options">
+            <group col="4">
+                <field name="account_report_id" domain="[('parent_id','=',False)]"/>
+                <field name="target_move" widget="radio"/>
+                <field name="enable_filter"/>
+                <field name="debit_credit" attrs="{'invisible': [('enable_filter','=',True)]}"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+            </group>
+            <group>
+                <notebook tabpos="up" colspan="4">
+                    <page string="Comparison" name="comparison" attrs="{'invisible': [('enable_filter','=',False)]}">
+                        <group>
+                            <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
+                            <field name="filter_cmp"/>
+                        </group>
+                        <group string="Dates" attrs="{'invisible':[('filter_cmp', '!=', 'filter_date')]}">
+                            <field name="date_from_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+                            <field name="date_to_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+                        </group>
+                    </page>
+                </notebook>
+                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
+            </group>
+            <footer>
+                <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                <button string="Cancel" class="btn btn-secondary" special="cancel" />
+            </footer>
+        </form>
+        </field>
+    </record>
+
+    <record id="action_account_report_custom" model="ir.actions.act_window">
+        <field name="name">Financial Reports</field>
+        <field name="res_model">accounting.report.xlsx</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account_financial_report_view_custom"/>
+        <field name="target">new</field>
+    </record>
+
+    <menuitem id="menu_account_report" name="Financial Report" action="action_account_report_custom" parent="account.menu_finance_reports" sequence="250"/>
+
+</odoo>
diff --git a/indoteknik_custom/views/account_report_general_ledger_view.xml b/indoteknik_custom/views/account_report_general_ledger_view.xml
new file mode 100644
index 00000000..61c0ffff
--- /dev/null
+++ b/indoteknik_custom/views/account_report_general_ledger_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo> 
+    <record id="account_report_export_ledger_custom_view" model="ir.ui.view">
+        <field name="name">Export Ledger</field>
+        <field name="model">account.report.general.ledger.xlsx</field>
+        <field name="arch" type="xml">
+        <form string="Report Options">
+            <field name="company_id" invisible="1"/>
+            <group col="4">
+                <field name="target_move" widget="radio"/>
+                <field name="sortby" widget="radio"/>
+                <field name="display_account" widget="radio"/>
+                <field name="initial_balance"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+            </group>
+            <group>
+                <field name="journal_ids" widget="many2many_tags"/>
+            </group>
+            <footer>
+                <button name="check_report_ledger" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                <button string="Cancel" class="btn btn-default" special="cancel" />
+            </footer>
+        </form>
+        </field>
+    </record>
+
+    <record id="action_account_report_export_ledger_custom_menu" model="ir.actions.act_window">
+        <field name="name">export_ledger</field>
+        <field name="res_model">account.report.general.ledger.xlsx</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account_report_export_ledger_custom_view"/>
+        <field name="target">new</field>
+    </record>
+
+<menuitem id="menu_export_ledger_custom" name="General Ledger Export" action="action_account_report_export_ledger_custom_menu" parent="account.menu_finance_reports" sequence="250"/>
+</odoo>
\ No newline at end of file