JF Aubert
047f2e556f
stdout: stderr: 13:41:03.985365 git.c:344 trace: built-in: git cherry-pick 20858c2a8805d9ec08edb98b090badf6c73fc342 error: Cherry-picking is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed ---------- status: closes odoo/odoo#79933 Signed-off-by: William Henrotin (whe) <whe@odoo.com>
9 lines
232 B
Python
9 lines
232 B
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from . import stock_picking
|
|
from . import res_company
|
|
from . import stock_warehouse
|
|
from . import purchase
|
|
from . import stock_rule
|