From 6491fd0bdcc80aad09af390ff3e2ea03151f0564 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 11 Mar 2013 16:41:16 +0530 Subject: [PATCH 01/26] [IMP] product: change string of field 'name_template' bzr revid: cha@tinyerp.com-20130311111116-a2msikzcx8t1fhtj --- addons/product/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/product.py b/addons/product/product.py index 1cacb58df23..a6de058fb86 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -554,7 +554,7 @@ class product_product(osv.osv): 'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')), 'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')), 'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'), - 'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True), + 'name_template': fields.related('product_tmpl_id', 'name', string="Product Template Name", type='char', size=128, store=True, select=True), 'color': fields.integer('Color Index'), # image: all image fields are base64 encoded and PIL-supported 'image': fields.binary("Image", From e42ef6cd0c38f7aa41595101ee9d276f6bc56ca1 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 11 Mar 2013 17:09:09 +0530 Subject: [PATCH 02/26] [IMP] crm: rename 'alias_id' to solve 'Sales Team' import issue bzr revid: cha@tinyerp.com-20130311113909-oaqguolwr59vpvvg --- addons/crm/crm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index df6d5e12b66..75b9c7eaff0 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -125,7 +125,7 @@ class crm_case_section(osv.osv): 'note': fields.text('Description'), 'working_hours': fields.float('Working Hours', digits=(16,2 )), 'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'), - 'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, + 'alias_id': fields.many2one('mail.alias', 'Mail Alias', ondelete="cascade", required=True, help="The email address associated with this team. New emails received will automatically " "create new leads assigned to the team."), } From de873d195d35ec708f190a45d6c712f60ec42811 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 11 Mar 2013 19:06:24 +0530 Subject: [PATCH 03/26] [IMP] base_calendar: rename 'organizer' to solve 'Calendar' import issue bzr revid: cha@tinyerp.com-20130311133624-jhmdy3rde2ou3dub --- addons/base_calendar/base_calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index ca75c9e20fc..6fb3024e696 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1073,7 +1073,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'recurrent_id_date': fields.datetime('Recurrent ID date'), 'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'), 'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}), - 'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent. + 'organizer': fields.char("Organizer's Email", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent. 'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}), 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'), 'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"), From c2244b5c1c9da541a6305ce00d93a57258ee49f8 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 12 Mar 2013 10:33:48 +0530 Subject: [PATCH 04/26] [IMP] base_calendar: change string of field 'attendee_ids' bzr revid: cha@tinyerp.com-20130312050348-jtqjspavpvmyy6us --- addons/base_calendar/crm_meeting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index 6010f5ccfca..daf2bfbb7b7 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -60,7 +60,7 @@ class crm_meeting(base_state, osv.Model): 'categ_ids': fields.many2many('crm.meeting.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags'), 'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\ - 'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}), + 'event_id', 'attendee_id', 'Invitations', states={'done': [('readonly', True)]}), } _defaults = { 'state': 'open', From c36e25c6403d582c047d916a688e2cd829a40f93 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 12 Mar 2013 10:47:59 +0530 Subject: [PATCH 05/26] [IMP] mail, project: change string of fields 'alias_name' & 'priority' bzr revid: cha@tinyerp.com-20130312051759-2ty3vro2l3x9nfol --- addons/mail/mail_alias.py | 2 +- addons/project/project.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index d9c49d833ab..cc559936a22 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -63,7 +63,7 @@ class mail_alias(osv.Model): return dict.fromkeys(ids, domain or "") _columns = { - 'alias_name': fields.char('Alias', required=True, + 'alias_name': fields.char('Alias Name', required=True, help="The name of the email alias, e.g. 'jobs' " "if you want to catch emails for ",), 'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade", diff --git a/addons/project/project.py b/addons/project/project.py index 831bea64ce8..c8f264ee773 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -234,7 +234,7 @@ class project(osv.osv): 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."), 'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True), - 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"), + 'priority': fields.integer('Priority', help="Gives the sequence order when displaying the list of projects"), 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'tasks': fields.one2many('project.task', 'project_id', "Task Activities"), From aaf11ba8a8991c9b784574953410e8a1b473ecd3 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 12 Mar 2013 16:02:30 +0530 Subject: [PATCH 06/26] [IMP] account: change string of three fields to solve import issue of 'Tax Templates' bzr revid: cha@tinyerp.com-20130312103230-b09wzh3vlm28expi --- addons/account/account.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index acf27c42392..b4a95be6404 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2792,14 +2792,14 @@ class account_tax_template(osv.osv): 'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."), 'python_compute':fields.text('Python Code'), 'python_compute_inv':fields.text('Python Code (reverse)'), - 'python_applicable':fields.text('Python Code'), + 'python_applicable':fields.text('Applicable Code'), # # Fields used for the Tax declaration # 'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."), 'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."), - 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), + 'base_sign': fields.float('Base Sign Code', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), # Same fields for refund invoices @@ -2807,7 +2807,7 @@ class account_tax_template(osv.osv): 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."), 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."), 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), - 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), + 'ref_tax_sign': fields.float('Tax Sign Code', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."), 'description': fields.char('Internal Name'), 'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,), From 7a14260535ed35126167dd2c633fd4e1054a0c19 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 12 Mar 2013 16:25:16 +0530 Subject: [PATCH 07/26] [IMP] account: change string of three fields to solve import issue of 'Taxes' bzr revid: cha@tinyerp.com-20130312105516-4eidfo5322rbb6tc --- addons/account/account.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index b4a95be6404..25a0ef6d3d6 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1878,7 +1878,7 @@ class account_tax(osv.osv): 'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."), 'python_compute':fields.text('Python Code'), 'python_compute_inv':fields.text('Python Code (reverse)'), - 'python_applicable':fields.text('Python Code'), + 'python_applicable':fields.text('Applicable Code'), # # Fields used for the Tax declaration @@ -1892,8 +1892,8 @@ class account_tax(osv.osv): 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."), 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."), - 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), - 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), + 'ref_base_sign': fields.float('Base Sign Code', help="Usually 1 or -1."), + 'ref_tax_sign': fields.float('Tax Sign Code', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"), 'company_id': fields.many2one('res.company', 'Company', required=True), 'description': fields.char('Tax Code'), From 2aab2caba38f2d37d895ea1f0894f16b53d1cbfa Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 12 Mar 2013 17:06:33 +0530 Subject: [PATCH 08/26] [IMP] product: change string of field 'factor_inv' to solve import issue of 'Unit of Measure' bzr revid: cha@tinyerp.com-20130312113633-2s4d5qw97yjh78p8 --- addons/product/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/product.py b/addons/product/product.py index a6de058fb86..c87bc60a669 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -136,7 +136,7 @@ class product_uom(osv.osv): '1 * (reference unit) = ratio * (this unit)'), 'factor_inv': fields.function(_factor_inv, digits=(12,12), fnct_inv=_factor_inv_write, - string='Ratio', + string='Bigger Ratio', help='How many times this Unit of Measure is bigger than the reference Unit of Measure in this category:\n'\ '1 * (this unit) = ratio * (reference unit)', required=True), 'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, From 709264645bf04f68891385f6ff02976df8ce5c1d Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 12 Mar 2013 19:03:09 +0530 Subject: [PATCH 09/26] [IMP] hr_payroll: change string of field 'note' bzr revid: cha@tinyerp.com-20130312133309-okitqk4yzdo1gsin --- addons/hr_payroll/hr_payroll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 06af3054b68..f63693fe50f 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -281,7 +281,7 @@ class hr_payslip(osv.osv): 'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}), - 'note': fields.text('Description', readonly=True, states={'draft':[('readonly',False)]}), + 'note': fields.text('Internal Note', readonly=True, states={'draft':[('readonly',False)]}), 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'), 'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}), From 2c3fab123c7c4a01a8e1dbe331833daf0f0c9d55 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 13 Mar 2013 11:17:45 +0530 Subject: [PATCH 10/26] [IMP] fleet: change string of fields to solve import issue bzr revid: cha@tinyerp.com-20130313054745-xt48w6zh0c0j92iz --- addons/fleet/fleet.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index dc2aabb54fc..a476a801e7c 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -160,8 +160,8 @@ class fleet_vehicle_model(osv.Model): 'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'), 'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'), 'image': fields.related('brand_id', 'image', type="binary", string="Logo"), - 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"), - 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"), + 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Medium Logo"), + 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Small Logo"), } @@ -354,8 +354,8 @@ class fleet_vehicle(osv.Model): 'power': fields.integer('Power (kW)', help='Power in kW of the vehicle'), 'co2': fields.float('CO2 Emissions', help='CO2 emissions of the vehicle'), 'image': fields.related('model_id', 'image', type="binary", string="Logo"), - 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo"), - 'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo"), + 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Medium Logo"), + 'image_small': fields.related('model_id', 'image_small', type="binary", string="Small Logo"), 'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="boolean", string='Has Contracts to renew', multi='contract_info'), 'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="boolean", string='Has Contracts Overdued', multi='contract_info'), 'contract_renewal_name': fields.function(_get_contract_reminder_fnc, type="text", string='Name of contract to renew soon', multi='contract_info'), From 4012a778b98d1d4faa909db8b90e664077adcc07 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 13 Mar 2013 11:29:37 +0530 Subject: [PATCH 11/26] [IMP] subscription: change string of field 'note' to solve import issue of 'subscriptions bzr revid: cha@tinyerp.com-20130313055937-n85y0cr963f5zzlm --- addons/subscription/subscription.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py index d181e97e8f0..94adfcc98a5 100644 --- a/addons/subscription/subscription.py +++ b/addons/subscription/subscription.py @@ -73,7 +73,7 @@ class subscription_subscription(osv.osv): 'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"), 'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True), 'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription", states={'running':[('readonly',True)], 'done':[('readonly',True)]}), - 'note': fields.text('Notes', help="Description or Summary of Subscription"), + 'note': fields.text('Summary', help="Description or Summary of Subscription"), } _defaults = { 'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), From 8670be1fde1a54830cf3b8f8f3957818ed4b4f34 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 13 Mar 2013 16:27:09 +0530 Subject: [PATCH 12/26] [IMP] account: made little change bzr revid: cha@tinyerp.com-20130313105709-hg2wzl87q3io6189 --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 25a0ef6d3d6..dd7dcd0ed50 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2799,14 +2799,14 @@ class account_tax_template(osv.osv): # 'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."), 'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."), - 'base_sign': fields.float('Base Sign Code', help="Usually 1 or -1."), + 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), # Same fields for refund invoices 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."), 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."), - 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), + 'ref_base_sign': fields.float('Base Sign Code', help="Usually 1 or -1."), 'ref_tax_sign': fields.float('Tax Sign Code', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."), 'description': fields.char('Internal Name'), From 494e8130bb21745fdde16458581fc431f4bed18e Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 14:39:45 +0530 Subject: [PATCH 13/26] [IMP] crm: rename string 'Mail Alias' to 'Alias' in crm.case.section bzr revid: cha@tinyerp.com-20130320090945-1ppztomawxb819z3 --- addons/crm/crm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 75b9c7eaff0..df6d5e12b66 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -125,7 +125,7 @@ class crm_case_section(osv.osv): 'note': fields.text('Description'), 'working_hours': fields.float('Working Hours', digits=(16,2 )), 'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'), - 'alias_id': fields.many2one('mail.alias', 'Mail Alias', ondelete="cascade", required=True, + 'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, help="The email address associated with this team. New emails received will automatically " "create new leads assigned to the team."), } From 7fb1818900a33ceb3f4cd159c227fb1c9b481264 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 14:50:42 +0530 Subject: [PATCH 14/26] [IMP] account: changed string for fields 'ref_base_sign' & 'ref_tax_sign' in 'account.tax.template' bzr revid: cha@tinyerp.com-20130320092042-dyzb4rl3w2hi4c7e --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 2e5eef9add0..3cee11f5c2b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2836,8 +2836,8 @@ class account_tax_template(osv.osv): 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."), 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."), - 'ref_base_sign': fields.float('Base Sign Code', help="Usually 1 or -1."), - 'ref_tax_sign': fields.float('Tax Sign Code', help="Usually 1 or -1."), + 'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1."), + 'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."), 'description': fields.char('Internal Name'), 'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,), From 227617dd9fd680a428a95de6fbf2f84c61517a07 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 15:09:21 +0530 Subject: [PATCH 15/26] [IMP] account: changed string for fields 'ref_base_sign' & 'ref_tax_sign' in 'account.tax' bzr revid: cha@tinyerp.com-20130320093921-irhg67f639s7xvcx --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 3cee11f5c2b..b2b7ff85c08 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1922,8 +1922,8 @@ class account_tax(osv.osv): 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."), 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."), - 'ref_base_sign': fields.float('Base Sign Code', help="Usually 1 or -1."), - 'ref_tax_sign': fields.float('Tax Sign Code', help="Usually 1 or -1."), + 'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1."), + 'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"), 'company_id': fields.many2one('res.company', 'Company', required=True), 'description': fields.char('Tax Code'), From a5a2139619ec4b75b47c5bbf33bad8601674a329 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 15:17:48 +0530 Subject: [PATCH 16/26] [IMP] subscription: change string for field 'note' in model 'subscription.subscription' bzr revid: cha@tinyerp.com-20130320094748-fam2fosjsctfziyl --- addons/subscription/subscription.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py index 94adfcc98a5..d181e97e8f0 100644 --- a/addons/subscription/subscription.py +++ b/addons/subscription/subscription.py @@ -73,7 +73,7 @@ class subscription_subscription(osv.osv): 'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"), 'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True), 'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription", states={'running':[('readonly',True)], 'done':[('readonly',True)]}), - 'note': fields.text('Summary', help="Description or Summary of Subscription"), + 'note': fields.text('Notes', help="Description or Summary of Subscription"), } _defaults = { 'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), From 54f3705481cfc548098c14e01dd1858a2885ca2a Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 17:08:35 +0530 Subject: [PATCH 17/26] [IMP] base_calandar: change string to 'Invited People' in crm.meeting bzr revid: cha@tinyerp.com-20130320113835-ywr9k89n37ztjmhp --- addons/base_calendar/crm_meeting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index daf2bfbb7b7..1d737401af4 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -60,7 +60,7 @@ class crm_meeting(base_state, osv.Model): 'categ_ids': fields.many2many('crm.meeting.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags'), 'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\ - 'event_id', 'attendee_id', 'Invitations', states={'done': [('readonly', True)]}), + 'event_id', 'attendee_id', 'Invited Poeple', states={'done': [('readonly', True)]}), } _defaults = { 'state': 'open', From bdf8c2bc1fa5777d21376ff55e48cf1148470ee2 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 18:13:10 +0530 Subject: [PATCH 18/26] [IMP] project: apply string 'Priority' to 'sequense' instead od 'priority' bzr revid: cha@tinyerp.com-20130320124310-hcld832k3kfjirn7 --- addons/project/project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index 0cb5f92ed6e..e260a4b38a2 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -232,9 +232,9 @@ class project(osv.osv): _columns = { 'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250), 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."), - 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."), + 'sequence': fields.integer('Priority', help="Gives the sequence order when displaying a list of Projects."), 'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True), - 'priority': fields.integer('Priority', help="Gives the sequence order when displaying the list of projects"), + 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"), 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'tasks': fields.one2many('project.task', 'project_id', "Task Activities"), From d157bc386d44cb87eb67a40e50b8dfd8559f282a Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 20 Mar 2013 19:01:37 +0530 Subject: [PATCH 19/26] [IMP] hr_payroll: changed string to 'Payslip Name' in model 'hr.payslip' bzr revid: cha@tinyerp.com-20130320133137-ypgfok0im8dq9gdk --- addons/hr_payroll/hr_payroll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index f63693fe50f..cc0537b6f09 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -260,7 +260,7 @@ class hr_payslip(osv.osv): _columns = { 'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True, states={'draft': [('readonly', False)]}, help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'), - 'name': fields.char('Description', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}), + 'name': fields.char('Payslip Name', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}), 'number': fields.char('Reference', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}), 'employee_id': fields.many2one('hr.employee', 'Employee', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date_from': fields.date('Date From', readonly=True, states={'draft': [('readonly', False)]}, required=True), From 7e188593d83d5f643927df5c2a1ce9a017f236e1 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 21 Mar 2013 10:58:49 +0530 Subject: [PATCH 20/26] [IMP] subscription: changes string for field 'notes' in model 'subscription.subscription' bzr revid: cha@tinyerp.com-20130321052849-bpxq2bye0flzj28p --- addons/subscription/subscription.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py index d181e97e8f0..8cf37342519 100644 --- a/addons/subscription/subscription.py +++ b/addons/subscription/subscription.py @@ -63,7 +63,7 @@ class subscription_subscription(osv.osv): 'name': fields.char('Name', size=60, required=True), 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the subscription without removing it."), 'partner_id': fields.many2one('res.partner', 'Partner'), - 'notes': fields.text('Notes'), + 'notes': fields.text('Internal Notes'), 'user_id': fields.many2one('res.users', 'User', required=True), 'interval_number': fields.integer('Interval Qty'), 'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'), From 64b08f3b7f8b48781c618fabf411b766691b5184 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 21 Mar 2013 11:14:10 +0530 Subject: [PATCH 21/26] [IMP] subscription: chaged seprator string to 'Internal Notes' bzr revid: cha@tinyerp.com-20130321054410-10vuc2jab7f6fjc2 --- addons/subscription/subscription_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index eb3700cfedc..77980c73f61 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -34,7 +34,7 @@ - + From 90f628e3ffa81ca0257bcad278aeccdf1b9e3b2d Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 22 Mar 2013 11:53:22 +0530 Subject: [PATCH 22/26] [IMP] base_calendar: removed field 'organizer' from model 'calendar.event' bzr revid: cha@tinyerp.com-20130322062322-t8lbf9rfirb808j9 --- addons/base_calendar/base_calendar.py | 16 +--------------- addons/base_calendar/crm_meeting_view.xml | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 6fb3024e696..649d01f37b7 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -450,11 +450,7 @@ property or property parameter."), event.add('location').value = event_obj.location if event_obj.rrule: event.add('rrule').value = event_obj.rrule - if event_obj.organizer: - event_org = event.add('organizer') - event_org.params['CN'] = [event_obj.organizer] - event_org.value = 'MAILTO:' + (event_obj.organizer) - elif event_obj.user_id or event_obj.organizer_id: + if event_obj.user_id or event_obj.organizer_id: event_org = event.add('organizer') organizer = event_obj.organizer_id if not organizer: @@ -1073,7 +1069,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'recurrent_id_date': fields.datetime('Recurrent ID date'), 'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'), 'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}), - 'organizer': fields.char("Organizer's Email", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent. 'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}), 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'), 'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"), @@ -1145,14 +1140,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), email_from = current_user.email, context=context) return True - def default_organizer(self, cr, uid, context=None): - user_pool = self.pool.get('res.users') - user = user_pool.browse(cr, uid, uid, context=context) - res = user.name - if user.email: - res += " <%s>" %(user.email) - return res - _defaults = { 'end_type': 'count', 'count': 1, @@ -1164,7 +1151,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'interval': 1, 'active': 1, 'user_id': lambda self, cr, uid, ctx: uid, - 'organizer': default_organizer, } def _check_closing_date(self, cr, uid, ids, context=None): diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index d9b659b91fa..bd1c3da8dc7 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -71,7 +71,6 @@ - From 267cabe03659d115b896a0ec96789520ac3a6472 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 22 Mar 2013 14:33:11 +0530 Subject: [PATCH 23/26] [IMP] project: removed field 'priority' from model 'project.project' bzr revid: cha@tinyerp.com-20130322090311-vvwy5w7zm2uvsk4g --- addons/project/project.py | 4 +--- addons/project/project_demo.xml | 6 +++--- addons/project/project_view.xml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index e260a4b38a2..9bacda955a5 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -232,9 +232,8 @@ class project(osv.osv): _columns = { 'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250), 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."), - 'sequence': fields.integer('Priority', help="Gives the sequence order when displaying a list of Projects."), + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."), 'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True), - 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"), 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'tasks': fields.one2many('project.task', 'project_id', "Task Activities"), @@ -281,7 +280,6 @@ class project(osv.osv): 'active': True, 'type': 'contract', 'state': 'open', - 'priority': 1, 'sequence': 10, 'type_ids': _get_type_common, 'alias_model': 'project.task', diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index f5fbf878fd0..799cabfa003 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -57,7 +57,7 @@ - 10 + 10 E-Learning Integration @@ -71,7 +71,7 @@ - 20 + 20 Website Design Templates @@ -84,7 +84,7 @@ - 2 + 2 Data Import/Export Plugin diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 16dbe44ccc1..8fb35c3eb5b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -148,7 +148,7 @@ - + From 037a8f49123b8667937fef67451b08d622eba45e Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 22 Mar 2013 15:07:35 +0530 Subject: [PATCH 24/26] [IMP] project_issue: made changes due to deletion of field 'priority' bzr revid: cha@tinyerp.com-20130322093735-22wtc02mxtuu7c62 --- addons/project_issue/project_issue_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 500a1376422..d725c0c42d2 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -321,7 +321,7 @@ {'invisible': [('use_tasks', '=', False),('use_issues','=',False)]} - + From e23b3de7ec5b65fdcbc96ea5ce0f705ffe500e42 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 22 Mar 2013 17:17:22 +0530 Subject: [PATCH 25/26] [IMP] base_calendar: made 'Invited People' spelling correct bzr revid: cha@tinyerp.com-20130322114722-agdm6o7r8kg1zvv0 --- addons/base_calendar/crm_meeting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index 1d737401af4..357cc107b6b 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -60,7 +60,7 @@ class crm_meeting(base_state, osv.Model): 'categ_ids': fields.many2many('crm.meeting.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags'), 'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\ - 'event_id', 'attendee_id', 'Invited Poeple', states={'done': [('readonly', True)]}), + 'event_id', 'attendee_id', 'Invited People', states={'done': [('readonly', True)]}), } _defaults = { 'state': 'open', From 2e494c9a9d22f950cda439b82e017858769dada0 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Fri, 21 Jun 2013 14:38:27 +0530 Subject: [PATCH 26/26] [Fleet] Improve fields string. bzr revid: amb@tinyerp.com-20130621090827-7222v30shoat0521 --- addons/fleet/fleet.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index a476a801e7c..c306ca814e8 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -160,8 +160,8 @@ class fleet_vehicle_model(osv.Model): 'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'), 'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'), 'image': fields.related('brand_id', 'image', type="binary", string="Logo"), - 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Medium Logo"), - 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Small Logo"), + 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo - medium"), + 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo - small"), } @@ -354,8 +354,8 @@ class fleet_vehicle(osv.Model): 'power': fields.integer('Power (kW)', help='Power in kW of the vehicle'), 'co2': fields.float('CO2 Emissions', help='CO2 emissions of the vehicle'), 'image': fields.related('model_id', 'image', type="binary", string="Logo"), - 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Medium Logo"), - 'image_small': fields.related('model_id', 'image_small', type="binary", string="Small Logo"), + 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo - medium"), + 'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo - small"), 'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="boolean", string='Has Contracts to renew', multi='contract_info'), 'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="boolean", string='Has Contracts Overdued', multi='contract_info'), 'contract_renewal_name': fields.function(_get_contract_reminder_fnc, type="text", string='Name of contract to renew soon', multi='contract_info'),