Cedric Snauwaert 498a30bf62 [FIX]fix conflict problem for event/event_view.xml in order to match current trunk ...

bzr revid: csn@openerp.com-20121031110228-pvnkce2c6fdsfkuv

2012-10-31 12:02:28 +01:00

..

i18n

Launchpad automatic translations update.

2012-10-30 05:37:00 +00:00

report

[MERGE] trunk-bug-1024145-abo: fix an issue in event reporting due to a missing outer join in the psql view

2012-10-11 16:54:27 +02:00

security

[IMP]User : Access rights in changed menu name

2012-09-19 14:21:03 +05:30

static/src

[MERGE] events improvements

2012-10-13 12:40:45 +02:00

test

[IMP]: Improved partner demo xml_id referenced based on changes in server

2012-06-20 17:33:05 +05:30

wizard

[MERGE] trunk

2012-10-02 12:29:15 +02:00

__init__.py

…

__openerp__.py

[MERGE] chm - improved subtype - fixes

2012-10-02 22:40:23 +02:00

board_association_view.xml

[IMP] removing some board stuff

2012-09-06 17:23:03 +02:00

email_template.xml

[REM] email.template: remove all text versions of demo/data templates

2012-09-04 15:28:03 +02:00

event_data.xml

[MERGE] chm - improved subtype - fixes

2012-10-02 22:40:23 +02:00

event_demo.xml

[FIX]: event: Fixed demo file for event, kept it as xml than yml

2012-07-13 16:30:16 +05:30

event_view.xml

[FIX]fix conflict problem for event/event_view.xml in order to match current trunk

2012-10-31 12:02:28 +01:00

event.py

[MERGE] typo

2012-10-24 22:18:59 +02:00

res_partner_view.xml

[FIX]event:typo

2012-09-25 15:23:01 +05:30

res_partner.py

…