Merge lp://qastaging/~leondm-10/openerp-ccorp-trainings/leondnm-10 into lp://qastaging/openerp-ccorp-trainings/2012-06-ctp-technical-costa-rica
Proposed by
Daniel León Mongel
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~leondm-10/openerp-ccorp-trainings/leondnm-10 |
| Merge into: | lp://qastaging/openerp-ccorp-trainings/2012-06-ctp-technical-costa-rica |
| Diff against target: |
237 lines (+181/-1) (has conflicts) 7 files modified
cv_clearcorp/__init__.py (+4/-0) cv_clearcorp/__openerp__.py (+32/-0) leondm10/__init__.py (+6/-1) leondm10/__openerp__.py (+31/-0) leondm10/leondm10.py (+29/-0) leondm10/leondm10_menu.xml (+9/-0) leondm10/leondm_view.xml (+70/-0) Path conflict: cv_clearcorp / cv_clearcorp Text conflict in cv_clearcorp/__init__.py Text conflict in cv_clearcorp/__openerp__.py Path conflict: jose_ernesto_mendez / jose_ernesto_mendez Path conflict: leondm10 / leondm10 Text conflict in leondm10/__init__.py Text conflict in leondm10/__openerp__.py Path conflict: rr_clearcorp / rr_clearcorp |
| To merge this branch: | bzr merge lp://qastaging/~leondm-10/openerp-ccorp-trainings/leondnm-10 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Carlos Vásquez (ClearCorp) | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 7. By Daniel León Mongel
-
Ultimos cambios
- 6. By Daniel León Mongel
-
prueba
- 5. By Daniel León Mongel
-
Ultimos cambios
- 4. By Daniel León Mongel
-
commit con el merge de todos los brach
- 3. By Daniel León Mongel
-
Estoy actualizando por el cambio del nombre
- 2. By Daniel León Mongel
-
Esto es una prueba para agreagar los archivos __init__py, __
- 1. By Daniel León Mongel
-
Nueno Modulo leondm-10
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
