[MERGE] Web assets moved from manifests to ir.ui.view bundles

bzr revid: fme@openerp.com-20140430151509-mme5st89o1hj4zcs

diff --cc addons/point_of_sale/__openerp__.py
index 8b97062,149d4f0..79b4cbe
--- 1/addons/point_of_sale/__openerp__.py
--- 2/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@@ -70,13 -75,7 +70,14 @@@ Main Feature
          'account_statement_report.xml',
          'res_users_view.xml',
          'res_partner_view.xml',
 +        'views/report_statement.xml',
 +        'views/report_usersproduct.xml',
 +        'views/report_receipt.xml',
 +        'views/report_saleslines.xml',
 +        'views/report_detailsofsales.xml',
 +        'views/report_payment.xml',
 +        'views/report_sessionsummary.xml',
+         'views/point_of_sale.xml',
      ],
      'demo': [
          'point_of_sale_demo.xml',