lp://staging/~jfb-tempo-consulting/unifield-server/us-11232

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/unifield-server at revision 6473

UniField Reviewer Team: Pending requested 2023-05-05

Diff: 3466 lines (+2635/-46) (has conflicts)

32 files modified

bin/addons/base/ir/ir_model.py (+1/-1)
bin/addons/base/ir/ir_rule.py (+1/-1)
bin/addons/base/res/res_user.py (+16/-0)
bin/addons/msf_audittrail/data/audittrail_data_products.yml (+26/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+625/-21)
bin/addons/msf_profile/msf_profile.py (+7/-3)
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+5/-1)
bin/addons/product/product.py (+38/-1)
bin/addons/product_asset/product_asset_view.xml (+1/-2)
bin/addons/product_attributes/__init__.py (+1/-0)
bin/addons/product_attributes/__openerp__.py (+2/-0)
bin/addons/product_attributes/product_attributes.py (+257/-0)
bin/addons/product_attributes/product_attributes_view.xml (+38/-0)
bin/addons/product_attributes/product_report.xml (+20/-0)
bin/addons/product_attributes/report/__init__.py (+2/-0)
bin/addons/product_attributes/report/product_mml.py (+99/-0)
bin/addons/product_attributes/report/unidata_sync_log.py (+24/-0)
bin/addons/product_attributes/unidata_sync.py (+880/-0)
bin/addons/product_attributes/unidata_sync.xml (+508/-0)
bin/addons/product_list/product_list.py (+2/-2)
bin/addons/register_accounting/wizard/wizard_liquidity_position.py (+0/-1)
bin/addons/stock/wizard/physical_inventory_import.py (+14/-0)
bin/addons/stock/wizard/physical_inventory_import_view.xml (+15/-0)
bin/addons/sync_client/update.py (+10/-0)
bin/addons/sync_common/common.py (+3/-0)
bin/addons/sync_server/rules.py (+4/-1)
bin/addons/sync_server/rules_view.xml (+1/-1)
bin/addons/sync_server/sync_server.py (+4/-0)
bin/addons/sync_server/update.py (+9/-0)
bin/osv/fields.py (+7/-0)
bin/osv/query.py (+13/-9)
bin/osv/xmlid_no_delete.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6476. By jftempo on 2023-05-05

French Translations

6475. By jftempo on 2023-05-05

French Translations

6474. By jftempo on 2023-05-04

Align UD/MSL log Product not found in UF

6473. By jftempo on 2023-05-04

Labels renamed

6472. By jftempo on 2023-04-28

Debug MML API

6471. By jftempo on 2023-04-28

Label

6470. By jftempo on 2023-04-28

Labels

6469. By jftempo on 2023-04-26

Rename MSL tab

6468. By jftempo on 2023-04-25

UD/MSL reports order

6467. By jftempo on 2023-04-25

Search product by active desc (duplicated msfid)