9.0 stock picking invoice link #261
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… is cancelled its pickings go back to "to2invoiced" state * If a cancelled invoice goes back again to draft, its pickings are marked as invoiced to avoid invoicing twice * Not able to erase an invoice with pickings not cancelled * Tests
…oice is in state 'draft' or 'cancel' * if invoice is in state 'draft', not cancelled picking will be invoiceable
… references For dropshipping pickings with module stock_dropshipping_dual_invoice, you generate two invoices for the same picking, so the many2one only reflects the last generated invoice. With this change, now both are linked.
$ git log refs/heads/8.0-extract --since=2015-10-14 --pretty=format:'%H' --reverse | while read line || [ -n "$line" ] ; do > git cherry-pick $line > done error: Commit 698d7875cc5e3145a59a07bd3b1b3d40cf81822e is a merge but no -m option was given. fatal: cherry-pick failed [9.0-stock_picking_invoice_link fd53a50] OCA Transbot updated translations from Transifex Author: OCA Transbot <[email protected]> Date: Mon Oct 26 08:22:09 2015 -0400 3 files changed, 214 insertions(+) create mode 100644 stock_picking_invoice_link/i18n/fr.po create mode 100644 stock_picking_invoice_link/i18n/it.po create mode 100644 stock_picking_invoice_link/i18n/sl.po [9.0-stock_picking_invoice_link 9a4358f] OCA Transbot updated translations from Transifex Author: OCA Transbot <[email protected]> Date: Sun Feb 21 01:45:13 2016 -0500 1 file changed, 72 insertions(+) create mode 100644 stock_picking_invoice_link/i18n/es.po error: could not apply 1b8d487... [IMP] stock_picking_invoice_link: added new functionality 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' error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed error: cherry-pick is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed Conflicts: stock_picking_invoice_link/models/stock_picking.py
Conflicts: stock_picking_invoice_link/models/stock_picking.py
|
Replace #246 👍 |
pedrobaeza
approved these changes
Oct 14, 2016
|
The port of this module doesn't allow anymore to find out the related moved that are invoiced. If you have 2 deliveries, it seems by reading the code, that the 2 invoices will point to the 2 deliveries and not the related one. |
FranzPoize
pushed a commit
to akretion/stock-logistics-workflow
that referenced
this pull request
Oct 18, 2023
* [10.0] re-introduce state field on product * [ADD] add setup for product state
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.