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

[MERGE] latest trunk 

bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
This commit is contained in:
Antonin Bourguignon 2012-08-13 17:26:04 +02:00
parent 381d97cbf2 36aaaf4a32
commit c06ff002b5
16 changed files with 80 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -277,18 +277,22 @@
<form string="Interview Appraisal" version="7.0">
<header>
<button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_highlight"/>
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" class="oe_highlight"/>
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to"/>
<button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
<button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
</header>
<sheet>
<div class="oe_right oe_button_box" name="button_box">
<button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_link"/>
</div>
<group>
<group>
<group col="3" colspan="1">
<field name="survey_id"/>
<button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<field name="user_to_review_id"/>
<label string=""/>
<field name="user_id" string="Interviewer"/>
</group>
<group>

14
addons/hr_holidays/hr_holidays_view.xml
View File

@ -340,7 +340,7 @@
<field name="name">Requests Approve</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
<field name="context">{'default_type': 'remove', 'search_default_approve':1}</field>
<field name="domain">[('type','=','remove')]</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
@ -507,7 +507,17 @@
</record>
<!-- Shortcuts -->
<act_window name="Leaves" domain="[('type','=','remove')]" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" res_model="hr.holidays" src_model="hr.employee" view_id="view_holiday" id="act_hr_employee_holiday_request"/>
<record id="act_hr_employee_holiday_request" model="ir.actions.act_window">
<field name="name">Leaves</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="src_model">hr.employee</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
<field name="domain">[('type','=','remove')]</field>
<field name="view_id" eval="view_holiday"/>
</record>
<!-- Assing leave -->

4
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -14,7 +14,7 @@
<field name="name"/>
<field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
<field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
<field name="amount" sum="Total cost" invisible="1"/>
<field name="general_account_id" invisible="1"/>
@ -42,7 +42,7 @@
<group>
<group string="Product">
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
<label string="Quantity" for="unit_amount"/>
<label string="Duration" for="unit_amount"/>
<div>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>

2
addons/portal/portal_data.xml
View File

@ -22,7 +22,7 @@
<!-- Mail group for the company's jobs -->
<record id="company_jobs" model="mail.group">
<field name="name">Company's jobs feed</field>
<field name="name">Company's jobs</field>
</record>
<record id="action_jobs" model="ir.actions.act_window">

13
addons/procurement/procurement_view.xml
View File

@ -309,5 +309,18 @@
</field>
</record>
<record model="ir.ui.view" id="product_form_view_procurement_button">
<field name="name">product.product.procurement</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='image_medium']" position="after">
<div class='oe_right oe_button_box'>
<button string="Procurement Request" name="%(act_make_procurement)d" type="action"/>
</div>
</xpath>
</field>
</record>
</data>
</openerp>

20
addons/procurement/wizard/make_procurement_product.py
View File

