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.

Sign up for GitHub

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

[16.0][FIX] base_ubl: street3 in UBL generation #904

Closed
wants to merge 1 commit into from
Closed

[16.0][FIX] base_ubl: street3 in UBL generation #904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions base_ubl/models/ubl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,31 @@
@api.model
def _ubl_add_address(self, partner, node_name, parent_node, ns, version="2.1"):
address = etree.SubElement(parent_node, ns["cac"] + node_name)
if partner.street:
if partner.street or partner.street2:
streetname = etree.SubElement(address, ns["cbc"] + "StreetName")
streetname.text = partner.street
if partner.street2:
streetname.text = partner.street or partner.street2
if partner.street and partner.street2:
addstreetname = etree.SubElement(
address, ns["cbc"] + "AdditionalStreetName"
)
addstreetname.text = partner.street2
# if oca/partner-contact/partner_address_street3 is installed

Check warning on line 49 in base_ubl/models/ubl.py

View check run for this annotation

Codecov / codecov/patch

base_ubl/models/ubl.py#L49 

Added line #L49 was not covered by tests
if hasattr(partner, "street3") and partner.street3:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if hasattr(partner, "street3") and partner.street3:
# if oca/partner-contact/partner_address_street3 is installed
if hasattr(partner, "street3") and partner.street3:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

comment added

blockname = etree.SubElement(address, ns["cbc"] + "BlockName")
blockname.text = partner.street3
# In an address, the real street is usually put in the last field

Check warning on line 51 in base_ubl/models/ubl.py

View check run for this annotation

Codecov / codecov/patch

base_ubl/models/ubl.py#L51 

Added line #L51 was not covered by tests
if partner.street and partner.street2:
# The first field is usually the Department

Check warning on line 53 in base_ubl/models/ubl.py

View check run for this annotation

Codecov / codecov/patch

base_ubl/models/ubl.py#L53 

Added line #L53 was not covered by tests
department = etree.SubElement(address, ns["cbc"] + "Department")
department.text = partner.street
streetname.text = partner.street2

Check warning on line 56 in base_ubl/models/ubl.py

View check run for this annotation

Codecov / codecov/patch

base_ubl/models/ubl.py#L56 

Added line #L56 was not covered by tests
addstreetname.text = partner.street3
elif partner.street or partner.street2:
addstreetname = etree.SubElement(

Check warning on line 59 in base_ubl/models/ubl.py

View check run for this annotation

Codecov / codecov/patch

base_ubl/models/ubl.py#L58-L59 

Added lines #L58 - L59 were not covered by tests
address, ns["cbc"] + "AdditionalStreetName"
)
addstreetname.text = partner.street3
else:
streetname = etree.SubElement(address, ns["cbc"] + "StreetName")
streetname.text = partner.street3
if partner.city:
city = etree.SubElement(address, ns["cbc"] + "CityName")
city.text = partner.city
Expand Down
Loading