Skip to content
Snippets Groups Projects

Add employee on cycles for running and done states

1 unresolved thread

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Cédric Krier
  • Cédric Krier
  • I think there should be also a cancelled by field.

  • The scenario should test employee is correctly set

  • Cédric Krier requested review from @ced

    requested review from @ced

  • resolved all threads

  • added 108 commits

    Compare with previous version

  • added 32 commits

    Compare with previous version

  • Sergi Almacellas Abellana enabled an automatic merge when the pipeline for 41144fc6b15a succeeds

    enabled an automatic merge when the pipeline for 41144fc6b15a succeeds

  • Why was it merge without review?

  • Cédric Krier
    Cédric Krier @ced started a thread on the diff
  • 321 322 'readonly': Eval('state').in_(['done', 'draft', 'cancelled']),
    322 323 })
    323 324 cost = fields.Numeric('Cost', digits=price_digits, readonly=True)
    325 company = fields.Function(
    326 fields.Many2One('company.company', "Company"),
    327 'on_change_with_company', searcher='search_company')
    328 run_by = employee_field("Run By", states={
    329 'readonly': Eval('state') != 'draft',
    330 })
    331 done_by = employee_field("Done By", states={
    332 'readonly': Eval('state').in_(['draft', 'running']),
    333 })
    334 cancelled_by = employee_field("Cancelled By", states={
    335 'readonly': Eval('state').in_(['draft', 'running']),
    336 })
    • Comment on lines +328 to +336
      Suggested change
      328 run_by = employee_field("Run By", states={
      329 'readonly': Eval('state') != 'draft',
      330 })
      331 done_by = employee_field("Done By", states={
      332 'readonly': Eval('state').in_(['draft', 'running']),
      333 })
      334 cancelled_by = employee_field("Cancelled By", states={
      335 'readonly': Eval('state').in_(['draft', 'running']),
      336 })
      328 run_by = employee_field(
      329 "Run By",
      330 states={
      331 'readonly': Eval('state') != 'draft',
      332 })
      333 done_by = employee_field(
      334 "Done By",
      335 states={
      336 'readonly': Eval('state').in_(['draft', 'running']),
      337 })
      338 cancelled_by = employee_field(
      339 "Cancelled By",
      340 states={
      341 'readonly': Eval('state').in_(['draft', 'running']),
      342 })
    • Please register or sign in to reply
    Please register or sign in to reply
    Loading