@ -110,12 +110,24 @@ class make_procurement(osv.osv_memory):
"""
if context is None:
context = {}
record_id = context and context.get('active_id', False) or False
record_id = context.get('active_id')
res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
if 'product_id' in fields:
res.update({'product_id':product_id})
if record_id and 'product_id' in fields:
proxy = self.pool.get('product.product')
product_ids = proxy.search(cr, uid, [('id', '=', record_id)], context=context, limit=1)
if product_ids:
product_id = product_ids[0]
product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
res['product_id'] = product.id
res['uom_id'] = product.uom_id.id
if 'warehouse_id' in fields:
warehouse_id = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
res['warehouse_id'] = warehouse_id[0] if warehouse_id else False
return res
make_procurement()

4
addons/procurement/wizard/make_procurement_view.xml
View File

@ -14,9 +14,9 @@
<group>
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="qty"/>
<field name="uom_id"/>
<field name="uom_id" groups="product.group_uom"/>
<field name="date_planned"/>
<field name="warehouse_id"/>
<field name="warehouse_id" groups="stock.group_locations"/>
</group>
<footer>
<button name="make_procurement" string="Ask New Products" type="object" class="oe_highlight" />

2
addons/product/product.py
View File

@ -602,6 +602,8 @@ class product_product(osv.osv):
def name_get(self, cr, user, ids, context=None):
if context is None:
context = {}
if isinstance(ids, (int, long)):
ids = [ids]
if not len(ids):
return []
def _name_get(d):

2
addons/sale_crm/wizard/crm_make_sale_view.xml
View File

@ -11,7 +11,7 @@
<form string="Convert to Quotation" version="7.0">
<group col="4">
<field name="partner_id" required="1"/>
<field name="shop_id" required="1" widget="selection"/>
<field name="shop_id" required="1" widget="selection" groups="stock.group_locations"/>
<field name="close"/>
</group>
<footer>

6
addons/stock/product_view.xml
View File

@ -133,7 +133,7 @@
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('product_id','=',active_id),('picking_id.type','=','in')]</field>
<field name="domain">[('picking_id.type','=','in')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
<field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
@ -154,7 +154,7 @@
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('product_id','=',active_id),('picking_id.type','=','out')]</field>
<field name="domain">[('picking_id.type','=','out')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
<field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
@ -190,7 +190,7 @@
<div class="oe_product_desc">
<h4><a type="edit"><field name="name"></field></a></h4>
<ul>
<li>Code: <field name="code"/></li>
<li t-if="record.code.raw_value">Code: <field name="code"/></li>
<li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
<li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
<li>Price: <field name="lst_price"></field></li>

1
addons/stock/security/ir.model.access.csv
View File

@ -22,6 +22,7 @@ access_stock_production_lot_user,stock.production.lot user,model_stock_productio
access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0
access_stock_move_warehouse_manager,stock.move.manager,model_stock_move,stock.group_stock_manager,1,1,1,1
access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0
access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
22 access_stock_production_lot_revision stock.production.lot.revision model_stock_production_lot_revision stock.group_stock_user 1 1 1 1
23 access_stock_move_manager stock.move manager model_stock_move stock.group_stock_manager 1 1 0 0
24 access_stock_move_user stock.move user model_stock_move stock.group_stock_user 1 0 0 0
25 access_stock_move_warehouse_manager stock.move.manager model_stock_move stock.group_stock_manager 1 1 1 1
26 access_stock_inventory_user stock.inventory user model_stock_inventory stock.group_stock_user 1 0 0 0
27 access_stock_inventory_manager stock.inventory manager model_stock_inventory stock.group_stock_manager 1 1 1 1
28 access_stock_inventory_line_user stock.inventory.line user model_stock_inventory_line stock.group_stock_user 1 0 0 0

28
addons/survey/survey_view.xml
View File

@ -3,13 +3,11 @@
<data>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Define Surveys" id="menu_define_survey"
groups="base.group_tool_manager"
parent="menu_surveys" />
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6"/>
<menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
<menuitem id="base.next_id_10" name="Survey" parent="base.menu_reporting" sequence="1" />
<!--
Survey
@ -314,7 +312,7 @@
</ul>
</div>
<div class="oe_kanban_content">
<h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"><field name="title"/></t></h3>
<h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"></t></h3>
<div class="oe_survey_responsible">
<t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
</div><br/>
@ -361,8 +359,8 @@
<menuitem name="Surveys" id="menu_survey_form"
action="action_survey_form1" parent="menu_define_survey"
groups="base.group_tool_manager"/>
action="action_survey_form1" parent="menu_surveys"
groups="base.group_tool_manager" sequence="1"/>
<!--
Survey Pages
@ -576,8 +574,8 @@
</record>
<menuitem name="Survey Pages" id="menu_survey_page_form1"
action="action_survey_page_form" parent='menu_define_survey'
groups="base.group_tool_manager"/>
action="action_survey_page_form" parent="menu_surveys"
groups="base.group_no_one"/>
<record model="ir.ui.view" id="survey_page_wizard_test1">
<field name="name">survey_page_wizard_test</field>
@ -1210,8 +1208,8 @@
</record>
<menuitem name="Survey Requests" id="menu_survey_type_form1"
action="action_survey_request_tree" parent='menu_answer_surveys'
groups="base.group_tool_manager"/>
action="action_survey_request_tree" parent="menu_surveys"
groups="base.group_tool_manager" sequence="3"/>
<!--
Survey Type
@ -1277,8 +1275,12 @@
res_model="survey.answer"
src_model="survey.question"/>
<menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
action="action_view_survey_name" parent="menu_answer_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user" icon="STOCK_INDEX"/>
<act_window
context="{'search_default_survey_id': active_id, 'default_survey_id': active_id}"
id="act_survey_request"
name="Survey Requests"
res_model="survey.request"
src_model="survey"/>
</data>
</openerp>

2
addons/survey/wizard/survey_browse_answer.xml
View File

@ -36,7 +36,7 @@
</record>
<menuitem name="Browse Answers" id="menu_browse_survey_response"
action="action_browse_survey_response" parent="menu_reporting"
action="action_browse_survey_response" parent="base.next_id_10"
groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
</data>

2
addons/survey/wizard/survey_print.xml
View File

@ -39,7 +39,7 @@
</record>
<menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
action="action_view_survey_print" parent="menu_reporting"
action="action_view_survey_print" parent="base.next_id_10"
groups="base.group_tool_manager" icon="STOCK_PRINT"/>
</data>

2
addons/survey/wizard/survey_print_answer.xml
View File

@ -40,7 +40,7 @@
</record>
<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
parent="base.next_id_10" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
</data>
</openerp>

2
addons/survey/wizard/survey_print_statistics.xml
View File

@ -32,7 +32,7 @@
</record>
<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
parent="base.next_id_10" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
</data>
</openerp>