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

[11.0] [MIG] account invoice view payment #399

Closed

Conversation

AMhadhbi
Copy link
Member

@pedrobaeza please could you remove this pull request #398 because I have issue with git format-patch so I create new one from scratch and now it is fine. thanks

@pedrobaeza pedrobaeza added this to the 11.0 milestone Jun 29, 2018
@pedrobaeza
Copy link
Member

No problem, updated.

Please squash together adjacent "OCA Transbot.." commits using https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests

@pedrobaeza pedrobaeza mentioned this pull request Jun 29, 2018
36 tasks
Copy link
Sponsor Member

@JordiBForgeFlow JordiBForgeFlow left a comment

Choose a reason for hiding this comment

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

Review. Changes required.

<field name="inherit_id"
ref="account.view_account_payment_form"/>
<field name="arch" type="xml">
<button name="post" position="after">
Copy link
Sponsor Member

Choose a reason for hiding this comment

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

Ths button name has changed. It is now 'action_validate_invoice_payment'

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated

<button name="post" position="after">
<button name="post_and_open_payment" class="oe_highlight"
string="Validate &amp; View Payment" type="object"
groups="account.group_account_user"/>
Copy link
Sponsor Member

Choose a reason for hiding this comment

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

change groups to "account.group_account_invoice" since in v11 this group can access to payments from invoice anyway. Please apply everywhere else in this module.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated.

Configuration
=============

Only users assigned to the 'Accounting & Finance' groups 'Accountant' or
Copy link
Sponsor Member

Choose a reason for hiding this comment

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

This has changed in V11 CE. Please change to Users assigned to the group "Billing" can display the payments from the invoice.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated.
Many Thanks @jbeficent for the review.

@JordiBForgeFlow
Copy link
Sponsor Member

Please rebase and try to resolve the conficts.

@AMhadhbi
Copy link
Member Author

