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

[IMP]delivery,hr_timesheet,lunch,users_ldap:Improvement is Done and a installer in user_ldap 

bzr revid: mma@tinyerp.com-20110604095246-vpd2gdecslk5wd73
This commit is contained in:
mayur maheshwari (Open ERP) 2011-06-04 15:22:46 +05:30
parent c62654c1c7
commit 4447c691a2
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/delivery/delivery_view.xml
View File

@ -35,9 +35,9 @@
<field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
</group>
<newline/>
<field name="use_detailed_pricelist"/>
<field name="use_detailed_pricelist" />
</group>
<field name="pricelist_ids" nolabel="1"/>
<field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}"/>
</form>
</field>
</record>

2
addons/hr_timesheet/hr_timesheet_demo.xml
View File

@ -7,7 +7,7 @@
<field name="standard_price">30.0</field>
<field name="uom_id" ref="product.uom_hour"/>
<field name="uom_po_id" ref="product.uom_hour"/>
<field name="name">Service on Timesheet</field>
<field name="name">consultant</field>
<field name="categ_id" ref="product.cat0"/>
<field name="type">service</field>
<field eval="False" name="purchase_ok"/>

17
addons/lunch/lunch_view.xml
View File

@ -24,14 +24,22 @@
<field name="model">lunch.order</field>
<field name="arch" type="xml">
<form string="Order">
<group colspan="2" col="4">
<group col="4" colspan="4">
<field name="user_id" select="1"/>
<field name="date" select="1"/>
<field name="product" select="1" on_change="onchange_product(product)"/>
<field name="category"/>
</group>
<group col="4" colspan="4">
<field name="product" select="1" on_change="onchange_product(product)"/>
<field name="category"/>
<field name="cashmove"/>
<field name="descript"/>
</group>
<group col="4" colspan="6" >
<field name="price"/>
<field name="cashmove"/>
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok"/>
<button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
</group>
<group col="2" colspan="4">
<field name="state"/>
</group>
</form>
@ -187,7 +195,6 @@
<search string="Search CashMove">
<filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="user_cashmove"/>
<field name="create_date"/>
<newline/>

7
addons/lunch/wizard/lunch_order_cancel_view.xml
View File

@ -30,11 +30,6 @@
<field name="view_id" ref="view_lunch_order_cancel"/>
<field name="target">new</field>
</record>
<act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order"
res_model="lunch.order.cancel" src_model="lunch.order"
view_mode="form" target="new" view_type="form"/>
</data>
</openerp>

5
addons/lunch/wizard/lunch_order_confirm_view.xml
View File

@ -33,10 +33,5 @@
<field name="target">new</field>
</record>
<act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order"
res_model="lunch.order.confirm" src_model="lunch.order"
view_mode="form" target="new" view_type="form"/>
</data>
</openerp>

1
addons/users_ldap/__init__.py
View File

@ -19,5 +19,6 @@
##############################################################################
import users_ldap
import installer
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/users_ldap/__openerp__.py
View File

@ -40,6 +40,7 @@ This module only works with Unix/Linux.
],
"update_xml" : [
"users_ldap_view.xml",
"user_ldap_installer.xml",
],
"active": False,
"installable": True,