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

9.0 stock picking invoice link #261

Merged
merged 21 commits into from
Oct 14, 2016
Merged

Conversation

hendrixcosta
Copy link
Member

No description provided.

rschnapka and others added 20 commits September 20, 2016 16:10
… 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 <transbot@odoo-community.org>
 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 <transbot@odoo-community.org>
 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
@pedrobaeza pedrobaeza mentioned this pull request Sep 20, 2016
34 tasks
@hendrixcosta
Copy link
Member Author

#246

@mileo
Copy link
Member

mileo commented Sep 21, 2016

Replace #246 👍

Copy link
Member

@eLBati eLBati left a comment

Choose a reason for hiding this comment

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

Thanks

@jbaudoux
Copy link
Contributor

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.
I'll make a PR that fix this.

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet