odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]: Improve css file. Improve view. 

bzr revid: atp@tinyerp.com-20120505173340-1jmgy4clza1gy6sh
This commit is contained in:
Atul Patel (OpenERP) 2012-05-05 23:03:40 +05:30
parent aab3d7379d
commit 0a09dbed34
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/event/event_view.xml
View File

@ -159,7 +159,7 @@
</div> </div>
<newline/> <newline/>
<group colspan="4" name="venue"> <group colspan="4" name="venue">
<div class="oe_sub1"> Venue : </div> <separator orientation="vertical"/> <div class="oe_sub1"> Venue : </div>
<field name="location_id" nolabel="1" readonly="1"/> <field name="location_id" nolabel="1" readonly="1"/>
</group> </group>
</group> </group>
@ -187,9 +187,10 @@
</tr> </tr>
</table> </table>
</group> </group>
</group> </group>
<separator string="Event Details" colspan="4"/> <separator string="" colspan="4"/>
<field name="note" colspan="4" nolabel="1" readonly="1"/> <label string="Event Details:" colspan="4"/>
<field name="note" colspan="4" nolabel="1" readonly="1"/>
</sheet> </sheet>
</form> </form>
</field> </field>

7
addons/event/static/src/css/event.css
View File

@ -125,6 +125,9 @@ div.oe_fold_column{
.oe_sub1 .oe_sub1
{ {
float:left; float:left;
height:50px;
border-right: 1px solid black;
border-color: #DCDCDC;
} }
.oe_mapbox .oe_mapbox
{ {
@ -133,6 +136,7 @@ div.oe_fold_column{
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
text-align: right; text-align: right;
} }
.oe_td_border .oe_td_border
{ {
@ -140,9 +144,12 @@ div.oe_fold_column{
padding: 2px; padding: 2px;
border-right: 1px solid black; border-right: 1px solid black;
text-align: center; text-align: center;
border-color: #DCDCDC;
} }
.oe_td_date_border .oe_td_date_border
{ {
border-right:1px solid black; border-right:1px solid black;
border-color: #DCDCDC;
} }

5
addons/event_sale/event_sale.py
View File

@ -179,8 +179,9 @@ class event_items(osv.osv):
_columns = { _columns = {
'product_id': fields.many2one('product.product', 'Product', required=True), 'product_id': fields.many2one('product.product', 'Product', required=True),
'price': fields.integer('Price'), 'price': fields.integer('Price'),
'max_qty': fields.integer('Max.Quantity available'), #Need to convert this integer field in to dynamic selection.. TODO
'qty': fields.integer('QTY', type ='integer'), # 'max_qty': fields.integer('Max.Quantity available'),
'qty': fields.integer('Quantity'),
'uom_id': fields.many2one('product.uom', 'UoM'), 'uom_id': fields.many2one('product.uom', 'UoM'),
'discount': fields.integer('Discount'), 'discount': fields.integer('Discount'),
'event_id': fields.many2one('event.event', 'Event'), 'event_id': fields.many2one('event.event', 'Event'),

6
addons/event_sale/event_sale_view.xml
View File

@ -42,8 +42,8 @@
<field name="product_id" readonly="1" /> <field name="product_id" readonly="1" />
<field name="sales_end_date" readonly="1"/> <field name="sales_end_date" readonly="1"/>
<field name="price" readonly="1"/> <field name="price" readonly="1"/>
<field name="max_qty" readonly="1" groups="event.group_event_manager"/> <!-- <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
<field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/> <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
</tree> </tree>
</field> </field>
<newline/> <newline/>
@ -68,7 +68,7 @@
<field name="product_id" string="Ticket Type" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/> <field name="product_id" string="Ticket Type" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
<field name="sales_end_date" /> <field name="sales_end_date" />
<field name="price"/> <field name="price"/>
<field name="max_qty" groups="event.group_event_manager"/> <!-- <field name="max_qty" groups="event.group_event_manager"/> -->
<field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/> <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
</tree> </tree>
</field> </field>