Merge commit 'aefed9e189c2c19f42af10873f60915255f39fc9' into account_…

…standard_report
OCA · Jul 18, 2017 · 4c13bd1 · 4c13bd1
2 parents 7d14971 + aefed9e
commit 4c13bd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/account_standard_report/report/report_account_standard_report.xml b/account_standard_report/report/report_account_standard_report.xml
@@ -231,7 +231,7 @@
                                         <tr>
                                             <th class="col-xs-1" t-if="o.type == 'journal'">JRNL</th>
                                             <th class="col-xs-1" t-if="o.type == 'account'">Account</th>
-                                            <th class="col-xs-3" t-if="o.type == 'partner'">Partner</th>
+                                            <th class="col-xs-1" t-if="o.type == 'partner'">Partner</th>
                                             <th class="col-xs-1 text-right">Debit</th>
                                             <th class="col-xs-1 text-right">Credit</th>
                                             <th class="col-xs-1 text-right">Balance</th>

diff --git a/account_standard_report/wizard/account_standard_report.py b/account_standard_report/wizard/account_standard_report.py
@@ -364,10 +364,12 @@ def _sql_unaffected_earnings(self):
         if unaffected_earnings_account not in self.account_ids:
             return
 
-        report_object_id = self.report_id.report_object_ids.create({'report_id': self.report_id.id,
-                                                                    'object_id': unaffected_earnings_account.id,
-                                                                    'name': '%s %s' % (unaffected_earnings_account.code, unaffected_earnings_account.name),
-                                                                    'account_id': unaffected_earnings_account.id})
+        report_object_id = self.report_id.report_object_ids.filtered(lambda x: x.object_id == unaffected_earnings_account.id)
+        if not report_object_id:
+            report_object_id = self.report_id.report_object_ids.create({'report_id': self.report_id.id,
+                                                                        'object_id': unaffected_earnings_account.id,
+                                                                        'name': '%s %s' % (unaffected_earnings_account.code, unaffected_earnings_account.name),
+                                                                        'account_id': unaffected_earnings_account.id})
         query = """
         INSERT INTO account_report_standard_ledger_line
             (report_id, create_uid, create_date, account_id, type, type_view, date, debit, credit, balance, cumul_balance, company_currency_id, reconciled, report_object_id)