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

[MERGE] merge some branches for the addons issues 4 

bzr revid: stw@openerp.com-20120822141810-lnnivl4w4vr1sumr
This commit is contained in:
Stephane Wirtel 2012-08-22 16:18:10 +02:00
parent 079b425d11 a598e04752
commit 73ed592657
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/base_calendar/crm_meeting_demo.xml
View File

@ -27,7 +27,7 @@
<field eval="time.strftime('%Y-%m-05 12:00:00')" name="date"/>
<field eval="time.strftime('%Y-%m-05 19:00:00')" name="date_deadline"/>
<field eval="7.0" name="duration"/>
<field name="state">draft</field>
<field name="state">open</field>
</record>
<record id="crm_meeting_3" model="crm.meeting">
@ -39,7 +39,7 @@
<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
<field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
<field eval="3.0" name="duration"/>
<field name="state">done</field>
<field name="state">open</field>
</record>
<record id="crm_meeting_4" model="crm.meeting">
@ -61,7 +61,7 @@
<field eval="time.strftime('%Y-%m-22 11:05:00')" name="date"/>
<field eval="time.strftime('%Y-%m-22 16:05:00')" name="date_deadline"/>
<field eval="5" name="duration"/>
<field name="state">draft</field>
<field name="state">open</field>
</record>
<record id="crm_meeting_6" model="crm.meeting">
@ -72,7 +72,7 @@
<field eval="time.strftime('%Y-%m-18 2:00:00')" name="date"/>
<field eval="time.strftime('%Y-%m-18 10:30:00')" name="date_deadline"/>
<field eval="8.5" name="duration"/>
<field name="state">done</field>
<field name="state">open</field>
</record>
</data>
</openerp>

10
addons/base_calendar/crm_meeting_view.xml
View File

@ -70,7 +70,7 @@
<field name="arch" type="xml">
<form string="Meetings" version="7.0">
<header>
<field name="state"/>
<field name="state" invisible="True"/>
</header>
<sheet>
<div class="oe_title">
@ -115,7 +115,7 @@
<label for="allday" string="All Day?"/>)
</div>
<field name="recurrency"
attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
</group>
<group>
<field name="alarm_id" widget="selection" />
@ -171,7 +171,6 @@
<button string="Invite People"
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
icon="terp-partner" type="action"
attrs="{'readonly': [('state', '=', 'done')]}"
context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
<field name="attendee_ids" widget="one2many" mode="tree">
<tree string="Invitation details" editable="top">
@ -245,12 +244,11 @@
<field name="name">CRM - Meetings Tree</field>
<field name="model">crm.meeting</field>
<field name="arch" type="xml">
<tree string="Meetings" fonts="bold:needaction_pending==True"
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<tree string="Meetings" fonts="bold:needaction_pending==True">
<field name="name" string="Subject" />
<field name="user_id"/>
<field name="date"/>
<field name="state"/>
<field name="state" invisible="True"/>
<field name="duration" />
<field name="needaction_pending" invisible="1"/>
</tree>

2
addons/hr_holidays/hr_holidays.py
View File

@ -274,7 +274,7 @@ class hr_holidays(osv.osv):
'date': record.date_from,
'end_date': record.date_to,
'date_deadline': record.date_to,
'state': 'done', # to block that meeting date in the calendar
'state': 'open', # to block that meeting date in the calendar
}
meeting_id = meeting_obj.create(cr, uid, meeting_vals)
self._create_resource_leave(cr, uid, [record], context=context)

6
addons/purchase/security/ir.model.access.csv
View File

