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

[FW][IMP] _pro_receiptbook: archived receiptboks use cases #580

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

  1. Mejoramos para que si el talonario esta archivado no deje consumir número (es para caso de uruguay donde los talonarios de recibos manuales existen y son legales y tienen que tener control de la numeración)
  2. Agregamos el open de receipbook para poder ir rápidamente al mismo si es necesario

Forward-Port-Of: #579

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@jjscarafia @maq-adhoc cherrypicking of pull request #579 failed.

stdout:

Auto-merging account_payment_pro_receiptbook/views/account_payment_receipt_group.xml
Auto-merging account_payment_pro_receiptbook/views/account_payment.xml
CONFLICT (content): Merge conflict in account_payment_pro_receiptbook/views/account_payment.xml
Auto-merging account_payment_pro_receiptbook/models/account_payment.py
CONFLICT (content): Merge conflict in account_payment_pro_receiptbook/models/account_payment.py
Auto-merging account_payment_pro_receiptbook/__manifest__.py
CONFLICT (content): Merge conflict in account_payment_pro_receiptbook/__manifest__.py

stderr:

12:51:32.560248 git.c:444               trace: built-in: git cherry-pick 45fb248330e5dcdf6ce144e5724094db75ebdfd0
error: could not apply 45fb2483... [IMP] _pro_receiptbook: archived receiptboks use cases
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

1. Mejoramos para que si el talonario esta archivado no deje consumir número (es para caso de uruguay donde los talonarios de recibos manuales existen y son legales y tienen que tener control de la numeración)
2. Agregamos el open de receipbook para poder ir rápidamente al mismo si es necesario
@jjscarafia jjscarafia force-pushed the 18.0-17.0-t-46070-jjs-2-WNsz-fw branch from 9646b04 to 874d275 Compare January 2, 2025 10:19
@jjscarafia
Copy link
Member

@roboadhoc r+

@roboadhoc roboadhoc closed this in a7ac609 Jan 2, 2025
@roboadhoc roboadhoc added the 17.1 label Jan 2, 2025
@jjscarafia jjscarafia deleted the 18.0-17.0-t-46070-jjs-2-WNsz-fw branch January 2, 2025 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants