Skip to content
  • This project
    • Loading...
  • Sign in

nexedi / erp5

Go to a project
Toggle navigation
Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Merge Requests 112
  • Wiki
  • Snippets
  • Network
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Open
Merge Request !980 opened 2019-11-12 03:43:12 UTC by Jérome Perrin@jerome

project: make Project Cell use OrderCell class

erp5_project does not depend on erp5_budget, so instanciating project cell fail unless erp5_budget is installed.

Project Cell are not used by default, so it's still a bit unclear, but with erp5_budget we can directly define budgets by project / project lines in a more flexible (but also more complex).

Project Line uses OrderLine, so it's consistent to use OrderCell for Project Cell.

Edited 2019-11-21 03:40:57 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge fix/project_cell_without_budget into master (113 commits behind)
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b fix/project_cell_without_budget origin/fix/project_cell_without_budget

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff fix/project_cell_without_budget

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Pipeline #6604 passed
for e5855c0b.
Pipeline #6604 passed with warnings
for e5855c0b.
Pipeline #6604 skipped
for e5855c0b.
Pipeline #6604 canceled
for e5855c0b.
Pipeline #6604 failed
for e5855c0b.
Pipeline #6604 running
for e5855c0b.
Pipeline #6604 pending
for e5855c0b.
Checking ability to merge automatically…
  • Discussion 4
  • Commits 1
  • Pipelines 2
  • Changes 1
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • @jerome Jérome Perrin
    @jerome

    added 1 commit

    • e5855c0b - project: make Project Cell use OrderCell class

    Compare with previous version

    2019-11-12 03:48:36 UTC

    added 1 commit

    • e5855c0b - project: make Project Cell use OrderCell class

    Compare with previous version

    Toggle commit list
  • @jerome Jérome Perrin
    @jerome

    changed title from project: make Project Cell use Predicate class to project: make Project Cell use OrderCell class

    2019-11-12 03:49:07 UTC

    changed title from project: make Project Cell use Predicate class to project: make Project Cell use OrderCell class

    Toggle commit list
  • @jerome Jérome Perrin
    @jerome commented 2019-11-12 03:50:23 UTC
    Owner

    @romain @rporchetto do you see a problem with this ? In your work on project you don't plan to allow defining budgets or anything using Project Cell ?

    I think that the history of this portal type is that it has been created so that maybe one day we can maybe define budget for project, but since that erp5_budget evolve to a module allowing to define budget for anything (including projects).

    I'm just interested of making it possible to create project cell when erp5_budget is not installed.

  • @jerome Jérome Perrin
    @jerome commented 2019-11-12 03:51:06 UTC
    Owner

    For reference budget cell class is https://lab.nexedi.com/nexedi/erp5/blob/0d702108e25107e4ba71e713ee723ee10c4f00fa/bt5/erp5_budget/DocumentTemplateItem/portal_components/document.erp5.BudgetCell.py , I don't think we use any of these methods on a Project Cell.

  • @romain Romain Courteaud
    @romain commented 2019-11-13 10:05:19 UTC
    Owner

    I didn't even know that Project Cell exists. That probably a question for @jp

  • @jerome Jérome Perrin
    @jerome commented 2019-11-13 10:54:12 UTC
    Owner

    I'll ask him next time I have a chance to talk to him, this is not at all urgent.

    Also, I would be very surprise that this change has any consequence with what's currently working. I was asking because you are working on some new things around project, but if you are not planning to use project cell in this work, we can probably apply this change, it would still be possible to define budgets for project from budget module the same way that we do today.

  • Write
  • Preview
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
4
4 participants
Reference: nexedi/erp5!980
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号