openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01753
Re: [Merge] lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
Review: Needs Fixing
Module product_multi_company should not be in addons, remove it.
Following files have conflicts
Text conflict in account/report/account_general_ledger_landscape.rml
Text conflict in account/report/account_partner_ledger.rml
Please correct the code and resubmit merge proposal.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/44786
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/pso-dev-addons3.
References