diff --git a/custom_receipts_for_pos/README.rst b/custom_receipts_for_pos/README.rst index 481dda755..789205c16 100644 --- a/custom_receipts_for_pos/README.rst +++ b/custom_receipts_for_pos/README.rst @@ -14,7 +14,7 @@ Credits ------- Developer: (V14) Syamili K, (V15) Sajna Sherin T, - (V16 & V17) Sadique Kottekkat, Abhishek E T @cybrosys + (V16 & V17) Sadique Kottekkat Contact: odoo@cybrosys.com Contacts diff --git a/custom_receipts_for_pos/__manifest__.py b/custom_receipts_for_pos/__manifest__.py index b9ccc03db..94947385a 100644 --- a/custom_receipts_for_pos/__manifest__.py +++ b/custom_receipts_for_pos/__manifest__.py @@ -22,7 +22,7 @@ ################################################################################ { 'name': 'POS Receipt Design', - 'version': '17.0.1.0.2', + 'version': '17.0.1.0.3', 'category': 'Point of Sale', 'summary': "POS Receipt, Receipt Design, POS Receipt Template, Design " "Report, Custom Receipt, POS Report, Customise Receipt, Odoo17, " @@ -38,7 +38,7 @@ 'security/ir.model.access.csv', 'data/pos_receipt_data.xml', 'views/pos_receipt_views.xml', - 'views/res_config_settings_views.xml', + 'views/pos_config_views.xml' ], 'assets': { 'point_of_sale._assets_pos': [ @@ -50,5 +50,5 @@ 'license': 'AGPL-3', 'installable': True, 'auto_install': False, - 'application': False, + 'application': False } diff --git a/custom_receipts_for_pos/doc/RELEASE_NOTES.md b/custom_receipts_for_pos/doc/RELEASE_NOTES.md index b0332a03d..d3e67a489 100644 --- a/custom_receipts_for_pos/doc/RELEASE_NOTES.md +++ b/custom_receipts_for_pos/doc/RELEASE_NOTES.md @@ -14,3 +14,8 @@ #### Version 17.0.1.0.2 ##### BUGFIX - Fix the receipt selection for each point of sales + +#### 15.06.2024 +#### Version 17.0.1.0.3 +##### BUGFIX +- Move the configuration to select the receipt from configuration settings to POS configuration diff --git a/custom_receipts_for_pos/models/__init__.py b/custom_receipts_for_pos/models/__init__.py index 6933d575f..7c3b13e9e 100644 --- a/custom_receipts_for_pos/models/__init__.py +++ b/custom_receipts_for_pos/models/__init__.py @@ -22,6 +22,4 @@ ################################################################################ from .import pos_receipt from .import pos_config -from .import res_config_settings from .import pos_session - diff --git a/custom_receipts_for_pos/models/pos_config.py b/custom_receipts_for_pos/models/pos_config.py index 3df28b047..cb66dd0bc 100644 --- a/custom_receipts_for_pos/models/pos_config.py +++ b/custom_receipts_for_pos/models/pos_config.py @@ -31,9 +31,7 @@ class PosConfig(models.Model): _inherit = 'pos.config' receipt_design = fields.Many2one('pos.receipt', string='Receipt Design', - help='Choose any receipt design', - default=lambda self: self.env[ - 'pos.receipt'].search([], limit=1)) + help='Choose any receipt design') design_receipt = fields.Text(related='receipt_design.design_receipt', string='Receipt XML') is_custom_receipt = fields.Boolean(string='Is Custom Receipt', diff --git a/custom_receipts_for_pos/models/pos_session.py b/custom_receipts_for_pos/models/pos_session.py index 10c390782..8d3959031 100644 --- a/custom_receipts_for_pos/models/pos_session.py +++ b/custom_receipts_for_pos/models/pos_session.py @@ -39,15 +39,6 @@ class PosSession(models.Model): result['search_params']['fields'].append('qty_available') return result - def _pos_ui_models_to_load(self): - """Function that super the ui models loading""" - result = super()._pos_ui_models_to_load() - result += [ - 'res.config.settings', - 'pos.receipt', - ] - return result - def _loader_params_pos_receipt(self): """Function that returns the product field pos Receipt""" return { @@ -60,17 +51,3 @@ class PosSession(models.Model): def _get_pos_ui_pos_receipt(self, params): """Used to Return the params value to the pos Receipts""" return self.env['pos.receipt'].search_read(**params['search_params']) - - def _loader_params_res_config_settings(self): - """The Function used to returns the field value""" - return { - 'search_params': { - 'fields': ['pos_receipt_design'], - - }, - } - - def _get_pos_ui_res_config_settings(self, params): - """Function is used to returns the config settings value""" - return (self.env['res.config.settings'].search_read - (**params['search_params'])) diff --git a/custom_receipts_for_pos/models/res_config_settings.py b/custom_receipts_for_pos/models/res_config_settings.py deleted file mode 100644 index d7a224c36..000000000 --- a/custom_receipts_for_pos/models/res_config_settings.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -################################################################################ -# -# Cybrosys Technologies Pvt. Ltd. -# -# Copyright (C) 2024-TODAY Cybrosys Technologies(). -# Author: Sadique Kottekkat () -# -# This program is free software: you can modify -# it under the terms of the GNU Affero General Public License (AGPL) as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -################################################################################ -from odoo import fields, models - - -class ResConfigSettings(models.TransientModel): - """ - This is an Odoo model for configuration settings. It inherits from the - 'res.config.settings' model and extends its functionality by adding - fields for custom receipt design configuration - """ - _inherit = 'res.config.settings' - - pos_receipt_design = fields.Many2one( - related='pos_config_id.receipt_design', readonly=False, - string='Receipt Design', help='Choose any receipt design') - pos_design_receipt = fields.Text(related='pos_config_id.design_receipt', - string='Receipt XML') - pos_is_custom_receipt = fields.Boolean( - related='pos_config_id.is_custom_receipt', readonly=False, store=True) diff --git a/custom_receipts_for_pos/static/description/assets/modules/6.jpg b/custom_receipts_for_pos/static/description/assets/modules/6.jpg new file mode 100644 index 000000000..bb668e760 Binary files /dev/null and b/custom_receipts_for_pos/static/description/assets/modules/6.jpg differ diff --git a/custom_receipts_for_pos/static/description/assets/modules/6.png b/custom_receipts_for_pos/static/description/assets/modules/6.png deleted file mode 100644 index 237d5d976..000000000 Binary files a/custom_receipts_for_pos/static/description/assets/modules/6.png and /dev/null differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/1.png b/custom_receipts_for_pos/static/description/assets/screenshots/1.png index 388a0fe9a..f18bfc7e3 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/1.png and b/custom_receipts_for_pos/static/description/assets/screenshots/1.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/2.png b/custom_receipts_for_pos/static/description/assets/screenshots/2.png index f60e6f415..d9c91add7 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/2.png and b/custom_receipts_for_pos/static/description/assets/screenshots/2.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/3.png b/custom_receipts_for_pos/static/description/assets/screenshots/3.png index 65601c61e..5a2ac916e 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/3.png and b/custom_receipts_for_pos/static/description/assets/screenshots/3.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/4.png b/custom_receipts_for_pos/static/description/assets/screenshots/4.png index be0a6d035..e469f8d1b 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/4.png and b/custom_receipts_for_pos/static/description/assets/screenshots/4.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/5.png b/custom_receipts_for_pos/static/description/assets/screenshots/5.png index 699413c9a..286f8d20d 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/5.png and b/custom_receipts_for_pos/static/description/assets/screenshots/5.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/6.png b/custom_receipts_for_pos/static/description/assets/screenshots/6.png index ca4a70e2d..e4649c71c 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/6.png and b/custom_receipts_for_pos/static/description/assets/screenshots/6.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/7.png b/custom_receipts_for_pos/static/description/assets/screenshots/7.png index 2a7a7287a..348689554 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/7.png and b/custom_receipts_for_pos/static/description/assets/screenshots/7.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif b/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif index 4bf88836d..7cc002120 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif and b/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif differ diff --git a/custom_receipts_for_pos/static/description/index.html b/custom_receipts_for_pos/static/description/index.html index 28d9806e2..a7f2528e3 100644 --- a/custom_receipts_for_pos/static/description/index.html +++ b/custom_receipts_for_pos/static/description/index.html @@ -88,7 +88,7 @@

