Browse Source

remove report

pull/29/head
cybroodoo 8 years ago
parent
commit
e7c06ba1a3
  1. 57
      .gitignore
  2. 5
      account_pdc/__init__.py
  3. 9
      account_pdc/__manifest__.py
  4. 43
      account_pdc/__manifest__.py~
  5. 6
      account_pdc/models/account_payment.py
  6. 110
      account_pdc/models/account_payment.py~
  7. 3
      account_pdc/report/__init__.py
  8. 60
      account_pdc/report/report_payment.py
  9. 24
      account_pdc/static/description/index.html
  10. 76
      account_pdc/views/report_payment.xml
  11. 23
      account_pdc/wizard/__init__.py
  12. 77
      account_pdc/wizard/account_report_payment.py
  13. 61
      account_pdc/wizard/account_report_payment_view.xml

57
.gitignore

@ -0,0 +1,57 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
# C extensions
*.so
# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
# Translations
*.mo
*.pot
# Django stuff:
*.log
# Sphinx documentation
docs/_build/
# PyBuilder
target/

5
account_pdc/__init__.py

@ -21,3 +21,8 @@
# #
############################################################################## ##############################################################################
import models import models
<<<<<<< HEAD
=======
import wizard
import report
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad

9
account_pdc/__manifest__.py

@ -22,7 +22,11 @@
############################################################################## ##############################################################################
{ {
'name': 'PDC Management', 'name': 'PDC Management',
<<<<<<< HEAD
'version': '10.0.1.0', 'version': '10.0.1.0',
=======
'version': '10.0.2.0',
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad
'author': 'Cybrosys Techno Solutions', 'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions',
'website': 'http://www.cybrosys.com', 'website': 'http://www.cybrosys.com',
@ -33,6 +37,11 @@
'data': [ 'data': [
'data/account_pdc_data.xml', 'data/account_pdc_data.xml',
'views/account_payment_view.xml', 'views/account_payment_view.xml',
<<<<<<< HEAD
=======
'views/report_payment.xml',
'wizard/account_report_payment_view.xml',
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad
], ],
'images': ['static/description/banner.jpg'], 'images': ['static/description/banner.jpg'],
'license': 'LGPL-3', 'license': 'LGPL-3',

43
account_pdc/__manifest__.py~

@ -0,0 +1,43 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
# Copyright (C) 2017-TODAY Cybrosys Technologies(<http://www.cybrosys.com>).
# Author: Cybrosys Technologies(<http://www.cybrosys.com>)
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'PDC Management',
'version': '10.0.1.0',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'website': 'http://www.cybrosys.com',
'category': 'Accounting',
'summary': 'Extension on Cheques to handle Post Dated Cheques',
'description': """ Extension on Cheques to handle Post Dated Cheques """,
'depends': ['account_check_printing'],
'data': [
'data/account_pdc_data.xml',
'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,
}

6
account_pdc/models/account_payment.py

@ -28,9 +28,15 @@ from odoo.exceptions import UserError
class AccountRegisterPayments(models.TransientModel): class AccountRegisterPayments(models.TransientModel):
_inherit = "account.register.payments" _inherit = "account.register.payments"
<<<<<<< HEAD
bank_reference = fields.Char(copy=False) bank_reference = fields.Char(copy=False)
cheque_reference = fields.Char(copy=False) cheque_reference = fields.Char(copy=False)
effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False) effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False)
=======
effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False)
bank_reference = fields.Char(copy=False)
cheque_reference = fields.Char(copy=False)
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad
def get_payment_vals(self): def get_payment_vals(self):
res = super(AccountRegisterPayments, self).get_payment_vals() res = super(AccountRegisterPayments, self).get_payment_vals()

110
account_pdc/models/account_payment.py~

@ -0,0 +1,110 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
# Copyright (C) 2017-TODAY Cybrosys Technologies(<http://www.cybrosys.com>).
# Author: Cybrosys Technologies(<http://www.cybrosys.com>)
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
from odoo import models, fields, api, _
from odoo.exceptions import UserError
class AccountRegisterPayments(models.TransientModel):
_inherit = "account.register.payments"
effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False)
bank_reference = fields.Char(copy=False)
cheque_reference = fields.Char(copy=False)
def get_payment_vals(self):
res = super(AccountRegisterPayments, self).get_payment_vals()
if self.payment_method_id == self.env.ref('account_check_printing.account_payment_method_check'):
res.update({
'check_amount_in_words': self.check_amount_in_words,
'check_manual_sequencing': self.check_manual_sequencing,
'effective_date': self.effective_date,
})
return res
class AccountPayment(models.Model):
_inherit = "account.payment"
bank_reference = fields.Char(copy=False)
cheque_reference = fields.Char(copy=False)
effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False)
@api.multi
def print_checks(self):
""" Check that the recordset is valid, set the payments state to sent and call print_checks() """
# Since this method can be called via a client_action_multi, we need to make sure the received records are what we expect
self = self.filtered(lambda r: r.payment_method_id.code in ['check_printing', 'pdc'] and r.state != 'reconciled')
if len(self) == 0:
raise UserError(_("Payments to print as a checks must have 'Check' or 'PDC' selected as payment method and "
"not have already been reconciled"))
if any(payment.journal_id != self[0].journal_id for payment in self):
raise UserError(_("In order to print multiple checks at once, they must belong to the same bank journal."))
if not self[0].journal_id.check_manual_sequencing:
# The wizard asks for the number printed on the first pre-printed check
# so payments are attributed the number of the check the'll be printed on.
last_printed_check = self.search([
('journal_id', '=', self[0].journal_id.id),
('check_number', '!=', 0)], order="check_number desc", limit=1)
next_check_number = last_printed_check and last_printed_check.check_number + 1 or 1
return {
'name': _('Print Pre-numbered Checks'),
'type': 'ir.actions.act_window',
'res_model': 'print.prenumbered.checks',
'view_type': 'form',
'view_mode': 'form',
'target': 'new',
'context': {
'payment_ids': self.ids,
'default_next_check_number': next_check_number,
}
}
else:
self.filtered(lambda r: r.state == 'draft').post()
self.write({'state': 'sent'})
return self.do_print_checks()
def _get_move_vals(self, journal=None):
""" Return dict to create the payment move
"""
journal = journal or self.journal_id
if not journal.sequence_id:
raise UserError(_('Configuration Error !'),
_('The journal %s does not have a sequence, please specify one.') % journal.name)
if not journal.sequence_id.active:
raise UserError(_('Configuration Error !'), _('The sequence of journal %s is deactivated.') % journal.name)
name = self.move_name or journal.with_context(ir_sequence_date=self.payment_date).sequence_id.next_by_id()
if self.payment_method_code =='pdc':
date = self.effective_date
else:
date = self.payment_date
return {
'name': name,
'date': date,
'ref': self.communication or '',
'company_id': self.company_id.id,
'journal_id': journal.id,
}

3
account_pdc/report/__init__.py

@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
import report_payment

60
account_pdc/report/report_payment.py

@ -0,0 +1,60 @@
# -*- coding: utf-8 -*-
import time
from odoo import api, models
import logging
_logger = logging.getLogger(__name__)
class ReportPayment(models.AbstractModel):
_name = 'report.account_pdc.report_payment_template'
def lines(self, payment_type, journal_ids, pdc_only, data):
domain = []
if isinstance(journal_ids, int):
journal_ids = [journal_ids]
domain.append(('journal_id', 'in', journal_ids))
if payment_type == 'inbound':
domain.append(('payment_type', '=', 'inbound'))
elif payment_type == 'outbound':
domain.append(('payment_type', '=', 'outbound'))
if data['form']['date_from']:
domain.append(('payment_date', '>=', data['form']['date_from']))
if data['form']['date_to']:
domain.append(('payment_date', '<=', data['form']['date_to']))
if data['form']['company_id']:
domain.append(('company_id', '=', data['form']['company_id'][0]))
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']))
if data['form']['effective_date_to']:
domain.append(('effective_date_to', '<=', data['form']['effective_date_to']))
return self.env['account.payment'].search(domain)
@api.model
def render_html(self, docids, data=None):
_logger.info("................................1..............................")
# 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)
docargs = {
'doc_ids': data['form']['journal_ids'],
'doc_model': self.env['account.journal'],
'data': data,
'docs': self.env['account.journal'].browse(data['form']['journal_ids']),
'time': time,
'lines': res,
}
return self.env['report'].render('account_pdc.report_payment_template', docargs)

24
account_pdc/static/description/index.html

@ -1,7 +1,11 @@
<section class="oe_container"> <section class="oe_container">
<div class="oe_row oe_spaced"> <div class="oe_row oe_spaced">
<div class="oe_span12"> <div class="oe_span12">
<<<<<<< HEAD
<h2 class="oe_slogan">PDC Management</h2> <h2 class="oe_slogan">PDC Management</h2>
=======
<h2 class="oe_slogan">PDC with Payments Report</h2>
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad
<h3 class="oe_slogan">...A simple way to handle Post Dated Checks...</h3> <h3 class="oe_slogan">...A simple way to handle Post Dated Checks...</h3>
<h4 class="oe_slogan">Cybrosys Techno Solutions, www.cybrosys.com</h4> <h4 class="oe_slogan">Cybrosys Techno Solutions, www.cybrosys.com</h4>
</div> </div>
@ -46,7 +50,11 @@
<div class="oe_row oe_spaced"> <div class="oe_row oe_spaced">
<div class="oe_span4"> <div class="oe_span4">
<p class="oe_mt32"> <p class="oe_mt32">
<<<<<<< HEAD
<p>When you select PDC, You have to put 'effective date' of PDC.</p> <p>When you select PDC, You have to put 'effective date' of PDC.</p>
=======
<p>When you select PDC, You can also put 'effective date' of PDC.</p>
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad
</p> </p>
</div> </div>
<div class="oe_span6"> <div class="oe_span6">
@ -57,6 +65,22 @@
</div> </div>
</section> </section>
<<<<<<< HEAD
=======
<section class="oe_container oe_dark">
<div class="oe_row oe_spaced">
<div class="oe_span12">
<h4 class="oe_slogan">Yes,...You can generate a PDF report of all your payments.</h4>
</div>
<div class="oe_span12">
<div class="oe_demo oe_picture oe_screenshot">
<img src="pdc_report.png">
</div>
</div>
</div>
</section>
>>>>>>> e773d5cc4ac49a15b964551d003ba499cf2bf5ad
<section class="oe_container"> <section class="oe_container">
<h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2> <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
<div class="oe_slogan" style="margin-top:10px !important;"> <div class="oe_slogan" style="margin-top:10px !important;">

76
account_pdc/views/report_payment.xml

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="report_payment_template">
<t t-call="report.html_container">
<t t-set="data_report_margin_top" t-value="12"/>
<t t-set="data_report_header_spacing" t-value="9"/>
<t t-set="data_report_dpi" t-value="110"/>
<t t-call="report.internal_layout">
<div class="page">
<h2>Payments Report</h2>
<div class="row mt32">
<div class="col-xs-3">
<strong>Company:</strong>
<p t-esc="res_company.name"/>
</div>
<div class="col-xs-3">
<strong>Journal:</strong>
<t t-foreach="docs" t-as="o"><span t-esc="o.name"/>,</t>
</div>
<div class="col-xs-3">
<strong>Payment Types</strong>
<p t-if="data['form']['payment_type'] == 'inbound'">Customer</p>
<p t-if="data['form']['payment_type'] == 'outbound'">Supplier</p>
<p t-if="data['form']['pdc_only'] == 1"> PDC only</p>
<p t-if="data['form']['payment_type'] == '' and data['form']['pdc_only'] == 0">ALL</p>
</div>
</div>
<t t-foreach="docs" t-as="o">
<t t-if="lines[o.id]">
<h4><t t-esc="o.name"/> Journal</h4>
<table class="table table-condensed">
<thead>
<tr>
<th>Date</th>
<th>Name</th>
<th>Partner</th>
<th>Bank Ref.</th>
<th>Cheque Ref.</th>
<th>Amount</th>
<th>Effc. Date</th>
<th>State</th>
</tr>
</thead>
<tbody>
<tr t-foreach="lines[o.id]" t-as="ap">
<td><span t-esc="ap.name"/></td>
<td><span t-field="ap.payment_date"/></td>
<td><span t-esc="ap.sudo().partner_id and ap.sudo().partner_id.name[:23] or ''"/></td>
<td><span t-field="ap.bank_reference"/></td>
<td><span t-field="ap.cheque_reference"/></td>
<td><span t-esc="ap.amount" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></td>
<td><span t-field="ap.effective_date"/></td>
<td><span t-field="ap.state"/></td>
</tr>
</tbody>
</table>
</t>
</t>
</div>
</t>
</t>
</template>
<data>
<report
id="action_report_payment"
model="account.payment"
string="Payments Report"
report_type="qweb-pdf"
name="account_pdc.report_payment_template"
file="account_pdc.report_payment_template"
/>
</data>
</odoo>

