Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 118
    • Merge Requests 118
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !1243

Merged
Opened Aug 13, 2020 by Xiaowu Zhang@xiaowu.zhang
  • Report abuse
Report abuse

Corporate identity Letter Improvement

Three functionalities are added:

  1. possible to define recipient position: right or left, and it padding value against to left

    Screenshot_2020-08-17_at_9.31.56_AM

    Screenshot_2020-08-17_at_9.32.29_AM

  2. possible to display the source address in one line just above the destination address.

    Screenshot_2020-08-17_at_9.33.10_AM

  3. possible to define header position against to top, so when print with no borderless printer, header is not cut off.

    Screenshot_2020-08-19_at_11.23.41_AM

One bug is fixed:

Display logo at middle in header, here is the diff:

Screenshot_2020-08-17_at_9.36.34_AM

Edited Aug 19, 2020 by Xiaowu Zhang

Check out, review, and merge locally

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

git fetch https://lab.nexedi.com/xiaowu.zhang/erp5.git Corporate_Identity
git checkout -b xiaowu.zhang/erp5-Corporate_Identity FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff xiaowu.zhang/erp5-Corporate_Identity

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.

  • Discussion 1
  • Commits 6
  • Changes 56
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!1243

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号