diff options
| author | Atul Patel (OpenERP) <atp@tinyerp.com> | 2012-05-09 17:12:10 +0530 |
|---|---|---|
| committer | Atul Patel (OpenERP) <atp@tinyerp.com> | 2012-05-09 17:12:10 +0530 |
| commit | 042e72de8d9c3f2838c6e1d443c83dc4da48c8c8 (patch) | |
| tree | e0419cb2d91230f8b41cbf1356496bc5271b46ba | |
| parent | b04b0d43ef0e9573c55bd4915b57281f43126841 (diff) | |
[FIX]: Fix alignment in kanban view. add accessrights for event.items.
bzr revid: atp@tinyerp.com-20120509114210-r3tp1nnn5rvoipqy
| -rw-r--r-- | addons/event/event_view.xml | 3 | ||||
| -rw-r--r-- | addons/event/static/src/css/event.css | 4 | ||||
| -rw-r--r-- | addons/event_sale/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/event_sale/event_sale_view.xml | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 23257cd8efe..6432a50542e 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -53,13 +53,14 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Events"> - <group col="6" colspan="4"> + <group col="8" colspan="4"> <field name="name"/> <field name="date_begin"/> <field name="date_end"/> <field name="type" on_change="onchange_event_type(type,context)"/> <field name="user_id"/> <field name="address_id" /> + <field name="location_id"/> </group> <notebook colspan="4"> <page string="Event"> diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css index d53770071d0..f898647db23 100644 --- a/addons/event/static/src/css/event.css +++ b/addons/event/static/src/css/event.css @@ -37,7 +37,7 @@ div.oe_fold_column{ border: 1px solid #ababab; color: #404040; font-size: 12px; - padding: 3px 10px; + padding: 0px !important; text-align: center; -o-background-size: 100% 100%; -moz-background-size: 100% 100%; @@ -117,7 +117,7 @@ div.oe_fold_column{ background-color: #DC5F59; } .no_of_seats{ - width:25px; + width:35px; } .oe_event_title{ font-size: 25px; diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index d8f689986e2..e235c31aa08 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -36,6 +36,7 @@ It defines a new kind of service products that offers you the possibility to cho 'author': 'OpenERP SA', 'depends': ['event','sale','sale_crm'], 'update_xml': [ + 'security/ir.model.access.csv', 'event_sale_view.xml', ], 'demo_xml': ['event_demo.xml'], diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index 1c2d520beb8..faaa157d356 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -127,9 +127,6 @@ </tree> </field> <newline/> - <div class="oe_right"> - <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/> - </div> </page> </xpath> </field> |