Choosing for Current Receipt Design.

-

User can choose whether the current pos needs custom receipt design. +

User can choose whether the current POS needs custom receipt design.

@@ -185,7 +185,7 @@

- We can add the Receipt designs from the backend in the menu 'Receipt Designs'.

+ We can add the receipt designs from the backend in the menu 'Receipt Designs'.
@@ -203,7 +203,7 @@

- We can choose the receipt design for each POS from the backend of the pos.

+ We can choose the receipt design for each POS from the backend of the POS.
@@ -226,21 +226,22 @@
-
+
- - + +
+
+
-

- Chosen receipt in the frontend

+

+ Chosen receipt in the frontend +

-

- We can see the chosen receipts for the POS in the frontend of the POS, It will vary as per we're choosing from the Backend for each POS.

+

+ We can see the chosen receipts for the POS in the frontend of the POS. +

@@ -261,7 +262,7 @@
  • User can choose whether the current pos needs custom receipt design. + width="16px">User can choose whether the current POS needs custom receipt design.
  • @@ -273,39 +274,47 @@
  • -
    -
    Version - 17.0.1.0.0|Released on: February 05, 2024 +
    +
    + Version 17.0.1.0.0| + Released on: February 05, 2024 +
    +

    + Initial Commit for POS Receipt Designs. +

    +
    +
    +
    +
    +
    + Version 17.0.1.0.1| + Released on: April 17, 2024
    -

    - Initial Commit for POS Receipt Designs.

    +

    + Fixed the error in printing the receipt. +

    -
    -
    Version - 17.0.1.0.0|Released on: April 17, 2024 +
    +
    + Version 17.0.1.0.2| + Released on: June 15, 2024
    -

    - Fixed the error in printing the receipt.

    +

    + Fix the receipt selection for each point of sales. +

    -
    -
    Version - 17.0.1.0.0|Released on: May 21, 2024 +
    +
    + Version 17.0.1.0.3| + Released on: June 15, 2024
    -

    - Fix the receipt selection for each point of sales.

    +

    + Move the configuration to select the receipt from configuration settings to POS configuration. +

    @@ -328,7 +337,7 @@
    -

    Odoo17 Invoice Format Editor

    +

    Invoice Format Editor

    @@ -354,7 +363,7 @@
    -

    Pos Product Magnify Image

    +

    POS Product Magnify Image

    @@ -391,12 +400,12 @@
    diff --git a/custom_receipts_for_pos/static/src/xml/order_receipt.xml b/custom_receipts_for_pos/static/src/xml/order_receipt.xml index 61606e743..5fd310f54 100644 --- a/custom_receipts_for_pos/static/src/xml/order_receipt.xml +++ b/custom_receipts_for_pos/static/src/xml/order_receipt.xml @@ -2,167 +2,13 @@ - -
    - - - - - -
  • - - -
  • -
      -
    • - - Lot Number - - - SN - -
    • -
    -
    -
    - - -
    --------
    -
    -
    - TOTAL - -
    - -
    - Rounding - -
    -
    To Pay - -
    -
    -
    -
    - - - -
    - - -
    -
    - CHANGE - -
    - - - - -
    - Discounts - -
    -
    -
    - - TAX% - Tax - Base - Total - - - - % - - - - - - - - - - - -
    - -