|
2025-06-05 03:19:22
|
CRITICAL
|
server
|
odoo.modules.module:483
invalid syntax
('/data/build/kmitl/budget/models/budget_template.py', 128, 1, '<<<<<<< HEAD\n', 128, 3)
|
|
|
2025-06-05 03:19:22
|
ERROR
|
server
|
odoo.modules.registry:92
Failed to load registry
Traceback (most recent call last):
File "/data/build/odoo/odoo/modules/registry.py", line 87, in new
odoo.modules.load_modules(registry, force_demo, status, update_module)
File "/data/build/odoo/odoo/modules/loading.py", line 493, in load_modules
processed_modules += load_marked_modules(cr, graph,
File "/data/build/odoo/odoo/modules/loading.py", line 374, in load_marked_modules
loaded, processed = load_module_graph(
File "/data/build/odoo/odoo/modules/loading.py", line 190, in load_module_graph
load_openerp_module(package.name)
File "/data/build/odoo/odoo/modules/module.py", line 471, in load_openerp_module
__import__('odoo.addons.' + module_name)
File "/data/build/kmitl/budget/__init__.py", line 3, in <module>
from . import models
File "/data/build/kmitl/budget/models/__init__.py", line 1, in <module>
from . import budget_template
File "/data/build/kmitl/budget/models/budget_template.py", line 128
<<<<<<< HEAD
^^
SyntaxError: invalid syntax
|
|
|
2025-06-05 03:19:22
|
CRITICAL
|
server
|
odoo.service.server:1364
Failed to initialize database `00870-16-0-without_demo`.
Traceback (most recent call last):
File "/data/build/odoo/odoo/service/server.py", line 1327, in preload_registries
registry = Registry.new(dbname, update_module=update_module)
File "<decorator-gen-16>", line 2, in new
File "/data/build/odoo/odoo/tools/func.py", line 87, in locked
return func(inst, *args, **kwargs)
File "/data/build/odoo/odoo/modules/registry.py", line 87, in new
odoo.modules.load_modules(registry, force_demo, status, update_module)
File "/data/build/odoo/odoo/modules/loading.py", line 493, in load_modules
processed_modules += load_marked_modules(cr, graph,
File "/data/build/odoo/odoo/modules/loading.py", line 374, in load_marked_modules
loaded, processed = load_module_graph(
File "/data/build/odoo/odoo/modules/loading.py", line 190, in load_module_graph
load_openerp_module(package.name)
File "/data/build/odoo/odoo/modules/module.py", line 471, in load_openerp_module
__import__('odoo.addons.' + module_name)
File "/data/build/kmitl/budget/__init__.py", line 3, in <module>
from . import models
File "/data/build/kmitl/budget/models/__init__.py", line 1, in <module>
from . import budget_template
File "/data/build/kmitl/budget/models/budget_template.py", line 128
<<<<<<< HEAD
^^
SyntaxError: invalid syntax
|
|