Review: Needs Fixing Hello Bharat,
Many conflicts are there. Remove conflicts. Thanks -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-split-sale-into-sale-and-sale_stock-atp-applying-changes-sale-stock-bde/+merge/114583 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-split-sale-into-sale-and-sale_stock-atp. _______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp

