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] [WIP] quality_control_stock #238

Closed
wants to merge 49 commits into from

Conversation

damendieta
Copy link

@damendieta damendieta commented Nov 15, 2017

This is a work in progress, the module is functional but no test had been added.


Depends on:

pedrobaeza and others added 30 commits November 2, 2015 18:05
…README files, and new concepts. WIP of quality_control_tolerance
* File missing
* Triggers for product category
* Omit lot when it's not present
* Change icon set
* Added "partner_selectable" field, so that inspections can by made by partner
* Stock inspections are "partner_selectable"
* Little view fixing, field was oe_edit_only instead of label
* Added partner to creation from stock_picking
* Added tests
* Picking pack operations automatically created
* more tests to increase coveralls
* added demo data
* replaced unlink method by ondelete="cascade"
* required changes
Making it a regular field, you can put any manual quantity in inspections
@damendieta damendieta mentioned this pull request Nov 15, 2017
2 tasks
@LoisRForgeFlow
Copy link
Contributor

@damendieta please squash all the consecutive transifex commits together to smash a little bit the history.

@damendieta
Copy link
Author

Hi

@lreficent I was thinking about to squash all commits before merge to have only one big commit for the module, that's why I havent's done that in this few commits.

Do you think it's necessary to do this in this state of the PR? can we wait to do it before the merge?

@LoisRForgeFlow
Copy link
Contributor

@damendieta yes, it is preferable, because we want to always keep the history and the previous contributions to a module, if we squash everything into one big commit we'll lose all previous contributions which wouldn't be fair for them. In the other hand, it is also good to keep history as small as possible, so that's why transifex commits can be squashed (as they are automatic translation commits) and (right before merging and after all possible reviews are attended) to squash all your commit of the migration.

@damendieta
Copy link
Author

@lreficent of course I was referring to squash all my commits, not all on the PR, that's why I took the work of keeping the history, even in the ones merged from odoo-mrp, it's important to respect everyones job.

I squashed the commits and I'll squash subsequents commit to have only one commit for all required changes for this PR.

Daniel.

@damendieta
Copy link
Author

@lreficent wich is the correct way to squash the changes for the OCA, I've tried several alternatives but all the time I get an undesired result.

You can see this:
https://github.com/damendieta/manufacture/commits/9.0-mig-quality_control_samples

It has added my name to all previous commits, I think this is because it was on another repo, but I don't think it's ok.

Could you please instruct me with the standard OCA way to squash commits.

Thanks.

@LoisRForgeFlow
Copy link
Contributor

Hi @damendieta

I'll point you this comment of another member of the OCA which is perfectly detailed and explained. Let me know if you have any issue.

@LoisRForgeFlow LoisRForgeFlow added this to the 9.0 milestone Nov 24, 2017
@damendieta damendieta closed this Jul 6, 2019
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.

7 participants