lp:~dorian-kemps/unifield-server/US-1080
Created by
Dorian
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- UniField Reviewer Team: Pending requested
-
Diff: 2467 lines (+1684/-43) (has conflicts)15 files modifiedbin/addons/msf_doc_import/__openerp__.py (+1/-0)
bin/addons/msf_doc_import/wizard/__init__.py (+5/-0)
bin/addons/msf_doc_import/wizard/wizard_import_product_line.py (+313/-0)
bin/addons/msf_doc_import/wizard/wizard_import_product_line_view.xml (+38/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+466/-40)
bin/addons/product/__openerp__.py (+3/-1)
bin/addons/product/product.py (+29/-1)
bin/addons/product/report/__init__.py (+1/-0)
bin/addons/product/report/product_mass_update_export.py (+55/-0)
bin/addons/product/report/product_mass_update_export_view.xml (+14/-0)
bin/addons/product/report/product_mass_update_export_xls.mako (+146/-0)
bin/addons/product/wizard/__init__.py (+1/-0)
bin/addons/product/wizard/product_mass_update.py (+467/-0)
bin/addons/product/wizard/product_mass_update_view.xml (+139/-0)
bin/addons/product_attributes/product_attributes_view.xml (+6/-1)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:unifield-server