Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • S slapos.core
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 38
    • Merge requests 38
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • nexedinexedi
  • slapos.core
  • Merge requests
  • !240

Revert controller and invoice page

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Lu Xu requested to merge lu.xu/slapos.core:revert_controller_and_invoice_page into master Jul 02, 2020
  • Overview 6
  • Commits 3
  • Pipelines 0
  • Changes 9

This MR mainly reverts the changes caused by automatic translation of portal_type. Thanks to Romain's foresight: https://lab.nexedi.com/nexedi/jio/commit/ff4846abf93561e7eff590e7b6a7a858a3bee78f , portal type translated title value won't be used and also thanks to Refeal who has rebased our ERP5, making works to be done much easilier.
Thomas has quickly fixed the invoice page of SlapOS console page before: https://lab.nexedi.com/nexedi/slapos.core/commit/7e49ec5e5f41a1545dbc7f1bc828b0a528be7603

Since bea2620a, the controller uses parent_relative_url instead of portal_type (because the portal_type canbe translated). For "Sale Invoice Transaction", the module is accounting, so rename the view page accordingly.

By reverting the changes of the invoice page's title as well as the controller page to use portal_type rather than parent_relative_url, we can go back to our track and cause no more problems with the massive change of controller_page.

Edited Jul 02, 2020 by Lu Xu
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: revert_controller_and_invoice_page
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7