Skip to content

Commit c074012

Browse files
Merge PR #499 into 16.0
Signed-off-by legalsylvain
2 parents c89a323 + 885799d commit c074012

10 files changed

Lines changed: 30 additions & 236 deletions

File tree

fermente_pos/README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ Customize Odoo / odoo / ``point_of_sale`` module.
4040
- Set 'Update quantities in stock' field of PoS config as 'Real Time',
4141
by default.
4242
- Add 'Available in PoS' field in the ``product.template`` tree view.
43-
- Add a lot of missing field on the simple pos.config form view.
44-
- Allow admin user to create new pos.config, via kanban view.
45-
- Allow non admin user to edit receipt header and footer.
4643

4744
Customize ``point_of_sale`` Front End.
4845

fermente_pos/__manifest__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"data": [
1414
"security/ir.model.access.csv",
1515
"views/view_product_template.xml",
16-
"views/view_pos_config.xml",
1716
"views/menu.xml",
1817
],
1918
"assets": {

fermente_pos/i18n/fr.po

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,26 @@ msgstr ""
99
"PO-Revision-Date: 2024-06-21 10:04+0000\n"
1010
"Last-Translator: \n"
1111
"Language-Team: \n"
12+
"Language: \n"
1213
"MIME-Version: 1.0\n"
1314
"Content-Type: text/plain; charset=UTF-8\n"
1415
"Content-Transfer-Encoding: \n"
1516
"Plural-Forms: \n"
17+
18+
#. module: fermente_pos
19+
#: model:ir.model.fields,help:fermente_pos.field_res_company__point_of_sale_update_stock_quantities
20+
msgid ""
21+
"At the session closing: A picking is created for the entire session when "
22+
"it's closed\n"
23+
" In real time: Each order sent to the server create its own picking"
24+
msgstr ""
25+
26+
#. module: fermente_pos
27+
#: model:ir.model,name:fermente_pos.model_res_company
28+
msgid "Companies"
29+
msgstr ""
30+
31+
#. module: fermente_pos
32+
#: model:ir.model.fields,field_description:fermente_pos.field_res_company__point_of_sale_update_stock_quantities
33+
msgid "Update quantities in stock"
34+
msgstr ""

fermente_pos/models/pos_config.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
class PosConfig(models.Model):
99
_inherit = "pos.config"
1010

11+
# TODO, remove this field, once
12+
# 16.0-2026-003-marthe-gautier has been deployed
1113
account_default_pos_receivable_account_id = fields.Many2one(
1214
string="Default Account Receivable (PoS)",
1315
related="company_id.account_default_pos_receivable_account_id",
@@ -19,4 +21,8 @@ def _default_sale_journal(self):
1921
return self._default_invoice_journal()
2022

2123
def _check_header_footer(self, values):
24+
# TODO, remove this function
25+
# once 16.0-2026-003-marthe-gautier has been deployed
26+
# is merged.
27+
# if we remove now, it conflict with #501.
2228
return True

fermente_pos/readme/DESCRIPTION.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ Customize Odoo / odoo / `point_of_sale` module.
1010
- Set 'Update quantities in stock' field of PoS config as 'Real Time',
1111
by default.
1212
- Add 'Available in PoS' field in the `product.template` tree view.
13-
- Add a lot of missing field on the simple pos.config form view.
14-
- Allow admin user to create new pos.config, via kanban view.
15-
- Allow non admin user to edit receipt header and footer.
1613

1714
Customize `point_of_sale` Front End.
1815

fermente_pos/views/view_pos_config.xml

Lines changed: 0 additions & 171 deletions
This file was deleted.

fermente_pos_restaurant/README.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
===================================
26
Fermente - Point Of Sale Restaurant
37
===================================
@@ -13,7 +17,7 @@ Fermente - Point Of Sale Restaurant
1317
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1418
:target: https://odoo-community.org/page/development-status
1519
:alt: Beta
16-
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
20+
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1822
:alt: License: AGPL-3
1923
.. |badge3| image:: https://img.shields.io/badge/github-grap%2Fgrap--odoo--custom-lightgray.png?logo=github
@@ -26,7 +30,6 @@ Customize Odoo / odoo / ``point_of_sale`` module.
2630

2731
- Allow non admin user to create ``restaurant.floor`` and
2832
``restaurant.table`` elements.
29-
- Add simple settings in the simple ``pos.config`` form view.
3033

3134
**Table of contents**
3235

fermente_pos_restaurant/__manifest__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"data": [
1414
"security/ir.model.access.csv",
1515
"views/menu.xml",
16-
"views/view_pos_config.xml",
1716
],
1817
"assets": {
1918
"point_of_sale.assets": [

fermente_pos_restaurant/readme/DESCRIPTION.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ Customize Odoo / odoo / `point_of_sale` module.
22

33
- Allow non admin user to create `restaurant.floor` and
44
`restaurant.table` elements.
5-
- Add simple settings in the simple `pos.config` form view.

fermente_pos_restaurant/views/view_pos_config.xml

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)