Merge lp:~openerp-dev/openobject-addons/trunk-bug-1199759-ssh into lp:openobject-addons

[Sunil Sharma(OpenERP)]

Hello,

       I have fix this bug, Traceback on deleting draft cash register linked with a pos session.

Thanks
Sunil Sharma (SSH)

[lp:~openerp-dev/openobject-addons/trunk-bug-1199759-ssh]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

Unmerged revisions

9110. By Sunil Sharma(OpenERP) on 2014-02-07

[imp]:point_of_sale:remove store=true

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2014-01-27 16:09:46 +0000
+++ point_of_sale/point_of_sale.py	2014-02-07 12:56:41 +0000
@@ -236,7 +236,7 @@
         'cash_register_id' : fields.function(_compute_cash_all,
                                              multi='cash',
                                              type='many2one', relation='account.bank.statement',
-                                             string='Cash Register', store=True),
+                                             string='Cash Register'),
 
         'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids', 
                 type='one2many', relation='account.cashbox.line',