diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 662fdda69d5..53c08525a6a 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -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'), diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index daf2f9ba8f2..8cdb20aa225 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -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={}): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 5e4e7aa2ccb..9496be9916e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -207,9 +207,9 @@ - + - + diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index e9dc2b95767..cd25a5f1883 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -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), diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 1a9331779df..a9fb4fdaae3 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -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 diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 9a07b28c0b0..b7b7840a3f5 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -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\'.\ diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py index 8f5f33c9107..395319eeb64 100644 --- a/addons/point_of_sale/account_bank_statement.py +++ b/addons/point_of_sale/account_bank_statement.py @@ -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: diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py index 934f1a42707..8fa330b1fb5 100644 --- a/addons/subscription/subscription.py +++ b/addons/subscription/subscription.py @@ -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 = { diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index 0c416c86a20..abe58ced56d 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -101,7 +101,7 @@ - All Subscriptions + Subscriptions ir.actions.act_window subscription.subscription form diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv index 10c07dc0b08..9d7c9c44ee4 100644 --- a/addons/survey/security/ir.model.access.csv +++ b/addons/survey/security/ir.model.access.csv @@ -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 diff --git a/addons/survey/survey.py b/addons/survey/survey.py index d1d392c5479..61d96f792f8 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -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), diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index ec3b1677db6..2aa3eac089d 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -476,7 +476,6 @@ - @@ -1106,7 +1105,7 @@ - + @@ -1119,6 +1118,7 @@ survey.request form tree,form + [('user_id','=',uid)]