diff --git a/account_pdc_payment_report/README.rst b/account_pdc_payment_report/README.rst deleted file mode 100644 index ff2cd9b04..000000000 --- a/account_pdc_payment_report/README.rst +++ /dev/null @@ -1,23 +0,0 @@ -PDC Payment Report v10 -====================== - -This module developed to take PDF report of PDC Payments. It is a supporting module of PDC Payment. - -Installation -============ - -Just select it from available modules to install it, there is no need to extra installations. - -Configuration -============= - -Nothing to configure. - -Known Issues -============ -*It will note work with Enterprise Edition - -Credits -======= -Cybrosys Techno Solutions - diff --git a/account_pdc_payment_report/__manifest__.py b/account_pdc_payment_report/__manifest__.py index 9d210577a..a992f98eb 100644 --- a/account_pdc_payment_report/__manifest__.py +++ b/account_pdc_payment_report/__manifest__.py @@ -27,7 +27,7 @@ 'company': 'Cybrosys Techno Solutions', 'website': 'http://www.cybrosys.com', 'category': 'Accounting', - 'summary': 'Report of Payments with Filter for PDC Type', + 'summary': 'Report of Payments with filter for PDC type', 'description': """ Report of Payments with filter for PDC type """, 'depends': ['account_check_printing', 'account_pdc'], 'data': [ diff --git a/account_pdc_payment_report/__manifest__.py~ b/account_pdc_payment_report/__manifest__.py~ deleted file mode 100644 index 8db3bb8c4..000000000 --- a/account_pdc_payment_report/__manifest__.py~ +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Cybrosys Technologies Pvt. Ltd. -# Copyright (C) 2017-TODAY Cybrosys Technologies(). -# Author: Cybrosys Technologies() -# you can modify it under the terms of the GNU LESSER -# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. -# -# It is forbidden to publish, distribute, sublicense, or sell copies -# of the Software or modified copies of the Software. -# -# 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 LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. -# -# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE -# GENERAL PUBLIC LICENSE (LGPL v3) along with this program. -# If not, see . -# -############################################################################## -{ - 'name': 'PDC Payments Report', - 'version': '10.0.1.0', - 'author': 'Cybrosys Techno Solutions', - 'company': 'Cybrosys Techno Solutions', - 'website': 'http://www.cybrosys.com', - 'category': 'Accounting', - 'summary': 'Report of Payments with Filter for PDC Type', - 'description': """ Report of Payments with filter for PDC type """, - 'depends': ['account_check_printing', 'account_pdc'], - 'data': [ - - 'views/account_payment_view.xml', - 'views/report_payment.xml', - 'wizard/account_report_payment_view.xml', - ], - 'images': ['static/description/banner.jpg'], - 'license': 'LGPL-3', - 'installable': True, - 'auto_install': False, -} diff --git a/account_pdc_payment_report/report/report_payment.py b/account_pdc_payment_report/report/report_payment.py index b5e378d15..c698d242b 100644 --- a/account_pdc_payment_report/report/report_payment.py +++ b/account_pdc_payment_report/report/report_payment.py @@ -8,7 +8,7 @@ _logger = logging.getLogger(__name__) class ReportPayment(models.AbstractModel): - _name = 'report.account_pdc.report_payment_template' + _name = 'report.account_pdc_payment_report.report_payment_template' def lines(self, payment_type, journal_ids, pdc_only, data): domain = [] @@ -28,9 +28,9 @@ class ReportPayment(models.AbstractModel): if pdc_only: domain.append(('payment_method_id.code', '=', 'pdc')) if data['form']['effective_date_from']: - domain.append(('effective_date_from', '>=', data['form']['effective_date_from'])) + domain.append(('effective_date', '>=', data['form']['effective_date_from'])) if data['form']['effective_date_to']: - domain.append(('effective_date_to', '<=', data['form']['effective_date_to'])) + domain.append(('effective_date', '<=', data['form']['effective_date_to'])) return self.env['account.payment'].search(domain) @@ -38,13 +38,8 @@ class ReportPayment(models.AbstractModel): @api.model def render_html(self, docids, data=None): - # target_move = data['form'].get('target_move', 'all') - # sort_selection = data['form'].get('sort_selection', 'date') payment_type = data['form']['payment_type'] pdc_only = data['form']['pdc_only'] - # effective_date_from = data['form']['effective_date_from'] - # effective_date_to = data['form']['effective_date_to'] - res = {} for journal in data['form']['journal_ids']: res[journal] = self.with_context(data['form'].get('used_context', {})).lines(payment_type, journal, pdc_only, data) @@ -56,4 +51,4 @@ class ReportPayment(models.AbstractModel): 'time': time, 'lines': res, } - return self.env['report'].render('account_pdc.report_payment_template', docargs) + return self.env['report'].render('account_pdc_payment_report.report_payment_template', docargs) diff --git a/account_pdc_payment_report/static/description/banner.jpg b/account_pdc_payment_report/static/description/banner.jpg index 4b011b00d..a1a674866 100644 Binary files a/account_pdc_payment_report/static/description/banner.jpg and b/account_pdc_payment_report/static/description/banner.jpg differ diff --git a/account_pdc_payment_report/static/description/icon.png b/account_pdc_payment_report/static/description/icon.png index d985b22a1..f47728351 100644 Binary files a/account_pdc_payment_report/static/description/icon.png and b/account_pdc_payment_report/static/description/icon.png differ diff --git a/account_pdc_payment_report/static/description/index.html b/account_pdc_payment_report/static/description/index.html index 04c3af812..a079b78c0 100644 --- a/account_pdc_payment_report/static/description/index.html +++ b/account_pdc_payment_report/static/description/index.html @@ -18,22 +18,7 @@ -
-
-
-

- If you want to analyze the working of PDC Management Module, Click Here:

-
-
PDC Management -
-
-
-
- -

Need Any Help?

diff --git a/account_pdc_payment_report/views/report_payment.xml b/account_pdc_payment_report/views/report_payment.xml index 793845de8..51dd254cb 100644 --- a/account_pdc_payment_report/views/report_payment.xml +++ b/account_pdc_payment_report/views/report_payment.xml @@ -26,21 +26,21 @@
- -

Journal

- - - - - - - - - - - - - +

Journal

+
DateNamePartnerBank Ref.Cheque Ref.AmountEffc. DateState
+ + + + + + + + + + + + + @@ -53,9 +53,8 @@ -
DateNamePartnerBank Ref.Cheque Ref.AmountEffc. DateState
- - + + @@ -68,8 +67,8 @@ model="account.payment" string="Payments Report" report_type="qweb-pdf" - name="account_pdc.report_payment_template" - file="account_pdc.report_payment_template" + name="account_pdc_payment_report.report_payment_template" + file="account_pdc_payment_report.report_payment_template" /> diff --git a/account_pdc_payment_report/wizard/account_report_payment.py b/account_pdc_payment_report/wizard/account_report_payment.py index 3ebb9e434..d3a0dbbf8 100644 --- a/account_pdc_payment_report/wizard/account_report_payment.py +++ b/account_pdc_payment_report/wizard/account_report_payment.py @@ -65,7 +65,7 @@ class AccountReportPayment(models.TransientModel): return self._print_report(data) def _print_report(self, data): - return self.env['report'].with_context(landscape=True).get_action(self, 'account_pdc.report_payment_template', data=data) + return self.env['report'].with_context(landscape=True).get_action(self, 'account_pdc_payment_report.report_payment_template', data=data)