Merge lp://qastaging/~openerp-dev/openobject-server/7.0-opw-590950-ksa into lp://qastaging/openobject-server
Proposed by
Kirti Savalia(OpenERP)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~openerp-dev/openobject-server/7.0-opw-590950-ksa |
| Merge into: | lp://qastaging/openobject-server |
| Diff against target: |
1142 lines (+510/-26) (has conflicts) 10 files modified
openerp/addons/base/i18n/fr.po (+35/-1) openerp/addons/base/i18n/hu.po (+189/-0) openerp/addons/base/i18n/mn.po (+30/-0) openerp/addons/base/i18n/ro.po (+48/-2) openerp/addons/base/i18n/ru.po (+14/-0) openerp/addons/base/i18n/tr.po (+150/-8) openerp/addons/base/res/res_company.py (+29/-9) openerp/addons/base/res/res_partner_view.xml (+1/-1) openerp/report/render/rml2pdf/trml2pdf.py (+8/-4) openerp/service/workers.py (+6/-1) Text conflict in openerp/addons/base/i18n/fr.po Text conflict in openerp/addons/base/i18n/hu.po Text conflict in openerp/addons/base/i18n/mn.po Text conflict in openerp/addons/base/i18n/ro.po Text conflict in openerp/addons/base/i18n/ru.po Text conflict in openerp/addons/base/i18n/tr.po |
| To merge this branch: | bzr merge lp://qastaging/~openerp-dev/openobject-server/7.0-opw-590950-ksa |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Naresh(OpenERP) | Pending | ||
|
Review via email:
|
|||
Description of the change
Hello,
Fixed the issue when duplicate the company.
Thanks
KSA
To post a comment you must log in.
Unmerged revisions
- 4931. By Kirti Savalia(OpenERP)
-
[FIX]:The problem when you duplicate the company
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
