Merge lp://staging/~mukunde/unifield-server/US-9389 into lp://staging/unifield-server
Proposed by
jftempo
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~mukunde/unifield-server/US-9389 |
Merge into: | lp://staging/unifield-server |
Diff against target: |
1839 lines (+1229/-19) (has conflicts) 16 files modified
bin/addons/account/__openerp__.py (+1/-0) bin/addons/account/account_report.xml (+13/-0) bin/addons/account/report/__init__.py (+1/-0) bin/addons/account/report/export_cv.mako (+206/-0) bin/addons/account/report/export_cv.py (+34/-0) bin/addons/account/report/export_invoice.mako (+82/-0) bin/addons/account/wizard/__init__.py (+1/-0) bin/addons/account/wizard/account_cv_import.py (+394/-0) bin/addons/account/wizard/account_cv_import.xml (+49/-0) bin/addons/account/wizard/account_invoice_import.py (+74/-3) bin/addons/account/wizard/account_invoice_import.xml (+2/-2) bin/addons/analytic_distribution/account_commitment.py (+32/-5) bin/addons/analytic_distribution/account_commitment_view.xml (+7/-0) bin/addons/analytic_distribution/analytic_distribution.py (+12/-1) bin/addons/base/ir/ir_model.py (+4/-1) bin/addons/msf_profile/i18n/fr_MF.po (+317/-7) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
To merge this branch: | bzr merge lp://staging/~mukunde/unifield-server/US-9389 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+428378@code.staging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 6284. By Gaël Mukunde
-
US-9732 [MERGE] lp:~jfb-tempo-consulting/unifield-server/US-9389
- 6283. By Gaël Mukunde
-
US-9732 [IMP] Set AD cell editable if it contains SPLIT.