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.

Sign up for GitHub

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

Jump to bottom

[FIX] pos_order_mgmt:compatibility with pos_restaurant #339

Merged
merged 2 commits into from
Jul 16, 2019
Merged

[FIX] pos_order_mgmt:compatibility with pos_restaurant #339

merged 2 commits into from
Jul 16, 2019

Conversation

carlos-domatix
Copy link

Fixed #333 . cc @chienandalu

pedrobaeza
pedrobaeza requested changes Mar 27, 2019
View reviewed changes
pos_order_mgmt/__manifest__.py Outdated Show resolved Hide resolved
@pedrobaeza
Copy link
Member

Even more: is it possible to directly cherry-pick the commit with the fix?

@carlos-domatix carlos-domatix force-pushed the 11.0-fix-pos_order_mgmt-incompatibility-pos-restaurant branch from 7bf2e12 to 19fdd71 Compare April 8, 2019 09:43
@legalsylvain legalsylvain added this to the 11.0 milestone Jul 11, 2019
legalsylvain
legalsylvain approved these changes Jul 11, 2019
View reviewed changes
Copy link
Contributor

@legalsylvain legalsylvain left a comment

Choose a reason for hiding this comment

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

LTGM. Thanks. Code review, no test.

@pedrobaeza, is it OK for you ?

regards.

@legalsylvain
Copy link
Contributor

Note. Should be rebased. Can you do it @carlosDomatix ?

@pedrobaeza
Copy link
Member

But should rebase and resolve the conflicting file

legalsylvain added a commit to legalsylvain/pos that referenced this pull request Jul 15, 2019
@legalsylvain
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
aed6476
legalsylvain added a commit to legalsylvain/pos that referenced this pull request Jul 15, 2019
@legalsylvain
[FIX] JS lint, with OCA eslint file
3448794 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[REF] JS remove useless code
[REF] Python remove useless code
[ADD] pos order view form. Add links to original returned order and refund orders.
[FIX] remove bad oldname
[FIX] add _compute_refund_order_qty
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[FIX] remove gap in bill display, when it is a refund
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
[IMP] Add helper on each button
[FIX] when reprinting a bill, the returned order name is displayed, if any
legalsylvain added a commit to legalsylvain/pos that referenced this pull request Jul 15, 2019
@legalsylvain
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
847e4f1 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
legalsylvain added a commit to legalsylvain/pos that referenced this pull request Jul 15, 2019
@legalsylvain
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
26cb18c 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
@legalsylvain legalsylvain mentioned this pull request Jul 15, 2019
Merged
@carlos-domatix carlos-domatix force-pushed the 11.0-fix-pos_order_mgmt-incompatibility-pos-restaurant branch from 19fdd71 to 13b321b Compare July 16, 2019 06:31
@carlos-domatix
Copy link
Author

Rebased.

@legalsylvain
Copy link
Contributor

/ocabot merge patch

Thanks @carlosDomatix

@sbidoul
Copy link
Member

sbidoul commented Jul 16, 2019

@legalsylvain at the moment, the bot command must be the last part of the comment. (OCA/oca-github-bot#53)

So your command was ignored, can you retry?

@legalsylvain
Copy link
Contributor

Thanks @sbidoul for this information. I was asking to myself if I can hide a little /ocabot command inside a comment. ;-)

@legalsylvain
Copy link
Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Rebased to 11.0-ocabot-merge-pr-339-by-legalsylvain-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 13b321b into OCA:11.0 Jul 16, 2019
OCA-git-bot added a commit that referenced this pull request Jul 16, 2019
@OCA-git-bot
Merge PR #339 into 11.0
644ecf2 
Signed-off-by legalsylvain
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 644ecf2. Thanks a lot for contributing to OCA. ❤️

PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into 11.0.

OCA-git-bot pushed a commit that referenced this pull request Jul 18, 2019
@legalsylvain @OCA-git-bot
[FIX] loaded orders date to local #361 cortesy @chienandalu
9946e1e 
[FIX] compatibility with pos_restaurant #339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
ammarofficewla pushed a commit to ammarofficewla/pos that referenced this pull request Oct 7, 2019
@legalsylvain @ammarofficewla
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
8d1e502 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
robyf70 pushed a commit to LevelPrime/pos that referenced this pull request Nov 20, 2019
@legalsylvain @robyf70
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
5686044 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
dalonsod pushed a commit to solvosci/pos that referenced this pull request Jan 8, 2021
@legalsylvain @dalonsod
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
1e6908c 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
fshah-initos pushed a commit to initOS/pos that referenced this pull request Apr 19, 2021
@legalsylvain @fshah-initos
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
b45effe 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
pedropote pushed a commit to pedropote/pos that referenced this pull request May 17, 2022
@legalsylvain @pedropote
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
c0a052a 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
zamberjo pushed a commit to aurestic/pos that referenced this pull request Apr 14, 2023
@legalsylvain @zamberjo
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
b2898b3 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
zamberjo pushed a commit to aurestic/pos that referenced this pull request Apr 19, 2023
@legalsylvain @zamberjo
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
c0714de 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
anmarmo1 pushed a commit to aurestic/pos that referenced this pull request May 3, 2023
@legalsylvain
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
1e4b424 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
zamberjo pushed a commit to aurestic/pos that referenced this pull request May 4, 2023
@legalsylvain @zamberjo
[FIX] loaded orders date to local OCA#361 cortesy @chienandalu
e6bb2cc 
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix
[FIX] add _compute_refund_order_qty
[ADD] pos order view form. Add links to original returned order and refund orders.
[IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id.
[IMP] Add helper on each button
[ADD] python test
[REF] JS remove useless code
[REF] Python remove useless code
[FIX] remove bad oldname
[FIX] remove gap in bill display, when it is a refund
[FIX] when reprinting a bill, the returned order name is displayed, if any
[FIX] JS lint, with OCA eslint file
[ADD] french translation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@legalsylvain legalsylvain legalsylvain approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

Assignees
No one assigned
Labels
merged 🎉
Projects
None yet
Milestone
11.0
Development

Successfully merging this pull request may close these issues.

[BUG] [11.0] [pos_order_mgmt] Incompatibility with pos_restaurant
6 participants
@carlos-domatix @pedrobaeza @legalsylvain @sbidoul @OCA-git-bot @chienandalu