diff --git a/pos_invoice_pay/__manifest__.py b/pos_invoice_pay/__manifest__.py index dfdb477be9..d3b6dc745f 100644 --- a/pos_invoice_pay/__manifest__.py +++ b/pos_invoice_pay/__manifest__.py @@ -7,7 +7,7 @@ "category": "Point of Sale", # "live_test_url": "http://apps.it-projects.info/shop/product/pos-invoice-pay?version=11.0", "images": ["images/pos_invoice_pay_main.png"], - "version": "11.0.1.2.3", + "version": "11.0.1.3.0", "application": False, "author": "IT-Projects LLC, Artyom Losev", "support": "pos@it-projects.info", diff --git a/pos_invoice_pay/doc/changelog.rst b/pos_invoice_pay/doc/changelog.rst index cc774ae8f7..7a8e5f51ec 100644 --- a/pos_invoice_pay/doc/changelog.rst +++ b/pos_invoice_pay/doc/changelog.rst @@ -1,3 +1,10 @@ +`1.3.0` +------- + +**New:** Implement printing invoice lines in receipts +**Fix:** Fixed field properties typo in sale_order_cashier_selection and invoice_cashier_selection +**Fix:** Fixed "'bool' object has no attribute 'mapped'" error in get_sale_details + `1.2.3` ------- diff --git a/pos_invoice_pay/models.py b/pos_invoice_pay/models.py index 42dad264bf..2f0809a3c9 100644 --- a/pos_invoice_pay/models.py +++ b/pos_invoice_pay/models.py @@ -158,6 +158,9 @@ def _get_default_writeoff_account(self): return acc if acc else False show_invoices = fields.Boolean(help="Show invoices in POS", default=True) + show_invoice_lines_in_receipt = fields.Boolean( + help="Show invoice lines in receipt", default=False + ) show_sale_orders = fields.Boolean(help="Show sale orders in POS", default=True) pos_invoice_pay_writeoff_account_id = fields.Many2one( "account.account", @@ -168,12 +171,12 @@ def _get_default_writeoff_account(self): invoice_cashier_selection = fields.Boolean( string="Select Invoice Cashier", help="Ask for a cashier when fetch invoices", - defaul=True, + default=True, ) sale_order_cashier_selection = fields.Boolean( string="Select Sale Order Cashier", help="Ask for a cashier when fetch orders", - defaul=True, + default=True, ) diff --git a/pos_invoice_pay/report/report.py b/pos_invoice_pay/report/report.py index 3be6a22290..808b659db8 100644 --- a/pos_invoice_pay/report/report.py +++ b/pos_invoice_pay/report/report.py @@ -1,5 +1,6 @@ # Copyright 2018 Artyom Losev # Copyright 2018 Kolushov Alexandr +# Copyright 2019 Eugene Molotov # License MIT (https://opensource.org/licenses/MIT). from odoo import api, models @@ -15,6 +16,11 @@ def get_sale_details(self, date_start=False, date_stop=False, configs=False): date_start, date_stop, configs ) + # reference: + # https://github.com/odoo/odoo/blob/560dba5313c5ca5265190dacc3bce7cbe509d30a/addons/point_of_sale/models/pos_order.py#L1120-L1121 + if not configs: + configs = self.env["pos.config"].search([]) + payments = self.env["account.payment"].search( [ ("datetime", ">=", date_start), diff --git a/pos_invoice_pay/static/src/xml/pos.xml b/pos_invoice_pay/static/src/xml/pos.xml index 5aba072473..aac7a3c59e 100644 --- a/pos_invoice_pay/static/src/xml/pos.xml +++ b/pos_invoice_pay/static/src/xml/pos.xml @@ -436,6 +436,29 @@
+ + + + + + + + + + + + + +
+ + + + + +
+
+
+
Phone:
User:
+ + +
+ + + + + + + + + + + + x + + + + + + + + + + + +
+
Subtotal: diff --git a/pos_invoice_pay/view.xml b/pos_invoice_pay/view.xml index bc286ff229..7ce47bb75b 100644 --- a/pos_invoice_pay/view.xml +++ b/pos_invoice_pay/view.xml @@ -39,6 +39,10 @@
+
+