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

8.0 l10n xaf export changes #1

Open
wants to merge 1 commit into
base: 8.0
Choose a base branch
from

Conversation

Hayyan-Ebrahem
Copy link

No description provided.

Copy link
Member

@thomaspaulb thomaspaulb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have elaborated three examples of things you can encounter. You'll have to apply the same logic and go through each change yourself.

.travis.yml Outdated
- VERSION="8.0" LINT_CHECK="1"
- VERSION="8.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0"
- VERSION="8.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
global:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Hayyan-Ebrahem Analysing this will go as follows:

  1. Look at the most recent version of this file on the 8.0 branch in the original OCA repo, and activate the Blame view.
  2. See that this change was added 9 months ago by Holger in this commit
  3. Conclude that this should not be in this PR.
  4. Look at the commits in this PR and conclude that they are too many - it should include only your commit.
  5. Follow this guide to get out of trouble.

@@ -653,7 +653,6 @@
<xsd:enumeration value="AT"/>
<xsd:enumeration value="AU"/>
<xsd:enumeration value="AW"/>
<xsd:enumeration value="AX"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Hayyan-Ebrahem As another example I will analyse this:

  1. Look at the most recent version of this file on the 8.0 branch in the original OCA repo, and activate the Blame view.
  2. See that AX was added 4 months ago by Andrea in this commit
  3. Conclude that reverting this should not be in this PR - it is not our work, but the reversion of a later update by someone from OCA.
  4. Remove it from your branch in a new commit

})
xml = self.env.ref('l10n_nl_xaf_auditfile_export.auditfile_template')\
.render(values={
'self': self.sudo(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Hayyan-Ebrahem as a final example, lets analyse this one:

  1. Look at the most recent version of this file on the 8.0 branch in the original OCA repo, and activate the Blame view.
  2. See that the newest OCA version is not including this at the moment
  3. In the Blame view of that file in the Freshfilter community modules repo, see that it was added by us in this commit
  4. Decide to keep it

thomaspaulb pushed a commit that referenced this pull request Sep 7, 2018
….0/performance_patch1

[IMP] Compute auditfile_name field
thomaspaulb pushed a commit that referenced this pull request Nov 17, 2020
[13.0] Rename l10n_nl_ubl to l10n_nl_base_ubl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants