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

[MERGE] addons 24 

bzr revid: fp@openerp.com-20121127212322-soubdlrcgqx4cz88
This commit is contained in:
Fabien Pinckaers 2012-11-27 22:23:22 +01:00
parent d5d270e9a3 00477a3149
commit 10afab6eb6
10 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -60,14 +60,13 @@
or view
</span>
<span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
<span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
No order to invoice, create
</span>
<button name="%(action_sales_order)d" string="Sale Orders"
type="action"
class="oe_link"
context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
/>
/></span>
</td>
</tr><tr>
<td class="oe_timesheet_grey">

2
addons/account_voucher/account_voucher_view.xml
View File

@ -174,7 +174,7 @@
<field name="view_id" ref="view_voucher_form"/>
<field name="act_window_id" ref="action_voucher_list"/>
</record>
<menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
<menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6" groups="base.group_no_one"/>
<act_window
id="act_journal_voucher_open"

1
addons/hr/hr_view.xml
View File

@ -227,6 +227,7 @@
<field name="department_id"/>
<field name="job_id"/>
<field name="coach_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
</record>

4
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -305,11 +305,9 @@
'default_subject': 'Reminder to fill up Survey' }"/>
</div>
<group>
<group col="3" colspan="1">
<group>
<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>

2
addons/hr_holidays/hr_holidays.py
View File

@ -143,7 +143,7 @@ class hr_holidays(osv.osv):
'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -67,7 +67,7 @@ class account_analytic_line(osv.osv):
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
raise osv.except_osv(_('Analytic Account incomplete !'),
_('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
_('Contract incomplete. Please fill in the Customer and Pricelist fields.'))

1
addons/hr_timesheet_sheet/static/src/js/timesheet.js
View File

@ -14,6 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
date_to: false,
date_from: false,
});
this.updating = true;
this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
this.field_manager.on("field_changed:date_from", this, function() {
this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});

2
addons/lunch/lunch_view.xml
View File

@ -389,7 +389,7 @@
<field name="name">cashmove tree</field>
<field name="model">lunch.cashmove</field>
<field name="arch" type="xml">
<tree string="cashmove tree">
<tree string="cashmove tree" create="false">
<field name="date"/>
<field name="user_id"/>
<field name="description"/>

2
addons/mail/mail_thread_view.xml
View File

@ -67,7 +67,7 @@
'read_action': 'read', }&quot;"/>
<field name="help" type="html">
<p>
<b>No todo!</b>
<b>No todo.</b>
</p><p>
When you process messages in your inbox, you can mark some
as <i>todo</i>. From this menu, you can process all your todo.

2
addons/project_issue_sheet/project_issue_sheet_view.xml
View File

@ -23,7 +23,7 @@
<tree editable="top" string="Timesheets">
<field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
<field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
<field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)" groups="analytic.group_analytic_accounting"/>
<field name="date"/>
<field name="user_id"/>
<field invisible="1" name="journal_id"/>