Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] compability between pos_customer_display and pos_pricelist #210

Merged
merged 3 commits into from
Sep 6, 2017

Conversation

gaelTorrecillas
Copy link

hello,

with the pos_pricelist and pos_customer_display, when I open a new ticket, the POS floods the customer display, so we have all products show on this display.

I modify pos_pricelist to remove this bug.

@oca-clabot
Copy link

Hey @gaelTorrecillas, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/website.cla
Here is a list of the users:

  • gael.torrecillas (no github login found)

Appreciation of efforts,
OCA CLAbot

@flotho
Copy link
Member

flotho commented Aug 30, 2017

Hi @pedrobaeza ,

Is @gaelTorrecillas registered in OCA CLA? Do we simply have to amend latest commit so that the PR will be accepted

@pedrobaeza
Copy link
Member

I have searched and there's no "gaelTorrecillas" registered on our system. You can submit the CLA for that user or amend the commit with other registered user.

@flotho
Copy link
Member

flotho commented Aug 30, 2017

@pedrobaeza , thanks he will do this.
Any comments on its work?
Regards

@pedrobaeza
Copy link
Member

I don't know too much about module pos_customer_display, so I can't say. I think @alexis-via and @StefanRijnhart can.

@flotho
Copy link
Member

flotho commented Aug 30, 2017

Ok, thanks @pedrobaeza ,

BTW, gael sent you the CLA by email

@flotho
Copy link
Member

flotho commented Aug 31, 2017

Hi @alexis-via @StefanRijnhart ,

Is it possible to have a review on this from you?
regards

@flotho
Copy link
Member

flotho commented Sep 1, 2017

This PR is about to fix this : #204

@cvinh
Copy link
Contributor

cvinh commented Sep 1, 2017

@flotho as this PR is for v10... which branch of pos_pricelist do you use ? I I see that this module is not migrated to v10 in OCA yet..