23
account_pdc/wizard/__init__.py

@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
# Copyright (C) 2017-TODAY Cybrosys Technologies(<http://www.cybrosys.com>).
# Author: Cybrosys Technologies(<http://www.cybrosys.com>)
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
import account_report_payment

77
account_pdc/wizard/account_report_payment.py

@ -0,0 +1,77 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
# Copyright (C) 2017-TODAY Cybrosys Technologies(<http://www.cybrosys.com>).
# Author: Cybrosys Technologies(<http://www.cybrosys.com>)
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
from odoo import fields, models, api
class AccountReportPayment(models.TransientModel):
_name = "account.report.payment"
_description = "Account Payment Report"
company_id = fields.Many2one('res.company', string='Company', readonly=True, default=lambda self: self.env.user.company_id)
date_from = fields.Date(string='Start Date')
date_to = fields.Date(string='End Date')
journal_ids = fields.Many2many('account.journal', string='Journals', required=True,
default=lambda self: self.env['account.journal'].search(
[('type', 'in', ['cash', 'bank'])]))
payment_type = fields.Selection([('inbound', 'Customer'), ('outbound', 'Supplier')], 'Payment Type')
pdc_only = fields.Boolean('PDC only')
effective_date_from = fields.Date('Effective Date From')
effective_date_to = fields.Date('Effective Date Upto')
def _build_contexts(self, data):
result = {}
result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or ''
result['date_from'] = data['form']['date_from'] or False
result['date_to'] = data['form']['date_to'] or False
result['payment_type'] = data['form']['payment_type'] or False
result['pdc_only'] = data['form']['pdc_only']
if result['pdc_only']:
result['effective_date_from'] = data['form']['effective_date_from'] or False
result['effective_date_to'] = data['form']['effective_date_to'] or False
result['strict_range'] = True if result['date_from'] else False
return result
@api.multi
def check_report(self):
self.ensure_one()
data = {}
data['ids'] = self.env.context.get('active_ids', [])
data['model'] = self.env.context.get('active_model', 'ir.ui.menu')
data['form'] = self.read(['date_from', 'date_to', 'journal_ids', 'payment_type', 'pdc_only', 'effective_date_from', 'effective_date_to', 'company_id'])[0]
used_context = self._build_contexts(data)
data['form']['used_context'] = dict(used_context, lang=self.env.context.get('lang', 'en_US'))
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)

61
account_pdc/wizard/account_report_payment_view.xml

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="account_report_payment_view" model="ir.ui.view">
<field name="name">Payments Report</field>
<field name="model">account.report.payment</field>
<field name="arch" type="xml">
<form string="Report Options">
<group>
<group>
<field name="company_id" invisible="1"/>
<field name="payment_type"/>
</group>
<group>
<field name="date_from"/>
<field name="date_to"/>
</group>
</group>
<group>
<group>
<field name="pdc_only"/>
</group>
<group>
<field name="effective_date_from" attrs="{'invisible':[('pdc_only','!=',True)]}"/>
<field name="effective_date_to" attrs="{'invisible': [('pdc_only', '!=', True)]}"/>
</group>
</group>
<group>
</group>
<group>
<field name="journal_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('type', 'in', ('cash', 'bank'))]"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
<record id="action_account_report_payment_menu" model="ir.actions.act_window">
<field name="name">Payments Report</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.report.payment</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_report_payment_view"/>
<field name="target">new</field>
</record>
<menuitem
id="menu_print_payment"
name="Payments Report"
parent="account.menu_finance_legal_statement"
action="action_account_report_payment_menu"
groups="account.group_account_manager,account.group_account_user"
/>
</odoo>
Loading…
Cancel
Save