Merge lp:~sandi-dirntis/openerpsl/20140717_1 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[MOD] Modified accounting_reports addon

[lp:~sandi-dirntis/openerpsl/20140717_1]

436. By Dušan Laznik (Mentis) on 2014-07-30

[MOD] Modified accounting_reports addon

=== modified file '.bzrignore'
--- .bzrignore	2014-07-17 08:30:12 +0000
+++ .bzrignore	2014-07-30 06:50:44 +0000
@@ -1,1 +1,2 @@
 ./.git
+.DS_Store

=== modified file 'accounting_reports/__init__.py'
--- accounting_reports/__init__.py	2014-05-07 12:52:05 +0000
+++ accounting_reports/__init__.py	2014-07-30 06:50:44 +0000
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-import report
+import res_partner
 import account_account
+import overdue_and_financial_report
 import wizard
-import overdue_and_financial_report
+import report

=== modified file 'accounting_reports/overdue_and_financial_report.py'
--- accounting_reports/overdue_and_financial_report.py	2014-05-08 07:47:31 +0000
+++ accounting_reports/overdue_and_financial_report.py	2014-07-30 06:50:44 +0000
@@ -46,42 +46,50 @@
     def init(self, cr):
         drop_view_if_exists(cr, 'overdue_financial_report')
         cr.execute("""
-            create or replace view overdue_financial_report as (
-                SELECT
-                    AML.id as id,
-                    AML.date as date,
-                    AML.date_maturity as date_maturity,
-                    AML.name as name,
-                    AML.ref as reference,
-                    P.name as partner,
-                    AM.name as journal_entry,
-                    AML.debit as debit,
-                    AML.credit as credit,
-                    AML.debit-AML.credit as saldo,
-                    AP.name as period,
-                    AML.reconcile_id as reconcile,
-                    CASE
-                        WHEN P.business_partner_type = '1' THEN 'D.D.'
-                        WHEN P.business_partner_type = '2' THEN 'D.O.O.'
-                        WHEN P.business_partner_type = '3' THEN 'S.P.'
-                        WHEN P.business_partner_type = '4' THEN 'Bolnice'
-                        WHEN P.business_partner_type = '5' THEN 'Šole'
-                        WHEN P.business_partner_type = '6' THEN 'Sindikati'
-                        WHEN P.business_partner_type = '7' THEN 'Društva'
-                        WHEN P.business_partner_type = '8' THEN 'Zavarovalnice'
-                        WHEN P.business_partner_type = '9' THEN 'Vrtec'
-                        WHEN P.business_partner_type = '10' THEN 'Občine'
-                        ELSE 'Neopredeljeni'
-                    END as partner_type,
-                    AA.type as account_type,
-                    AA.code as account_code
-                FROM account_move_line AML
-                    LEFT JOIN account_account AA ON AML.account_id = AA.id
-                    LEFT JOIN res_partner P ON AML.partner_id = P.id
-                    LEFT JOIN account_move AM ON AML.move_id = AM.id
-                    LEFT JOIN account_period AP ON AML.period_id = AP.id
-                WHERE
-                    AA.reconcile = true
+            CREATE OR REPLACE VIEW overdue_financial_report AS (
+                SELECT aml.id AS id,
+                       aml.date AS date,
+                       aml.date_maturity AS date_maturity,
+                       aml.name AS name,
+                       aml.ref AS reference,
+                       pa.name AS partner,
+                       am.name AS journal_entry,
+                       aml.debit AS debit,
+                       aml.credit AS credit,
+                       aml.debit-aml.credit AS saldo,
+                       ap.name AS period,
+                       aml.reconcile_id AS reconcile,
+                       CASE
+                         WHEN pa.business_partner_type = '1'
+                           THEN 'D.D.'
+                         WHEN pa.business_partner_type = '2'
+                           THEN 'D.O.O.'
+                         WHEN pa.business_partner_type = '3'
+                           THEN 'S.pa.'
+                         WHEN pa.business_partner_type = '4'
+                           THEN 'Bolnice'
+                         WHEN pa.business_partner_type = '5'
+                           THEN 'Šole'
+                         WHEN pa.business_partner_type = '6'
+                           THEN 'Sindikati'
+                         WHEN pa.business_partner_type = '7'
+                           THEN 'Društva'
+                         WHEN pa.business_partner_type = '8'
+                           THEN 'Zavarovalnice'
+                         WHEN pa.business_partner_type = '9'
+                           THEN 'Vrtec'
+                         WHEN pa.business_partner_type = '10'
+                           THEN 'Občine'
+                         ELSE 'Neopredeljeni'
+                       END AS partner_type,
+                       aa.type AS account_type,
+                       aa.code AS account_code
+                  FROM account_move_line AS aml
+                       LEFT JOIN account_account AS aa ON aa.id = aml.account_id
+                       LEFT JOIN res_partner AS pa ON pa.id = aml.partner_id
+                       LEFT JOIN account_move AS am ON am.id = aml.move_id
+                       LEFT JOIN account_period AS ap ON ap.id = aml.period_id
+                 WHERE aa.reconcile = true
             )""")
 overdue_financial_report()
     

=== added file 'accounting_reports/res_partner.py'
--- accounting_reports/res_partner.py	1970-01-01 00:00:00 +0000
+++ accounting_reports/res_partner.py	2014-07-30 06:50:44 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Mentis d.o.o.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'business_partner_type': fields.selection([('1','D.D.'),
+                                                   ('2','D.O.O.'),
+                                                   ('3','S.P.'),
+                                                   ('4','Bolnice'),
+                                                   ('5','Šole'),
+                                                   ('6','Sindikati'),
+                                                   ('7','Društva'),
+                                                   ('8','Zavarovalnice'),
+                                                   ('9','Vrtec'),
+                                                   ('10','Občine')], 'Type of Business Partner')
+    }