diff --git a/payment_receipt_invoice/README.rst b/payment_receipt_invoice/README.rst index f85ab60e3..269adb53b 100644 --- a/payment_receipt_invoice/README.rst +++ b/payment_receipt_invoice/README.rst @@ -1,7 +1,6 @@ Account Payment Receipt v10 =========================== - -This module will print payment receipts with paid details +This module will print detailed payment receipts. Credits diff --git a/payment_receipt_invoice/__init__.py b/payment_receipt_invoice/__init__.py index be6313a49..b89de25f3 100644 --- a/payment_receipt_invoice/__init__.py +++ b/payment_receipt_invoice/__init__.py @@ -2,8 +2,8 @@ ############################################################################## # # Cybrosys Technologies Pvt. Ltd. -# Copyright (C) 2009-TODAY Cybrosys Technologies(). -# Author: Niyas Raphy() +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy,Fasluca() # you can modify it under the terms of the GNU LESSER # GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # @@ -20,4 +20,3 @@ # If not, see . # ############################################################################## -import models diff --git a/payment_receipt_invoice/__manifest__.py b/payment_receipt_invoice/__manifest__.py index d949cdca6..1442e0157 100644 --- a/payment_receipt_invoice/__manifest__.py +++ b/payment_receipt_invoice/__manifest__.py @@ -2,8 +2,8 @@ ############################################################################## # # Cybrosys Technologies Pvt. Ltd. -# Copyright (C) 2009-TODAY Cybrosys Technologies(). -# Author: Niyas Raphy() +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy,Fasluca() # you can modify it under the terms of the GNU LESSER # GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # @@ -23,8 +23,8 @@ { 'name': 'Account Payment Receipt', 'summary': """Payment Receipt With Paid Details""", - 'version': '0.3', - 'description': """""", + 'version': '10.0.1.0', + 'description': """Payment Receipt With Paid Details""", 'author': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions', 'website': 'http://www.cybrosys.com', @@ -32,9 +32,9 @@ 'depends': ['base', 'account'], 'license': 'AGPL-3', 'data': [ - 'views/receipt_print_template.xml', - 'views/account_payment_print.xml', - ], + 'views/report_payment.xml', + 'views/report.xml', + ], 'demo': [], 'images': ['static/description/banner.jpg'], 'installable': True, diff --git a/payment_receipt_invoice/models/__init__.py b/payment_receipt_invoice/models/__init__.py deleted file mode 100644 index 33720fea2..000000000 --- a/payment_receipt_invoice/models/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Cybrosys Technologies Pvt. Ltd. -# Copyright (C) 2009-TODAY Cybrosys Technologies(). -# Author: Niyas Raphy() -# 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 . -# -############################################################################## -import account_receipt_parser diff --git a/payment_receipt_invoice/models/account_receipt_parser.py b/payment_receipt_invoice/models/account_receipt_parser.py deleted file mode 100644 index f5f17ea3a..000000000 --- a/payment_receipt_invoice/models/account_receipt_parser.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Cybrosys Technologies Pvt. Ltd. -# Copyright (C) 2009-TODAY Cybrosys Technologies(). -# Author: Niyas Raphy() -# 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 . -# -############################################################################## -import json -from odoo.report import report_sxw -from odoo.osv import osv -from odoo import api -from odoo.http import request - - -class AccountReceiptParser(report_sxw.rml_parse): - - def __init__(self, cr, uid, name, context=None): - super(AccountReceiptParser, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'get_details': self.get_details, - 'get_details_invoice': self.get_details_invoice, - }) - self.context = context - - @api.multi - def get_details_invoice(self, doc): - lines = [] - 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: - 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 = [] - 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.payment_receipt_invoice.report_payment' - _inherit = 'report.abstract_report' - _template = 'payment_receipt_invoice.report_payment' - _wrapped_report_class = AccountReceiptParser - - diff --git a/payment_receipt_invoice/static/description/banner.jpg b/payment_receipt_invoice/static/description/banner.jpg index 7b577dc0a..110670c83 100644 Binary files a/payment_receipt_invoice/static/description/banner.jpg and b/payment_receipt_invoice/static/description/banner.jpg differ diff --git a/payment_receipt_invoice/static/description/customer_invoice_form_view.png b/payment_receipt_invoice/static/description/customer_invoice_form_view.png deleted file mode 100644 index 0af91bed4..000000000 Binary files a/payment_receipt_invoice/static/description/customer_invoice_form_view.png and /dev/null differ diff --git a/payment_receipt_invoice/static/description/customer_receipt.png b/payment_receipt_invoice/static/description/customer_receipt.png deleted file mode 100644 index 7f0a34cb7..000000000 Binary files a/payment_receipt_invoice/static/description/customer_receipt.png and /dev/null differ diff --git a/payment_receipt_invoice/static/description/diff_curr_repo.png b/payment_receipt_invoice/static/description/diff_curr_repo.png new file mode 100644 index 000000000..16385dbb1 Binary files /dev/null and b/payment_receipt_invoice/static/description/diff_curr_repo.png differ diff --git a/payment_receipt_invoice/static/description/index.html b/payment_receipt_invoice/static/description/index.html index a072a26d5..c1b977f3c 100644 --- a/payment_receipt_invoice/static/description/index.html +++ b/payment_receipt_invoice/static/description/index.html @@ -1,103 +1,100 @@

