From 22c2793f98fb3b4215c2116f924b2f6a5de4c8ce Mon Sep 17 00:00:00 2001
From: Fekete Mihai <mihai.fekete@forbiom.eu>
Date: Fri, 23 Feb 2018 11:59:15 +0200
Subject: [PATCH] Update code, still tested to add.

---
 l10n_ro_report_D300/__manifest__.py              |  2 +-
 .../report/l10n_ro_report_D300.py                | 16 +++++++---------
 .../static/src/js/l10n_ro_report_d300_widgets.js |  8 ++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/l10n_ro_report_D300/__manifest__.py b/l10n_ro_report_D300/__manifest__.py
index 549f8183e..18f728f0a 100644
--- a/l10n_ro_report_D300/__manifest__.py
+++ b/l10n_ro_report_D300/__manifest__.py
@@ -14,7 +14,7 @@
     'depends': [
         'l10n_ro',
         'date_range',
-        'report_xlsx',],
+        'report_xlsx'],
     'data': [
         "views/layouts.xml",
         "views/l10n_ro_report_d300.xml",
diff --git a/l10n_ro_report_D300/report/l10n_ro_report_D300.py b/l10n_ro_report_D300/report/l10n_ro_report_D300.py
index 507b5e6ce..d0790ca22 100644
--- a/l10n_ro_report_D300/report/l10n_ro_report_D300.py
+++ b/l10n_ro_report_D300/report/l10n_ro_report_D300.py
@@ -182,12 +182,11 @@ def _inject_taxtags_values(self):
         query_inject_taxtags = """
 WITH
     taxtags AS
-        (SELECT coalesce(replace(
-            tag.name, 'Romania - D300: randul ', ''),0)::integer
-            AS code,
+        (SELECT coalesce(regexp_replace(replace(tag.name, 'D300', ''),
+                '[^0-9\.]+', '', 'g')::numeric * 10, 0)::integer AS code,
                 tag.name, tag.id,
-                abs(coalesce(sum(movetax.tax_base_amount), 0.00)) AS net,
-                abs(coalesce(sum(movetax.balance), 0.00)) AS tax
+                coalesce(sum(movetax.tax_base_amount), 0.00) AS net,
+                coalesce(sum(movetax.balance), 0.00) AS tax
             FROM
                 account_account_tag AS tag
                 INNER JOIN account_tax_account_tag AS taxtag
@@ -202,8 +201,7 @@ def _inject_taxtags_values(self):
                 AND move.company_id = %s AND move.date >= %s
                     AND move.date <= %s AND move.state = 'posted'
             GROUP BY tag.id
-            ORDER BY replace(tag.name, 'Romania - D300: randul ',
-                '')::integer, tag.name
+            ORDER BY code, tag.name
         )
 INSERT INTO
     l10n_ro_report_d300_taxtag
@@ -242,8 +240,8 @@ def _inject_tax_values(self):
             SELECT
                 tag.id AS report_tax_id, '' AS code,
                 tax.name, tax.id,
-                abs(coalesce(sum(movetax.tax_base_amount), 0.00)) AS net,
-                abs(coalesce(sum(movetax.balance), 0.00)) AS tax
+                coalesce(sum(movetax.tax_base_amount), 0.00) AS net,
+                coalesce(sum(movetax.balance), 0.00) AS tax
             FROM
                 l10n_ro_report_d300_taxtag AS tag
                 INNER JOIN account_tax_account_tag AS taxtag
diff --git a/l10n_ro_report_D300/static/src/js/l10n_ro_report_d300_widgets.js b/l10n_ro_report_D300/static/src/js/l10n_ro_report_d300_widgets.js
index 9435b843c..5a1311ec2 100644
--- a/l10n_ro_report_D300/static/src/js/l10n_ro_report_d300_widgets.js
+++ b/l10n_ro_report_D300/static/src/js/l10n_ro_report_d300_widgets.js
@@ -5,11 +5,7 @@ odoo.define('l10n_ro_report_D300.l10n_ro_report_d300_widget', function
 var core = require('web.core');
 var Widget = require('web.Widget');
 
-var QWeb = core.qweb;
-
-var _t = core._t;
-
-var accountFinancialReportWidget = Widget.extend({
+var D300ReportWidget = Widget.extend({
     events: {
         'click .o_l10n_ro_report_d300_web_action': 'boundLink',
         'click .o_l10n_ro_report_d300_web_action_multi': 'boundLinkmulti',
@@ -44,6 +40,6 @@ var accountFinancialReportWidget = Widget.extend({
     },
 });
 
-return accountFinancialReportWidget;
+return D300ReportWidget;
 
 });