[IMP]

fmdl · Jun 25, 2017 · 0688abe · 0688abe
1 parent cbf6e86
commit 0688abe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/report/report_account_standard_excel.py b/report/report_account_standard_excel.py
@@ -81,7 +81,7 @@ def _header_sheet(sheet):
                      'col': {'total_function': 'sum', 'format': currency_format}},
                 ]
 
-                all_lines = wizard.sql_get_total_line(type_l=('4_total',))
+                all_lines = wizard.sql_get_line_for_report(type_l=('4_total',))
                 # print(all_lines)
                 if all_lines:
 
@@ -211,7 +211,7 @@ def _set_table(start_row, row):
                 _header_sheet(sheet)
 
                 row = 6
-                all_lines = wizard.sql_get_total_line(type_l=('1_init_line', '2_line'))
+                all_lines = wizard.sql_get_line_for_report(type_l=('1_init_line', '2_line'))
                 for obj in report.report_object_ids:
 
                     lines_obj = []
@@ -282,7 +282,7 @@ def _set_table(start_row, row):
                 sheet = workbook.add_worksheet(report.name)
                 _header_sheet(sheet)
 
-                all_lines = wizard.sql_get_total_line(type_l=('4_total',))
+                all_lines = wizard.sql_get_line_for_report(type_l=('4_total',))
                 # for group_by in data['group_by_data']['ids']:
                 #     all_lines.append(data['lines_group_by'][group_by])
                 if all_lines:
@@ -412,7 +412,7 @@ def _set_table(start_row, row):
                 #         if line['type_line'] != 'total':
                 #             all_lines.append(line)
 
-                all_lines = wizard.sql_get_total_line(type_l=('1_init_line', '2_line'))
+                all_lines = wizard.sql_get_line_for_report(type_l=('1_init_line', '2_line'))
                 for obj in report.report_object_ids:
                     lines_obj = []
                     obj_id = obj.id

diff --git a/wizard/account_standard_report.py b/wizard/account_standard_report.py
@@ -823,7 +823,7 @@ def _get_name_report(self):
             report_name += _(' Balance')
         return report_name
 
-    def sql_get_total_line(self, type_l, report_object=None):
+    def sql_get_line_for_report(self, type_l, report_object=None):
         query = """SELECT
                     aml.report_object_id AS report_object_id,
                     CASE

diff --git a/wizard/account_standard_report_view.xml b/wizard/account_standard_report_view.xml
@@ -22,7 +22,6 @@
                         <field name="reconciled" attrs="{'readonly': [('type_ledger', 'not in', ('partner', 'aged',))]}"/>
                         <field name="compact_account" attrs="{'readonly': [('type_ledger', '!=', 'general')]}"/>
                         <field name="result_selection" attrs="{'invisible': [('type_ledger', 'not in', ('partner', 'aged',))]}"/>
-                        <field name="amount_currency" groups="base.group_multi_currency"/>
                     </group>
                     <group col="4">
                         <field name="periode_date" widget="selection"/>
@@ -46,7 +45,7 @@
                         <field name="account_in_ex_clude" widget="many2many_tags" options="{'no_create': True}"/>
                         <field name="account_methode" attrs="{'invisible':[('account_in_ex_clude', '=', [])]}"/>
                     </group>
-                    <group col="4">
+                    <group col="2">
                         <field name="init_balance_history"/>
                     </group>
                 </form>