lp:~fabien-morin/unifield-server/fm-us-2619-2661-merged
Created by
Fabien MORIN
and last modified
- Get this branch:
- bzr branch lp:~fabien-morin/unifield-server/fm-us-2619-2661-merged
Only
Fabien MORIN
can upload to this branch. If you are
Fabien MORIN
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp:unifield-server
- UniField Reviewer Team: Pending requested
-
Diff: 2792 lines (+2080/-112)16 files modifiedbin/addons/base/i18n/fr.po (+12/-0)
bin/addons/base/ir/ir_actions.py (+1/-1)
bin/addons/import_data/import_data.py (+4/-1)
bin/addons/msf_doc_import/__init__.py (+1/-0)
bin/addons/msf_doc_import/__openerp__.py (+1/-0)
bin/addons/msf_doc_import/doc_import_report.xml (+11/-0)
bin/addons/msf_doc_import/msf_import_export.py (+792/-0)
bin/addons/msf_doc_import/msf_import_export_conf.py (+530/-0)
bin/addons/msf_doc_import/report/export_generic.mako (+137/-0)
bin/addons/msf_doc_import/report/import_generic_template.mako (+21/-0)
bin/addons/msf_doc_import/report/import_generic_template.py (+52/-0)
bin/addons/msf_doc_import/view/msf_import_export_view.xml (+96/-0)
bin/addons/msf_doc_import/wizard/abstract_wizard_import.py (+16/-3)
bin/addons/msf_profile/i18n/fr_MF.po (+364/-96)
bin/addons/product_nomenclature/product_nomenclature.py (+1/-1)
bin/osv/orm.py (+41/-10)
Branch information
Recent revisions
- 4325. By Fabien MORIN
-
US-2619-2661 [FIX] do not apply this change in the context of
sync_update_execution as both the import and the update execution uses the same
import_data method.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:unifield-server