@ -6,7 +6,7 @@ access_purchase_order_line_manager,purchase.order.line manager,model_purchase_or
access_stock_location_purchase_user,stock.location,stock.model_stock_location,group_purchase_user,1,0,0,0
access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0
access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1
access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,0,0,0
access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,0
access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0
access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0
access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0
@ -19,7 +19,7 @@ access_stock_picking_purchase_user_manager,stock.picking,stock.model_stock_picki
access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,group_purchase_manager,1,1,1,1
access_account_tax_purchase_user_manager,account.tax,account.model_account_tax,group_purchase_manager,1,0,0,0
access_product_product_purchase_user,product.product.purchase.user,product.model_product_product,group_purchase_user,1,0,0,0
access_product_product_purchase_manager,product.product.purchase.manager,product.model_product_product,group_purchase_manager,1,0,0,0
access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
@ -49,7 +49,6 @@ access_product_uom_purchase_manager,product.uom purchase_manager,product.model_p
access_product_ul_purchase_manager,product.ul purchase_manager,product.model_product_ul,purchase.group_purchase_manager,1,1,1,1
access_product_category_purchase_manager,product.category purchase_manager,product.model_product_category,purchase.group_purchase_manager,1,1,1,1
access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
access_product_supplierinfo_purchase_manager,product.supplierinfo purchase_manager,product.model_product_supplierinfo,purchase.group_purchase_manager,1,1,1,1
access_pricelist_partnerinfo_purchase_manager,pricelist.partnerinfo purchase_manager,product.model_pricelist_partnerinfo,purchase.group_purchase_manager,1,1,1,1
@ -65,3 +64,4 @@ access_account_journal_purchase_manager,account.journal purchase manager,account
access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
6 access_stock_location_purchase_user stock.location stock.model_stock_location group_purchase_user 1 0 0 0
7 access_stock_warehouse_purchase_user stock.warehouse stock.model_stock_warehouse group_purchase_user 1 0 0 0
8 access_stock_picking_purchase_user stock.picking stock.model_stock_picking group_purchase_user 1 1 1 1
9 access_stock_move_purchase_user stock.move stock.model_stock_move group_purchase_user 1 0 1 0 1 0
10 access_purchase_order_stock_worker purchase.order model_purchase_order stock.group_stock_user 1 0 0 0
11 access_purchase_order_line_stock_worker purchase.order.line model_purchase_order_line stock.group_stock_user 1 0 0 0
12 access_account_tax_purchase_user account.tax account.model_account_tax group_purchase_user 1 0 0 0
19 access_stock_move_purchase_user_manager stock.move stock.model_stock_move group_purchase_manager 1 1 1 1
20 access_account_tax_purchase_user_manager account.tax account.model_account_tax group_purchase_manager 1 0 0 0
21 access_product_product_purchase_user product.product.purchase.user product.model_product_product group_purchase_user 1 0 0 0
22 access_product_product_purchase_manager product.product.purchase.manager product.product purchase_manager product.model_product_product group_purchase_manager purchase.group_purchase_manager 1 0 1 0 1 0 1
23 access_product_template_purchase_user product.template purchase_user product.model_product_template group_purchase_user 1 0 0 0
24 access_product_template_purchase_manager product.template purchase_manager product.model_product_template group_purchase_manager 1 0 0 0
25 access_account_invoice_purchase account_invoice purchase account.model_account_invoice group_purchase_user 1 1 1 1
49 access_product_ul_purchase_manager product.ul purchase_manager product.model_product_ul purchase.group_purchase_manager 1 1 1 1
50 access_product_category_purchase_manager product.category purchase_manager product.model_product_category purchase.group_purchase_manager 1 1 1 1
51 access_product_template_purchase_manager product.template purchase_manager product.model_product_template purchase.group_purchase_manager 1 1 1 1
access_product_product_purchase_manager product.product purchase_manager product.model_product_product purchase.group_purchase_manager 1 1 1 1
52 access_product_packaging_purchase_manager product.packaging purchase_manager product.model_product_packaging purchase.group_purchase_manager 1 1 1 1
53 access_product_supplierinfo_purchase_manager product.supplierinfo purchase_manager product.model_product_supplierinfo purchase.group_purchase_manager 1 1 1 1
54 access_pricelist_partnerinfo_purchase_manager pricelist.partnerinfo purchase_manager product.model_pricelist_partnerinfo purchase.group_purchase_manager 1 1 1 1
64 access_stock_tracking_purchase_user stock.tracking purchase.user stock.model_stock_tracking purchase.group_purchase_user 1 1 1 0
65 access_stock_location_purchase_manager stock.location purchase manager stock.model_stock_location purchase.group_purchase_manager 1 0 0 0
66 access_stock_warehouse_orderpoint_manager stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint purchase.group_purchase_manager 1 0 0 0
67 access_stock_warehouse_orderpoint_manager stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint group_purchase_user 1 0 0 0