[MERGE] Merged from the main trunk addons
bzr revid: ach@tinyerp.com-20100916132920-hzu8x69xwnz6lgyk
This commit is contained in:
commit
94457b04eb
|
@ -730,7 +730,7 @@ class account_bank_statement_line(osv.osv):
|
|||
'reconcile_amount': fields.function(_reconcile_amount,
|
||||
string='Amount reconciled', method=True, type='float'),
|
||||
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
|
||||
'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
|
||||
'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
|
||||
}
|
||||
_defaults = {
|
||||
'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
|
||||
|
|
|
@ -267,7 +267,7 @@ class account_cash_statement(osv.osv):
|
|||
super(account_cash_statement, self).write(cr, uid, ids, vals)
|
||||
res = self._get_starting_balance(cr, uid, ids)
|
||||
for rs in res:
|
||||
super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
|
||||
super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
|
||||
return True
|
||||
|
||||
def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
|
||||
|
|
|
@ -207,9 +207,9 @@
|
|||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
<filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
|
||||
<filter string="Parent Account" icon="terp-folder-green" domain="" context="{'group_by':'parent_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
|
||||
<filter string="Account Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
|
||||
<filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
|
||||
</group>
|
||||
</search>
|
||||
|
|
|
@ -179,7 +179,7 @@ class mailgate_message(osv.osv):
|
|||
|
||||
_columns = {
|
||||
'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
|
||||
'type':fields.selection([
|
||||
'server_type':fields.selection([
|
||||
('pop', 'POP Server'),
|
||||
('imap', 'IMAP Server'),
|
||||
], 'Server Type', select=True, readonly=True),
|
||||
|
|
|
@ -3,16 +3,18 @@
|
|||
"access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
|
||||
"access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
|
||||
"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
|
||||
"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
|
||||
"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
|
||||
"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
|
||||
"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0
|
||||
"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
|
||||
"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,0,0,0
|
||||
"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
|
||||
"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,1,1,1
|
||||
"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
|
||||
"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
|
||||
"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0
|
||||
"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
|
||||
"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
|
||||
"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
|
||||
|
|
|
|
@ -167,7 +167,7 @@ class idea_idea(osv.osv):
|
|||
'state': fields.selection([('draft', 'Draft'),
|
||||
('open', 'Opened'),
|
||||
('close', 'Accepted'),
|
||||
('cancel', 'Cancelled')],
|
||||
('cancel', 'Refused')],
|
||||
'State', readonly=True,
|
||||
help='When the Idea is created the state is \'Draft\'.\n It is \
|
||||
opened by the user, the state is \'Opened\'.\
|
||||
|
|
|
@ -69,31 +69,4 @@ class account_cash_statement(osv.osv):
|
|||
|
||||
account_cash_statement()
|
||||
|
||||
class account_bank_statement_line(osv.osv):
|
||||
|
||||
def _default_company(self, cr, uid, context={}):
|
||||
""" To get default company for the object"
|
||||
@param self: The object pointer
|
||||
@param cr: the current row, from the database cursor,
|
||||
@param uid: the current user’s ID for security checks,
|
||||
@param ids: List of bank statement ids
|
||||
@param context: A standard dictionary for contextual values
|
||||
@return: company
|
||||
"""
|
||||
|
||||
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
||||
if user.company_id:
|
||||
return user.company_id.id
|
||||
|
||||
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
|
||||
|
||||
_inherit = 'account.bank.statement.line'
|
||||
_columns = {
|
||||
'company_id':fields.many2one('res.company', 'Company', required=True),
|
||||
}
|
||||
_defaults = {
|
||||
'company_id': _default_company,
|
||||
}
|
||||
account_bank_statement_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -53,7 +53,7 @@ class subscription_document_fields(osv.osv):
|
|||
_rec_name = 'field'
|
||||
_columns = {
|
||||
'field': fields.many2one('ir.model.fields', 'Field', domain="[('model_id', '=', parent.model)]", required=True),
|
||||
'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40),
|
||||
'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40, help="User can set new values for the field when new document is generated"),
|
||||
'document_id': fields.many2one('subscription.document', 'Subscription Document', ondelete='cascade'),
|
||||
}
|
||||
_defaults = {}
|
||||
|
@ -77,9 +77,9 @@ class subscription_subscription(osv.osv):
|
|||
'exec_init': fields.integer('Number of documents'),
|
||||
'date_init': fields.datetime('First Date'),
|
||||
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
|
||||
'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
|
||||
'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"),
|
||||
'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
|
||||
'cron_id': fields.many2one('ir.cron', 'Cron Job'),
|
||||
'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which run on subscription"),
|
||||
'note': fields.text('Notes', help="Description or Summary of Subscription"),
|
||||
}
|
||||
_defaults = {
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
</record>
|
||||
|
||||
<record id="action_subscription_form" model="ir.actions.act_window">
|
||||
<field name="name">All Subscriptions</field>
|
||||
<field name="name">Subscriptions</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">subscription.subscription</field>
|
||||
<field name="view_type">form</field>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
|
||||
"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
|
||||
"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
|
||||
"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_user",1,1,1,1
|
||||
"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
|
||||
"access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
|
||||
"access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
|
||||
"access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
|
||||
|
@ -44,4 +44,8 @@
|
|||
"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
|
||||
"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
|
||||
"access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
|
||||
"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,
|
||||
"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,1
|
||||
"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
|
||||
"access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
|
||||
"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
|
||||
"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
|
||||
|
|
|
|
@ -60,7 +60,7 @@ class survey(osv.osv):
|
|||
'response_user': fields.integer('Maximum Answer per User',
|
||||
help="Set to one if you require only one Answer per user"),
|
||||
'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
|
||||
'responsible_id': fields.many2one('res.users', 'Responsible'),
|
||||
'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
|
||||
'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
|
||||
'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
|
||||
'note': fields.text('Description', size=128),
|
||||
|
|
|
@ -476,7 +476,6 @@
|
|||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="4" col="20">
|
||||
<filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
|
||||
<filter string="Page" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'title'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
@ -1106,7 +1105,7 @@
|
|||
<group expand="0" string="Group By..." colspan="4" col="20">
|
||||
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Survey" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'survey_id'}"/>
|
||||
<filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
</group>
|
||||
|
@ -1119,6 +1118,7 @@
|
|||
<field name="res_model">survey.request</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('user_id','=',uid)]</field>
|
||||
<field name="view_id" ref="survey_request_tree"></field>
|
||||
<field name="search_view_id" ref="survey_request_search"/>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue