Compare commits
12 Commits
a5133b1ba0
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| cb9f337d00 | |||
| c991a54930 | |||
| 56992e2ccc | |||
| d83c7903eb | |||
| c5c3fa8920 | |||
| df755ea599 | |||
| e15799fb6e | |||
| 5cd3a56b3e | |||
| 82ce1fa21d | |||
| 515876e6c9 | |||
| 1cd16ebc09 | |||
| 8edc710be8 |
@@ -87,8 +87,8 @@ start() {
|
|||||||
|
|
||||||
gitchangelog | grep -v "[rR]elease:" > HISTORY.md
|
gitchangelog | grep -v "[rR]elease:" > HISTORY.md
|
||||||
git add HISTORY.md
|
git add HISTORY.md
|
||||||
echo $new_version > CustomOdoo/VERSION
|
echo $new_version > VERSION
|
||||||
git add CustomOdoo/VERSION
|
git add VERSION
|
||||||
git commit -m "release: version $new_version 🚀"
|
git commit -m "release: version $new_version 🚀"
|
||||||
echo "creating git tag : $new_version"
|
echo "creating git tag : $new_version"
|
||||||
git tag $new_version
|
git tag $new_version
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ jobs:
|
|||||||
- name: Check version match
|
- name: Check version match
|
||||||
run: |
|
run: |
|
||||||
REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $2}' | tr '-' '_')
|
REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $2}' | tr '-' '_')
|
||||||
if [ "$(cat $REPOSITORY_NAME/VERSION)" = "${GITHUB_REF_NAME}" ] ; then
|
if [ "$(cat VERSION)" = "${GITHUB_REF_NAME}" ] ; then
|
||||||
echo "Version matches successfully!"
|
echo "Version matches successfully!"
|
||||||
else
|
else
|
||||||
echo "Version must match!"
|
echo "Version must match!"
|
||||||
@@ -57,5 +57,5 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $1}' | tr '[:upper:]' '[:lower:]')
|
REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $1}' | tr '[:upper:]' '[:lower:]')
|
||||||
REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $2}' | tr '-' '_')
|
REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $2}' | tr '-' '_')
|
||||||
docker build -t "git.disi.dev/$REPOSITORY_OWNER/odoo17:$(cat $REPOSITORY_NAME/VERSION)" ./
|
docker build -t "git.disi.dev/$REPOSITORY_OWNER/odoo17:$(cat VERSION)" ./
|
||||||
docker push "git.disi.dev/$REPOSITORY_OWNER/odoo17:$(cat $REPOSITORY_NAME/VERSION)"
|
docker push "git.disi.dev/$REPOSITORY_OWNER/odoo17:$(cat VERSION)"
|
||||||
|
|||||||
43
HISTORY.md
43
HISTORY.md
@@ -5,10 +5,53 @@ Changelog
|
|||||||
(unreleased)
|
(unreleased)
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
Fix
|
||||||
|
~~~
|
||||||
|
- No vat in address for individuals, refs NOISSUE. [Simon Diesenreiter]
|
||||||
|
|
||||||
|
Other
|
||||||
|
~~~~~
|
||||||
|
- Feat: force release, refs NOISSUE. [Simon Diesenreiter]
|
||||||
|
|
||||||
|
|
||||||
|
0.2.0 (2025-05-27)
|
||||||
|
------------------
|
||||||
|
- Feat: disable adding company name at beginning of customer name, refs
|
||||||
|
NOISSUE. [Simon Diesenreiter]
|
||||||
|
|
||||||
|
|
||||||
|
0.1.4 (2025-05-24)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
Fix
|
||||||
|
~~~
|
||||||
|
- Broken source code indentation, refs NOISSUE. [Simon Diesenreiter]
|
||||||
|
|
||||||
|
Other
|
||||||
|
~~~~~
|
||||||
|
|
||||||
|
|
||||||
|
0.1.3 (2025-05-24)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
Fix
|
||||||
|
~~~
|
||||||
|
- More CI issues, refs NOISSUE. [Simon Diesenreiter]
|
||||||
|
|
||||||
|
Other
|
||||||
|
~~~~~
|
||||||
|
|
||||||
|
|
||||||
|
0.1.2 (2025-05-24)
|
||||||
|
------------------
|
||||||
|
|
||||||
Fix
|
Fix
|
||||||
~~~
|
~~~
|
||||||
- CI issues, refs NOISSUE. [Simon Diesenreiter]
|
- CI issues, refs NOISSUE. [Simon Diesenreiter]
|
||||||
|
|
||||||
|
Other
|
||||||
|
~~~~~
|
||||||
|
|
||||||
|
|
||||||
0.1.1 (2025-05-24)
|
0.1.1 (2025-05-24)
|
||||||
------------------
|
------------------
|
||||||
|
|||||||
@@ -355,8 +355,6 @@ class Partner(models.Model):
|
|||||||
if self.company_name or self.parent_id:
|
if self.company_name or self.parent_id:
|
||||||
if not name and self.type in displayed_types:
|
if not name and self.type in displayed_types:
|
||||||
name = type_description[self.type]
|
name = type_description[self.type]
|
||||||
if not self.is_company:
|
|
||||||
name = f"{self.commercial_company_name or self.sudo().parent_id.name}, {name}"
|
|
||||||
return name.strip()
|
return name.strip()
|
||||||
|
|
||||||
@api.depends('is_company', 'name', 'parent_id.name', 'type', 'company_name', 'commercial_company_name')
|
@api.depends('is_company', 'name', 'parent_id.name', 'type', 'company_name', 'commercial_company_name')
|
||||||
@@ -479,10 +477,10 @@ class Partner(models.Model):
|
|||||||
'was never correctly set. If an existing contact starts working for a new '
|
'was never correctly set. If an existing contact starts working for a new '
|
||||||
'company then a new contact should be created under that new '
|
'company then a new contact should be created under that new '
|
||||||
'company. You can use the "Discard" button to abandon this change.')}
|
'company. You can use the "Discard" button to abandon this change.')}
|
||||||
if partner.type == 'contact' or self.type == 'contact':
|
#if partner.type == 'contact' or self.type == 'contact':
|
||||||
# for contacts: copy the parent address, if set (aka, at least one
|
# # for contacts: copy the parent address, if set (aka, at least one
|
||||||
# value is set in the address: otherwise, keep the one from the
|
# # value is set in the address: otherwise, keep the one from the
|
||||||
# contact)
|
# # contact)
|
||||||
# address_fields = self._address_fields()
|
# address_fields = self._address_fields()
|
||||||
# if any(self.parent_id[key] for key in address_fields):
|
# if any(self.parent_id[key] for key in address_fields):
|
||||||
# def convert(value):
|
# def convert(value):
|
||||||
@@ -897,6 +895,8 @@ class Partner(models.Model):
|
|||||||
if partner._context.get('show_email') and partner.email:
|
if partner._context.get('show_email') and partner.email:
|
||||||
name = f"{name} <{partner.email}>"
|
name = f"{name} <{partner.email}>"
|
||||||
if partner._context.get('show_vat') and partner.vat:
|
if partner._context.get('show_vat') and partner.vat:
|
||||||
|
if partner.is_company:
|
||||||
|
# only shot vat in addresses of companies, not individuals
|
||||||
name = f"{name} ‒ {partner.vat}"
|
name = f"{name} ‒ {partner.vat}"
|
||||||
|
|
||||||
partner.display_name = name.strip()
|
partner.display_name = name.strip()
|
||||||
|
|||||||
Reference in New Issue
Block a user