@@ -203,7 +203,10 @@ odoo.define('pos_customer_display', function(require) {
var res = OrderlineSuper.prototype.set_quantity.call(this, quantity);
if (quantity != 'remove') {
var line = this;
this.pos.prepare_text_customer_display('add_update_line', {'line': line});
if(this.selected)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please adhere to the style from the surrounding code: keep curly opening bracket on the same line, and apply indents of length 4.

@StefanRijnhart
Copy link
Member

Migrated or not, I get the point of this change. Pos_pricelist calls this particular method on non-selected lines, triggering the screen changes from this module on all those lines.

@gaelTorrecillas
Copy link
Author

hello @StefanRijnhart,

I commit the modifications of style.

@pedrobaeza
Copy link
Member

Please change module version number according https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md#version-numbers

@flotho
Copy link
Member

flotho commented Sep 5, 2017

Thanks all of you, @gaelTorrecillas will change this fast

@flotho
Copy link
Member

flotho commented Sep 5, 2017

@pedrobaeza , the requested changes have been done, thanks in advance for your merging

@flotho
Copy link
Member

flotho commented Sep 6, 2017

Hi @pedrobaeza , @StefanRijnhart , any chance to be merged ?
Regards

@StefanRijnhart StefanRijnhart merged commit a1f90f2 into OCA:10.0 Sep 6, 2017
@StefanRijnhart
Copy link
Member

Squashed and merged. Thank you!

@cvinh
Copy link
Contributor

cvinh commented Sep 6, 2017

Hi @flotho , as I wish to migrate pos_pricelist to v10, could you kindly point me to the branch you are using for pos_pricelist ? Thanks in advance

hparfr added a commit to akretion/pos that referenced this pull request Apr 27, 2018
* [ADD] setup.py

* [UPD] addons table in README.md

* [FIX] travis: Update travis file to new standard
* Add new matrix
* Add transifex support
* Switch coveralls to travis_after_tests_success
* Move pip requirements to requirements.txt

* OCA Transbot updated translations from Transifex

* OCA Transbot updated translations from Transifex

* [UPD] addons table in README.md

* [UPD] addons table in README.md

* Make pos_customer_display odoo9 compatible

* Fix version number of pos_customer_display

* Port pos_customer_display to v10

Remove the "Show total to customer" button, which is not need given the new user interface of the POS: the big "Payment" button has this role now.
Add README.rst

* Display relevant info on LCD when Qty/price/discount is forced via the buttons of the POS frontend

* Remove comment

* [UPD] addons table in README.md

* [ADD] setup.py

* new module pos_margin

* [PORT] 10.0 pos_margin

* [UPD] addons table in README.md

* [ADD] setup.py

* OCA Transbot updated translations from Transifex

* pos_remove_pos_category (OCA#148)

* migrate to v9 and add italian translation

* short headers

* migrate JS

* [fix] be defensive: do not assume we have a product category

* OCA Transbot updated translations from Transifex

* [MIG] pos_remove_pos_category: Migrated to 10.0

* [FIX] static javascript assets

* [UPD] addons table in README.md

* [ADD] setup.py

* OCA Transbot updated translations from Transifex

* [ADD] pos_loyalty: loyalty programs for POS (OCA#185)

* [ADD] pos_loyalty: loyalty programs for POS

* [FIX] Limit to one discount reward per order

* [FIX] Remove unused variables and returns

* [IMP] Refactoring rules loading

* [UPD] addons table in README.md

* [ADD] setup.py

* OCA Transbot updated translations from Transifex

* OCA Transbot updated translations from Transifex

* [REM] remove pos_remove_pos_category Fix : OCA#200

* [UPD] addons table in README.md

* Revert "[REM] remove pos_remove_pos_category Fix : OCA#200"

This reverts commit 5825f0f.

* [FIX] avoid monkey patch and error on foreign key constraint

* [UPD] addons table in README.md

* pos_remove_pos_category: inherit the proper view of product.template

* [fix] compability between pos_customer_display and pos_pricelist (OCA#210)

* [fix] compability between pos_customer_display and pos_pricelist

* [UPD] addons table in README.md

* [ADD] PoS session pay invoice module

* [UPD] addons table in README.md

* [add] pos_default_payment_method

* fixup! [add] pos_default_payment_method

* [UPD] addons table in README.md

* [ADD] setup.py

* [FIX] Fix pos_customer_display with Floors in Restaurant

* Add mobule pos_backend_partner

* Update readme

Fix link to github

* Improve readme and manifest

* Add OCA dependencies for allowing tests on a not merged PR

* Fix readme, fix indent, fix bug when choosing a customer in payment pane.

* Add screenshots

* Fix screenshot path

* Update readme

* Hide button when not opened by pos

* [10.0] Remove hw_customer_display and hw_telium_payment_terminal (OCA#231)

* Remove hw_customer_display and hw_telium_payment_terminal

POSbox image runs Odoo v8, so we should maintain hw_* modules only in the 8.0 branch for the moment.

* Update requirements.txt following removal of hw_* modules

* [UPD] addons table in README.md

* update oca_dependencies

* update readme

* Update __init__

* update manifest

* update __init

* fix copyright

* fix copyright2

* update roadmap

* OCA Transbot updated translations from Transifex

* Add pos_backend_communication module

* Update readme

Fix github link

* Update readme

* Update readme.rst

* Update common.js

Fix typo

* Update readme

* [UPD] addons table in README.md

* [ADD] setup.py

* [ADD] module pos_price_to_weight (OCA#171)

* [ADD] module pos_price_to_weight

* [FIX] jslint / pylint / flake8 issues

* OCA Transbot updated translations from Transifex

* [MIG] pos_price_to_weight: Migration to 10.0

* [FIX] in v10, we can add value to selection fieldw

* [UPD] addons table in README.md

* [ADD] setup.py

* [FIX] website URI

* [FIX] website URI

* remove duplicated act_windows

* [ADD] new module pos_quick_logout (OCA#116)

* OCA Transbot updated translations from Transifex

* OCA Transbot updated translations from Transifex

* [MIG] pos_quick_logout: Migration to 10.0

[FIX] Fix Travis

[FIX] Fix Licence

[FIX] rename pos_quick_logout.py to pos_config.py

[FIX] Travis

[FIX] fix javascript syntax + __manifest__ typo

[FIX] fix python syntax

[FIX] rename pos_quick_logout_view.xml to pos_config_view.xml

[FIX] Travis : remove unused imports

* [IMP] add autologout to pos_quick_logout

[IMP] it's better to launch timeout fonction with start

* [UPD] addons table in README.md

* [ADD] setup.py

* [FIX] remove outdated dependencies

* OCA Transbot updated translations from Transifex

* [ADD] new module pos_timeout

* [UPD] addons table in README.md

* [ADD] setup.py

* [FIX] fixes currencies with decimals <>2

* [MIG] pos_pricelist: Migrate to v10 by backporting from v11 (OCA#247)

This module included previously support for taxes and pricelists.

Taxes are now included in upstream Odoo v10, so that feature is removed.

The pricelist feature, however, is supported in upstream Odoo v11. Thus, to ease the migration path, that functionality has been scalpel-backported from there.

This also means a great diff between previous OCA-only code and current Odoo-backport-only code, but with the advantage that the end user gets exactly the behavior that he would have when updating to v11.

Since most of the code has been copied from Odoo, the addon now has to become LGPL, and Odoo has been added as an author.

* [FIX] pos_pricelist: Fix language file

* [UPD] addons table in README.md

* [ADD] setup.py

* [FIX] pos_pricelist: Use lower-version date comparison

The removed function was introduced in momentjs in version 2.11.0, but Odoo 10.0 ships 2.8.1, so I'm using a different comparison system here that should yield the same results without exceptions.

* [UPD] addons table in README.md

* OCA Transbot updated translations from Transifex

* [10.0][ADD] pos_lot_selection: New module (OCA#256)

* [UPD] addons table in README.md

* [ADD] setup.py

* [ADD] pos_stock_picking_invoice_link: New Module

* Add module pos_default_empty_image

Big perf improvement for loading POS if you have thousand of products
without image

* Limit lines to < 80 chars

* No new line at end of file

* Add missing credits

* description file;

* Fix line length in readme

Remove __openerp.py_.description
Remove _name
Remove unneeded contents in init

* [PORT] pos_default_empty_image courtesy @invitu

* [IMP] pos_default_empty_image courtesy @invitu

* [FIX] set has_image on 'product.product' model
[IMP] make has_image stored
[REF] improve description and add screenshots
[REF] OCA convention

* [FIX] wording + remove useless JS code

* [REF] cosmetic points

* Fix readme remarks

* [UPD] addons table in README.md

* [ADD] setup.py

* [UPD] addons table in README.md

* [ADD] setup.py

* Updated pos_product_template addon to Odoo 9

* Added Spanish translation to pos_product_template (es.po)

* [FIX] Change the version number to 9 and make module installable.

* Add readme, update manifest,

switch to short copyright headers

* Some refactorings

* Refactore db

* Refactore set_product_list

* Remove comments

* Add pos_fix_search_limit module

* add pos_fix_search_limit in manifest

* [UPD] addons table in README.md

* [ADD] setup.py

* Make the ppt inheritable
rupa-acespritech pushed a commit to rupa-acespritech/pos that referenced this pull request Jan 19, 2019
* [fix] compability between pos_customer_display and pos_pricelist
vvrossem pushed a commit to vvrossem/pos that referenced this pull request Mar 27, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
vvrossem pushed a commit to vvrossem/pos that referenced this pull request Apr 3, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
vvrossem pushed a commit to vvrossem/pos that referenced this pull request Apr 3, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
vvrossem pushed a commit to vvrossem/pos that referenced this pull request Apr 4, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
vvrossem pushed a commit to vvrossem/pos that referenced this pull request Apr 10, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
PierrickBrun pushed a commit to PierrickBrun/pos that referenced this pull request May 7, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
robinkeunen pushed a commit to coopiteasy/pos that referenced this pull request Nov 7, 2019
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
legalsylvain pushed a commit to legalsylvain/pos that referenced this pull request Jan 9, 2020
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
AdriaGForgeFlow pushed a commit to ForgeFlow/pos that referenced this pull request Aug 14, 2020
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
alexis-via pushed a commit to akretion/pos that referenced this pull request Dec 23, 2020
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
ivantodorovich pushed a commit to camptocamp/pos that referenced this pull request Dec 1, 2021
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
PierrickBrun pushed a commit to akretion/pos that referenced this pull request Apr 14, 2022
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
OCA-git-bot pushed a commit to legalsylvain/pos that referenced this pull request May 18, 2022
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
PierrickBrun pushed a commit to akretion/pos that referenced this pull request Oct 31, 2022
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
alexis-via pushed a commit to akretion/pos that referenced this pull request Jun 20, 2023
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
legalsylvain pushed a commit to grap/pos that referenced this pull request Feb 21, 2024
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
legalsylvain pushed a commit to grap/pos that referenced this pull request Mar 28, 2024
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
legalsylvain pushed a commit to grap/pos that referenced this pull request Mar 28, 2024
…#210)

* [fix] compability between pos_customer_display and pos_pricelist
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants