openerp-community team mailing list archive

[Lorenzo Battistini <lorenzo.battistini@xxxxxxxxxxx>]

Hello,

we made some investigations on hotels modules.

We tried the modules at lp:hotel-management-system/7.0 
<https://code.launchpad.net/%7Ehotel-core-editors/hotel-management-system/7.0> 
but they seems to be for the 6.1 version, so not usable at all as are.

We tried the modules at lp:~serpentcs/hotel-management-system/hotel-7.0 
<https://code.launchpad.net/%7Eserpentcs/hotel-management-system/hotel-7.0> 
and they work.

I tried

~/workspace/openerp/7.0/hotel-management-system$ bzr merge lp:~serpentcs/hotel-management-system/hotel-7.0


but

Text conflict in hotel/__openerp__.py

Text conflict in hotel/hotel_view.xml

Conflict adding file hotel/static.  Moved existing file to hotel/static.moved.

Text conflict in hotel_reservation/__openerp__.py

4 conflicts encountered



So, Jay, where did you branch from when you created 
/lp:~serpentcs/hotel-management-system/hotel-7.0/ ?


My suggestion is: let's recreate /lp:hotel-management-system/7.0/ so that

bzr merge lp:~serpentcs/hotel-management-system/hotel-7.0

can work.

Meanwhile, let's work on 
/lp:~serpentcs/hotel-management-system/hotel-7.0/ in order to make it a 
bit more OCA compliant.
Finally, let's merge it into /lp:hotel-management-system/7.0/ so that 
everyone uses the same stable branch.