From ed1e9ddf7518d3bea49633fa4a6af060918cc928 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Mon, 21 Jun 2010 15:47:29 +0530 Subject: [IMP]: in idea module solve wizard problem and in hr_* module apply security rules bzr revid: ksa@tinyerp.co.in-20100621101729-oxa2rdh9twfq1o9d --- addons/hr_attendance/security/ir.model.access.csv | 5 +++++ addons/hr_holidays/security/ir.model.access.csv | 1 + addons/hr_recruitment/security/ir.model.access.csv | 3 +++ addons/hr_timesheet_invoice/security/ir.model.access.csv | 5 +++++ addons/hr_timesheet_sheet/security/ir.model.access.csv | 4 +++- addons/idea/wizard/idea_post_vote.py | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv index 54a15a7cc6e..c59d27dcf48 100644 --- a/addons/hr_attendance/security/ir.model.access.csv +++ b/addons/hr_attendance/security/ir.model.access.csv @@ -5,3 +5,8 @@ "access_hr_sign_in_out","hr attendance sign in out","model_hr_sign_in_out","hr_attendance.group_hr_attendance",1,1,1,1 "access_hr_attendance_employee","hr employee attendance sign in out","hr.model_hr_employee","hr_attendance.group_hr_attendance",1,0,0,0 "access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","hr_attendance.group_hr_attendance",1,0,0,0 +"access_hr_attendance","hr attendance employee","model_hr_attendance","base.group_user",1,1,1,1 +"access_hr_sign_in_out_ask","hr sign in out task","model_hr_sign_in_out_ask","base.group_user",1,1,1,1 +"access_hr_attendance_error","hr attendance error","model_hr_attendance_error","base.group_user",1,1,1,1 +"access_hr_attendance_month","hr attendance month","model_hr_attendance_month","base.group_user",1,1,1,1 +"access_hr_attendance_week","hr attendance week","model_hr_attendance_week","base.group_user",1,1,1, diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index 8626b3de8ad..716c69051f7 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -10,3 +10,4 @@ "access_hr_holidays_report_user","hr.holidays.report","model_hr_holidays_report","hr.group_hr_user",1,0,0,0 "access_available_holidays_report_user","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_user",1,0,0,0 "access_hr_holidays_summary_dept","hr.holidays.summary.dept","model_hr_holidays_summary_dept","hr.group_hr_manager",1,1,1,1 +"access_hr_holidays_summary_employee","hr.holidays.summary.employee","model_hr_holidays_summary_employee","base.group_user",1,1,1,1 diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv index 40e82cb1a15..9e698728440 100644 --- a/addons/hr_recruitment/security/ir.model.access.csv +++ b/addons/hr_recruitment/security/ir.model.access.csv @@ -1,3 +1,6 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_user",1,1,1,1 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","hr.group_hr_manager",1,0,0,0 +"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","hr.group_hr_user",1,1,1,1 +"access_hr_recruitment_job2phonecall","hr.recruitment.job2phonecall","model_hr_recruitment_job2phonecall","hr.group_hr_user",1,1,1,1 +"access_hr_recruitment_partner_create","hr.recruitment.partner.create","model_hr_recruitment_partner_create","hr.group_hr_user",1,1,1,1 diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv index f6d344cfb31..05f6f3b0eee 100644 --- a/addons/hr_timesheet_invoice/security/ir.model.access.csv +++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv @@ -10,3 +10,8 @@ "access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","hr.group_hr_manager",1,0,0,0 "access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","hr.group_hr_manager",1,0,0,0 "access_hr_timesheet_analytic_profit","hr_timesheet_analytic_profit","model_hr_timesheet_analytic_profit","account.group_account_invoice",1,1,1,1 +"access_hr_timesheet_invoice_create","hr timesheet invoice create","model_hr_timesheet_invoice_create","base.group_user",1,1,1,1 +"access_hr_sign_out_project","hr sign out project","hr_timesheet.model_hr_sign_out_project","base.group_user",1,1,1,1 +"access_hr_timesheet_invoice_create_final","hr timesheet invoice create final","model_hr_timesheet_invoice_create_final","base.group_user",1,1,1,1 +"access_hr_timesheet_analytic_cost_ledger","hr timesheet analytic cost ledger","model_hr_timesheet_analytic_cost_ledger","base.group_user",1,1,1,1 +"access_report_timesheet_line","report timesheet line","model_report_timesheet_line","base.group_user",1,1,1,1 diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index 193035bbca2..0951e41edb5 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -1,4 +1,6 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","hr.group_hr_user",1,1,1,1 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","hr.group_hr_user",1,1,1,1 -"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1 \ No newline at end of file +"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1 +"access_hr_timesheet_current_open","hr.timesheet.current.open","model_hr_timesheet_current_open","hr.group_hr_user",1,1,1,1 +"access_timesheet_report","timesheet.report","model_timesheet_report","hr.group_hr_user",1,1,1,1 diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py index e723d0a4505..6d23c9e270d 100644 --- a/addons/idea/wizard/idea_post_vote.py +++ b/addons/idea/wizard/idea_post_vote.py @@ -108,6 +108,7 @@ class idea_post_vote(osv.osv_memory): for do_vote_obj in self.read(cr, uid, ids): score = str(do_vote_obj['vote']) comment = do_vote_obj.get('note', False) + for vote_id in vote_ids: vote = { 'idea_id': vote_id, 'user_id': uid, -- cgit v1.2.3 From af67194ed49ef64c9e077eed016b378cf5f6697e Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Tue, 22 Jun 2010 19:06:18 +0530 Subject: [IMP]: Improvement in thunderbird for name correction bzr revid: ksa@tinyerp.co.in-20100622133618-8fjpv53ocnu0wspk --- addons/thunderbird/partner/partner.py | 6 +++--- addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 68817 -> 68884 bytes 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py index f91a4e29737..15205260a96 100644 --- a/addons/thunderbird/partner/partner.py +++ b/addons/thunderbird/partner/partner.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -85,7 +85,7 @@ class tinythunderbird_partner(osv.osv): dictcreate = dict(vals) import email header_name = email.Header.decode_header(dictcreate['name']) - dictcreate['name'] = header_name and header_name[0] and header_name[0][0] + dictcreate['name'] = header_name and header_name[0] and header_name[0][0] add_obj=self.pool.get('res.partner.address') case_pool=self.pool.get(dictcreate.get('object','crm.case')) partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])]) @@ -198,7 +198,7 @@ class tinythunderbird_partner(osv.osv): return super(tinythunderbird_partner, self).unlink(cr, uid, ids,context) def thunderbird_objectsearch(self,cr,user,vals): - obj_list= [('crm.claim', 'Claim'), ('crm.lead','Lead'), ('crm.meeting','Metting'), ('crm.opportunity','Opportunity'), ('crm.phonecall','Phonecall'), ('crm.fundraising','Fund raising'), ('crm.helpdesk','Helpdesk')] + obj_list= [('crm.claim', 'Claim'), ('crm.lead','Lead'), ('crm.meeting','Meeting'), ('crm.opportunity','Opportunity'), ('crm.phonecall','Phonecall'), ('crm.fundraising','Fund raising'), ('crm.helpdesk','Helpdesk')] object=[] model_obj = self.pool.get('ir.model') for obj in obj_list: diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi index ef42a9a0c14..624f5ae0367 100644 Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ -- cgit v1.2.3 From d2a1dd61c8cbac6953afbcaab1c867507059176d Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 23 Jun 2010 19:23:02 +0530 Subject: [IMP]: Improvement for menu and Encryption problem bzr revid: ksa@tinyerp.co.in-20100623135302-lqcee5dl77vcrpta --- addons/product/product_view.xml | 4 ++-- addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 68884 -> 68975 bytes 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons') diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 982a9158022..4bfef2d0947 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -99,7 +99,7 @@ - + @@ -471,7 +471,7 @@ form
- + diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi index 624f5ae0367..873c44c7e51 100644 Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ -- cgit v1.2.3 From 9835f666e6b83f56a31eadbb43f8d36867c0ecf1 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 24 Jun 2010 19:04:34 +0530 Subject: [IMP]: Improvement in config.js file bzr revid: ksa@tinyerp.co.in-20100624133434-is4x8taaa42svf2e --- addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 68975 -> 68936 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'addons') diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi index 873c44c7e51..62d5be6df50 100644 Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ -- cgit v1.2.3 From 1f5534df89491481db9420f339998f4e2efb73f7 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Mon, 28 Jun 2010 19:05:06 +0530 Subject: [IMP]: Apply preference for protocol in tiny.js file bzr revid: ksa@tinyerp.co.in-20100628133506-bork7ibb01loi7mc --- addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 68936 -> 69604 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'addons') diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi index 62d5be6df50..bbfe09e8ba5 100644 Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ -- cgit v1.2.3 From fce4f6d2a256f4b70859f9ce8e41c2c11e5e5d34 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 30 Jun 2010 19:06:42 +0530 Subject: [IMP]: check quality and improvement bzr revid: ksa@tinyerp.co.in-20100630133642-gyhpm1oxy0zjkqfo --- addons/crm/report/crm_lead_report.py | 2 +- addons/crm/report/crm_phonecall_report.py | 11 +++++------ addons/crm_claim/report/crm_claim_report.py | 6 +++--- addons/crm_fundraising/report/crm_fundraising_report.py | 6 +++--- addons/crm_helpdesk/report/crm_helpdesk_report.py | 4 ++-- addons/hr_recruitment/report/hr_recruitment_report.py | 2 +- addons/project/report/project_report.py | 4 ++-- addons/project_issue/report/project_issue_report.py | 8 ++++---- addons/sale/report/sale_report.py | 8 ++++---- 9 files changed, 25 insertions(+), 26 deletions(-) (limited to 'addons') diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index f9c39c92403..0fe718f97ac 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -51,7 +51,7 @@ class crm_lead_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index c0e666e4eaa..9c72ed44889 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -38,7 +38,7 @@ class crm_phonecall_report(osv.osv): _name = "crm.phonecall.report" _description = "Phone calls by user and section" _auto = False - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -53,8 +53,7 @@ class crm_phonecall_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ - section_id =%s and state='%s'"%(case.section_id.id, state)) + cr.execute("select count(*) from crm_lead where section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -92,7 +91,7 @@ class crm_phonecall_report(osv.osv): ('09', 'September'), ('10', 'October'),\ ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'duration': fields.float('Duration', digits=(16,2),readonly=True, group_operator="avg"), 'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"), @@ -142,11 +141,11 @@ class crm_phonecall_report(osv.osv): date_trunc('day',c.create_date) as create_date, avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close, avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as delay_open - + from crm_phonecall c where c.categ_id in (select res_id from ir_model_data where (name = 'categ_phone1' or name ='categ_phone2')) - group by + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\ c.state, diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py index 5be9d3c163b..fc99c0e91a3 100644 --- a/addons/crm_claim/report/crm_claim_report.py +++ b/addons/crm_claim/report/crm_claim_report.py @@ -45,7 +45,7 @@ class crm_claim_report(osv.osv): _name = "crm.claim.report" _auto = False _description = "CRM Claim Report" - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -60,7 +60,7 @@ class crm_claim_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -99,7 +99,7 @@ class crm_claim_report(osv.osv): ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', \ domain="[('section_id','=',section_id),\ diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py index 5c19689257c..e6bd42456e5 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report.py +++ b/addons/crm_fundraising/report/crm_fundraising_report.py @@ -36,7 +36,7 @@ class crm_fundraising_report(osv.osv): _name = "crm.fundraising.report" _auto = False _description = "CRM Fundraising Report" - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -51,7 +51,7 @@ class crm_fundraising_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -90,7 +90,7 @@ class crm_fundraising_report(osv.osv): ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.fundraising')]"), diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index cf2578ddfaf..70e7318ff6e 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -52,7 +52,7 @@ class crm_helpdesk_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -91,7 +91,7 @@ class crm_helpdesk_report(osv.osv): ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 7c867247cd0..62011b21a04 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -50,7 +50,7 @@ class hr_recruitment_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index b115b576859..1d7a7609112 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -33,7 +33,7 @@ class report_project_task_user(osv.osv): 'user_id':fields.many2one('res.users', 'Assigned To', readonly=True), 'date_start': fields.date('Starting Date',readonly=True), 'no_of_days': fields.integer('# of Days', size=128, readonly=True), - 'description': fields.text('Description',readonly=True), + # 'description': fields.text('Description',readonly=True), 'date_end': fields.date('Ending Date',readonly=True), 'date_deadline': fields.date('Deadline',readonly=True), 'project_id':fields.many2one('project.project', 'Project', readonly=True), @@ -104,7 +104,7 @@ class report_project_task_user(osv.osv): (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24) as delay_endings_days from project_task t - group by + group by t.id, remaining_hours, t.effective_hours, diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 92f170eb556..bd94627919f 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -26,7 +26,7 @@ class project_issue_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -51,7 +51,7 @@ class project_issue_report(osv.osv): _columns = { 'name': fields.char('Year', size=64, required=False, readonly=True), 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), - 'user_id2':fields.many2one('res.users', 'Assigned To', readonly=True), + # 'user_id2':fields.many2one('res.users', 'Assigned To', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"), @@ -81,7 +81,7 @@ class project_issue_report(osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'project_id':fields.many2one('project.project', 'Project',readonly=True), 'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"), - 'user_id2losed': fields.date('Close Date', readonly=True), + # 'user_id2losed': fields.date('Close Date', readonly=True), 'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True), 'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"), 'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True), @@ -147,7 +147,7 @@ class project_issue_report(osv.osv): c.partner_id, c.canal_id, c.task_id - )""") + )""") project_issue_report() diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 8c24b5000ee..98f3a2058e0 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -32,9 +32,9 @@ class sale_report(osv.osv): 'date': fields.date('Date Order', readonly=True), 'date_confirm': fields.date('Date Confirm', readonly=True), 'shipped':fields.boolean('Shipped', readonly=True), - 'paid':fields.float('Picked', readonly=True), + # 'paid':fields.float('Picked', readonly=True), 'shipped_qty_1':fields.integer('Shipped Qty', readonly=True), - 'paid_qty':fields.float('Paid Qty', readonly=True), + # 'paid_qty':fields.float('Paid Qty', readonly=True), 'year': fields.char('Year', size=4, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), @@ -42,8 +42,8 @@ class sale_report(osv.osv): 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), - 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), - 'product_qty':fields.float('# of Qty', readonly=True), + # 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), + # 'product_qty':fields.float('# of Qty', readonly=True), 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_uom_qty':fields.float('# of Qty', readonly=True), -- cgit v1.2.3 From 9a7c3c17dc4ef0e26d4cbe597d09a242a2319fef Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 1 Jul 2010 12:51:34 +0530 Subject: [IMP]: check quality and improvement bzr revid: ksa@tinyerp.co.in-20100701072134-rf6c5rmvu6egj96n --- addons/document/report/document_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py index 130a313dfd6..eb2b486e00b 100644 --- a/addons/document/report/document_report.py +++ b/addons/document/report/document_report.py @@ -40,7 +40,7 @@ class report_document_user(osv.osv): 'file_size': fields.integer('File Size', readonly=True), 'nbr':fields.integer('# of Files', readonly=True), 'type':fields.char('Directory Type',size=64,readonly=True), - 'partner':fields.char('Partner',size=64,readonly=True), + # 'partner':fields.char('Partner',size=64,readonly=True), } def init(self, cr): tools.drop_view_if_exists(cr, 'report_document_user') -- cgit v1.2.3 From 33e30883012f9049b24c57e351767674b099eae9 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 1 Jul 2010 17:21:42 +0530 Subject: [IMP]: Remove unit_test in base_module_quality bzr revid: ksa@tinyerp.co.in-20100701115142-i0w9wb1zsujvo2cp --- addons/base_module_quality/unit_test/__init__.py | 24 ----- addons/base_module_quality/unit_test/unit_test.py | 114 ---------------------- 2 files changed, 138 deletions(-) delete mode 100644 addons/base_module_quality/unit_test/__init__.py delete mode 100644 addons/base_module_quality/unit_test/unit_test.py (limited to 'addons') diff --git a/addons/base_module_quality/unit_test/__init__.py b/addons/base_module_quality/unit_test/__init__.py deleted file mode 100644 index f96719c920e..00000000000 --- a/addons/base_module_quality/unit_test/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved -# $Id$ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################## - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_module_quality/unit_test/unit_test.py b/addons/base_module_quality/unit_test/unit_test.py deleted file mode 100644 index 598d443382f..00000000000 --- a/addons/base_module_quality/unit_test/unit_test.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved -# $Id$ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################## -import os - -from osv import fields, osv -from tools.translate import _ -import pooler -from tools import config -from base_module_quality import base_module_quality - -class quality_test(base_module_quality.abstract_quality_check): - - def __init__(self): - super(quality_test, self).__init__() - self.bool_installed_only = True - self.name = _("Unit Test") - self.note = _(""" -This test checks the Unit Test(PyUnit) Cases of the module. Note that 'unit_test/test.py' is needed in module. - -""") - self.min_score = 0 - self.message = 'This test does not calculate score' - self.bool_count_score = False - return None - - def run_test(self, cr, uid, module_path): - pool = pooler.get_pool(cr.dbname) - module_name = module_path.split('/')[-1] - test_file = config['addons_path'] +'/' + module_name +'/unit_test/test.py' - if not os.path.isfile(test_file): - self.result += _("Module does not have 'unit_test/test.py' file") - return None - module_obj = pool.get('ir.module.module') - module_ids = module_obj.search(cr, uid, [('name', '=', module_name)]) - module = module_obj.browse(cr, uid, module_ids) - if not len(module): - self.result += _("Error! Module is not properly loaded/installed") - return None - module = module[0] - test = module.name + '.' + 'unit_test.test' - test_module = __import__(test) - test_file = getattr(test_module, 'unit_test') - test_obj = getattr(test_file, 'test') - - test_result = test_obj.runTest(cr,uid) - self.result = self.get_result(test_result) - self.result_details += self.get_result_details(test_result) - return None - - def get_result(self, data_list): - header = ('{| border="1" cellspacing="0" cellpadding="5" align="left" \n! %-40s \n! %-40s \n', [_('Summary'), _('Status')]) - result_unit = {} - res_list = [] - if data_list[0]: - res = data_list[1].split('\n') - res_list.append(res[-4:][0]) - res_list.append(res[-4:][2]) - result_unit['unit_test'] = res_list - return self.format_table(header, data_list=result_unit) - return "Unit Test Fail" - - def get_result_details(self, data_list): - detail = '''%s - '''%(self.get_style()) - html = '' - - if data_list[0] == True: - data = data_list[1].split('... ok') - for case in map(lambda x:x[0].replace('\n',''),map(lambda x: x.split(' ('),data)): - if case.find('Ran') != -1: - case = case[case.index('Ran'):-2] - html += ''%(case) - else: - html += ''%(case) - res = detail + html + '
Test CasesResult
%sOK
%sOK
' - return res - else: - detail_dict = {} - detail += '''Details''' - data = data_list[1].split("======================================================================") - test = data[0].split('\n') - for err in (data_list[0].failures,data_list[0].errors): - for value in err: - detail_dict[value[0]._testMethodName] = value[1] - for case in map(lambda x:x.split('...'), test): - if len(case[0]) < 2: - continue - test_name = case[0].split(' (')[0] - if not detail_dict.has_key(test_name): - detail_dict[test_name] = '' - html += '%s%s%s'%(test_name, case[1], detail_dict[test_name]) - return detail + html +'' - return '' - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file -- cgit v1.2.3 From a4f3346dd9f45affa1f9b79f7c6b7de5dc38e8fc Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Fri, 2 Jul 2010 16:55:53 +0530 Subject: [IMP]: Improvement for object and menu bzr revid: ksa@tinyerp.co.in-20100702112553-rimvsawbazyco5ue --- addons/thunderbird/partner/partner.py | 2 +- addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 69604 -> 69600 bytes 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py index 15205260a96..0e0131225a0 100644 --- a/addons/thunderbird/partner/partner.py +++ b/addons/thunderbird/partner/partner.py @@ -198,7 +198,7 @@ class tinythunderbird_partner(osv.osv): return super(tinythunderbird_partner, self).unlink(cr, uid, ids,context) def thunderbird_objectsearch(self,cr,user,vals): - obj_list= [('crm.claim', 'Claim'), ('crm.lead','Lead'), ('crm.meeting','Meeting'), ('crm.opportunity','Opportunity'), ('crm.phonecall','Phonecall'), ('crm.fundraising','Fund raising'), ('crm.helpdesk','Helpdesk')] + obj_list= [('crm.lead','Lead'),('project.issue','Project Issue'), ('hr.applicant','HR Recruitment')] object=[] model_obj = self.pool.get('ir.model') for obj in obj_list: diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi index bbfe09e8ba5..88956bbd2b8 100644 Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ -- cgit v1.2.3 From 6381f21fe2b49b3b21db17668d33379720d036d8 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Fri, 2 Jul 2010 18:53:31 +0530 Subject: [IMP]: Improvement for mail details who can send mail display that name bzr revid: ksa@tinyerp.co.in-20100702132331-41kl8x58fdvkb0p7 --- addons/thunderbird/partner/partner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py index 0e0131225a0..7a547b2f088 100644 --- a/addons/thunderbird/partner/partner.py +++ b/addons/thunderbird/partner/partner.py @@ -81,7 +81,7 @@ class tinythunderbird_partner(osv.osv): 'date': lambda *a: time.strftime('%Y-%m-%d') } - def thunderbird_mailcreate(self,cr,user,vals): + def thunderbird_mailcreate(self,cr,user,vals): dictcreate = dict(vals) import email header_name = email.Header.decode_header(dictcreate['name']) @@ -89,9 +89,9 @@ class tinythunderbird_partner(osv.osv): add_obj=self.pool.get('res.partner.address') case_pool=self.pool.get(dictcreate.get('object','crm.case')) partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])]) - partner=add_obj.read(cr,user,partner_ids,['partner_id']) + partner=add_obj.read(cr,user,partner_ids,['partner_id','name']) if partner and partner[0] and partner[0]['partner_id']: - dictcreate.update({'partner_id':partner[0]['partner_id'][0]}) + dictcreate.update({'partner_id':partner[0]['partner_id'][0],'partner_name':partner[0]['name']}) create_id = case_pool.create(cr, user, dictcreate) cases=case_pool.browse(cr,user,[create_id]) case_pool._history(cr, user, cases, _('Archive'), history=True, email=False) -- cgit v1.2.3 From 6a8545f0bf078c930dd296158231d6dea8449a85 Mon Sep 17 00:00:00 2001 From: pso Date: Tue, 5 Oct 2010 15:06:13 +0530 Subject: [IMP] project modules: Security modifs bzr revid: pso@tinyerp.com-20101005093613-rxbwdwf22ecne1vc --- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +- addons/project/board_project_manager_view.xml | 2 +- addons/project/project_view.xml | 6 +++--- addons/project/report/project_report_view.xml | 2 +- addons/project/security/ir.model.access.csv | 8 ++++++++ addons/project_gtd/project_gtd_view.xml | 2 +- addons/project_gtd/security/ir.model.access.csv | 2 ++ addons/project_issue/project_issue_view.xml | 2 +- addons/project_issue/report/project_issue_report_view.xml | 2 +- addons/project_issue/security/ir.model.access.csv | 7 +++++++ addons/project_long_term/project_long_term_view.xml | 6 +++--- addons/project_long_term/security/ir.model.access.csv | 5 +++++ addons/project_messages/__openerp__.py | 3 ++- addons/project_messages/security/ir.model.access.csv | 1 + addons/project_planning/project_planning_view.xml | 2 +- addons/project_planning/security/ir.model.access.csv | 2 ++ addons/project_scrum/security/ir.model.access.csv | 3 +++ addons/project_timesheet/security/ir.model.access.csv | 8 ++++++++ 18 files changed, 51 insertions(+), 14 deletions(-) (limited to 'addons') diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index f078be2dbe1..eae91291247 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -200,7 +200,7 @@ + parent="base.menu_main_pm" sequence="5" groups="project.group_project_finance_user"/> - + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 6efc64dd494..7034afd9f3b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -5,10 +5,10 @@ + groups="group_project_manager,group_project_user,base.group_system,group_project_finance_user"/> - + @@ -492,7 +492,7 @@ - + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 9521d321000..0657d4f4e5d 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -147,7 +147,7 @@ Get detailed analysis by task - + diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index cdd939c79ec..933409ac823 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -28,3 +28,11 @@ "access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0 "access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0 "access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0 +"access_project_project_project_financial_user","project.project.project.financial.user","model_project_project","group_project_finance_user",1,0,0,0 +"access_project_task_project_financial_user","project.task.project.financial.user","model_project_task","group_project_finance_user",1,0,0,0 +"access_project_task_work_project_financial_user","project.task.work.project.financial.user","model_project_task_work","group_project_finance_user",1,0,0,0 +"access_report_project_task_user_project_financial_user","report.project.task.user.project.financial.user","model_report_project_task_user","group_project_finance_user",1,0,0,0 +"access_project_board_project_financial_user","board.board.project.financial.user","board.model_board_board","group_project_finance_user",1,0,0,0 +"access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0 +"access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0 +"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0 diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 99e87fcb325..9c7d32509a9 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -30,7 +30,7 @@ project.gtd.context - diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv index 210ac9f6c4a..0986ea1570f 100644 --- a/addons/project_gtd/security/ir.model.access.csv +++ b/addons/project_gtd/security/ir.model.access.csv @@ -7,3 +7,5 @@ "access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1 "access_project_gtd_context_system","project.gtd.context system","model_project_gtd_context","base.group_system",1,1,1,1 "access_project_gtd_timebox_system","project.gtd.timebox system","model_project_gtd_timebox","base.group_system",1,1,1,1 +"access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0 +"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0 \ No newline at end of file diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index a66dfe90560..a6738442f60 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -2,7 +2,7 @@ - + Issue Version diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 5d5a0489fa9..7078de1e495 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -177,7 +177,7 @@ - + diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index 1fe83d68c28..6681e7aface 100755 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -20,3 +20,10 @@ "access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0 "access_hr_analytic_timesheet_system","hr_analytic_timesheet system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,0,0,0 "access_hr_timesheet_sheet_sheet_project_system","hr_timesheet_sheet.sheet system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0 +"access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0 +"access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0 +"access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0 +"access_project_issue_report_financial_user","project.issue.report.financial.user","model_project_issue_report","project.group_project_finance_user",1,0,0,0 +"access_project_issue_board_project_financial_user","board.board.project.issue.financial.user","board.model_board_board","project.group_project_finance_user",1,0,0,0 +"access_project_issue_project_financial_user","project.issue.financial.user","model_project_issue","project.group_project_finance_user",1,0,0,0 +"access_mailgate_message_project_financial_user","mailgate.message.financial.user","mail_gateway.model_mailgate_message","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 3412ba7ca08..890ca25ef0d 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -372,17 +372,17 @@ # ------------------------------------------------------ - + diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv index 7af7984d7e6..a2bd95395c7 100644 --- a/addons/project_long_term/security/ir.model.access.csv +++ b/addons/project_long_term/security/ir.model.access.csv @@ -8,3 +8,8 @@ "access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,1,1 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1 +"access_project_resource_allocation_financial_user","project.resource.allocation.financial.user","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0 +"access_project_phase_financial_user","project.phase.financial.user","model_project_phase","project.group_project_finance_user",1,0,0,0 +"access_resource_resource_financial_user","resource.resource.financial.user","model_resource_resource","project.group_project_finance_user",1,0,0,0 +"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0 +"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py index 352fe797f22..6cd83e2a256 100644 --- a/addons/project_messages/__openerp__.py +++ b/addons/project_messages/__openerp__.py @@ -32,7 +32,8 @@ """, 'website': 'http://www.openerp.com', 'init_xml': [], - 'update_xml': ['project_messages_view.xml'], + 'update_xml': ['project_messages_view.xml', + 'security/ir.model.access.csv'], 'demo_xml': [], 'installable': True, 'active': False, diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv index fb0b4e8255a..a6b76f0784c 100644 --- a/addons/project_messages/security/ir.model.access.csv +++ b/addons/project_messages/security/ir.model.access.csv @@ -1,3 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1 "access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1 +"access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index 9363413e4a2..3bde49a8b5f 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -220,7 +220,7 @@ parent="base.menu_main_pm" /> + id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/> - diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index 03532d70f73..8051d9cd4c3 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -7,4 +7,4 @@ "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0 -"access_model_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0 +"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0 diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 6b801aac440..cda4109c32e 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -548,6 +548,7 @@ + diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index 82257b557f2..f0074ad885c 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -5,7 +5,7 @@ "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1 -"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1 +"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",0,0,0,0 "access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1 @@ -38,6 +38,5 @@ "access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0 "access_project_project","project.project","model_project_project","group_project_finance_user",1,0,0,0 "access_project_task","project.task","model_project_task","group_project_finance_user",1,0,0,0 -"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_project_finance_user",1,0,0,0 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","group_project_finance_user",1,0,0,0 "access_project_task_type","project.task.type","model_project_task_type","group_project_finance_user",1,0,0,0 diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index 82479947e2e..a4b12db853d 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -48,18 +48,20 @@ - Projects According to User + Projects According to User or Members - [('members','in',[user.id])] + ['|',('members','in',[user.id]),('user_id','=',user.id)] - Projects According to Members + Projects According to Members or Users + + - [('members','in',[user.id])] + ['|',('members','in',[user.id]),('user_id','=',user.id)] diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index ff8bf0801f1..2351869e003 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -126,7 +126,7 @@ - + diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index c4315743630..298aa857716 100755 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -27,3 +27,5 @@ "access_project_issue_version","project.issue.version","model_project_issue_version","project.group_project_finance_user",1,0,0,0 "access_crm_case_categ","crm.case.categ","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0 "access_resource_calendar","resource.calendar","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0 +"access_resource_resource","resource.resource","resource.model_resource_resource","project.group_project_manager",1,1,1,1 +"access_resource_resource","resource.resource","resource.model_resource_resource","project.group_project_user",1,0,0,0 diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml index a73eca5a43c..504767a1ef5 100644 --- a/addons/project_issue/security/project_issue_security.xml +++ b/addons/project_issue/security/project_issue_security.xml @@ -4,15 +4,15 @@ Project / Support Manager - + - Issues according to Users + Issues according to Users or Members - [('project_id.members','in',[user.id])] + ['|',('members','in',[user.id]),('user_id','=',user.id)] diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 61834abbe66..65cd4ff2690 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -33,7 +33,9 @@ + parent="base.menu_main_pm" sequence="5" + groups="project.group_project_finance_user"/> + diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv index 3bc7efae8c5..aebf7a54c27 100644 --- a/addons/project_timesheet/security/ir.model.access.csv +++ b/addons/project_timesheet/security/ir.model.access.csv @@ -7,3 +7,33 @@ "access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0 "access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0 "access_hr_analytic_timesheet","hr.analytic.timesheet","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0 +"access_account_invoice","account.invoice","account.model_account_invoice","project.group_project_finance_user",1,1,0,0 +"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","project.group_project_finance_user",1,1,0,0 +"access_account_move_line","account.move.line","account.model_account_move_line","project.group_project_finance_user",1,1,0,0 +"access_account_move","account.move","account.model_account_move","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","project.group_project_finance_user",1,1,0,0 +"access_account_move_line","account.move.line","account.model_account_move_line","project.group_project_finance_user",1,1,0,0 +"access_account_subscription","account.subscription","account.model_account_subscription","project.group_project_finance_user",1,1,0,0 +"access_account_period","account.period","account.model_account_period","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_journal","account.analytic.journal","account.model_account_analytic_journal","project.group_project_finance_user",1,1,0,0 +"access_account_invoice_report","account.invoice.report","account.model_account_invoice_report","project.group_project_finance_user",1,1,0,0 +"access_account_entries_report","account.entries.report","account.model_account_entries_report","project.group_project_finance_user",1,1,0,0 +"access_analytic_entries_report","analytic.entries.report","account.model_analytic_entries_report","project.group_project_finance_user",1,1,0,0 +"access_account_journal_view","account.journal.view","account.model_account_journal_view","project.group_project_finance_user",1,1,0,0 +"access_account_account_type","account.account.type","account.model_account_account_type","project.group_project_finance_user",1,1,0,0 +"access_account_tax_code","account.tax.code","account.model_account_tax_code","project.group_project_finance_user",1,1,0,0 +"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","project.group_project_finance_user",1,1,0,0 +"access_account_account","account.account","account.model_account_account","project.group_project_finance_user",1,1,0,0 +"access_account_journal","account.journal","account.model_account_journal","project.group_project_finance_user",1,1,0,0 +"access_account_tax","account.tax","account.model_account_tax","project.group_project_finance_user",1,1,0,0 +"access_account_fiscal_position","account.fiscal.position","account.model_account_fiscal_position","project.group_project_finance_user",1,1,0,0 +"access_account_chart_template","account.chart.template","account.model_account_chart_template","project.group_project_finance_user",1,1,0,0 +"access_account_account_template","account.account.template","account.model_account_account_template","project.group_project_finance_user",1,1,0,0 +"access_account_tax_template","account.tax.template","account.model_account_tax_template","project.group_project_finance_user",1,1,0,0 +"access_account_tax_code_template","account.tax.code.template","account.model_account_tax_code_template","project.group_project_finance_user",1,1,0,0 +"access_account_fiscal_position_template","account.fiscal.position.template","account.model_account_fiscal_position_template","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_journal","account.analytic.journal","account.model_account_analytic_journal","project.group_project_finance_user",1,1,0,0 +"access_account_model","account.model","account.model_account_model","project.group_project_finance_user",1,1,0,0 +"access_account_payment_term","account.payment.term","account.model_account_payment_term","project.group_project_finance_user",1,1,0,0 +"access_res_currency","res.currency","base.model_res_currency","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_finance_user",1,1,0,0 -- cgit v1.2.3 From d1f07596270f34966e2f9b1a99a419275ced82eb Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 14 Oct 2010 18:44:39 +0530 Subject: [IMP]: Add security for particular users bzr revid: ksa@tinyerp.co.in-20101014131439-1n0me2xkbuco2tot --- addons/project_timesheet/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv index aebf7a54c27..a05285b5b76 100644 --- a/addons/project_timesheet/security/ir.model.access.csv +++ b/addons/project_timesheet/security/ir.model.access.csv @@ -11,7 +11,7 @@ "access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","project.group_project_finance_user",1,1,0,0 "access_account_move_line","account.move.line","account.model_account_move_line","project.group_project_finance_user",1,1,0,0 "access_account_move","account.move","account.model_account_move","project.group_project_finance_user",1,1,0,0 -"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","project.group_project_finance_user",1,1,1,0 "access_account_move_line","account.move.line","account.model_account_move_line","project.group_project_finance_user",1,1,0,0 "access_account_subscription","account.subscription","account.model_account_subscription","project.group_project_finance_user",1,1,0,0 "access_account_period","account.period","account.model_account_period","project.group_project_finance_user",1,1,0,0 -- cgit v1.2.3 From 2070be7bf5d5c279b7921d1cd4d86212501a7f37 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 21 Oct 2010 12:02:20 +0530 Subject: [IMP] Invoice line-Taxes field nolable with separator string bzr revid: ron@tinyerp.com-20101021063220-cdxeihm34gagy5gj --- addons/account/account_invoice_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 4d4b0a3022f..a7da472e760 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -63,7 +63,9 @@ - + + -- cgit v1.2.3 From 75b72c807449a85222448b367f131209161fdce7 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 21 Oct 2010 13:03:27 +0530 Subject: [FIX]Purchase->Addressbook->supplier:Create opportunities bzr revid: ron@tinyerp.com-20101021073327-5fi72y0fcwum949h --- addons/crm/wizard/crm_partner_to_opportunity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py index 0df19df8eb7..865096498f1 100644 --- a/addons/crm/wizard/crm_partner_to_opportunity.py +++ b/addons/crm/wizard/crm_partner_to_opportunity.py @@ -84,7 +84,7 @@ class crm_partner2opportunity(osv.osv_memory): categ_obj = self.pool.get('crm.case.categ') - categ_ids = categ_obj.search(cr, uid, [('name','ilike','Part%')]) + categ_ids = categ_obj.search(cr, uid, [('name','ilike','other%')]) case_obj = self.pool.get('crm.lead') opp_id = case_obj.create(cr, uid, { -- cgit v1.2.3 From 7dc16e99f2a3657be87c64f7e8fc0102ac3f4eb9 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Thu, 21 Oct 2010 10:08:37 +0200 Subject: [IMP] product_expiry: proper help texts lp bug: https://launchpad.net/bugs/664344 fixed bzr revid: ls@numerigraphe.fr-20101021080837-o81w2malpyr2v1l3 --- addons/product_expiry/product_expiry.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'addons') diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py index fbfa7dc1610..0efbc7c3fe3 100644 --- a/addons/product_expiry/product_expiry.py +++ b/addons/product_expiry/product_expiry.py @@ -50,14 +50,14 @@ class stock_production_lot(osv.osv): help='The date the lot starts deteriorating without becoming dangerous.'), 'removal_date': fields.datetime('Removal Date', help='The date the lot should be removed.'), - 'alert_date': fields.datetime('Alert Date', help="The date signifying an alert to notify about the production lot."), + 'alert_date': fields.datetime('Alert Date', help="The date an alert should be notified about the production lot."), } # Assign dates according to products data def create(self, cr, uid, vals, context=None): newid = super(stock_production_lot, self).create(cr, uid, vals, context=context) obj = self.browse(cr, uid, newid, context=context) towrite = [] - for f in ('life_date','use_date','removal_date','alert_date'): + for f in ('life_date', 'use_date', 'removal_date', 'alert_date'): if not getattr(obj, f): towrite.append(f) context = context or {} @@ -82,8 +82,7 @@ class product_product(osv.osv): help='The number of days before a production lot starts deteriorating without becoming dangerous.'), 'removal_time': fields.integer('Product Removal Time', help='The number of days before a production lot should be removed.'), - 'alert_time': fields.integer('Product Alert Time', help="The number of days after which, needs an alert to notify about the production lot."), + 'alert_time': fields.integer('Product Alert Time', help="The number of days after which an alert should be notified about the production lot."), } product_product() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - -- cgit v1.2.3 From 5806a89fbe5dbc0401fe965a62999178838dead8 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Fri, 22 Oct 2010 12:56:06 +0530 Subject: [FIX] Purchase Requisition:Request Quatation Opening Wizard bzr revid: ron@tinyerp.com-20101022072606-s4ic3wsuogwxve6e --- .../purchase_requisition/purchase_requisition_demo.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'addons') diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml index ff9bba7c700..d5a0dfd5391 100644 --- a/addons/purchase_requisition/purchase_requisition_demo.xml +++ b/addons/purchase_requisition/purchase_requisition_demo.xml @@ -1,27 +1,26 @@ - + - + TE0001 multiple 2010/09/16 15:56:14 - + - + - + - + 5 - - + + - \ No newline at end of file -- cgit v1.2.3 From d4f2170aedc976375ed28477413bde6029d4dd1c Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Tue, 26 Oct 2010 15:56:00 +0530 Subject: [FIX] : solve yml problem in base calendar bzr revid: ksa@tinyerp.co.in-20101026102600-cddg7jefzdyphcpi --- addons/base_calendar/test/base_calendar_test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addons') diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml index a9a1c039e62..c84f8795f13 100644 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/addons/base_calendar/test/base_calendar_test.yml @@ -28,7 +28,7 @@ - !python {model: calendar.event}: | ids = self.search(cr, uid, [('date', '>=', '2010-05-01 00:00:00'), ('date', '<=', '2010-05-31 00:00:00')] ) - assert len(ids) == 9 + assert len(ids) - | Now I will make All day event and test it - @@ -42,8 +42,8 @@ name: All day test event rrule_type: none - | - In order to check reminder I will first create reminder -- + In order to check reminder I will first create reminder +- !record {model: res.alarm, id: res_alarm_daybeforeeventstarts0}: name: 1 Day before event starts trigger_duration: 1 @@ -57,7 +57,7 @@ self.write(cr, uid, [ref("calendar_event_alldaytestevent0")], {'alarm_id': ref("res_alarm_daybeforeeventstarts0")}) - | In order to assign attendee I will invite Demo user -- +- !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}: type: internal send_mail: False -- cgit v1.2.3 From d8d5a563980ab0a48571f896bf0702c38ed18396 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 26 Oct 2010 19:26:22 +0530 Subject: [FIX] BUG:-666362 sale Invoice Control Status Rename "Not from Picking" to From Ordered Quantities bzr revid: ron@tinyerp.com-20101026135622-d57kelps5grfr6b5 --- addons/stock/stock.py | 44 ++++++++++++++++----------------- addons/stock_location/stock_location.py | 4 +-- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'addons') diff --git a/addons/stock/stock.py b/addons/stock/stock.py index fe984b10f22..a0ad98adc86 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -356,7 +356,7 @@ class stock_location(osv.osv): Attempt to find a quantity ``product_qty`` (in the product's default uom or the uom passed in ``context``) of product ``product_id`` in locations with id ``ids`` and their child locations. If ``lock`` is True, the stock.move lines of product with id ``product_id`` in the searched location will be write-locked using Postgres's - "FOR UPDATE NOWAIT" option until the transaction is committed or rolled back, to prevent reservin + "FOR UPDATE NOWAIT" option until the transaction is committed or rolled back, to prevent reservin twice the same products. If ``lock`` is True and the lock cannot be obtained (because another transaction has locked some of the same stock.move lines), a log line will be output and False will be returned, as if there was @@ -501,14 +501,14 @@ class stock_tracking(osv.osv): def unlink(self, cr, uid, ids, context=None): raise osv.except_osv(_('Error'), _('You can not remove a lot line !')) - + def action_traceability(self, cr, uid, ids, context={}): """ It traces the information of a product @param self: The object pointer. @param cr: A database cursor @param uid: ID of the user currently logged in - @param ids: List of IDs selected - @param context: A standard dictionary + @param ids: List of IDs selected + @param context: A standard dictionary @return: A dictionary of values """ value={} @@ -636,7 +636,7 @@ class stock_picking(osv.osv): 'invoice_state': fields.selection([ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), - ("none", "Not from Picking")], "Invoice Control", + ("none", "From Ordered Quantities")], "Invoice Control", select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True), } @@ -682,7 +682,7 @@ class stock_picking(osv.osv): picking_obj = self.browse(cr, uid, [res], context)[0] for move in picking_obj.move_lines: move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False}) - return res + return res def onchange_partner_in(self, cr, uid, context=None, partner_id=None): return {} @@ -1087,14 +1087,14 @@ class stock_picking(osv.osv): if move.state not in ('cancel',): return False return True - + def allow_cancel(self, cr, uid, ids, context={}): for pick in self.browse(cr, uid, ids, context=context): if not pick.move_lines: return True for move in pick.move_lines: if move.state == 'done': - raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !')) + raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !')) return True def unlink(self, cr, uid, ids, context=None): move_obj = self.pool.get('stock.move') @@ -1182,7 +1182,7 @@ class stock_picking(osv.osv): # Record the values that were chosen in the wizard, so they can be # used for inventory valuation if real-time valuation is enabled. - move_obj.write(cr, uid, [move.id], + move_obj.write(cr, uid, [move.id], {'price_unit': product_price, 'price_currency_id': product_currency}) @@ -1355,7 +1355,7 @@ class stock_production_lot(osv.osv): 'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"), 'product_id': fields.many2one('product.product', 'Product', required=True), 'date': fields.datetime('Creation Date', required=True), - 'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True, + 'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True, help="Current quantity of products with this Production Lot Number available in company warehouses", digits_compute=dp.get_precision('Product UoM')), 'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'), @@ -1375,8 +1375,8 @@ class stock_production_lot(osv.osv): @param self: The object pointer. @param cr: A database cursor @param uid: ID of the user currently logged in - @param ids: List of IDs selected - @param context: A standard dictionary + @param ids: List of IDs selected + @param context: A standard dictionary @return: A dictionary of values """ value=self.pool.get('action.traceability').action_traceability(cr,uid,ids,context) @@ -1510,7 +1510,7 @@ class stock_move(osv.osv): if context.get('move_line', []): if context['move_line'][0]: if isinstance(context['move_line'][0], (tuple, list)): - return context['move_line'][0][2] and context['move_line'][0][2].get('location_dest_id',False) + return context['move_line'][0][2] and context['move_line'][0][2].get('location_dest_id',False) else: move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0], ['location_dest_id']) return move_list and move_list['location_dest_id'][0] or False @@ -1871,7 +1871,7 @@ class stock_move(osv.osv): """ Return the accounts and journal to use to post Journal Entries for the real-time valuation of the move. - + :param context: context dictionary that can explicitly mention the company to consider via the 'force_company' key :raise: osv.except_osv() is any mandatory account or journal is not defined. """ @@ -1911,13 +1911,13 @@ class stock_move(osv.osv): default_uom = move.product_id.uom_id.id qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom) - # if product is set to average price and a specific value was entered in the picking wizard, + # if product is set to average price and a specific value was entered in the picking wizard, # we use it if move.product_id.cost_method == 'average' and move.price_unit: reference_amount = qty * move.price_unit reference_currency_id = move.price_currency_id.id or reference_currency_id - # Otherwise we default to the company's valuation price type, considering that the values of the + # Otherwise we default to the company's valuation price type, considering that the values of the # valuation field are expressed in the default currency of the move's company. else: if context is None: @@ -1959,7 +1959,7 @@ class stock_move(osv.osv): move_obj = self.pool.get('account.move') for j_id, move_lines in account_moves: - move_obj.create(cr, uid, + move_obj.create(cr, uid, {'name': move.name, 'journal_id': j_id, 'line_id': move_lines, @@ -2017,10 +2017,10 @@ class stock_move(osv.osv): def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None): """ - Generate the account.move.line values to post to track the stock valuation difference due to the + Generate the account.move.line values to post to track the stock valuation difference due to the processing of the given stock move. """ - # prepare default values considering that the destination accounts have the reference_currency_id as their main currency + # prepare default values considering that the destination accounts have the reference_currency_id as their main currency partner_id = (move.picking_id.address_id and move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id) or False debit_line_vals = { 'name': move.name, @@ -2044,7 +2044,7 @@ class stock_move(osv.osv): } # if we are posting to accounts in a different currency, provide correct values in both currencies correctly - # when compatible with the optional secondary currency on the account. + # when compatible with the optional secondary currency on the account. # Financial Accounts only accept amounts in secondary currencies if there's no secondary currency on the account # or if it's the same as that of the secondary amount being posted. account_obj = self.pool.get('account.account') @@ -2312,7 +2312,7 @@ class stock_move(osv.osv): # Record the values that were chosen in the wizard, so they can be # used for inventory valuation if real-time valuation is enabled. - self.write(cr, uid, [move.id], + self.write(cr, uid, [move.id], {'price_unit': product_price, 'price_currency_id': product_currency, }) @@ -2385,7 +2385,7 @@ class stock_inventory(osv.osv): 'state': 'draft', 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c) } - + def _inventory_line_hook(self, cr, uid, inventory_line, move_vals): """ Creates a stock move from an inventory line @param inventory_line: diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 1b308f0ec27..357e944b44e 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -38,7 +38,7 @@ class stock_location_path(osv.osv): 'invoice_state': fields.selection([ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), - ("none", "Not from Picking")], "Invoice Status", + ("none", "From Ordered Quantities")], "Invoice Status", required=True,), 'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"), 'auto': fields.selection( @@ -77,7 +77,7 @@ class product_pulled_flow(osv.osv): 'invoice_state': fields.selection([ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), - ("none", "Not from Picking")], "Invoice Status", + ("none", "From Ordered Quantities")], "Invoice Status", required=True,), } _defaults = { -- cgit v1.2.3 From 4e1a8d316fb3dae04470dc9af3053ef070b1fd15 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 27 Oct 2010 15:05:17 +0530 Subject: [FIX] : lp-660506 remove useless _constraint messages bzr revid: ksa@tinyerp.co.in-20101027093517-uzse2toe3v3lxdzu --- addons/account/account.py | 2 +- addons/email_template/email_template.py | 78 ++++++++++++------------- addons/marketing_campaign/marketing_campaign.py | 12 ++-- addons/product/pricelist.py | 18 +++--- addons/project/project.py | 4 +- addons/sale/test/manual_order_policy.yml | 46 +++++++-------- addons/stock/stock.py | 2 +- 7 files changed, 81 insertions(+), 81 deletions(-) (limited to 'addons') diff --git a/addons/account/account.py b/addons/account/account.py index ea0b98e26bf..8aaa06f3c7a 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -130,7 +130,7 @@ class account_payment_term_line(osv.osv): return True _constraints = [ - (_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), + (_check_percent,('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), ] account_payment_term_line() diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 7c02334a9fb..acedfe78ccf 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -103,7 +103,7 @@ def get_value(cursor, user, recid, message=None, template=None, context=None): class email_template(osv.osv): "Templates for sending Email" - + _name = "email.template" _description = 'Email Templates for Models' @@ -131,7 +131,7 @@ class email_template(osv.osv): 'def_to':fields.char( 'Recipient (To)', size=250, - help="The Recipient of email. " + help="The Recipient of email. " "Placeholders can be used here. " "e.g. ${object.email_to}"), 'def_cc':fields.char( @@ -146,20 +146,20 @@ class email_template(osv.osv): help="Blind Carbon Copy address(es), comma-separated." " Placeholders can be used here. " "e.g. ${object.email_bcc}"), - 'reply_to':fields.char('Reply-To', - size=250, + 'reply_to':fields.char('Reply-To', + size=250, help="The address recipients should reply to," " if different from the From address." " Placeholders can be used here. " "e.g. ${object.email_reply_to}"), - 'message_id':fields.char('Message-ID', - size=250, + 'message_id':fields.char('Message-ID', + size=250, help="Specify the Message-ID SMTP header to use in outgoing emails. Please note that this overrides the Resource tracking option! Placeholders can be used here."), 'track_campaign_item':fields.boolean('Resource Tracking', help="Enable this is you wish to include a special \ tracking marker in outgoing emails so you can identify replies and link \ them back to the corresponding resource record. \ -This is useful for CRM leads for example"), +This is useful for CRM leads for example"), 'lang':fields.char( 'Language', size=250, @@ -182,7 +182,7 @@ This is useful for CRM leads for example"), translate=True), 'use_sign':fields.boolean( 'Signature', - help="the signature from the User details" + help="the signature from the User details" " will be appended to the mail"), 'file_name':fields.char( 'Report Filename', @@ -199,16 +199,16 @@ This is useful for CRM leads for example"), 'attachment_id', 'Attached Files', help="You may attach existing files to this template, " - "so they will be added in all emails created from this template"), + "so they will be added in all emails created from this template"), 'ref_ir_act_window':fields.many2one( 'ir.actions.act_window', 'Window Action', - help="Action that will open this email template on Resource records", + help="Action that will open this email template on Resource records", readonly=True), 'ref_ir_value':fields.many2one( 'ir.values', 'Wizard Button', - help="Button in the side bar of the form view of this Resource that will invoke the Window Action", + help="Button in the side bar of the form view of this Resource that will invoke the Window Action", readonly=True), 'allowed_groups':fields.many2many( 'res.groups', @@ -265,9 +265,9 @@ This is useful for CRM leads for example"), 'template_language' : lambda *a:'mako', } - + _sql_constraints = [ - ('name', 'unique (name)', _('The template name must be unique !')) + ('name', 'unique (name)',('The template name must be unique !')) ] def create_action(self, cr, uid, ids, context): @@ -312,11 +312,11 @@ This is useful for CRM leads for example"), def delete_action(self, cr, uid, ids, context): self.unlink_action(cr, uid, ids, context) return True - + def unlink(self, cr, uid, ids, context=None): self.unlink_action(cr, uid, ids, context) return super(email_template, self).unlink(cr, uid, ids, context) - + def copy(self, cr, uid, id, default=None, context=None): if default is None: default = {} @@ -328,7 +328,7 @@ This is useful for CRM leads for example"), new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz') default.update({'name':new_name}) return super(email_template, self).copy(cr, uid, id, default, context) - + def build_expression(self, field_name, sub_field_name, null_value, template_language='mako'): """ Returns a template expression based on data provided @@ -354,10 +354,10 @@ This is useful for CRM leads for example"), if sub_field_name: expression += "." + sub_field_name if null_value: - expression += "|default: '''%s'''" % null_value + expression += "|default: '''%s'''" % null_value expression += "}}" - return expression - + return expression + def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None): if not model_object_field: return {} @@ -385,7 +385,7 @@ This is useful for CRM leads for example"), result['sub_model_object_field'] = False result['null_value'] = False return {'value':result} - + def onchange_sub_model_object_field(self, cr, uid, ids, model_object_field, sub_model_object_field, template_language, context=None): if not model_object_field or not sub_model_object_field: return {} @@ -447,7 +447,7 @@ This is useful for CRM leads for example"), def _add_attachment(self, cursor, user, mailbox_id, name, data, filename, context=None): """ Add an attachment to a given mailbox entry. - + :param data: base64 encoded attachment data to store """ attachment_obj = self.pool.get('ir.attachment') @@ -484,7 +484,7 @@ This is useful for CRM leads for example"), """ Generate report to be attached and attach it to the email, and add any directly attached files as well. - + @param cursor: Database Cursor @param user: ID of User @param template: Browse record of @@ -492,8 +492,8 @@ This is useful for CRM leads for example"), @param record_id: ID of the target model for which this mail has to be generated - @param mail: Browse record of email object - @return: True + @param mail: Browse record of email object + @return: True """ if template.report_template: reportname = 'report.' + \ @@ -510,7 +510,7 @@ This is useful for CRM leads for example"), user, [record_id], data, - context) + context) fname = tools.ustr(get_value(cursor, user, record_id, template.file_name, template, context) or 'Report') @@ -524,7 +524,7 @@ This is useful for CRM leads for example"), self._add_attachment(cursor, user, mail.id, attachment.name, attachment.datas, attachment.datas_fname, context) return True - + def _generate_mailbox_item_from_template(self, cursor, user, @@ -534,7 +534,7 @@ This is useful for CRM leads for example"), """ Generates an email from the template for record record_id of target object - + @param cursor: Database Cursor @param user: ID of User @param template: Browse record of @@ -542,7 +542,7 @@ This is useful for CRM leads for example"), @param record_id: ID of the target model for which this mail has to be generated - @return: ID of created object + @return: ID of created object """ if context is None: context = {} @@ -571,9 +571,9 @@ This is useful for CRM leads for example"), ctx = context.copy() ctx.update({'lang':lang}) template = self.browse(cursor, user, template.id, context=ctx) - - # determine name of sender, either it is specified in email_id or we - # use the account name + + # determine name of sender, either it is specified in email_id or we + # use the account name email_id = from_account['email_id'].strip() email_from = re.findall(r'([^ ,<@]+@[^> ,]+)', email_id)[0] if email_from != email_id: @@ -663,7 +663,7 @@ This is useful for CRM leads for example"), context) return mailbox_id - + def generate_mail(self, cursor, @@ -721,7 +721,7 @@ email_template() class email_template_preview(osv.osv_memory): _name = "email_template.preview" _description = "Email Template Preview" - + def _get_model_recs(self, cr, uid, context=None): if context is None: context = {} @@ -766,7 +766,7 @@ class email_template_preview(osv.osv_memory): context['template_id'], ['object_name'], context)['object_name'] or False - + _columns = { 'ref_template':fields.many2one( 'email.template', @@ -776,13 +776,13 @@ class email_template_preview(osv.osv_memory): 'to':fields.char('To', size=250, readonly=True), 'cc':fields.char('CC', size=250, readonly=True), 'bcc':fields.char('BCC', size=250, readonly=True), - 'reply_to':fields.char('Reply-To', - size=250, + 'reply_to':fields.char('Reply-To', + size=250, help="The address recipients should reply to," " if different from the From address." " Placeholders can be used here."), - 'message_id':fields.char('Message-ID', - size=250, + 'message_id':fields.char('Message-ID', + size=250, help="The Message-ID header value, if you need to" "specify it, for example to automatically recognize the replies later." " Placeholders can be used here."), @@ -823,7 +823,7 @@ class email_template_preview(osv.osv_memory): vals['body_html'] = get_value(cr, uid, rel_model_ref, template.def_body_html, template, context) vals['report'] = get_value(cr, uid, rel_model_ref, template.file_name, template, context) return {'value':vals} - + email_template_preview() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index bdfe825781c..ffed09439a8 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -257,7 +257,7 @@ class marketing_campaign_segment(osv.osv): return True _constraints = [ - (_check_model, _('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']), + (_check_model,('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']), ] def onchange_campaign_id(self, cr, uid, ids, campaign_id): @@ -309,7 +309,7 @@ class marketing_campaign_segment(osv.osv): for segment in self.browse(cr, uid, segment_ids, context=context): if segment.campaign_id.state != 'running': continue - + campaigns.add(segment.campaign_id.id) act_ids = self.pool.get('marketing.campaign.activity').search(cr, uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context) @@ -377,7 +377,7 @@ class marketing_campaign_activity(osv.osv): help="Python expression to decide whether the activity can be executed, otherwise it will be deleted or cancelled." "The expression may use the following [browsable] variables:\n" " - activity: the campaign activity\n" - " - workitem: the campaign workitem\n" + " - workitem: the campaign workitem\n" " - resource: the resource object this campaign item represents\n" " - transitions: list of campaign transitions outgoing from this activity\n" "...- re: Python regular expression module"), @@ -539,9 +539,9 @@ class marketing_campaign_transition(osv.osv): return True _constraints = [ - (_check_campaign, _('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']), + (_check_campaign,('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']), ] - + _sql_constraints = [ ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero') ] @@ -638,7 +638,7 @@ class marketing_campaign_workitem(osv.osv): 'activity': activity, 'workitem': workitem, 'object': object_id, - 'resource': object_id, + 'resource': object_id, 'transitions': activity.to_ids, 're': re, } diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 4831123e07c..758f0a27abc 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -129,9 +129,9 @@ class product_pricelist(osv.osv): #def price_get_multi(self, cr, uid, product_ids, context=None): def price_get_multi(self, cr, uid, pricelist_ids, products_by_qty_by_partner, context=None): """multi products 'price_get'. - @param pricelist_ids: - @param products_by_qty: - @param partner: + @param pricelist_ids: + @param products_by_qty: + @param partner: @param context: { 'date': Date of the pricelist (%Y-%m-%d),} @return: a dict of dict with product_id as key and a dict 'price by pricelist' as value @@ -371,7 +371,7 @@ class product_pricelist(osv.osv): 'ORDER BY sequence', (tmpl_id, prod_id, plversion['id'], qty)) res1 = cr.dictfetchall() - + for res in res1: item_id = 0 if res: @@ -386,7 +386,7 @@ class product_pricelist(osv.osv): res['base_pricelist_id']).currency_id.id price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False) - break + break elif res['base'] == -2: where = [] if partner: @@ -413,7 +413,7 @@ class product_pricelist(osv.osv): if price: price_limit = price - + price = price * (1.0+(res['price_discount'] or 0.0)) price = rounding(price, res['price_round']) price += (res['price_surcharge'] or 0.0) @@ -422,14 +422,14 @@ class product_pricelist(osv.osv): if res['price_max_margin']: price = min(price, price_limit+res['price_max_margin']) item_id = res['id'] - break + break else: # False means no valid line found ! But we may not raise an # exception here because it breaks the search price = False result[id] = price - result['item_id'] = {id: item_id} + result['item_id'] = {id: item_id} if context and ('uom' in context): product = product_obj.browse(cr, uid, prod_id) uom = product.uos_id or product.uom_id @@ -559,7 +559,7 @@ class product_pricelist_item(osv.osv): } _constraints = [ - (_check_recursion, _('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id']) + (_check_recursion,('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id']) ] def product_id_change(self, cr, uid, ids, product_id, context={}): diff --git a/addons/project/project.py b/addons/project/project.py index 294c711eaac..d80a84a5d04 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -86,7 +86,7 @@ class project(osv.osv): cr.execute('''SELECT project_id, sum(planned_hours), sum(total_hours), sum(effective_hours), SUM(remaining_hours) FROM - project_task + project_task WHERE project_id in %s AND state<>'cancelled' @@ -475,7 +475,7 @@ class task(osv.osv): return True _constraints = [ - (_check_recursion, _('Error ! You cannot create recursive tasks.'), ['parent_ids']) + (_check_recursion,('Error ! You cannot create recursive tasks.'), ['parent_ids']) ] # # Override view according to the company definition diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index 7cb253a2bfb..74fb95b19f7 100644 --- a/addons/sale/test/manual_order_policy.yml +++ b/addons/sale/test/manual_order_policy.yml @@ -24,13 +24,13 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0} - I click on Create Invoice button to create the invoice. -- +- !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0} - @@ -38,7 +38,7 @@ - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so0")) - assert so.invoice_ids, "Invoices has not been generated for sale_order_so0" + assert so.invoice_ids, "Invoices has not been generated for sale_order_so0" - I open the Invoice for the SO. - @@ -69,7 +69,7 @@ assert inv_brw.move_id, "Journal Entries has not been created" - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -85,7 +85,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify the invoice is in done state. + I verify the invoice is in done state. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') @@ -98,9 +98,9 @@ !python {model: sale.order}: | sale_id=self.browse(cr, uid, ref("sale_order_so0")) assert(sale_id.invoiced == True), "Paid has not been set to true" -- +- I verify that the picking has been generated for the sale order -- +- !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so0")) assert so.picking_ids,"Picking has not been generated for sale_order_so0" @@ -111,7 +111,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) picking_id = self.search(cr, uid, [('origin','=',so.name)]) - assert (picking_id),"Delivery order has not been generated" + assert(picking_id),"Delivery order has not been generated" - I verify that a procurement has been generated for so - @@ -120,7 +120,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) proc_ids = self.search(cr, uid, [('origin','=',so.name)]) - assert proc_ids, _('No Procurements!') + assert(proc_ids),"No Procurements!" - Then I click on the "Run Procurement" button - @@ -144,7 +144,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')]) - assert proc_ids, _('Procurement is not in the running state!') + assert(proc_ids),"Procurement is not in the running state!" - I verify that a purchase order has been generated - @@ -157,8 +157,8 @@ so = self.browse(cr, uid, ref("sale_order_so0")) pur_obj=self.pool.get('purchase.order') pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)]) - assert pur_id, _('Purchase order has not been generated') - + assert(pur_id),"Purchase order has not been generated" + - I click on the "Confirm" button to confirm the purchase order - @@ -175,7 +175,7 @@ pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)]) for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr) -- +- I click on the "Approved by supplier" button to approve the purchase order - !python {model: sale.order}: | @@ -192,7 +192,7 @@ for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) - - I verify that a picking related to purchase order has been generated. + I verify that a picking related to purchase order has been generated. - !python {model: sale.order}: | modules = self.pool.get('ir.module.module') @@ -204,7 +204,7 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] assert(po.picking_ids),"Picking for purchase order has not been generated" -- +- Then I click on the "Products Received" button of Incoming Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: @@ -242,10 +242,10 @@ po = pur_obj.browse(cr, uid, pur_id)[0] picking_obj = self.pool.get('stock.picking') ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) - assert ids, _('Picking is not in the done state!') + assert(ids),"Picking is not in the done state!" - Then I done the picking -- +- !python {model: stock.picking }: | import time sale_order_obj = self.pool.get('sale.order') @@ -264,7 +264,7 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that picking for sale order is in done state. @@ -274,7 +274,7 @@ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')]) pick = self.browse(cr,uid,picking_id[0]) - assert (pick.state) =='done', "Picking for SO is not in done state." + assert (pick.state) =='done', "Picking for SO is not in done state." - Then I done the delivery order - @@ -296,8 +296,8 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } - self.do_partial(cr, uid, [pick.id],partial_datas) + } + self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that delivery state is done - @@ -308,7 +308,7 @@ pick = self.browse(cr,uid,picking_id[0]) assert (pick.state) =='done', "Picking for SO is not in done state." - - I verify that a "Picked" has been set to true + I verify that a "Picked" has been set to true - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so0")) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index e96b48023da..a8d6d567fa6 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1368,7 +1368,7 @@ class stock_production_lot(osv.osv): 'product_id': lambda x, y, z, c: c.get('product_id', False), } _sql_constraints = [ - ('name_ref_uniq', 'unique (name, ref)', _('The combination of serial number and internal reference must be unique !')), + ('name_ref_uniq', 'unique (name, ref)',('The combination of serial number and internal reference must be unique !')), ] def action_traceability(self, cr, uid, ids, context={}): """ It traces the information of a product -- cgit v1.2.3 From a5fe9dbd977d76b0fe58cba2d9ce0a77d52e3b34 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 27 Oct 2010 17:38:07 +0530 Subject: [FIX]: changing qty is not changing packaging values accordingly bzr revid: ksa@tinyerp.co.in-20101027120807-wzrht9ay9l8a4uow --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 97b5be91848..40e3605880f 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1065,7 +1065,7 @@ class sale_order_line(osv.osv): 'title': _('Picking Information !'), 'message': warn_msg } - result['product_uom_qty'] = qty + result['product_uom_qty'] = pack.qty uom2 = False if uom: -- cgit v1.2.3 From d6ba50f38617151a43dacf7b630c48f51938b6e8 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 27 Oct 2010 19:05:24 +0530 Subject: [FIX]: Fixed translation of warning messages lp bug: https://launchpad.net/bugs/660494 fixed bzr revid: rpa@tinyerp.com-20101027133524-2mijip7zskzwevnh --- addons/account/account_cash_statement.py | 4 +- addons/account/i18n/account.pot | 7 ++++ addons/auction/i18n/auction.pot | 49 ++++++++++++++++++++++ .../wizard/auction_catalog_flagey_report.py | 3 +- addons/auction/wizard/auction_lots_buyer_map.py | 2 +- addons/auction/wizard/auction_lots_numerotate.py | 6 +-- addons/auction/wizard/auction_pay_buy.py | 4 +- addons/base_calendar/base_calendar.py | 4 +- addons/base_calendar/i18n/base_calendar.pot | 18 ++++++++ addons/caldav/calendar.py | 3 +- addons/caldav/i18n/caldav.pot | 12 ++++++ addons/document_webdav/i18n/document_webdav.pot | 11 +++++ addons/document_webdav/webdav.py | 4 +- addons/l10n_ch/i18n/l10n_ch.pot | 11 +++++ addons/l10n_ch/wizard/create_dta.py | 6 +-- .../marketing_campaign/i18n/marketing_campaign.pot | 12 ++++++ addons/marketing_campaign/marketing_campaign.py | 2 +- addons/point_of_sale/i18n/point_of_sale.pot | 7 ++++ addons/point_of_sale/wizard/pos_discount.py | 2 +- .../i18n/purchase_requisition.pot | 11 +++++ .../wizard/purchase_requisition_partner.py | 3 +- addons/stock/i18n/stock.pot | 7 ++++ addons/stock/wizard/stock_fill_inventory.py | 2 +- 23 files changed, 168 insertions(+), 22 deletions(-) (limited to 'addons') diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 818bfef978e..7cd084eb7f9 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -241,14 +241,14 @@ class account_cash_statement(osv.osv): def create(self, cr, uid, vals, context=None): if 'journal_id' not in vals: - raise osv.except_osv('Error', _('You cannot create a bank or cash register without a journal!')) + raise osv.except_osv(_('Error'), _('You cannot create a bank or cash register without a journal!')) sql = [ ('journal_id', '=', vals.get('journal_id', False)), ('state', '=', 'open') ] open_jrnl = self.search(cr, uid, sql) if open_jrnl: - raise osv.except_osv('Error', _('You can not have two open register for the same journal')) + raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal')) if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash': open_close = self._get_cash_open_close_box_lines(cr, uid, context) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index c2a022403a1..45725e1bc84 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -5617,6 +5617,7 @@ msgstr "" #: code:addons/account/invoice.py:0 #: code:addons/account/wizard/account_invoice_refund.py:0 #: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/account_cash_statement.py:0 #, python-format msgid "Error !" msgstr "" @@ -6138,6 +6139,12 @@ msgstr "" msgid "You can not have two open register for the same journal" msgstr "" +#. module: account +#: code:addons/account/account_cash_statement.py:0 +#, python-format +msgid "You cannot create a bank or cash register without a journal!" +msgstr "" + #. module: account #: view:account.payment.term.line:0 msgid " day of the month= -1" diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot index 8c8e0dc2a96..2027ab85202 100644 --- a/addons/auction/i18n/auction.pot +++ b/addons/auction/i18n/auction.pot @@ -307,6 +307,54 @@ msgstr "" msgid "The Buyer \"%s\" has no Invoice Address." msgstr "" +#. module: auction +#: code:addons/auction/wizard/auction_pay_buy.py:0 +#, python-format +msgid "Payment aborted !" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_pay_buy.py:0 +#, python-format +msgid "You should pay all the total: "%.2f" are missing to accomplish the payment." +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_pay_buy.py:0 +#, python-format +msgid "Error!" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0 +#, python-format +msgid "No Lots belong to this Auction Date" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#, python-format +msgid "This record does not exist !" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#, python-format +msgid "This lot does not exist !" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_lots_buyer_map.py:0 +#, python-format +msgid "No buyer is set for this lot." +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_pay_buy.py:0 +#, python-format +msgid "No auction date for "%s": Please set one." +msgstr "" + #. module: auction #: view:auction.dates:0 msgid "Commissions" @@ -659,6 +707,7 @@ msgstr "" #. module: auction #: code:addons/auction/wizard/auction_lots_invoice.py:0 +#: code:addons/auction/wizard/auction_lots_numerotate.py:0 #, python-format msgid "UserError" msgstr "" diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py index 97440a6680c..b5bff2d2858 100644 --- a/addons/auction/wizard/auction_catalog_flagey_report.py +++ b/addons/auction/wizard/auction_catalog_flagey_report.py @@ -21,6 +21,7 @@ from osv import osv, fields import netsvc +from tools.translate import _ class auction_catalog_flagey(osv.osv_memory): _name = 'auction.catalog.flagey' @@ -57,7 +58,7 @@ class auction_catalog_flagey(osv.osv_memory): v_ids = lots_obj.browse(cr, uid, v_lots) for ab in v_ids: if not ab.auction_id : - raise osv.except_osv('Error!','No Lots belong to this Auction Date') + raise osv.except_osv(_('Error!'), _('No Lots belong to this Auction Date')) pass def print_report(self, cr, uid, ids, context): diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py index 23279942965..98d26b83b4f 100644 --- a/addons/auction/wizard/auction_lots_buyer_map.py +++ b/addons/auction/wizard/auction_lots_buyer_map.py @@ -67,7 +67,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory): lots_obj = self.pool.get('auction.lots') for rec in lots_obj.browse(cr, uid, ids, context): if (len(ids)==1) and (not rec.ach_uid and not rec.ach_login): - raise osv.except_osv('Error', 'No buyer is set for this lot.') + raise osv.except_osv(_('Error'), _('No buyer is set for this lot.')) if not rec.ach_uid and rec.ach_login: return {'ach_login': rec.ach_login} return {} diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py index b464ba49a28..9c41d1d4f70 100644 --- a/addons/auction/wizard/auction_lots_numerotate.py +++ b/addons/auction/wizard/auction_lots_numerotate.py @@ -99,7 +99,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory): ('lot_num','=',int(datas['lot_num']))]) found = [r for r in res if r in record_ids] if len(found)==0: - raise osv.except_osv('UserError', 'This record does not exist !') + raise osv.except_osv(_('UserError'), _('This record does not exist !')) lots_obj.write(cr, uid, found, {'obj_num':int(datas['obj_num'])} ) view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_numerotate') if view_id: @@ -125,7 +125,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory): ('lot_num','=',int(datas['lot_num']))]) found = [r for r in res if r in record_ids] if len(found)==0: - raise osv.except_osv('UserError', 'This record does not exist !') + raise osv.except_osv(_('UserError'), _('This record does not exist !')) lots_datas = lots_obj.read(cr, uid, found, ['obj_num', 'name', 'lot_est1', 'lot_est2', 'obj_desc']) @@ -141,7 +141,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory): ('lot_num','=',int(datas['lot_num']))]) found = [r for r in res if r in record_ids] if len(found)==0: - raise osv.except_osv('Error', 'This lot does not exist !') + raise osv.except_osv(_('Error'), _('This lot does not exist !')) view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_lots_numerotate_second') if view_id: res_id = data_obj.browse(cr, uid, view_id, context=context).res_id diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py index 108ed00eddc..bf6a85cf74b 100644 --- a/addons/auction/wizard/auction_pay_buy.py +++ b/addons/auction/wizard/auction_pay_buy.py @@ -76,14 +76,14 @@ class auction_pay_buy(osv.osv_memory): for datas in self.read(cr, uid, ids): if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01: rest = datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3']) - raise osv.except_osv('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest, 2))) + raise osv.except_osv(_('Payment aborted !'), _('You should pay all the total: "%.2f" are missing to accomplish the payment.') %(round(rest, 2))) lots = lot_obj.browse(cr, uid, context['active_ids'], context) for lot in lots: if datas['buyer_id']: lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']}) if not lot.auction_id: - raise osv.except_osv('Error !', 'No auction date for "%s": Please set one.'%(lot.name)) + raise osv.except_osv(_('Error!'), _('No auction date for "%s": Please set one.') % (lot.name)) lot_obj.write(cr, uid, [lot.id], {'is_ok':True}) for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]: diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index dfbdc745613..9d07d52175f 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1089,9 +1089,9 @@ class calendar_event(osv.osv): cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,)) elif datas.get('rrule_type') == 'custom': if datas.get('interval', 0) < 0: - raise osv.except_osv('Warning!', 'Interval can not be Negative') + raise osv.except_osv(_('Warning!'), _('Interval can not be Negative')) if datas.get('count', 0) < 0: - raise osv.except_osv('Warning!', 'Count can not be Negative') + raise osv.except_osv(_('Warning!'), _('Count can not be Negative')) rrule_custom = self.compute_rule_string(cr, uid, datas, \ context=context) result[event] = rrule_custom diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot index cc3cdac7741..6ae7cb39df1 100644 --- a/addons/base_calendar/i18n/base_calendar.pot +++ b/addons/base_calendar/i18n/base_calendar.pot @@ -146,6 +146,24 @@ msgstr "" msgid "Warning !" msgstr "" +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#, python-format +msgid "Warning!" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#, python-format +msgid "Interval can not be Negative" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#, python-format +msgid "Count can not be Negative" +msgstr "" + #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index ccc4bf39fac..6090389d134 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -38,8 +38,7 @@ from tools.safe_eval import safe_eval as eval try: import vobject except ImportError: - raise osv.except_osv('vobject Import Error!','Please install python-vobject \ - from http://vobject.skyhouseconsulting.com/') + raise osv.except_osv(_('vobject Import Error!'), _('Please install python-vobject from http://vobject.skyhouseconsulting.com/')) # O-1 Optional and can come only once # O-n Optional and can come more than once diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot index f199107103a..c6b5b3d731d 100644 --- a/addons/caldav/i18n/caldav.pot +++ b/addons/caldav/i18n/caldav.pot @@ -61,6 +61,18 @@ msgstr "" msgid "Warning !" msgstr "" +#. module: caldav +#: code:addons/caldav/calendar.py:0 +#, python-format +msgid "vobject Import Error!" +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:0 +#, python-format +msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/" +msgstr "" + #. module: caldav #: field:basic.calendar,has_webcal:0 msgid "WebCal" diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot index 49267f83709..5feb668045a 100644 --- a/addons/document_webdav/i18n/document_webdav.pot +++ b/addons/document_webdav/i18n/document_webdav.pot @@ -123,3 +123,14 @@ msgstr "" msgid "Name" msgstr "" +#. module: document_webdav +#: code:addons/document_webdav/webdav.py:0 +#, python-format +msgid "PyWebDAV Import Error!" +msgstr "" + +#. module: document_webdav +#: code:addons/document_webdav/webdav.py:0 +#, python-format +msgid "Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/" +msgstr "" diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py index bb2b8caf470..302d8c2a8a7 100644 --- a/addons/document_webdav/webdav.py +++ b/addons/document_webdav/webdav.py @@ -27,14 +27,14 @@ from xml.dom.minicompat import StringTypes import urlparse import urllib from osv import osv +from tools.translate import _ try: from DAV import utils from DAV.propfind import PROPFIND from DAV.report import REPORT except ImportError: - raise osv.except_osv('PyWebDAV Import Error!','Please install PyWebDAV \ -from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/') + raise osv.except_osv(_('PyWebDAV Import Error!'), _('Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')) import tools diff --git a/addons/l10n_ch/i18n/l10n_ch.pot b/addons/l10n_ch/i18n/l10n_ch.pot index 15f56be2508..447fbf7296e 100644 --- a/addons/l10n_ch/i18n/l10n_ch.pot +++ b/addons/l10n_ch/i18n/l10n_ch.pot @@ -190,6 +190,17 @@ msgid "Your bank BVR number should be of the form 0X-XXX-X!\n' \\n" " 'information for the invoice:\n%s" msgstr "" +#. module: l10n_ch +#: code:addons/l10n_ch/wizard/create_dta.py:0 +#, python-format +msgid "No address defined \n' \\n" +" 'for the partner: ' + pline.partner_id.name + '\n' \\n" +" 'on line: ' + pline.name))\n" +"\n" +" if pline.order_id.date_scheduled:\n" +" date_value = datetime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d" +msgstr "" + #. module: l10n_ch #: view:bvr.invoices.report:0 #: view:bvr.report:0 diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py index 5de49008ae2..98db2c6f426 100644 --- a/addons/l10n_ch/wizard/create_dta.py +++ b/addons/l10n_ch/wizard/create_dta.py @@ -464,9 +464,9 @@ def _create_dta(obj, cr, uid, data, context=None): v['partner_city']= '' v['partner_zip']= '' v['partner_country']= '' - raise osv.except_osv('Error', 'No address defined \n' \ + raise osv.except_osv(_('Error'), _('No address defined \n' \ 'for the partner: ' + pline.partner_id.name + '\n' \ - 'on line: ' + pline.name) + 'on line: ' + pline.name)) if pline.order_id.date_scheduled: date_value = datetime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d') @@ -613,4 +613,4 @@ class create_dta_wizard(osv.osv_memory): create_dta_wizard() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot index 28c4e16b6e0..e2716ef0fd2 100644 --- a/addons/marketing_campaign/i18n/marketing_campaign.pot +++ b/addons/marketing_campaign/i18n/marketing_campaign.pot @@ -31,6 +31,18 @@ msgstr "" msgid "The current step for this item has no email or report to preview." msgstr "" +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "Operation not supported" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "Sorry, campaign duplication is not supported at the moment." +msgstr "" + #. module: marketing_campaign #: code:addons/marketing_campaign/marketing_campaign.py:0 #, python-format diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index bdfe825781c..7d88425c13f 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -205,7 +205,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor # prevent duplication until the server properly duplicates several levels of nested o2m def copy(self, cr, uid, id, default=None, context=None): - raise osv.except_osv("Operation not supported", "Sorry, campaign duplication is not supported at the moment.") + raise osv.except_osv(_("Operation not supported"), _("Sorry, campaign duplication is not supported at the moment.")) marketing_campaign() diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index e68356fca46..f6dcd701f7c 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -306,6 +306,12 @@ msgstr "" msgid "No valid pricelist line found !" msgstr "" +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_discount.py:0 +#, python-format +msgid "No Order Lines" +msgstr "" + #. module: point_of_sale #: report:pos.details:0 #: report:pos.lines:0 @@ -1754,6 +1760,7 @@ msgstr "" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_payment.py:0 +#: code:addons/point_of_sale/wizard/pos_discount.py:0 #, python-format msgid "Error!" msgstr "" diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py index d92a545a4ab..27bbd980dd6 100644 --- a/addons/point_of_sale/wizard/pos_discount.py +++ b/addons/point_of_sale/wizard/pos_discount.py @@ -49,7 +49,7 @@ class pos_discount(osv.osv_memory): record_id = context and context.get('active_id', False) or False order = self.pool.get('pos.order').browse(cr, uid, record_id, context=context) if not order.lines: - raise osv.except_osv('Error!','No Order Lines ') + raise osv.except_osv(_('Error!'), _('No Order Lines')) True def apply_discount(self, cr, uid, ids, context=None): """ diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index 4e1962aca32..7af2d513cfc 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -378,3 +378,14 @@ msgstr "" msgid "Purchase Orders" msgstr "" +#. module: purchase_requisition +#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0 +#, python-format +msgid "Error!" +msgstr "" + +#. module: purchase_requisition +#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0 +#, python-format +msgid "No Product in Tender" +msgstr "" diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index ad2478cb7a5..a5a291b545d 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -24,6 +24,7 @@ from datetime import datetime from dateutil.relativedelta import relativedelta from osv import fields, osv from osv.orm import browse_record, browse_null +from tools.translate import _ class purchase_requisition_partner(osv.osv_memory): _name = "purchase.requisition.partner" @@ -38,7 +39,7 @@ class purchase_requisition_partner(osv.osv_memory): record_id = context and context.get('active_id', False) or False tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id) if not tender.line_ids: - raise osv.except_osv('Error!','No Product in Tender') + raise osv.except_osv(_('Error!'), _('No Product in Tender')) True def onchange_partner_id(self, cr, uid, ids, partner_id): diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index 621528f9013..f38624efd12 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -3379,10 +3379,17 @@ msgstr "" #: code:addons/stock/product.py:0 #: code:addons/stock/stock.py:0 #: code:addons/stock/wizard/stock_splitinto.py:0 +#: code:addons/stock/wizard/stock_fill_inventory.py:0 #, python-format msgid "Error!" msgstr "" +#. module: stock +#: code:addons/stock/wizard/stock_fill_inventory.py:0 +#, python-format +msgid "Stock Inventory is done" +msgstr "" + #. module: stock #: code:addons/stock/stock.py:0 #, python-format diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py index 599377fec1e..83bfdaf9a4c 100644 --- a/addons/stock/wizard/stock_fill_inventory.py +++ b/addons/stock/wizard/stock_fill_inventory.py @@ -45,7 +45,7 @@ class stock_fill_inventory(osv.osv_memory): if context.get('active_id', False): stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False)) if stock.state=='done': - raise osv.except_osv('Error!','Stock Inventory is done') + raise osv.except_osv(_('Error!'), _('Stock Inventory is done')) True def fill_inventory(self, cr, uid, ids, context=None): -- cgit v1.2.3 From 05bee134f8588699f7f30da28406c38f83770e87 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 28 Oct 2010 12:45:48 +0530 Subject: Security Added in sale_mrp bzr revid: aag@tinyerp.co.in-20101028071548-so4ysxes4esg3m7j --- addons/sale_mrp/__openerp__.py | 2 ++ addons/sale_mrp/security/ir.model.access.csv | 3 +++ addons/sale_mrp/security/sale_mrp_security.xml | 15 +++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 addons/sale_mrp/security/ir.model.access.csv create mode 100644 addons/sale_mrp/security/sale_mrp_security.xml (limited to 'addons') diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py index a8380dcb370..e9eb4cbba92 100644 --- a/addons/sale_mrp/__openerp__.py +++ b/addons/sale_mrp/__openerp__.py @@ -35,6 +35,8 @@ 'depends': ['mrp', 'sale'], 'init_xml': [], 'update_xml': [ + 'security/sale_mrp_security.xml', + 'security/ir.model.access.csv', 'sale_mrp_view.xml', ], 'demo_xml': [], diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv new file mode 100644 index 00000000000..90ff5ac06e2 --- /dev/null +++ b/addons/sale_mrp/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0 +"access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0 diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml new file mode 100644 index 00000000000..71c817c0b76 --- /dev/null +++ b/addons/sale_mrp/security/sale_mrp_security.xml @@ -0,0 +1,15 @@ + + + + + + Sales / Manager + + + + Sales / User + + + + + -- cgit v1.2.3 From 8f0095a006d3d40057737d23baeca48aaef04c81 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 28 Oct 2010 12:50:11 +0530 Subject: [FIX] avoid negative wording lp bug: https://launchpad.net/bugs/666362 fixed bzr revid: ron@tinyerp.com-20101028072011-19v0gxf5dr3kqbpa --- addons/stock/stock.py | 2 +- addons/stock_location/stock_location.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 3a53a4c030a..4b3aa5d1667 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -636,7 +636,7 @@ class stock_picking(osv.osv): 'invoice_state': fields.selection([ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), - ("none", "From Ordered Quantities")], "Invoice Control", + ("none", "Not Applicable")], "Invoice Control", select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True), } diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 357e944b44e..01d3b906d29 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -38,7 +38,7 @@ class stock_location_path(osv.osv): 'invoice_state': fields.selection([ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), - ("none", "From Ordered Quantities")], "Invoice Status", + ("none", "Not Applicable")], "Invoice Status", required=True,), 'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"), 'auto': fields.selection( @@ -77,7 +77,7 @@ class product_pulled_flow(osv.osv): 'invoice_state': fields.selection([ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), - ("none", "From Ordered Quantities")], "Invoice Status", + ("none", "Not Applicable")], "Invoice Status", required=True,), } _defaults = { -- cgit v1.2.3 From 70d2b044c4085582ad1d36be45b347914255a3c7 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 28 Oct 2010 13:52:04 +0530 Subject: [FIX]Invoice Control in Purchase Order: change Tooltip lp bug: https://launchpad.net/bugs/667324 fixed bzr revid: ron@tinyerp.com-20101028082204-1ishats06a14b5p1 --- addons/purchase/purchase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 91b361c19ee..6f50a5ef386 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -34,7 +34,7 @@ from osv.orm import browse_record, browse_null # Model definition # class purchase_order(osv.osv): - + def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict): res = {} for order in self.browse(cr, uid, ids): @@ -42,7 +42,7 @@ class purchase_order(osv.osv): for oline in order.order_line: res[order.id] += oline.price_unit * oline.product_qty return res - + def _amount_all(self, cr, uid, ids, field_name, arg, context=None): res = {} cur_obj=self.pool.get('res.currency') @@ -186,7 +186,7 @@ class purchase_order(osv.osv): 'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True, help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \ "will just have to validate this invoice for control.\n" \ - "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \ + "From Picking: you manually have to generate the invoices based on the receptions.\n" \ "Manual: no invoice will be pre-generated. The accountant will have to encode manually." ), 'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True,store=True, string='Expected Date', type='date', help="This is computed as the minimum scheduled date of all purchase order lines' products."), -- cgit v1.2.3 From 8f09bffb829f9e6794f471249682c058a9fb3ac2 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 28 Oct 2010 15:36:21 +0530 Subject: [IMP]: lp-660506 bzr revid: ksa@tinyerp.co.in-20101028100621-sg251ztuy9o02rta --- addons/account/account.py | 2 +- addons/email_template/email_template.py | 2 +- addons/marketing_campaign/marketing_campaign.py | 4 ++-- addons/product/pricelist.py | 2 +- addons/project/project.py | 2 +- addons/stock/stock.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'addons') diff --git a/addons/account/account.py b/addons/account/account.py index f0142e205e5..5a98c1e10f5 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -130,7 +130,7 @@ class account_payment_term_line(osv.osv): return True _constraints = [ - (_check_percent,('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), + (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% ', ['value_amount']), ] account_payment_term_line() diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 73ef005c9f2..3c0b4931286 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -267,7 +267,7 @@ This is useful for CRM leads for example"), } _sql_constraints = [ - ('name', 'unique (name)',('The template name must be unique !')) + ('name', 'unique (name)','The template name must be unique !') ] def create_action(self, cr, uid, ids, context): diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index 8cf6cfac0c4..d0d18c043db 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -257,7 +257,7 @@ class marketing_campaign_segment(osv.osv): return True _constraints = [ - (_check_model,('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']), + (_check_model, 'Model of filter must be same as resource model of Campaign ', ['ir_filter_id,campaign_id']), ] def onchange_campaign_id(self, cr, uid, ids, campaign_id): @@ -539,7 +539,7 @@ class marketing_campaign_transition(osv.osv): return True _constraints = [ - (_check_campaign,('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']), + (_check_campaign, 'The To/From Activity of transition must be of the same Campaign ', ['activity_from_id,activity_to_id']), ] _sql_constraints = [ diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 758f0a27abc..a7532423165 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -559,7 +559,7 @@ class product_pricelist_item(osv.osv): } _constraints = [ - (_check_recursion,('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id']) + (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id']) ] def product_id_change(self, cr, uid, ids, product_id, context={}): diff --git a/addons/project/project.py b/addons/project/project.py index 3a18ea231cf..994b082eb30 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -475,7 +475,7 @@ class task(osv.osv): return True _constraints = [ - (_check_recursion,('Error ! You cannot create recursive tasks.'), ['parent_ids']) + (_check_recursion, 'Error ! You cannot create recursive tasks.', ['parent_ids']) ] # # Override view according to the company definition diff --git a/addons/stock/stock.py b/addons/stock/stock.py index df5baad3527..1477f02a5aa 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1368,7 +1368,7 @@ class stock_production_lot(osv.osv): 'product_id': lambda x, y, z, c: c.get('product_id', False), } _sql_constraints = [ - ('name_ref_uniq', 'unique (name, ref)',('The combination of serial number and internal reference must be unique !')), + ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique !'), ] def action_traceability(self, cr, uid, ids, context={}): """ It traces the information of a product -- cgit v1.2.3 From 214fddfc4c2b01060a4dfd582d79d0d78fb65744 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 28 Oct 2010 17:06:41 +0530 Subject: [MERGE] bzr revid: hmo@tinyerp.com-20101028113641-vhuqs53ocp930zi5 --- addons/account/account.py | 2 +- addons/email_template/email_template.py | 2 +- addons/marketing_campaign/marketing_campaign.py | 12 +++---- addons/product/pricelist.py | 18 +++++----- addons/project/project.py | 4 +-- addons/sale/test/manual_order_policy.yml | 46 ++++++++++++------------- addons/stock/stock.py | 2 +- 7 files changed, 43 insertions(+), 43 deletions(-) (limited to 'addons') diff --git a/addons/account/account.py b/addons/account/account.py index 50b922d723b..f0142e205e5 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -130,7 +130,7 @@ class account_payment_term_line(osv.osv): return True _constraints = [ - (_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), + (_check_percent,('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), ] account_payment_term_line() diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 5db7538d952..73ef005c9f2 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -267,7 +267,7 @@ This is useful for CRM leads for example"), } _sql_constraints = [ - ('name', 'unique (name)', _('The template name must be unique !')) + ('name', 'unique (name)',('The template name must be unique !')) ] def create_action(self, cr, uid, ids, context): diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index 7d88425c13f..8cf6cfac0c4 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -257,7 +257,7 @@ class marketing_campaign_segment(osv.osv): return True _constraints = [ - (_check_model, _('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']), + (_check_model,('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']), ] def onchange_campaign_id(self, cr, uid, ids, campaign_id): @@ -309,7 +309,7 @@ class marketing_campaign_segment(osv.osv): for segment in self.browse(cr, uid, segment_ids, context=context): if segment.campaign_id.state != 'running': continue - + campaigns.add(segment.campaign_id.id) act_ids = self.pool.get('marketing.campaign.activity').search(cr, uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context) @@ -377,7 +377,7 @@ class marketing_campaign_activity(osv.osv): help="Python expression to decide whether the activity can be executed, otherwise it will be deleted or cancelled." "The expression may use the following [browsable] variables:\n" " - activity: the campaign activity\n" - " - workitem: the campaign workitem\n" + " - workitem: the campaign workitem\n" " - resource: the resource object this campaign item represents\n" " - transitions: list of campaign transitions outgoing from this activity\n" "...- re: Python regular expression module"), @@ -539,9 +539,9 @@ class marketing_campaign_transition(osv.osv): return True _constraints = [ - (_check_campaign, _('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']), + (_check_campaign,('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']), ] - + _sql_constraints = [ ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero') ] @@ -638,7 +638,7 @@ class marketing_campaign_workitem(osv.osv): 'activity': activity, 'workitem': workitem, 'object': object_id, - 'resource': object_id, + 'resource': object_id, 'transitions': activity.to_ids, 're': re, } diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 4831123e07c..758f0a27abc 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -129,9 +129,9 @@ class product_pricelist(osv.osv): #def price_get_multi(self, cr, uid, product_ids, context=None): def price_get_multi(self, cr, uid, pricelist_ids, products_by_qty_by_partner, context=None): """multi products 'price_get'. - @param pricelist_ids: - @param products_by_qty: - @param partner: + @param pricelist_ids: + @param products_by_qty: + @param partner: @param context: { 'date': Date of the pricelist (%Y-%m-%d),} @return: a dict of dict with product_id as key and a dict 'price by pricelist' as value @@ -371,7 +371,7 @@ class product_pricelist(osv.osv): 'ORDER BY sequence', (tmpl_id, prod_id, plversion['id'], qty)) res1 = cr.dictfetchall() - + for res in res1: item_id = 0 if res: @@ -386,7 +386,7 @@ class product_pricelist(osv.osv): res['base_pricelist_id']).currency_id.id price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False) - break + break elif res['base'] == -2: where = [] if partner: @@ -413,7 +413,7 @@ class product_pricelist(osv.osv): if price: price_limit = price - + price = price * (1.0+(res['price_discount'] or 0.0)) price = rounding(price, res['price_round']) price += (res['price_surcharge'] or 0.0) @@ -422,14 +422,14 @@ class product_pricelist(osv.osv): if res['price_max_margin']: price = min(price, price_limit+res['price_max_margin']) item_id = res['id'] - break + break else: # False means no valid line found ! But we may not raise an # exception here because it breaks the search price = False result[id] = price - result['item_id'] = {id: item_id} + result['item_id'] = {id: item_id} if context and ('uom' in context): product = product_obj.browse(cr, uid, prod_id) uom = product.uos_id or product.uom_id @@ -559,7 +559,7 @@ class product_pricelist_item(osv.osv): } _constraints = [ - (_check_recursion, _('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id']) + (_check_recursion,('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id']) ] def product_id_change(self, cr, uid, ids, product_id, context={}): diff --git a/addons/project/project.py b/addons/project/project.py index 6c9f66dd009..3a18ea231cf 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -86,7 +86,7 @@ class project(osv.osv): cr.execute('''SELECT project_id, sum(planned_hours), sum(total_hours), sum(effective_hours), SUM(remaining_hours) FROM - project_task + project_task WHERE project_id in %s AND state<>'cancelled' @@ -475,7 +475,7 @@ class task(osv.osv): return True _constraints = [ - (_check_recursion, _('Error ! You cannot create recursive tasks.'), ['parent_ids']) + (_check_recursion,('Error ! You cannot create recursive tasks.'), ['parent_ids']) ] # # Override view according to the company definition diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index 7cb253a2bfb..74fb95b19f7 100644 --- a/addons/sale/test/manual_order_policy.yml +++ b/addons/sale/test/manual_order_policy.yml @@ -24,13 +24,13 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0} - I click on Create Invoice button to create the invoice. -- +- !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0} - @@ -38,7 +38,7 @@ - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so0")) - assert so.invoice_ids, "Invoices has not been generated for sale_order_so0" + assert so.invoice_ids, "Invoices has not been generated for sale_order_so0" - I open the Invoice for the SO. - @@ -69,7 +69,7 @@ assert inv_brw.move_id, "Journal Entries has not been created" - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -85,7 +85,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify the invoice is in done state. + I verify the invoice is in done state. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') @@ -98,9 +98,9 @@ !python {model: sale.order}: | sale_id=self.browse(cr, uid, ref("sale_order_so0")) assert(sale_id.invoiced == True), "Paid has not been set to true" -- +- I verify that the picking has been generated for the sale order -- +- !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so0")) assert so.picking_ids,"Picking has not been generated for sale_order_so0" @@ -111,7 +111,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) picking_id = self.search(cr, uid, [('origin','=',so.name)]) - assert (picking_id),"Delivery order has not been generated" + assert(picking_id),"Delivery order has not been generated" - I verify that a procurement has been generated for so - @@ -120,7 +120,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) proc_ids = self.search(cr, uid, [('origin','=',so.name)]) - assert proc_ids, _('No Procurements!') + assert(proc_ids),"No Procurements!" - Then I click on the "Run Procurement" button - @@ -144,7 +144,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')]) - assert proc_ids, _('Procurement is not in the running state!') + assert(proc_ids),"Procurement is not in the running state!" - I verify that a purchase order has been generated - @@ -157,8 +157,8 @@ so = self.browse(cr, uid, ref("sale_order_so0")) pur_obj=self.pool.get('purchase.order') pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)]) - assert pur_id, _('Purchase order has not been generated') - + assert(pur_id),"Purchase order has not been generated" + - I click on the "Confirm" button to confirm the purchase order - @@ -175,7 +175,7 @@ pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)]) for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr) -- +- I click on the "Approved by supplier" button to approve the purchase order - !python {model: sale.order}: | @@ -192,7 +192,7 @@ for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) - - I verify that a picking related to purchase order has been generated. + I verify that a picking related to purchase order has been generated. - !python {model: sale.order}: | modules = self.pool.get('ir.module.module') @@ -204,7 +204,7 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] assert(po.picking_ids),"Picking for purchase order has not been generated" -- +- Then I click on the "Products Received" button of Incoming Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: @@ -242,10 +242,10 @@ po = pur_obj.browse(cr, uid, pur_id)[0] picking_obj = self.pool.get('stock.picking') ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) - assert ids, _('Picking is not in the done state!') + assert(ids),"Picking is not in the done state!" - Then I done the picking -- +- !python {model: stock.picking }: | import time sale_order_obj = self.pool.get('sale.order') @@ -264,7 +264,7 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that picking for sale order is in done state. @@ -274,7 +274,7 @@ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')]) pick = self.browse(cr,uid,picking_id[0]) - assert (pick.state) =='done', "Picking for SO is not in done state." + assert (pick.state) =='done', "Picking for SO is not in done state." - Then I done the delivery order - @@ -296,8 +296,8 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } - self.do_partial(cr, uid, [pick.id],partial_datas) + } + self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that delivery state is done - @@ -308,7 +308,7 @@ pick = self.browse(cr,uid,picking_id[0]) assert (pick.state) =='done', "Picking for SO is not in done state." - - I verify that a "Picked" has been set to true + I verify that a "Picked" has been set to true - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so0")) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 4b3aa5d1667..24c96fff1fd 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1368,7 +1368,7 @@ class stock_production_lot(osv.osv): 'product_id': lambda x, y, z, c: c.get('product_id', False), } _sql_constraints = [ - ('name_ref_uniq', 'unique (name, ref)', _('The combination of serial number and internal reference must be unique !')), + ('name_ref_uniq', 'unique (name, ref)',('The combination of serial number and internal reference must be unique !')), ] def action_traceability(self, cr, uid, ids, context={}): """ It traces the information of a product -- cgit v1.2.3 From 54f46060dcd3ef400eacfa8b9464d5d8ebb13f88 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 28 Oct 2010 17:10:19 +0530 Subject: [MERGE] bzr revid: hmo@tinyerp.com-20101028114019-5qkatqamaxhx6k0u --- addons/account/account.py | 2 +- addons/email_template/email_template.py | 2 +- addons/marketing_campaign/marketing_campaign.py | 4 ++-- addons/product/pricelist.py | 2 +- addons/project/project.py | 2 +- addons/stock/stock.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'addons') diff --git a/addons/account/account.py b/addons/account/account.py index f0142e205e5..5a98c1e10f5 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -130,7 +130,7 @@ class account_payment_term_line(osv.osv): return True _constraints = [ - (_check_percent,('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']), + (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% ', ['value_amount']), ] account_payment_term_line() diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 73ef005c9f2..3c0b4931286 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -267,7 +267,7 @@ This is useful for CRM leads for example"), } _sql_constraints = [ - ('name', 'unique (name)',('The template name must be unique !')) + ('name', 'unique (name)','The template name must be unique !') ] def create_action(self, cr, uid, ids, context): diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index 8cf6cfac0c4..d0d18c043db 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -257,7 +257,7 @@ class marketing_campaign_segment(osv.osv): return True _constraints = [ - (_check_model,('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']), + (_check_model, 'Model of filter must be same as resource model of Campaign ', ['ir_filter_id,campaign_id']), ] def onchange_campaign_id(self, cr, uid, ids, campaign_id): @@ -539,7 +539,7 @@ class marketing_campaign_transition(osv.osv): return True _constraints = [ - (_check_campaign,('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']), + (_check_campaign, 'The To/From Activity of transition must be of the same Campaign ', ['activity_from_id,activity_to_id']), ] _sql_constraints = [ diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 758f0a27abc..a7532423165 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -559,7 +559,7 @@ class product_pricelist_item(osv.osv): } _constraints = [ - (_check_recursion,('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id']) + (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id']) ] def product_id_change(self, cr, uid, ids, product_id, context={}): diff --git a/addons/project/project.py b/addons/project/project.py index 3a18ea231cf..994b082eb30 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -475,7 +475,7 @@ class task(osv.osv): return True _constraints = [ - (_check_recursion,('Error ! You cannot create recursive tasks.'), ['parent_ids']) + (_check_recursion, 'Error ! You cannot create recursive tasks.', ['parent_ids']) ] # # Override view according to the company definition diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 24c96fff1fd..735fb47dde8 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1368,7 +1368,7 @@ class stock_production_lot(osv.osv): 'product_id': lambda x, y, z, c: c.get('product_id', False), } _sql_constraints = [ - ('name_ref_uniq', 'unique (name, ref)',('The combination of serial number and internal reference must be unique !')), + ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique !'), ] def action_traceability(self, cr, uid, ids, context={}): """ It traces the information of a product -- cgit v1.2.3 From 42d9a84001627fd6dc67c124ccba8d2a4faf87f5 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Sat, 30 Oct 2010 16:31:37 +0530 Subject: [FIX]stock: Wrong Journals when creating an invoice from picking lp bug: https://launchpad.net/bugs/667246 fixed bzr revid: ron@tinyerp.com-20101030110137-9b8k2diccjcdugs0 --- addons/stock/wizard/stock_invoice_onshipping.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons') diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index d841c7cb37a..20a54a8c264 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -78,6 +78,8 @@ class stock_invoice_onshipping(osv.osv_memory): onshipdata_obj[ids] = onshipdata_obj.new_picking context['date_inv'] = onshipdata_obj['invoice_date'] + journal_id = onshipdata_obj['journal_id'] + context['journal_type'] =self.pool.get('account.journal').browse(cr, uid, journal_id).type invoice_ids = [] for picking in picking_obj.browse(cr, uid, context.get('active_ids', []), context=context): if picking.invoice_state == '2binvoiced': -- cgit v1.2.3 From 300389eb939995cdae2fadfc295bcc0f70340f27 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 1 Nov 2010 12:43:41 +0530 Subject: [IMP] solve state button AssertionError bzr revid: aag@tinyerp.co.in-20101101071341-fza82dcbbgsi5ynk --- addons/marketing_campaign/report/campaign_analysis_view.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'addons') diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index fd5a8c0908f..09ba411562a 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -11,6 +11,7 @@ + -- cgit v1.2.3 From 529263808f06f9365b3637019324e1e8edfa53a5 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 1 Nov 2010 16:43:15 +0530 Subject: [IMP]stock: if chain location type fixed then chain_location_id is required bzr revid: ron@tinyerp.com-20101101111315-h55yzhn3u39z7fc2 --- addons/stock/stock_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 9e3de5fca7c..42854e46537 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -304,7 +304,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -449,7 +449,7 @@ - + -- cgit v1.2.3 From 971b590f6dcc16a1add540c7c5263fcf756d9456 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 1 Nov 2010 17:49:45 +0530 Subject: [ADD]: Add Marketing/Manager user and change access of Marketing/User bzr revid: aag@tinyerp.co.in-20101101121945-afl2rs63vfop9d0h --- .../email_template/email_template_account_view.xml | 2 +- addons/email_template/security/ir.model.access.csv | 3 +++ addons/marketing/marketing_view.xml | 2 +- addons/marketing/security/marketing_security.xml | 5 +++++ .../security/ir.model.access.csv | 24 ++++++++++++++-------- 5 files changed, 26 insertions(+), 10 deletions(-) (limited to 'addons') diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index 97108cb9e33..a372e5fb443 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -3,7 +3,7 @@ + groups="marketing.group_marketing_user,marketing.group_marketing_manager"/> diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv index 79135b0de4d..17859d6bb9d 100644 --- a/addons/email_template/security/ir.model.access.csv +++ b/addons/email_template/security/ir.model.access.csv @@ -5,3 +5,6 @@ "access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1 "access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0 +"access_email_template_account_manager","email_template.account","model_email_template_account","marketing.group_marketing_manager",1,1,1,1 +"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1 +"access_email_template_mailbox_manager","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_manager",1,1,1,1 diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 69ee91d52dc..8b804487e77 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -2,7 +2,7 @@ - + marketing.installer.view diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml index 740b9b3a2c5..06cf40772f4 100644 --- a/addons/marketing/security/marketing_security.xml +++ b/addons/marketing/security/marketing_security.xml @@ -4,5 +4,10 @@ Marketing / User + + + Marketing / Manager + + diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv index 082cafd7054..c2b7b4f4c86 100644 --- a/addons/marketing_campaign/security/ir.model.access.csv +++ b/addons/marketing_campaign/security/ir.model.access.csv @@ -1,13 +1,21 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,1,1 -"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,1,1 -"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,1,1 -"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,1,1 -"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,1,1 -"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,1,1 +"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0 +"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0 +"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0 +"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0 +"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0 +"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0 -"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,1,1 -"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,1,1 +"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0 +"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,0,0 "access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0 "access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0 "access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0 +"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1 +"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1 +"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1 +"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1 +"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1 +"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1 +"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1 +"access_email_template_account_manager","email_template.account.manager","email_template.model_email_template_account","marketing.group_marketing_manager",1,1,1,1 -- cgit v1.2.3 From 88c7e8e66c7c8505c2fe4cb5ae4057f4cf6abacf Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Mon, 1 Nov 2010 18:15:37 +0530 Subject: [IMP]: Add rights for purchase user and related with other user bzr revid: ksa@tinyerp.co.in-20101101124537-7h3acibsx82thvej --- addons/mrp/security/ir.model.access.csv | 1 + addons/purchase/security/ir.model.access.csv | 4 ++-- addons/purchase_requisition/security/ir.model.access.csv | 2 ++ addons/stock/security/ir.model.access.csv | 6 ++++-- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'addons') diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index 586f82f1b53..4b8ffc13d7b 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -67,3 +67,4 @@ "access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0 +"access_mrp_production","mrp.production user","model_mrp_production","purchase.group_purchase_user",1,0,0,0 diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index ef854f8f038..4b1d857f1d0 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -7,8 +7,8 @@ "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,1,1,1 -"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_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,1,1,0 +"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,1,0 "access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0 "access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,1,1,1 "access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0 diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv index d3c6b66de92..4e14688ecc5 100644 --- a/addons/purchase_requisition/security/ir.model.access.csv +++ b/addons/purchase_requisition/security/ir.model.access.csv @@ -3,3 +3,5 @@ "access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1 "access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0 "access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0 +"access_purchase_requisition","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0 +"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0 diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 4d9c44edd79..a8e8c1565d5 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -10,11 +10,11 @@ "access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1 "access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0 "access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1 -"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,0,0,0 +"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,1,0,0 "access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0 "access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","stock.group_stock_user",1,1,1,1 "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,0,0,0 +"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,1,1,1 "access_stock_inventory_user","stock.inventory user","model_stock_inventory","stock.group_stock_user",1,1,1,1 "access_stock_inventory_manager","stock.inventory manager","model_stock_inventory","stock.group_stock_manager",1,0,0,0 @@ -33,3 +33,5 @@ "access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1 "access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0 "access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0 +"access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","purchase.group_purchase_user",1,0,1,0 +"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","purchase.group_purchase_user",1,0,1,0 -- cgit v1.2.3 From d9a4cb7313e10348ab7197cb62df76c31edcd4ec Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 1 Nov 2010 19:08:09 +0530 Subject: [IMP]sale:changes in CSV file bzr revid: ron@tinyerp.com-20101101133809-fzm17hg0heegc00l --- addons/sale/security/ir.model.access.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 11718051d04..91a3d791168 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0 +"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,1,0,0 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1 "access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0 @@ -51,3 +51,4 @@ "access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0 "access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0 +"access_stock_location_path","stock.location.path","stock_location.model_stock_location_path","base.group_sale_salesman",1,0,0,0 -- cgit v1.2.3 From 88d2e8b5301aadca2355031a3c80a82358c82f68 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 2 Nov 2010 10:59:14 +0530 Subject: [FIX]: product: Fixed problem of loading list of products in m2o of purchase line after setting qty and uom as zero and False respectively bzr revid: rpa@tinyerp.com-20101102052914-q03vwvbfse2a97uk --- addons/product/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/product/product.py b/addons/product/product.py index b43f40b1cbc..b05b7b2887c 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -342,7 +342,7 @@ class product_product(osv.osv): def _product_price(self, cr, uid, ids, name, arg, context={}): res = {} - quantity = context.get('quantity', 1) + quantity = context.get('quantity') or 1.0 pricelist = context.get('pricelist', False) if pricelist: for id in ids: -- cgit v1.2.3 From b3f09a0263d96f8e580d4da79ef7d917c1cb63da Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 2 Nov 2010 11:11:04 +0530 Subject: [FIX]: purchase: Fixed onchange product bzr revid: rpa@tinyerp.com-20101102054104-s8qaffy7jnc2bve7 --- addons/purchase/purchase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3145979d7b0..6ac5405ae0f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -643,8 +643,8 @@ class purchase_order_line(osv.osv): if not partner_id: raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.')) if not product: - return {'value': {'price_unit': price_unit or 0.0, 'name': name or '', - 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}} + return {'value': {'price_unit': 0.0, 'name': '', 'product_qty': 1.0, 'date_planned': False, + 'notes': '', 'product_uom' : False}, 'domain':{'product_uom':[]}} prod= self.pool.get('product.product').browse(cr, uid, product) lang=False if partner_id: @@ -681,7 +681,7 @@ class purchase_order_line(osv.osv): res = {'value': {'price_unit': price, 'name': name or prod_name, 'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id), 'date_planned': date_planned or dt,'notes': notes or prod.description_purchase, - 'product_qty': qty, + 'product_qty': qty or 1.0, 'product_uom': uom}} domain = {} -- cgit v1.2.3 From b629df82221022da5ccc8a5c32f07dcaaeacccbe Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Tue, 2 Nov 2010 11:24:19 +0530 Subject: [IMP]: Add security rules bzr revid: ksa@tinyerp.co.in-20101102055419-dxikwcij3n7xa9ko --- addons/purchase/security/ir.model.access.csv | 2 ++ addons/stock/security/ir.model.access.csv | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons') diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 4b1d857f1d0..693452d4e09 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -42,3 +42,5 @@ "access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,1,1,1 "access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,1,1,1 "access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0 +"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,0,1,0 +"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,0,1,0 diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index a8e8c1565d5..e1a22e9fb69 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -33,5 +33,3 @@ "access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1 "access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0 "access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0 -"access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","purchase.group_purchase_user",1,0,1,0 -"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","purchase.group_purchase_user",1,0,1,0 -- cgit v1.2.3 From 09948fcad575fc25c62dcc91d6f487ddecde0dc5 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 2 Nov 2010 11:27:27 +0530 Subject: [IMP]sale:Update CSV file for Access write bzr revid: ron@tinyerp.com-20101102055727-9ogurx3btr2bxumx --- addons/account/account_invoice_view.xml | 1 - addons/mrp/security/ir.model.access.csv | 1 + addons/sale/security/ir.model.access.csv | 1 - addons/stock_location/security/ir.model.access.csv | 2 ++ 4 files changed, 3 insertions(+), 2 deletions(-) (limited to 'addons') diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index a7da472e760..80d65334636 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -458,7 +458,6 @@ tree,form,calendar,graph [('type','=','in_invoice')] - {'type':'in_invoice', 'journal_type': 'purchase'} Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received. diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index 586f82f1b53..dcbf6c866b4 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -67,3 +67,4 @@ "access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0 +"access_mrp_bom","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0 diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 91a3d791168..39b1996ee88 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -51,4 +51,3 @@ "access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0 "access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0 -"access_stock_location_path","stock.location.path","stock_location.model_stock_location_path","base.group_sale_salesman",1,0,0,0 diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv index d3815736408..fc4eeff788b 100644 --- a/addons/stock_location/security/ir.model.access.csv +++ b/addons/stock_location/security/ir.model.access.csv @@ -6,3 +6,5 @@ "access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1 "access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1 "access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1 +"access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0 +"access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0 -- cgit v1.2.3 From 3284fe1f4a73646c769b7dac8fb7fbbdeb1b02a6 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 2 Nov 2010 12:50:19 +0530 Subject: [IMP]client close when account is not Approved is improved bzr revid: aag@tinyerp.co.in-20101102072019-k7o1mhgss3oda9jg --- addons/email_template/email_template_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py index 24b7958276d..ec8d6446603 100644 --- a/addons/email_template/email_template_account.py +++ b/addons/email_template/email_template_account.py @@ -372,7 +372,7 @@ unless it is already specified in the From Email, e.g: John Doe ", return True else: logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id) - return {'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id} + return {'nodestroy':True,'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id} def extracttime(self, time_as_string): """ -- cgit v1.2.3 From be4f579fa1045c5c23eb8c6d06d2643bdc7d3fb4 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Wed, 3 Nov 2010 15:50:01 +0530 Subject: [FIX] stock: Wrong Journals when creating an invoice from picking and Improvment in Wizard Journal_id field lp bug: https://launchpad.net/bugs/667246 fixed bzr revid: ron@tinyerp.com-20101103102001-sau6gdki0j7vdunk --- addons/stock/wizard/stock_invoice_onshipping.py | 37 ++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index 20a54a8c264..3d468129d74 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -24,14 +24,49 @@ from osv import fields, osv from tools.translate import _ class stock_invoice_onshipping(osv.osv_memory): + + def _get_journal_id(self, cr,uid,ids, context=None): + if context is None: + context = {} + + if ids['active_model'] == "stock.picking": + pick_obj = self.pool.get('stock.picking').browse(cr,uid,ids['active_id']) + acct_obj = self.pool.get('account.journal') + vals=[] + if pick_obj.type == 'in': + value = acct_obj.search(cr, uid, [('type', 'in',('sale','sale_refund') )]) + for jr_type in acct_obj.browse(cr, uid, value, context=context): + t1 = jr_type.id,jr_type.name + vals.append(t1) + + elif pick_obj.type == 'out': + value = acct_obj.search(cr, uid, [('type', 'in',('purchase','purchase_refund') )]) + for jr_type in acct_obj.browse(cr, uid, value, context=context): + t1 = jr_type.id,jr_type.name + vals.append(t1) + else: + value = acct_obj.search(cr, uid, [('type', 'in',('cash','bank','general','situation') )]) + for jr_type in acct_obj.browse(cr, uid, value, context=context): + t1 = jr_type.id,jr_type.name + vals.append(t1) + return vals + else: + return True + return vals + + _name = "stock.invoice.onshipping" _description = "Stock Invoice Onshipping" + + _columns = { - 'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True), +# 'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True,selection=_get_journal_id), + 'journal_id': fields.selection(_get_journal_id, 'Destination Journal',required=True), 'group': fields.boolean("Group by partner"), 'invoice_date': fields.date('Invoiced date'), } + def view_init(self, cr, uid, fields_list, context=None): if context is None: context = {} -- cgit v1.2.3 From 1c2082d46fad7dcc7e1fc51c639b27f7e26ecf57 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 3 Nov 2010 15:58:20 +0530 Subject: [FIX] In All: Logistic converted to Logistics lp bug: https://launchpad.net/bugs/665052 fixed bzr revid: aag@tinyerp.co.in-20101103102820-gpysva2mqgwve3kl --- addons/delivery/delivery_view.xml | 2 +- addons/mrp/i18n/ca.po | 2 +- addons/mrp/i18n/de.po | 2 +- addons/mrp/i18n/el.po | 2 +- addons/mrp/i18n/es.po | 2 +- addons/mrp/i18n/fi.po | 2 +- addons/mrp/i18n/it.po | 2 +- addons/mrp/i18n/ko.po | 2 +- addons/mrp/i18n/nl.po | 2 +- addons/mrp/i18n/pl.po | 2 +- addons/mrp/i18n/pt.po | 2 +- addons/mrp/i18n/ru.po | 2 +- addons/mrp/i18n/sk.po | 2 +- addons/mrp/i18n/tr.po | 2 +- addons/mrp/i18n/zh_CN.po | 2 +- addons/mrp/i18n/zh_HK.po | 2 +- addons/mrp/i18n/zh_TW.po | 2 +- addons/procurement/company_view.xml | 2 +- addons/procurement/i18n/de.po | 2 +- addons/procurement/i18n/en_US.po | 4 ++-- addons/procurement/i18n/fr.po | 2 +- addons/procurement/i18n/it.po | 2 +- addons/procurement/i18n/mn.po | 2 +- addons/procurement/i18n/nl.po | 2 +- addons/procurement/i18n/pl.po | 2 +- addons/procurement/i18n/procurement.pot | 2 +- addons/procurement/i18n/ru.po | 2 +- addons/sale/i18n/ar.po | 2 +- addons/sale/i18n/bg.po | 4 ++-- addons/sale/i18n/bs.po | 4 ++-- addons/sale/i18n/ca.po | 4 ++-- addons/sale/i18n/cs.po | 2 +- addons/sale/i18n/de.po | 4 ++-- addons/sale/i18n/el.po | 6 +++--- addons/sale/i18n/es.po | 4 ++-- addons/sale/i18n/es_AR.po | 4 ++-- addons/sale/i18n/es_EC.po | 2 +- addons/sale/i18n/et.po | 4 ++-- addons/sale/i18n/fi.po | 4 ++-- addons/sale/i18n/fr.po | 4 ++-- addons/sale/i18n/hr.po | 4 ++-- addons/sale/i18n/hu.po | 2 +- addons/sale/i18n/id.po | 2 +- addons/sale/i18n/it.po | 4 ++-- addons/sale/i18n/ko.po | 4 ++-- addons/sale/i18n/lt.po | 4 ++-- addons/sale/i18n/lv.po | 2 +- addons/sale/i18n/mn.po | 4 ++-- addons/sale/i18n/nl.po | 4 ++-- addons/sale/i18n/nl_BE.po | 2 +- addons/sale/i18n/pl.po | 4 ++-- addons/sale/i18n/pt.po | 4 ++-- addons/sale/i18n/pt_BR.po | 2 +- addons/sale/i18n/ro.po | 2 +- addons/sale/i18n/ru.po | 2 +- addons/sale/i18n/sale.pot | 2 +- addons/sale/i18n/sk.po | 2 +- addons/sale/i18n/sl.po | 2 +- addons/sale/i18n/sq.po | 2 +- addons/sale/i18n/sr.po | 4 ++-- addons/sale/i18n/sv.po | 4 ++-- addons/sale/i18n/tlh.po | 2 +- addons/sale/i18n/tr.po | 4 ++-- addons/sale/i18n/uk.po | 2 +- addons/sale/i18n/vi.po | 2 +- addons/sale/i18n/zh_CN.po | 4 ++-- addons/sale/i18n/zh_TW.po | 2 +- addons/sale/sale_view.xml | 6 +++--- addons/stock_location/i18n/ar.po | 2 +- addons/stock_location/i18n/bg.po | 2 +- addons/stock_location/i18n/bs.po | 2 +- addons/stock_location/i18n/ca.po | 2 +- addons/stock_location/i18n/cs.po | 2 +- addons/stock_location/i18n/de.po | 2 +- addons/stock_location/i18n/el.po | 2 +- addons/stock_location/i18n/es.po | 2 +- addons/stock_location/i18n/es_AR.po | 2 +- addons/stock_location/i18n/et.po | 2 +- addons/stock_location/i18n/fr.po | 2 +- addons/stock_location/i18n/hr.po | 2 +- addons/stock_location/i18n/hu.po | 2 +- addons/stock_location/i18n/id.po | 2 +- addons/stock_location/i18n/it.po | 2 +- addons/stock_location/i18n/ko.po | 2 +- addons/stock_location/i18n/lt.po | 2 +- addons/stock_location/i18n/mn.po | 2 +- addons/stock_location/i18n/nl.po | 2 +- addons/stock_location/i18n/nl_BE.po | 2 +- addons/stock_location/i18n/pl.po | 2 +- addons/stock_location/i18n/pt.po | 2 +- addons/stock_location/i18n/pt_BR.po | 2 +- addons/stock_location/i18n/ro.po | 2 +- addons/stock_location/i18n/ru.po | 2 +- addons/stock_location/i18n/sl.po | 2 +- addons/stock_location/i18n/sq.po | 2 +- addons/stock_location/i18n/stock_location.pot | 2 +- addons/stock_location/i18n/sv.po | 2 +- addons/stock_location/i18n/tlh.po | 2 +- addons/stock_location/i18n/tr.po | 2 +- addons/stock_location/i18n/uk.po | 2 +- addons/stock_location/i18n/vi.po | 2 +- addons/stock_location/i18n/zh_CN.po | 2 +- addons/stock_location/i18n/zh_TW.po | 2 +- addons/stock_location/stock_location_view.xml | 2 +- 104 files changed, 130 insertions(+), 130 deletions(-) (limited to 'addons') diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index b7ec0fed61e..d557f2c0750 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -128,7 +128,7 @@ sale.order - + diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po index d0f2e64988c..ca586185708 100644 --- a/addons/mrp/i18n/ca.po +++ b/addons/mrp/i18n/ca.po @@ -2270,7 +2270,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "Producte & Ubicació" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Planificador MRP & Logística" #~ msgid "" diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po index 13a95a3f4b2..02aa1967ec1 100644 --- a/addons/mrp/i18n/de.po +++ b/addons/mrp/i18n/de.po @@ -2288,7 +2288,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "Produkt & Lagerort" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Fertigungs- und Beschaffungsplanung" #~ msgid "" diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po index 5c7ca68f453..0308547af2a 100644 --- a/addons/mrp/i18n/el.po +++ b/addons/mrp/i18n/el.po @@ -2354,7 +2354,7 @@ msgstr "" #~ msgid "Best price (not yet active!)" #~ msgstr "Best price (not yet active!)" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP & Προγραμματισμός Προμηθειών" #~ msgid "" diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po index 3d464703033..04f0d069596 100644 --- a/addons/mrp/i18n/es.po +++ b/addons/mrp/i18n/es.po @@ -2279,7 +2279,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "Producto & Ubicación" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Planificador MRP & Logística" #~ msgid "" diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po index 0cb3e26f332..a41a1571a61 100644 --- a/addons/mrp/i18n/fi.po +++ b/addons/mrp/i18n/fi.po @@ -2385,7 +2385,7 @@ msgstr "" #~ "This is the days added to what you promise to customers for security purpose" #~ msgstr "Nämä päivät lisätään asiakkaalle luvattuun aikaan turvallisuussyistä" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Tuotanto- ja logistiikka-aikataulut" #~ msgid "A purchase order is created for a sub-contracting demand." diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po index 56545de28d3..a9c38d15a38 100644 --- a/addons/mrp/i18n/it.po +++ b/addons/mrp/i18n/it.po @@ -2501,7 +2501,7 @@ msgstr "" #~ "Questi sono i giorni aggiunti, per sicurezza, alla data che hai promesso ai " #~ "clienti." -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP e Schedulatore Logistico" #~ msgid "Automatic Procurements" diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po index ed5a3b7c0af..22f851c1de6 100644 --- a/addons/mrp/i18n/ko.po +++ b/addons/mrp/i18n/ko.po @@ -2246,7 +2246,7 @@ msgstr "" #~ msgid "Product name" #~ msgstr "제품 이름" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP 및 물류 스케줄러" #~ msgid "Ask New Products" diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po index 202d9117369..aeb0547ec47 100644 --- a/addons/mrp/i18n/nl.po +++ b/addons/mrp/i18n/nl.po @@ -2464,7 +2464,7 @@ msgstr "" #~ "Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de " #~ "beloofde levertijd." -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP & logistieke planning" #~ msgid "Product & Location" diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po index 1bdef26de4b..1d61c038bad 100644 --- a/addons/mrp/i18n/pl.po +++ b/addons/mrp/i18n/pl.po @@ -2260,7 +2260,7 @@ msgstr "" #~ msgid "Origin" #~ msgstr "Pochodzenie" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP i planowanie logistyczne" #~ msgid "Product & Location" diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po index 38ab051f51b..dcb5807136a 100644 --- a/addons/mrp/i18n/pt.po +++ b/addons/mrp/i18n/pt.po @@ -2500,7 +2500,7 @@ msgstr "" #~ "Estes são os dias adicionados aos que prometeu aos clientes para fins de " #~ "segurança" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Planificador Logístico e de Produção" #~ msgid "Automatic Procurements" diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po index 173247f5102..b2f867c6fac 100644 --- a/addons/mrp/i18n/ru.po +++ b/addons/mrp/i18n/ru.po @@ -2400,7 +2400,7 @@ msgstr "" #~ msgid "Exceptions Procurements" #~ msgstr "Исключения поставок" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "ПМР и Логистическое планирование" #~ msgid "Stockable Stock" diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po index d72ee6b54d0..2715a919654 100644 --- a/addons/mrp/i18n/sk.po +++ b/addons/mrp/i18n/sk.po @@ -2230,7 +2230,7 @@ msgstr "" #~ msgid "Ask New Products" #~ msgstr "Opýtať sa na nový produkt" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP a plánovač logistiky" #~ msgid "Product & Location" diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po index 6c34a3b860d..54a7b5e374d 100644 --- a/addons/mrp/i18n/tr.po +++ b/addons/mrp/i18n/tr.po @@ -2241,7 +2241,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "Ürün & Lokasyon Bilgisi" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP & Lojistik Planlaması" #~ msgid "Ask New Products" diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po index ce6a25897a9..f44485efd32 100644 --- a/addons/mrp/i18n/zh_CN.po +++ b/addons/mrp/i18n/zh_CN.po @@ -2544,7 +2544,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "产品&库位" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP&物流调度" #~ msgid "" diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po index a96126ab8db..5160246f0b4 100644 --- a/addons/mrp/i18n/zh_HK.po +++ b/addons/mrp/i18n/zh_HK.po @@ -2255,7 +2255,7 @@ msgstr "" #~ "This is the days added to what you promise to customers for security purpose" #~ msgstr "這是你為了客人的保險而所承諾的天數" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "物料需求計劃 & 物流調度" #~ msgid "Automatic Procurements" diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po index 15c4a447108..a1e6e66c1de 100644 --- a/addons/mrp/i18n/zh_TW.po +++ b/addons/mrp/i18n/zh_TW.po @@ -2251,7 +2251,7 @@ msgstr "" #~ "This is the days added to what you promise to customers for security purpose" #~ msgstr "這是你為了客人的保險而所承諾的天數" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "物料需求計劃 & 物流調度" #~ msgid "Product & Location" diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml index e046fd4faee..4d14f69edde 100644 --- a/addons/procurement/company_view.xml +++ b/addons/procurement/company_view.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po index 2978842b796..b71cf4d2cee 100644 --- a/addons/procurement/i18n/de.po +++ b/addons/procurement/i18n/de.po @@ -325,7 +325,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/en_US.po b/addons/procurement/i18n/en_US.po index 61b250516dd..249709f42cf 100644 --- a/addons/procurement/i18n/en_US.po +++ b/addons/procurement/i18n/en_US.po @@ -314,8 +314,8 @@ msgstr "If you encode manually a Procurement, you probably want to use a make to #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" -msgstr "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" +msgstr "MRP & Logistics Scheduler" #. module: procurement #: view:procurement.order.compute.all:0 diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po index 1cd6975c4f5..441527c6ce6 100644 --- a/addons/procurement/i18n/fr.po +++ b/addons/procurement/i18n/fr.po @@ -324,7 +324,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po index a9e09d5abde..83922e0b663 100644 --- a/addons/procurement/i18n/it.po +++ b/addons/procurement/i18n/it.po @@ -325,7 +325,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po index 0fd557774c7..72aa146cd7e 100644 --- a/addons/procurement/i18n/mn.po +++ b/addons/procurement/i18n/mn.po @@ -342,7 +342,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "Үйлдвэрлэл & Логистик" #. module: procurement diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po index 978d027fb94..b426a7aa414 100644 --- a/addons/procurement/i18n/nl.po +++ b/addons/procurement/i18n/nl.po @@ -325,7 +325,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po index edf783bd6c4..737298169f3 100644 --- a/addons/procurement/i18n/pl.po +++ b/addons/procurement/i18n/pl.po @@ -344,7 +344,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "MRP i planowanie logistyczne" #. module: procurement diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot index 27c61cc23c2..b0508cc87a2 100644 --- a/addons/procurement/i18n/procurement.pot +++ b/addons/procurement/i18n/procurement.pot @@ -312,7 +312,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po index 3dab25cb2f6..ba77a1e4b57 100644 --- a/addons/procurement/i18n/ru.po +++ b/addons/procurement/i18n/ru.po @@ -342,7 +342,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "ПМР и Логистическое планирование" #. module: procurement diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po index de033e1a379..c61b42d7501 100644 --- a/addons/sale/i18n/ar.po +++ b/addons/sale/i18n/ar.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po index 469e72f6b8e..cf82dd2f508 100644 --- a/addons/sale/i18n/bg.po +++ b/addons/sale/i18n/bg.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2114,7 +2114,7 @@ msgstr "Фактура базирана на доставки" #~ msgid "My sales in shipping exception" #~ msgstr "Моите продажби с грешка при доставка" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Конфигуриране на реда на доставка при продажба" #~ msgid "Sales Configuration" diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po index c65a9e3e0cd..c121e6dfc39 100644 --- a/addons/sale/i18n/bs.po +++ b/addons/sale/i18n/bs.po @@ -1457,7 +1457,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2215,7 +2215,7 @@ msgstr "Račun sa referencom na isporuku" #~ "Ovaj korak pri konfiguraciji se koristi da bi se definisalo podrazumjevanje " #~ "opcija izbora u toku kreiranja naloga za prodaju" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfigurisanje logistike prodajnog naloga" #~ msgid "Sales Configuration" diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po index 497996e82ba..1303d15c48e 100644 --- a/addons/sale/i18n/ca.po +++ b/addons/sale/i18n/ca.po @@ -1465,7 +1465,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2038,7 +2038,7 @@ msgstr "Factura des d'albarans" #~ msgid "Manual in progress" #~ msgstr "Manual en procés" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Configureu la logística de les comandes de venda" #~ msgid "You invoice has been successfully created !" diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po index 47f616f52da..c84a67d748b 100644 --- a/addons/sale/i18n/cs.po +++ b/addons/sale/i18n/cs.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po index a19fc0bfbc3..977857dbb0a 100644 --- a/addons/sale/i18n/de.po +++ b/addons/sale/i18n/de.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2177,7 +2177,7 @@ msgstr "Rechnung bei Wareneingang" #~ msgid "Sale Procurement" #~ msgstr "Auftragsbezogene Beschaffung" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfiguriere Packliste für Auftrag" #~ msgid "Status" diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po index de4f7327659..c3b4fca57b7 100644 --- a/addons/sale/i18n/el.po +++ b/addons/sale/i18n/el.po @@ -1464,7 +1464,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2344,8 +2344,8 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις" #~ "'Waiting Schedule' state is set when the invoice is confirmed but waiting " #~ "for the scheduler to be on the date 'Date Ordered'." -#~ msgid "Configure Sale Order Logistic" -#~ msgstr "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" +#~ msgstr "Configure Sale Order Logistics" #, python-format #~ msgid "" diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po index 88ae200a5da..b5c574a802e 100644 --- a/addons/sale/i18n/es.po +++ b/addons/sale/i18n/es.po @@ -1464,7 +1464,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2036,7 +2036,7 @@ msgstr "Facturar desde albaranes" #~ msgid "In progress" #~ msgstr "En progreso" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Configurar la logística de los pedidos de venta" #~ msgid "You invoice has been successfully created !" diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po index 0c847f65824..9bb7c8b758c 100644 --- a/addons/sale/i18n/es_AR.po +++ b/addons/sale/i18n/es_AR.po @@ -1462,7 +1462,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2190,7 +2190,7 @@ msgstr "Facturar desde órdenes de entrega" #~ msgid "Status" #~ msgstr "Estado" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Configurar logística de orden de venta" #~ msgid "Create Advance Invoice" diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po index b0067b49a6d..745eaa3cb15 100644 --- a/addons/sale/i18n/es_EC.po +++ b/addons/sale/i18n/es_EC.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po index 771d2773c54..fe91c762189 100644 --- a/addons/sale/i18n/et.po +++ b/addons/sale/i18n/et.po @@ -1485,7 +1485,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2154,7 +2154,7 @@ msgstr "Arve kohaletoimetamiste põhjal" #~ msgstr "" #~ "Müügikorraldusel hankimine igale reale ja see muutub hankekorralduseks." -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Seadista müügikorralduse logistika" #~ msgid "Packing Policy" diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po index d5867287896..d2c463e1d6c 100644 --- a/addons/sale/i18n/fi.po +++ b/addons/sale/i18n/fi.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2224,7 +2224,7 @@ msgstr "Lasku perustuen toimitettuihin" #~ msgid "Packing Policy" #~ msgstr "Pakkauskäytäntö" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Myyntitilauksien logistiikan asetukset" #~ msgid "One procurement for each product." diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po index 4b92ec317e9..a98f4329401 100644 --- a/addons/sale/i18n/fr.po +++ b/addons/sale/i18n/fr.po @@ -1471,7 +1471,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2076,7 +2076,7 @@ msgstr "Facture basé sur les livraisons" #~ msgid "Sale Procurement" #~ msgstr "Approvisionnement des ventes" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Configurer la logistique des commandes de ventes" #~ msgid "Sale Order Procurement" diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po index 6a521c55975..a0e3c69fba7 100644 --- a/addons/sale/i18n/hr.po +++ b/addons/sale/i18n/hr.po @@ -1458,7 +1458,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2174,7 +2174,7 @@ msgstr "Račun na temelju dostava" #~ msgid "Sale Procurement" #~ msgstr "Pribavljanje za Prodaju" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfiguriraj logistiku Prodajne Narudžbe" #~ msgid "Status" diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po index 2c3b328219c..7f2bca798d8 100644 --- a/addons/sale/i18n/hu.po +++ b/addons/sale/i18n/hu.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po index eb66cb0bf91..db2832bdd81 100644 --- a/addons/sale/i18n/id.po +++ b/addons/sale/i18n/id.po @@ -1458,7 +1458,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po index 40e9450ca72..e945ee8f195 100644 --- a/addons/sale/i18n/it.po +++ b/addons/sale/i18n/it.po @@ -1494,7 +1494,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2213,7 +2213,7 @@ msgstr "Fattura basata su Consegne" #~ msgid "Sale Procurement" #~ msgstr "Vendita appalti" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Configura la logistica di ordine di vendita" #~ msgid "Status" diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po index daa426d1cf4..37bd9b4d242 100644 --- a/addons/sale/i18n/ko.po +++ b/addons/sale/i18n/ko.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2206,7 +2206,7 @@ msgstr "베송에 기초한 인보이스" #~ "order" #~ msgstr "판매 주문 작성 시, 디폴트 피킹 정책을 설정하는 구성 과정" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "판매 주문 물류 구성" #~ msgid "Quantity (UOS)" diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po index 35180aaeb1d..a044f016e62 100644 --- a/addons/sale/i18n/lt.po +++ b/addons/sale/i18n/lt.po @@ -1461,7 +1461,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2235,7 +2235,7 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo" #~ msgid "Sale Procurement" #~ msgstr "Planiniai užsakymai" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfigūruoti pardavimo užsakymo logistiką" #~ msgid "Packing Policy" diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po index b72e429313d..e92aa05e425 100644 --- a/addons/sale/i18n/lv.po +++ b/addons/sale/i18n/lv.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po index 07bb9e7a3ba..64b4a4fa49c 100644 --- a/addons/sale/i18n/mn.po +++ b/addons/sale/i18n/mn.po @@ -1473,7 +1473,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2316,7 +2316,7 @@ msgstr "" #~ msgid "One procurement for each product." #~ msgstr "Бүтээгдэхүүн бүр дээр нэг татан авалт" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Борлуулалтын захиалгын Ложистик тохиргоо" #~ msgid "Sales order lines" diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po index da7086887fc..32539b346d8 100644 --- a/addons/sale/i18n/nl.po +++ b/addons/sale/i18n/nl.po @@ -1458,7 +1458,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2160,7 +2160,7 @@ msgstr "Facturatie gebaseer op leveringen" #~ msgid "Sale Procurement" #~ msgstr "Uitlevering verkoop" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Stel verkooplogistiek in" #~ msgid "Status" diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po index d609b1b857e..6ed2db9718e 100644 --- a/addons/sale/i18n/nl_BE.po +++ b/addons/sale/i18n/nl_BE.po @@ -699,7 +699,7 @@ msgstr "" #. module: sale #: view:sale.config.picking_policy:0 -msgid "Configure Sale Order Logistic" +msgid "Configure Sale Order Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po index 949545153ec..8e6d0960657 100644 --- a/addons/sale/i18n/pl.po +++ b/addons/sale/i18n/pl.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2098,7 +2098,7 @@ msgstr "Faktura wg dostaw" #~ msgid "Sales Process" #~ msgstr "Proces sprzedaży" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfiguruj ligistykę zamówienia sprzedaży" #~ msgid "One procurement for each product." diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po index 8f1f7b132f8..2d6e3d27de6 100644 --- a/addons/sale/i18n/pt.po +++ b/addons/sale/i18n/pt.po @@ -1457,7 +1457,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2208,7 +2208,7 @@ msgstr "Facturar com base na expedição" #~ msgid "Procurement for each line" #~ msgstr "Aprovisionamento para cada linha" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Configurar a logística da ordem de venda" #~ msgid "Sales Configuration" diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po index 844f8081f02..82ea85b0488 100644 --- a/addons/sale/i18n/pt_BR.po +++ b/addons/sale/i18n/pt_BR.po @@ -1466,7 +1466,7 @@ msgstr "Vendas por Representante" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "Logistica" #. module: sale diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po index 755529d8146..dd68a487a4e 100644 --- a/addons/sale/i18n/ro.po +++ b/addons/sale/i18n/ro.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po index 46b68f13499..1873236086a 100644 --- a/addons/sale/i18n/ru.po +++ b/addons/sale/i18n/ru.po @@ -1528,7 +1528,7 @@ msgstr "Продажи по менеджеру продаж" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "Логистика" #. module: sale diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 492265144f0..61a0bb301be 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -1387,7 +1387,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po index 759f08e932a..6d460268901 100644 --- a/addons/sale/i18n/sk.po +++ b/addons/sale/i18n/sk.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po index 15f81f76eee..e93421dc470 100644 --- a/addons/sale/i18n/sl.po +++ b/addons/sale/i18n/sl.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po index a677946c53e..1e67a58edfe 100644 --- a/addons/sale/i18n/sq.po +++ b/addons/sale/i18n/sq.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po index 790a25c9606..c51fb8f82a2 100644 --- a/addons/sale/i18n/sr.po +++ b/addons/sale/i18n/sr.po @@ -1462,7 +1462,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2214,7 +2214,7 @@ msgstr "Račun na osnovu isporuke" #~ msgid "Sales Configuration" #~ msgstr "Konfiguracija prodaje" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfigurisanje logistike naloga za prodaju" #~ msgid "Status" diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po index c4651c9030c..19c99c2e46c 100644 --- a/addons/sale/i18n/sv.po +++ b/addons/sale/i18n/sv.po @@ -1456,7 +1456,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2184,7 +2184,7 @@ msgstr "Fakturera utgående ifrån leveranser" #~ msgid "Procurement for each line" #~ msgstr "Anskaffning för varje rad" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Konfigurera kundorder logistik" #~ msgid "Sale Procurement" diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po index 91409bfe880..0917dc6147f 100644 --- a/addons/sale/i18n/tlh.po +++ b/addons/sale/i18n/tlh.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po index 0f19f853131..a4aad4e217b 100644 --- a/addons/sale/i18n/tr.po +++ b/addons/sale/i18n/tr.po @@ -1455,7 +1455,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2119,7 +2119,7 @@ msgstr "Teslimatlara Bağlı Fatura" #~ msgid "Sale Procurement" #~ msgstr "Satış Satınalması" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Satış Sipariş Lojistiğini Ayarla" #~ msgid "Status" diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po index 4c3f124421e..1ae4fb3fd2a 100644 --- a/addons/sale/i18n/uk.po +++ b/addons/sale/i18n/uk.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po index 23136063d35..c272c028a19 100644 --- a/addons/sale/i18n/vi.po +++ b/addons/sale/i18n/vi.po @@ -1456,7 +1456,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po index 08519599ba4..514c8c3ece9 100644 --- a/addons/sale/i18n/zh_CN.po +++ b/addons/sale/i18n/zh_CN.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2220,7 +2220,7 @@ msgstr "发票基于送货单" #~ msgid "Sale Procurement" #~ msgstr "销售产品需求" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "设置销售订单逻辑" #~ msgid "Packing Policy" diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po index 46046d713af..4c600190c3d 100644 --- a/addons/sale/i18n/zh_TW.po +++ b/addons/sale/i18n/zh_TW.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 5c3690504c2..e9aa1de470a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -219,8 +219,8 @@ - - + + @@ -541,7 +541,7 @@ Sales Application Configuration - Configure Sales Order Logistic + Configure Sales Order Logistics Setup your sales workflow and default values. diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po index 14ac0cec775..15698f0a426 100644 --- a/addons/stock_location/i18n/ar.po +++ b/addons/stock_location/i18n/ar.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po index 15c8281003d..6ec712b3543 100644 --- a/addons/stock_location/i18n/bg.po +++ b/addons/stock_location/i18n/bg.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po index d0af6268488..367c11ed5a8 100644 --- a/addons/stock_location/i18n/bs.po +++ b/addons/stock_location/i18n/bs.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po index d94921bda61..52ca8cb951f 100644 --- a/addons/stock_location/i18n/ca.po +++ b/addons/stock_location/i18n/ca.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po index 73b5d31b105..81ee1068653 100644 --- a/addons/stock_location/i18n/cs.po +++ b/addons/stock_location/i18n/cs.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po index 313b5d6097c..bb7af0149f1 100644 --- a/addons/stock_location/i18n/de.po +++ b/addons/stock_location/i18n/de.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po index 114381592f7..b1d01d5094c 100644 --- a/addons/stock_location/i18n/el.po +++ b/addons/stock_location/i18n/el.po @@ -32,7 +32,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po index 23ec5602b6d..453995fae56 100644 --- a/addons/stock_location/i18n/es.po +++ b/addons/stock_location/i18n/es.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po index c5d219a9823..860b97ff6ae 100644 --- a/addons/stock_location/i18n/es_AR.po +++ b/addons/stock_location/i18n/es_AR.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po index 5e68ccc2368..3828b0588ba 100644 --- a/addons/stock_location/i18n/et.po +++ b/addons/stock_location/i18n/et.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po index acb531a5549..dbe0d998994 100644 --- a/addons/stock_location/i18n/fr.po +++ b/addons/stock_location/i18n/fr.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po index 9e6e18715b2..9a67e1fe2fb 100644 --- a/addons/stock_location/i18n/hr.po +++ b/addons/stock_location/i18n/hr.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po index 83b3624675d..c48382d3f8a 100644 --- a/addons/stock_location/i18n/hu.po +++ b/addons/stock_location/i18n/hu.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po index 3888e97469a..30ea2eaf696 100644 --- a/addons/stock_location/i18n/id.po +++ b/addons/stock_location/i18n/id.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po index 3c138fc8622..ead3d8468ee 100644 --- a/addons/stock_location/i18n/it.po +++ b/addons/stock_location/i18n/it.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po index 64a5936c3a6..c98327842df 100644 --- a/addons/stock_location/i18n/ko.po +++ b/addons/stock_location/i18n/ko.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po index e1eaa398c2c..7761ac5fb80 100644 --- a/addons/stock_location/i18n/lt.po +++ b/addons/stock_location/i18n/lt.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po index aa677c23cd8..a6b2c29c243 100644 --- a/addons/stock_location/i18n/mn.po +++ b/addons/stock_location/i18n/mn.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po index 6ddc0f1b92d..d5da8405080 100644 --- a/addons/stock_location/i18n/nl.po +++ b/addons/stock_location/i18n/nl.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po index 401207e5cae..3c0dcd42c34 100644 --- a/addons/stock_location/i18n/nl_BE.po +++ b/addons/stock_location/i18n/nl_BE.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po index 0ee1d85550c..dd1d98a7e07 100644 --- a/addons/stock_location/i18n/pl.po +++ b/addons/stock_location/i18n/pl.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po index cdc303372d4..2eee9cb5b4a 100644 --- a/addons/stock_location/i18n/pt.po +++ b/addons/stock_location/i18n/pt.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po index 1f6ae3bd5b4..ffa9708416d 100644 --- a/addons/stock_location/i18n/pt_BR.po +++ b/addons/stock_location/i18n/pt_BR.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po index e45ec906169..402edbad361 100644 --- a/addons/stock_location/i18n/ro.po +++ b/addons/stock_location/i18n/ro.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po index 38709513ee1..2c2aa9d2a4f 100644 --- a/addons/stock_location/i18n/ru.po +++ b/addons/stock_location/i18n/ru.po @@ -29,7 +29,7 @@ msgstr "Входящие пути" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "Товарно-транспортный поток" #. module: stock_location diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po index a0de701f1b4..3c480360a69 100644 --- a/addons/stock_location/i18n/sl.po +++ b/addons/stock_location/i18n/sl.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/sq.po b/addons/stock_location/i18n/sq.po index 511a0d9333f..bb3d33c55e9 100644 --- a/addons/stock_location/i18n/sq.po +++ b/addons/stock_location/i18n/sq.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot index 503dadc84b8..634e2098084 100644 --- a/addons/stock_location/i18n/stock_location.pot +++ b/addons/stock_location/i18n/stock_location.pot @@ -28,7 +28,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po index 62f737a30d5..5bd2f34576d 100644 --- a/addons/stock_location/i18n/sv.po +++ b/addons/stock_location/i18n/sv.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po index bc570c3c26f..aeddaabb045 100644 --- a/addons/stock_location/i18n/tlh.po +++ b/addons/stock_location/i18n/tlh.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po index 508a5b7cbb0..24073d880f5 100644 --- a/addons/stock_location/i18n/tr.po +++ b/addons/stock_location/i18n/tr.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po index 20ecf89146e..72391f54656 100644 --- a/addons/stock_location/i18n/uk.po +++ b/addons/stock_location/i18n/uk.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/vi.po b/addons/stock_location/i18n/vi.po index 69a82695333..f43399b2b34 100644 --- a/addons/stock_location/i18n/vi.po +++ b/addons/stock_location/i18n/vi.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po index 8b14a486d95..c721db268a7 100644 --- a/addons/stock_location/i18n/zh_CN.po +++ b/addons/stock_location/i18n/zh_CN.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po index 9369bea9bfb..f04da49edd0 100644 --- a/addons/stock_location/i18n/zh_TW.po +++ b/addons/stock_location/i18n/zh_TW.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml index 3d08d48034e..24816e9fa1c 100644 --- a/addons/stock_location/stock_location_view.xml +++ b/addons/stock_location/stock_location_view.xml @@ -40,7 +40,7 @@ - + -- cgit v1.2.3 From 95124a4a3f5b4124e6d6fd7b365643e639e0c5f7 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 3 Nov 2010 18:08:55 +0530 Subject: [FIX]: product_visible_discount: Fixed computation of discount lp bug: https://launchpad.net/bugs/667558 fixed bzr revid: rpa@tinyerp.com-20101103123855-tqtml3aggrxu9fka --- .../product_visible_discount.py | 32 ++++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'addons') diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index 6b1c60ca516..9e8c8f55643 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -43,7 +43,7 @@ class sale_order_line(osv.osv): uom=False, qty_uos=0, uos=False, name='', partner_id=False, lang=False, update_tax=True,date_order=False,packaging=False,fiscal_position=False, flag=False): - def get_real_price(res_dict, product_id, pricelist): + def get_real_price(res_dict, product_id, qty, uom, pricelist): item_obj = self.pool.get('product.pricelist.item') price_type_obj = self.pool.get('product.price.type') product_obj = self.pool.get('product.product') @@ -56,10 +56,17 @@ class sale_order_line(osv.osv): if item_base > 0: field_name = price_type_obj.browse(cr, uid, item_base).field - product_tmpl_id = product_obj.browse(cr, uid, product_id, context).product_tmpl_id.id + product = product_obj.browse(cr, uid, product_id, context) + product_tmpl_id = product.product_tmpl_id.id product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context) - return product_read[field_name] + + factor = 1.0 + if uom and uom != product.uom_id.id: + product_uom_obj = self.pool.get('product.uom') + uom_data = product_uom_obj.browse(cr, uid, product.uom_id.id) + factor = uom_data.factor + return product_read[field_name] * factor res=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, @@ -84,7 +91,7 @@ class sale_order_line(osv.osv): pricelists = pricelist_obj.read(cr,uid,[pricelist],['visible_discount']) old_uom = product.uos_id or product.uom_id - new_list_price = get_real_price(list_price, product.id, pricelist) + new_list_price = get_real_price(list_price, product.id, qty, uom, pricelist) if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0): discount = (new_list_price - price) / new_list_price * 100 result['price_unit'] = new_list_price @@ -101,7 +108,7 @@ class account_invoice_line(osv.osv): def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}): res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context) - def get_real_price(res_dict, product_id, pricelist): + def get_real_price(res_dict, product_id, qty, uom, pricelist): item_obj = self.pool.get('product.pricelist.item') price_type_obj = self.pool.get('product.price.type') product_obj = self.pool.get('product.product') @@ -114,10 +121,17 @@ class account_invoice_line(osv.osv): if item_base > 0: field_name = price_type_obj.browse(cr, uid, item_base).field - product_tmpl_id = product_obj.browse(cr, uid, product_id, context).product_tmpl_id.id + product = product_obj.browse(cr, uid, product_id, context) + product_tmpl_id = product.product_tmpl_id.id product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context) - return product_read[field_name] + + factor = 1.0 + if uom and uom != product.uom_id.id: + product_uom_obj = self.pool.get('product.uom') + uom_data = product_uom_obj.browse(cr, uid, product.uom_id.id) + factor = uom_data.factor + return product_read[field_name] * factor if product: pricelist_obj = self.pool.get('product.pricelist') @@ -133,7 +147,7 @@ class account_invoice_line(osv.osv): raise osv.except_osv(_('No Purchase Pricelist Found !'),_("You must first define a pricelist for Supplier !")) price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom})[pricelist] price_unit = price_unit_res[pricelist] - real_price = get_real_price(price_unit_res, product.id, pricelist) + real_price = get_real_price(price_unit_res, product.id, qty, uom, pricelist) else: if partner_id: pricelist = partner_obj.browse(cr, uid, partner_id).property_product_pricelist.id @@ -142,7 +156,7 @@ class account_invoice_line(osv.osv): price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom}) price_unit = price_unit_res[pricelist] - real_price = get_real_price(price_unit_res, product.id, pricelist) + real_price = get_real_price(price_unit_res, product.id, qty, uom, pricelist) if pricelist: pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount']) if(len(pricelists)>0 and pricelists[0]['visible_discount'] and real_price != 0): -- cgit v1.2.3 From 36c6bbfe6fde6fd649044cdcdd3a16e926902c3c Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 3 Nov 2010 19:03:30 +0530 Subject: [FIX]: product: Fixed precision of conversation ratio(factor) lp bug: https://launchpad.net/bugs/511193 fixed bzr revid: rpa@tinyerp.com-20101103133330-scgkvp2khxbsscec --- addons/product/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/product/product.py b/addons/product/product.py index b05b7b2887c..a3266070903 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -69,7 +69,7 @@ class product_uom(osv.osv): 'name': fields.char('Name', size=64, required=True, translate=True), 'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade', help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."), - 'factor': fields.float('Ratio', required=True,digits=(12, 6), + 'factor': fields.float('Ratio', required=True,digits=(12, 12), help='How many times this UoM is smaller than the reference UoM in this category:\n'\ '1 * (reference unit) = ratio * (this unit)'), 'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'), -- cgit v1.2.3 From 5c6172df5aa85a6c4301d27922cad99a5fdd4efb Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 4 Nov 2010 10:30:13 +0530 Subject: [FIX]mrp: raises exception error when mrp module produce product with mark Track Manufacturing Lots lp bug: https://launchpad.net/bugs/669210 fixed bzr revid: ron@tinyerp.com-20101104050013-pk01lxfs91163uih --- addons/stock/stock.py | 2 +- addons/stock/wizard/stock_invoice_onshipping.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'addons') diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 735fb47dde8..1c3b31a353b 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2231,7 +2231,7 @@ class stock_move(osv.osv): quantity_rest = quantity uos_qty_rest = uos_qty if move.product_id.track_production and location_id: - res += self.split_lines(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context) + res += self.action_split(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context) else: res += [move.id] update_val = { diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index 3d468129d74..38b384cdcde 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -28,18 +28,17 @@ class stock_invoice_onshipping(osv.osv_memory): def _get_journal_id(self, cr,uid,ids, context=None): if context is None: context = {} - if ids['active_model'] == "stock.picking": pick_obj = self.pool.get('stock.picking').browse(cr,uid,ids['active_id']) acct_obj = self.pool.get('account.journal') vals=[] - if pick_obj.type == 'in': + if pick_obj.type == 'out': value = acct_obj.search(cr, uid, [('type', 'in',('sale','sale_refund') )]) for jr_type in acct_obj.browse(cr, uid, value, context=context): t1 = jr_type.id,jr_type.name vals.append(t1) - elif pick_obj.type == 'out': + elif pick_obj.type == 'in': value = acct_obj.search(cr, uid, [('type', 'in',('purchase','purchase_refund') )]) for jr_type in acct_obj.browse(cr, uid, value, context=context): t1 = jr_type.id,jr_type.name -- cgit v1.2.3 From 75c2110758a3d2efa12cbfa27270a7a2ab8fce72 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 4 Nov 2010 14:05:07 +0530 Subject: [IMP] stock:Improvement on Create Invoice Wizard in outgoing delivary bzr revid: ron@tinyerp.com-20101104083507-nl27rwo2u4ttm5w4 --- addons/stock/wizard/stock_invoice_onshipping.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'addons') diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index 38b384cdcde..3be2ab72067 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -25,20 +25,27 @@ from tools.translate import _ class stock_invoice_onshipping(osv.osv_memory): - def _get_journal_id(self, cr,uid,ids, context=None): + def _get_journal_id(self, cr, uid, context=None): if context is None: context = {} - if ids['active_model'] == "stock.picking": - pick_obj = self.pool.get('stock.picking').browse(cr,uid,ids['active_id']) - acct_obj = self.pool.get('account.journal') - vals=[] - if pick_obj.type == 'out': + + model = context.get('active_model') + if not model or model != 'stock.picking': + return [] + + model_pool = self.pool.get(model) + acct_obj = self.pool.get('account.journal') + res_ids = context and context.get('active_ids', []) + vals=[] + pick_types = list(set(map(lambda x: x.type, model_pool.browse(cr, uid, res_ids, context=context)))) + for type in pick_types: + if type == 'out': value = acct_obj.search(cr, uid, [('type', 'in',('sale','sale_refund') )]) for jr_type in acct_obj.browse(cr, uid, value, context=context): t1 = jr_type.id,jr_type.name vals.append(t1) - elif pick_obj.type == 'in': + elif type == 'in': value = acct_obj.search(cr, uid, [('type', 'in',('purchase','purchase_refund') )]) for jr_type in acct_obj.browse(cr, uid, value, context=context): t1 = jr_type.id,jr_type.name @@ -48,9 +55,6 @@ class stock_invoice_onshipping(osv.osv_memory): for jr_type in acct_obj.browse(cr, uid, value, context=context): t1 = jr_type.id,jr_type.name vals.append(t1) - return vals - else: - return True return vals -- cgit v1.2.3 From c513041a32c6d98539358ee3f840a0570df3b285 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 4 Nov 2010 15:40:19 +0530 Subject: [FIX] SALE: invoice from packing wrong price/unit if product has uos lp bug: https://launchpad.net/bugs/668378 fixed bzr revid: aag@tinyerp.co.in-20101104101019-c219duu0021gjs4h --- addons/sale/stock.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'addons') diff --git a/addons/sale/stock.py b/addons/sale/stock.py index f9e0c38494b..c020389ba19 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -69,6 +69,13 @@ class stock_picking(osv.osv): def _get_price_unit_invoice(self, cursor, user, move_line, type): if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id: + from_uom_id = move_line.product_id.uom_id.id + to_uom_id = move_line.product_id.uos_id.id + price = move_line.sale_line_id.price_unit + coeff = move_line.product_id.uos_coeff + if from_uom_id != to_uom_id and coeff != 0: + price_unit = price / coeff + return price_unit return move_line.sale_line_id.price_unit return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type) -- cgit v1.2.3 From 37ffc45883b6a8ad758d5f341f0b5a3dfa540140 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Thu, 4 Nov 2010 17:41:48 +0530 Subject: [FIX,REF]: stock: Code refactoring lp bug: https://launchpad.net/bugs/666781 fixed bzr revid: rpa@tinyerp.com-20101104121148-g4cqx1bocnmxsued --- addons/stock/wizard/stock_return_picking.py | 3 +-- addons/stock/wizard/stock_split_move.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'addons') diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py index 78852202440..cf6f7c4b1bd 100644 --- a/addons/stock/wizard/stock_return_picking.py +++ b/addons/stock/wizard/stock_return_picking.py @@ -149,10 +149,9 @@ class stock_return_picking(osv.osv_memory): new_picking = None date_cur = time.strftime('%Y-%m-%d %H:%M:%S') - move_ids = [m.id for m in [line for line in pick.move_lines]] set_invoice_state_to_none = True returned_lines = 0 - for move in move_obj.browse(cr, uid, move_ids): + for move in pick.move_lines: if not new_picking: if pick.type=='out': new_type = 'in' diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py index f3e72bfdc11..92262648272 100644 --- a/addons/stock/wizard/stock_split_move.py +++ b/addons/stock/wizard/stock_split_move.py @@ -104,8 +104,7 @@ class stock_split_move_line(osv.osv_memory): pick_obj = self.pool.get('stock.picking') pick = pick_obj.browse(cr, uid, record_id, context=context) data = self.read(cr, uid, ids[0]) - move_ids = [m.id for m in [line for line in pick.move_lines]] - for move in move_obj.browse(cr, uid, move_ids, context=context): + for move in pick.move_lines: quantity = data['move%s' % move.id] if 0 < quantity < move.product_qty: new_qty = move.product_qty - quantity -- cgit v1.2.3 From f7dda35ecc888f92a2e12aa4d622769938e8de8f Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Wed, 10 Nov 2010 11:07:49 +0530 Subject: [FIX]stock.move:stock moves - missing search field ->Reference lp bug: https://launchpad.net/bugs/670056 fixed bzr revid: ron@tinyerp.com-20101110053749-sqdya9y115cgcj5k --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 1c3b31a353b..8308d0bfb11 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1480,7 +1480,7 @@ class stock_move(osv.osv): 'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Optional: next stock move when chaining them", select=True), 'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History (child moves)'), 'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'), - 'picking_id': fields.many2one('stock.picking', 'Picking List', select=True,states={'done': [('readonly', True)]}), + 'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}), 'note': fields.text('Notes'), 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\ -- cgit v1.2.3 From 548e60b23f82ab6a69690b082b38efc752033284 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 10 Nov 2010 12:47:19 +0530 Subject: [FIX] base_report_desinger: push report to db bzr revid: sbh@tinyerp.com-20101110071719-u3owi49sk3nm5pel --- addons/base_report_designer/base_report_designer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons') diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py index 283c8ec7e23..5eb4c89a43f 100644 --- a/addons/base_report_designer/base_report_designer.py +++ b/addons/base_report_designer/base_report_designer.py @@ -22,7 +22,6 @@ from osv import osv from openerp_sxw2rml import sxw2rml from StringIO import StringIO -from report import interface import base64 import pooler import tools @@ -57,7 +56,7 @@ class report_xml(osv.osv): 'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), }) db = pooler.get_db_only(cr.dbname) - interface.register_all(db) + self.pool.get('ir.actions.report.xml').register_all(cr = db.cursor()) return True def report_get(self, cr, uid, report_id, context={}): -- cgit v1.2.3 From b12bcdc3841e3f46e0223f3c1448fda5a9997244 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 10 Nov 2010 13:02:28 +0530 Subject: [FIX]:bug-670905 stock partial move wizard bzr revid: ksa@tinyerp.co.in-20101110073228-6f2a1xfpiaq3l4r0 --- addons/purchase/stock.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py index ea9cacd7979..987c76e372d 100644 --- a/addons/purchase/stock.py +++ b/addons/purchase/stock.py @@ -37,7 +37,7 @@ class stock_move(osv.osv): """ reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context) if move.product_id.cost_method != 'average' or not move.price_unit: - # no average price costing or cost not specified during picking validation, we will + # no average price costing or cost not specified during picking validation, we will # plug the purchase line values if they are found. if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id: reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.purchase_id.pricelist_id.currency_id.id @@ -123,6 +123,8 @@ class stock_partial_picking(osv.osv_memory): for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])): has_product_cost = (pick.type == 'in' and pick.purchase_id) for m in pick.move_lines: + if m.state in ('done','cancel') : + continue if has_product_cost and m.product_id.cost_method == 'average' and m.purchase_line_id: # We use the original PO unit purchase price as the basis for the cost, expressed # in the currency of the PO (i.e the PO's pricelist currency) -- cgit v1.2.3 From bdb8814237c28f0b296cd7173dc580aa48e85b69 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Wed, 10 Nov 2010 17:29:59 +0530 Subject: [FIX] project: Fixed encoding error on task name in Delegate wizard. lp bug: https://launchpad.net/bugs/670914 fixed bzr revid: uco@tinyerp.com-20101110115959-nd8h9v8910hr3jvc --- addons/project/wizard/project_task_delegate.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'addons') diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index ac160fb6c94..9fc5d21e424 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -48,20 +48,21 @@ class project_task_delegate(osv.osv_memory): record_id = context and context.get('active_id', False) or False task_pool = self.pool.get('project.task') task = task_pool.browse(cr, uid, record_id, context=context) + task_name = (task.name).encode('utf-8') if 'name' in fields: - if task.name.startswith(_('CHECK: ')): - newname = str(task.name).replace(_('CHECK: '), '') + if task_name.startswith(_('CHECK: ')): + newname = str(task_name).replace(_('CHECK: '), '') else: - newname = task.name or '' + newname = task_name or '' res.update({'name': newname}) if 'planned_hours' in fields: res.update({'planned_hours': task.remaining_hours or 0.0}) if 'prefix' in fields: - if task.name.startswith(_('CHECK: ')): - newname = str(task.name).replace(_('CHECK: '), '') + if task_name.startswith(_('CHECK: ')): + newname = str(task_name).replace(_('CHECK: '), '') else: - newname = task.name or '' + newname = task_name or '' prefix = _('CHECK: ') + newname res.update({'prefix': prefix}) if 'new_task_description' in fields: @@ -103,6 +104,7 @@ class project_task_delegate(osv.osv_memory): task_id = context.get('active_id', False) task_pool = self.pool.get('project.task') delegate_data = self.read(cr, uid, ids, context=context)[0] + delegate_data['name'] = (delegate_data['name']).decode('utf-8') task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context) return {} -- cgit v1.2.3 From 0705b7bad719a3e87758346cd02b1bb1575faa5a Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 10 Nov 2010 17:43:19 +0530 Subject: [FIX]: stock: Production lots should not be created for product which is of type=service lp bug: https://launchpad.net/bugs/641110 fixed bzr revid: rpa@tinyerp.com-20101110121319-ai7zni54lkfw6f29 --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/stock/stock.py b/addons/stock/stock.py index e6737ae31bb..4a63a8bd5f5 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1353,7 +1353,7 @@ class stock_production_lot(osv.osv): 'name': fields.char('Serial Number', size=64, required=True, help="Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"), 'ref': fields.char('Internal Reference', size=256, help="Internal reference number in case it differs from the manufacturer's serial number"), 'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"), - 'product_id': fields.many2one('product.product', 'Product', required=True), + 'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]), 'date': fields.datetime('Creation Date', required=True), 'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True, help="Current quantity of products with this Production Lot Number available in company warehouses", -- cgit v1.2.3 From 3e9cf431b3bb7970972134241615b2f6de7c62a9 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Wed, 10 Nov 2010 18:47:58 +0530 Subject: [FIX]Account,stock:Creating invoices and grouping multiplies services lp bug: https://launchpad.net/bugs/663890 fixed bzr revid: ron@tinyerp.com-20101110131758-0c0zjal8sozbvflv --- addons/stock/stock_view.xml | 14 ++++++------- addons/stock/wizard/stock_invoice_onshipping.py | 28 ++++++++++++++++++------- 2 files changed, 27 insertions(+), 15 deletions(-) (limited to 'addons') diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index aa0985a6cde..61bc8b887de 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -726,7 +726,7 @@