Hi Joao Alfredo Gama Batista, Thanks for inform me.
All the conflicts has been resolved, you can see in my latest revision. Thank you. -- https://code.launchpad.net/~serpentcs/openerp-isp/serpentcs_openerp-isp_7.0/+merge/190563 Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:openerp-isp. -- Mailing list: https://launchpad.net/~savoirfairelinux-openerp Post to : [email protected] Unsubscribe : https://launchpad.net/~savoirfairelinux-openerp More help : https://help.launchpad.net/ListHelp
