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

Jump to bottom

15.0 modificari #104

Merged
merged 3 commits into from
Nov 10, 2023
Merged

15.0 modificari #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
799871b
fix union all
dhongu Nov 7, 2023
8f12177
Merge remote-tracking branch 'origin/15.0' into 15.0
dhongu Nov 9, 2023
a4a31eb
fix locality_ver
dhongu Nov 10, 2023
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
2 changes: 1 addition & 1 deletion l10n_ro_intrastat_xml/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Romanian Intrastat Declaration XML",
"license": "AGPL-3",
"version": "15.0.1.0.3",
"version": "15.0.1.0.4",
"author": "Dorin Hongu," "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/l10n-romania",
"depends": ["product", "sale_stock", "account", "l10n_ro"],
Expand Down
2 changes: 1 addition & 1 deletion l10n_ro_intrastat_xml/wizard/intrastat_xml_declaration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def _get_unit_ver(self):
"NatureOfTransactionBVer", size=4, required=True, default=_get_nature_of_transaction_b_ver
)
county_ver = fields.Char("CountyVer", size=4, required=True, default=_get_county_ver)
locality_ver = fields.Char("LocalityVer", size=4, required=True, default=_get_locality_ver)
locality_ver = fields.Char("LocalityVer", required=True, default=_get_locality_ver)
unit_ver = fields.Char("UnitVer", size=4, required=True, default=_get_unit_ver)

enterprise = fields.Boolean("Enterprise", default=False, compute="_compute_enterprise")
Expand Down
4 changes: 2 additions & 2 deletions l10n_ro_stock_account_check/report/stock_check_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def do_compute_product_aml_details(self):
date_trunc('day',sm.date) <= %(date_to)s AND
( %(all_products)s or sm.product_id in %(products)s )
group by sm.product_id)
union
union all
select product_id, 0 as svl_value, sum(aml.balance) as aml_value,
array[]::integer[] as svl_ids,
array_agg(aml.id) as aml_ids
Expand Down Expand Up @@ -151,7 +151,7 @@ def do_compute_product_no_aml_details(self):
date_trunc('day',sm.date) <= %(date_to)s AND
( %(all_products)s or sm.product_id in %(products)s )
group by sm.product_id)
union
union all
select product_id, 0 as svl_value, sum(aml.balance) as aml_value,
array[]::integer[] as svl_ids,
array_agg(aml.id) as aml_ids
Expand Down
Loading