@pedrobaeza
I worked to squash together adjacent "OCA Transbot.." commits also to merge all my commit to single commit.
I try with this git rebase -i origin/11.0 but always I have this issue with Transfix.
issue :
`Auto-merging account_invoice_view_payment/i18n/zh_TW.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/zh_TW.po
Auto-merging account_invoice_view_payment/i18n/zh_CN.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/zh_CN.po
Auto-merging account_invoice_view_payment/i18n/tr_TR.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/tr_TR.po
Auto-merging account_invoice_view_payment/i18n/tr.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/tr.po
Auto-merging account_invoice_view_payment/i18n/th.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/th.po
Auto-merging account_invoice_view_payment/i18n/sv.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/sv.po
Auto-merging account_invoice_view_payment/i18n/sl.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/sl.po
Auto-merging account_invoice_view_payment/i18n/sk_SK.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/sk_SK.po
Auto-merging account_invoice_view_payment/i18n/ru.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/ru.po
Auto-merging account_invoice_view_payment/i18n/ro.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/ro.po
Auto-merging account_invoice_view_payment/i18n/pt_PT.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/pt_PT.po
Auto-merging account_invoice_view_payment/i18n/pt_BR.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/pt_BR.po
Auto-merging account_invoice_view_payment/i18n/pt.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/pt.po
Auto-merging account_invoice_view_payment/i18n/pl.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/pl.po
Auto-merging account_invoice_view_payment/i18n/nl_NL.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/nl_NL.po
Auto-merging account_invoice_view_payment/i18n/nl_BE.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/nl_BE.po
Auto-merging account_invoice_view_payment/i18n/nl.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/nl.po
Auto-merging account_invoice_view_payment/i18n/nb_NO.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/nb_NO.po
Auto-merging account_invoice_view_payment/i18n/nb.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/nb.po
Auto-merging account_invoice_view_payment/i18n/mn.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/mn.po
Auto-merging account_invoice_view_payment/i18n/mk.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/mk.po
Auto-merging account_invoice_view_payment/i18n/lt.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/lt.po
Auto-merging account_invoice_view_payment/i18n/ja.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/ja.po
Auto-merging account_invoice_view_payment/i18n/it.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/it.po
Auto-merging account_invoice_view_payment/i18n/id.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/id.po
Auto-merging account_invoice_view_payment/i18n/hu.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/hu.po
Auto-merging account_invoice_view_payment/i18n/hr_HR.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/hr_HR.po
Auto-merging account_invoice_view_payment/i18n/hr.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/hr.po
Auto-merging account_invoice_view_payment/i18n/gl.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/gl.po
Auto-merging account_invoice_view_payment/i18n/fr_CH.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/fr_CH.po
Auto-merging account_invoice_view_payment/i18n/fr_CA.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/fr_CA.po
Auto-merging account_invoice_view_payment/i18n/fr.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/fr.po
Auto-merging account_invoice_view_payment/i18n/fi.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/fi.po
Auto-merging account_invoice_view_payment/i18n/et.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/et.po
Auto-merging account_invoice_view_payment/i18n/es_MX.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/es_MX.po
Auto-merging account_invoice_view_payment/i18n/es_ES.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/es_ES.po
Auto-merging account_invoice_view_payment/i18n/es_EC.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/es_EC.po
Auto-merging account_invoice_view_payment/i18n/es_CR.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/es_CR.po
Auto-merging account_invoice_view_payment/i18n/es.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/es.po
Auto-merging account_invoice_view_payment/i18n/en_GB.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/en_GB.po
Auto-merging account_invoice_view_payment/i18n/el_GR.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/el_GR.po
Auto-merging account_invoice_view_payment/i18n/de.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/de.po
Auto-merging account_invoice_view_payment/i18n/cs.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/cs.po
Auto-merging account_invoice_view_payment/i18n/ca.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/ca.po
Auto-merging account_invoice_view_payment/i18n/bs.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/bs.po
Auto-merging account_invoice_view_payment/i18n/bg.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/bg.po
Auto-merging account_invoice_view_payment/i18n/ar.po
CONFLICT (add/add): Merge conflict in account_invoice_view_payment/i18n/ar.po
error: could not apply 159f1a9... OCA Transbot updated translations from Transifex

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Could not apply 159f1a9... OCA Transbot updated translations from Transifex
`
Please how can I fix this issue ? thanks

@pedrobaeza
Copy link
Member

Are you altering the order of the commits? You should respect and put together only adjacent commits for avoiding this problem.

@AMhadhbi
Copy link
Member Author

AMhadhbi commented Jun 29, 2018

it is correct?
git rebase -i origin/11.0

pick eed35a3 account_invoice_view_payment
pick 2a5abc5 Tests
pick 994a647 [MIG] account_invoice_view_payment: Migration to 10.0
pick 19f8aff OCA Transbot updated translations from Transifex
pick b60e0af [UPD] Update account_invoice_view_payment.pot
pick dd97e9e [MIG] account_invoice_view_payment: Migration to 11.0
pick 7311df9 [FIX] account_invoice_view_payment: fix issue related to the review
fixup 159f1a9 OCA Transbot updated translations from Transifex
fixup ad8fa1a OCA Transbot updated translations from Transifex
fixup 74eb34e OCA Transbot updated translations from Transifex
pick 1405739 OCA Transbot updated translations from Transifex
pick 575d3df [UPD] Update account_invoice_view_payment.pot
pick 2345086 [MIG] account_invoice_view_payment: Migration to 11.0
pick 5132f37 [FIX] fix issue Element cannot be located in parent view

Rebase cacd1f5..5132f37 onto cacd1f5 (14 commands)

@pedrobaeza
Copy link
Member

I miss the fixup (f shortened) for 1405739 also

@MiquelRForgeFlow
Copy link
Contributor

MiquelRForgeFlow commented Jul 9, 2018

As there is clearly a problem with rebases and reorderings, superseeded by #403. This PR can be closed.

@pedrobaeza pedrobaeza closed this Jul 9, 2018
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

6 participants