Payment Receipt Report

-

Customer Receipts & Vendor Payment Report

-

Cybrosys Techno Solutions, www.cybrosys.com

+

Customer & Vendor Payment Receipt

+

Cybrosys Techno Solutions, www.cybrosys.com

-
+ +
- ☀ Generate Customer invoice receipt with payment details.
- ☀ Generate Vendor receipt with payment details.
+ ☀ Generate Receipt for Customer & Supplier Payment.
+ ☀ Supports Multi Currency.
-

Customer Invoice

-

Customer Invoice Form View

+

Print Customer/Supplier Payment

+

Payment Form


-
- +
+ +
Here you can see the option to print receipt against this payment
-

Customer Receipt Print

+

Invoices Paid by above payment


-
- +
+ +
These are the invoices paid by above payment
+
+ +
-

Customer Receipt Report

+

Payment Receipt


-
- +
+
+
-
+ +
-

Vendor Bill

-

Vendor Bill Form View

-

-
-

-
- +
+ +
When payment and company are in different currency
-
-
-
-

Vendor Receipt Print

-
-

-
-

-
- -
-
-
-
-

Vendor Receipt Report

-
-

-
-

-
- +
+
+ +
When payment and company are in same currency
-
-

Need Any Help?

-
- Email Contact Us Request Customization -
- -
+
+

Need Any Help?

+
+ +
+ +
+ + + + + +
+
+
diff --git a/payment_receipt_invoice/static/description/invoices.png b/payment_receipt_invoice/static/description/invoices.png new file mode 100644 index 000000000..2d2f4fef1 Binary files /dev/null and b/payment_receipt_invoice/static/description/invoices.png differ diff --git a/payment_receipt_invoice/static/description/payment.png b/payment_receipt_invoice/static/description/payment.png new file mode 100644 index 000000000..3d6b46542 Binary files /dev/null and b/payment_receipt_invoice/static/description/payment.png differ diff --git a/payment_receipt_invoice/static/description/receipt_print_customer.png b/payment_receipt_invoice/static/description/receipt_print_customer.png deleted file mode 100644 index 68ac64059..000000000 Binary files a/payment_receipt_invoice/static/description/receipt_print_customer.png and /dev/null differ diff --git a/payment_receipt_invoice/static/description/receipt_report2.png b/payment_receipt_invoice/static/description/receipt_report2.png new file mode 100644 index 000000000..33c4e95ba Binary files /dev/null and b/payment_receipt_invoice/static/description/receipt_report2.png differ diff --git a/payment_receipt_invoice/static/description/same_curr_repo.png b/payment_receipt_invoice/static/description/same_curr_repo.png new file mode 100644 index 000000000..788eaccb3 Binary files /dev/null and b/payment_receipt_invoice/static/description/same_curr_repo.png differ diff --git a/payment_receipt_invoice/static/description/vendor_invoice_form.png b/payment_receipt_invoice/static/description/vendor_invoice_form.png deleted file mode 100644 index b61e73b09..000000000 Binary files a/payment_receipt_invoice/static/description/vendor_invoice_form.png and /dev/null differ diff --git a/payment_receipt_invoice/static/description/vendor_print_button.png b/payment_receipt_invoice/static/description/vendor_print_button.png deleted file mode 100644 index 15e38d4e7..000000000 Binary files a/payment_receipt_invoice/static/description/vendor_print_button.png and /dev/null differ diff --git a/payment_receipt_invoice/static/description/vendor_receipt.png b/payment_receipt_invoice/static/description/vendor_receipt.png deleted file mode 100644 index 8d0603df2..000000000 Binary files a/payment_receipt_invoice/static/description/vendor_receipt.png and /dev/null differ diff --git a/payment_receipt_invoice/views/account_payment_print.xml b/payment_receipt_invoice/views/account_payment_print.xml deleted file mode 100644 index 4b719f9f8..000000000 --- a/payment_receipt_invoice/views/account_payment_print.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/payment_receipt_invoice/views/receipt_print_template.xml b/payment_receipt_invoice/views/receipt_print_template.xml deleted file mode 100644 index 3be8f4271..000000000 --- a/payment_receipt_invoice/views/receipt_print_template.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - diff --git a/payment_receipt_invoice/views/report.xml b/payment_receipt_invoice/views/report.xml new file mode 100644 index 000000000..751cc9b14 --- /dev/null +++ b/payment_receipt_invoice/views/report.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/payment_receipt_invoice/views/report_payment.xml b/payment_receipt_invoice/views/report_payment.xml new file mode 100644 index 000000000..b75e09c10 --- /dev/null +++ b/payment_receipt_invoice/views/report_payment.xml @@ -0,0 +1,137 @@ + + + + + + + + \ No newline at end of file