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

[15.0] fieldservice_recurring: Forward ports from 14 #1136

Merged
merged 13 commits into from
Dec 13, 2023

Conversation

brian10048
Copy link
Contributor

depends #1133

Forward port bug fixes and improvements from v14 to v15

@brian10048 brian10048 added this to the 15.0 milestone Nov 13, 2023
@brian10048 brian10048 requested a review from hparfr November 13, 2023 17:29
@brian10048 brian10048 self-assigned this Nov 13, 2023
@OCA-git-bot
Copy link
Contributor

Hi @wolfhall, @max3903,
some modules you are maintaining are being modified, check this out!

hparfr and others added 2 commits November 13, 2023 12:38
Stages are now:
draft: not started yet
progress: orders are and will continue to be generated
suspend: it can continue to generate orders but it has been put on pause
for some reason
close: no new orders will / can be generated

```dot

digraph {
draft -> progress -> suspend -> close
suspend -> progress
}
```

Why this change ?

- it was impossible to go back to progress after cancel
- pending / renew is too opinated to be in a base module,
- renew duration was hardcoded

(btw renew can be implemented by a renew_date instead of a stage
in a dedicated module)
@brian10048 brian10048 force-pushed the 15.0-recurring-fwd-14 branch from 800d419 to f924891 Compare November 13, 2023 17:38
@brian10048 brian10048 changed the title [15.0] Fieldservice Recurring forward ports from 14 [15.0] fieldservice_recurring: Forward ports from 14 Nov 13, 2023
@brian10048
Copy link
Contributor Author

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-1136-by-brian10048-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 12, 2023
Signed-off-by brian10048
@OCA-git-bot
Copy link
Contributor

@brian10048 The merge process could not be finalized, because command git push origin 15.0-ocabot-merge-pr-1136-by-brian10048-bump-nobump:15.0 failed with output:

To https://github.com/OCA/field-service
 ! [rejected]          15.0-ocabot-merge-pr-1136-by-brian10048-bump-nobump -> 15.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/field-service'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@brian10048
Copy link
Contributor Author

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 15.0-ocabot-merge-pr-1136-by-brian10048-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 7461f85 into OCA:15.0 Dec 13, 2023
5 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 75a52c4. Thanks a lot for contributing to OCA. ❤️

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.

6 participants