Merge lp://staging/~fabien-morin/unifield-server/fm-us-2661-2619-merged into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Rejected |
|---|---|
| Rejected by: | jftempo |
| Proposed branch: | lp://staging/~fabien-morin/unifield-server/fm-us-2661-2619-merged |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
3157 lines (+2287/-125) 22 files modified
bin/addons/account_hq_entries/wizard/hq_entries_import.py (+9/-4) bin/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_budget/wizard/wizard_budget_import.py (+3/-0) 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 (+859/-0) bin/addons/msf_doc_import/msf_import_export_conf.py (+544/-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 (+99/-0) bin/addons/msf_doc_import/wizard/abstract_wizard_import.py (+28/-3) bin/addons/msf_profile/data/patches.xml (+4/-0) bin/addons/msf_profile/i18n/fr_MF.po (+401/-96) bin/addons/msf_profile/msf_profile.py (+26/-0) bin/addons/msf_tools/automated_import_job.py (+3/-2) bin/addons/product_nomenclature/product_nomenclature.py (+1/-1) bin/addons/res_currency_tables/wizard/import_currencies.py (+4/-0) bin/osv/orm.py (+66/-17) |
| To merge this branch: | bzr merge lp://staging/~fabien-morin/unifield-server/fm-us-2661-2619-merged |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 4415. By Fabien MORIN
-
US-2661-2619 [MERGE] with latest trunk
- 4414. By Fabien MORIN
-
US-2661-2619 [MERGE] with latest US-2661 improvments
- 4413. By Fabien MORIN
-
US-2661-2619 [MERGE] with latest 2661 improvments
- 4412. By Fabien MORIN
-
US-2661-2619 [MERGE] with latest 2661 improvments
- 4411. By Fabien MORIN
-
US-2661-2619 [MERGE] with latest 2661 improvments
- 4410. By Fabien MORIN
-
US-2661-2619 [MERGE] with 2661 latest improvments
- 4409. By Fabien MORIN
-
[IMP] do not allow new line character in the new import
- 4408. By Fabien MORIN
-
[MERGE] 2661 with 2619
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
