diff --git a/invoice_payment_receipt/README.rst b/invoice_payment_receipt/README.rst deleted file mode 100644 index c3a53d9ba..000000000 --- a/invoice_payment_receipt/README.rst +++ /dev/null @@ -1,12 +0,0 @@ -Account Payment Receipt -======================= - - This module will print payment receipts with paid details - - -Credits -======= -Cybrosys Techno Solutions -Author ------- -* Cybrosys Techno Solutions diff --git a/payment_receipt_invoice/README.rst b/payment_receipt_invoice/README.rst new file mode 100644 index 000000000..f85ab60e3 --- /dev/null +++ b/payment_receipt_invoice/README.rst @@ -0,0 +1,12 @@ +Account Payment Receipt v10 +=========================== + +This module will print payment receipts with paid details + + +Credits +======= +Cybrosys Techno Solutions +Author +------ +* Cybrosys Techno Solutions diff --git a/invoice_payment_receipt/__init__.py b/payment_receipt_invoice/__init__.py similarity index 100% rename from invoice_payment_receipt/__init__.py rename to payment_receipt_invoice/__init__.py diff --git a/invoice_payment_receipt/__manifest__.py b/payment_receipt_invoice/__manifest__.py similarity index 96% rename from invoice_payment_receipt/__manifest__.py rename to payment_receipt_invoice/__manifest__.py index 24350a6a0..d949cdca6 100644 --- a/invoice_payment_receipt/__manifest__.py +++ b/payment_receipt_invoice/__manifest__.py @@ -23,12 +23,12 @@ { 'name': 'Account Payment Receipt', 'summary': """Payment Receipt With Paid Details""", - 'version': '1.0', + 'version': '0.3', 'description': """""", 'author': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions', 'website': 'http://www.cybrosys.com', - 'category': 'Reporting', + 'category': 'Accounting', 'depends': ['base', 'account'], 'license': 'AGPL-3', 'data': [ diff --git a/invoice_payment_receipt/models/__init__.py b/payment_receipt_invoice/models/__init__.py similarity index 100% rename from invoice_payment_receipt/models/__init__.py rename to payment_receipt_invoice/models/__init__.py diff --git a/invoice_payment_receipt/models/account_receipt_parser.py b/payment_receipt_invoice/models/account_receipt_parser.py similarity index 58% rename from invoice_payment_receipt/models/account_receipt_parser.py rename to payment_receipt_invoice/models/account_receipt_parser.py index 35fd6d0bc..f5f17ea3a 100644 --- a/invoice_payment_receipt/models/account_receipt_parser.py +++ b/payment_receipt_invoice/models/account_receipt_parser.py @@ -20,11 +20,11 @@ # If not, see . # ############################################################################## +import json from odoo.report import report_sxw from odoo.osv import osv from odoo import api from odoo.http import request -import json class AccountReceiptParser(report_sxw.rml_parse): @@ -40,43 +40,52 @@ class AccountReceiptParser(report_sxw.rml_parse): @api.multi def get_details_invoice(self, doc): lines = [] - acc_inv = request.env['account.invoice'] - acc_inv_rec = acc_inv.search([('number', '=', doc.number)]) - total_amount = acc_inv_rec.amount_total - if acc_inv_rec.state == 'draft': - balance_amount = total_amount + if doc.number: + acc_inv = request.env['account.invoice'] + acc_inv_rec = acc_inv.search([('number', '=', doc.number)]) + total_amount = acc_inv_rec.amount_total + if acc_inv_rec.state == 'draft': + balance_amount = total_amount + else: + balance_amount = acc_inv_rec.residual + paid = total_amount - balance_amount + vals = { + 'total_amount': total_amount, + 'balance_amount': balance_amount, + 'paid': paid, + } + lines.append(vals) else: - balance_amount = acc_inv_rec.residual - paid = total_amount - balance_amount - vals = { - 'total_amount': total_amount, - 'balance_amount': balance_amount, - 'paid': paid, - } - lines.append(vals) + vals = { + 'total_amount': doc.amount_total, + 'balance_amount': doc.amount_total, + 'paid': 0, + } + lines.append(vals) return lines @api.multi def get_details(self, doc): lines = [] - acc_inv = request.env['account.invoice'] - acc_inv_rec = acc_inv.search([('number', '=', doc.number)]) - d = json.loads(acc_inv_rec.payments_widget) - for payment in d['content']: - vals = { - 'memo': payment['name'], - 'amount': payment['amount'], - 'method': payment['journal_name'], - 'date': payment['date'], - } - lines.append(vals) + if doc.number: + acc_inv = request.env['account.invoice'] + acc_inv_rec = acc_inv.search([('number', '=', doc.number)]) + d = json.loads(acc_inv_rec.payments_widget) + for payment in d['content']: + vals = { + 'memo': payment['name'], + 'amount': payment['amount'], + 'method': payment['journal_name'], + 'date': payment['date'], + } + lines.append(vals) return lines class PrintReport(osv.AbstractModel): - _name = 'report.invoice_payment_receipt.report_payment' + _name = 'report.payment_receipt_invoice.report_payment' _inherit = 'report.abstract_report' - _template = 'invoice_payment_receipt.report_payment' + _template = 'payment_receipt_invoice.report_payment' _wrapped_report_class = AccountReceiptParser diff --git a/invoice_payment_receipt/static/description/banner.jpg b/payment_receipt_invoice/static/description/banner.jpg similarity index 100% rename from invoice_payment_receipt/static/description/banner.jpg rename to payment_receipt_invoice/static/description/banner.jpg diff --git a/invoice_payment_receipt/static/description/customer_invoice_form_view.png b/payment_receipt_invoice/static/description/customer_invoice_form_view.png similarity index 100% rename from invoice_payment_receipt/static/description/customer_invoice_form_view.png rename to payment_receipt_invoice/static/description/customer_invoice_form_view.png diff --git a/invoice_payment_receipt/static/description/customer_receipt.png b/payment_receipt_invoice/static/description/customer_receipt.png similarity index 100% rename from invoice_payment_receipt/static/description/customer_receipt.png rename to payment_receipt_invoice/static/description/customer_receipt.png diff --git a/invoice_payment_receipt/static/description/cybro_logo.png b/payment_receipt_invoice/static/description/cybro_logo.png similarity index 100% rename from invoice_payment_receipt/static/description/cybro_logo.png rename to payment_receipt_invoice/static/description/cybro_logo.png diff --git a/invoice_payment_receipt/static/description/icon.png b/payment_receipt_invoice/static/description/icon.png similarity index 100% rename from invoice_payment_receipt/static/description/icon.png rename to payment_receipt_invoice/static/description/icon.png diff --git a/invoice_payment_receipt/static/description/index.html b/payment_receipt_invoice/static/description/index.html similarity index 100% rename from invoice_payment_receipt/static/description/index.html rename to payment_receipt_invoice/static/description/index.html diff --git a/invoice_payment_receipt/static/description/receipt_print_customer.png b/payment_receipt_invoice/static/description/receipt_print_customer.png similarity index 100% rename from invoice_payment_receipt/static/description/receipt_print_customer.png rename to payment_receipt_invoice/static/description/receipt_print_customer.png diff --git a/invoice_payment_receipt/static/description/vendor_invoice_form.png b/payment_receipt_invoice/static/description/vendor_invoice_form.png similarity index 100% rename from invoice_payment_receipt/static/description/vendor_invoice_form.png rename to payment_receipt_invoice/static/description/vendor_invoice_form.png diff --git a/invoice_payment_receipt/static/description/vendor_print_button.png b/payment_receipt_invoice/static/description/vendor_print_button.png similarity index 100% rename from invoice_payment_receipt/static/description/vendor_print_button.png rename to payment_receipt_invoice/static/description/vendor_print_button.png diff --git a/invoice_payment_receipt/static/description/vendor_receipt.png b/payment_receipt_invoice/static/description/vendor_receipt.png similarity index 100% rename from invoice_payment_receipt/static/description/vendor_receipt.png rename to payment_receipt_invoice/static/description/vendor_receipt.png diff --git a/invoice_payment_receipt/views/account_payment_print.xml b/payment_receipt_invoice/views/account_payment_print.xml similarity index 72% rename from invoice_payment_receipt/views/account_payment_print.xml rename to payment_receipt_invoice/views/account_payment_print.xml index e5bdb5586..4b719f9f8 100644 --- a/invoice_payment_receipt/views/account_payment_print.xml +++ b/payment_receipt_invoice/views/account_payment_print.xml @@ -6,14 +6,14 @@ string="Payment Receipt" model="account.invoice" report_type="qweb-pdf" - file="invoice_payment_receipt.report_payment" - name="invoice_payment_receipt.report_payment" + file="payment_receipt_invoice.report_payment" + name="payment_receipt_invoice.report_payment" /> diff --git a/invoice_payment_receipt/views/receipt_print_template.xml b/payment_receipt_invoice/views/receipt_print_template.xml similarity index 100% rename from invoice_payment_receipt/views/receipt_print_template.xml rename to payment_receipt_invoice/views/receipt_print_template.xml