Merge lp://staging/~openerp-commiter/openobject-training/6.1-migration-kbh into lp://staging/~openerp-commiter/openobject-training/6.1
Proposed by
Khushboo Bhatt(openerp)
| Status: | Merged |
|---|---|
| Merged at revision: | 2685 |
| Proposed branch: | lp://staging/~openerp-commiter/openobject-training/6.1-migration-kbh |
| Merge into: | lp://staging/~openerp-commiter/openobject-training/6.1 |
| Diff against target: |
1026 lines (+250/-165) 16 files modified
base_contact_team/__init__.py (+21/-0) base_contact_team/__openerp__.py (+21/-0) base_contact_team/base_contact_team.py (+22/-2) core_config/ir_config.py (+4/-5) document_type/__init__.py (+21/-1) document_type/document_directory.py (+20/-4) document_type/document_type.py (+1/-2) document_type/document_type_view.xml (+3/-2) document_type/ir_attachment.py (+1/-2) training/base_contact_view.xml (+2/-4) training/document_price.py (+3/-4) training/partner.py (+7/-8) training/security/ir.model.access.csv (+0/-1) training/training.py (+111/-117) training/training_content_review.py (+9/-11) training/training_view.xml (+4/-2) |
| To merge this branch: | bzr merge lp://staging/~openerp-commiter/openobject-training/6.1-migration-kbh |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Committers | Pending | ||
|
Review via email:
|
|||
Description of the change
hello,
I have added coding utf-8 in document_type and base_contact team module.
search view of training course updated.
Thank you,
KBH.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
