diff --git a/addons/account/account.py b/addons/account/account.py index 0f8c9575931..ac4e64413f7 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -54,7 +54,7 @@ class account_payment_term(osv.osv): _description = "Payment Term" _columns = { 'name': fields.char('Payment Term', size=64, translate=True, required=True), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the payment term without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."), 'note': fields.text('Description', translate=True), 'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'), } @@ -374,7 +374,7 @@ class account_account(osv.osv): 'note': fields.text('Note'), 'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'), 'company_id': fields.many2one('res.company', 'Company', required=True), - 'active': fields.boolean('Active', select=2, help="If the active field is set to true, it will allow you to hide the account without removing it."), + 'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."), 'parent_left': fields.integer('Parent Left', select=1), 'parent_right': fields.integer('Parent Right', select=1), @@ -959,7 +959,7 @@ class account_journal_period(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"), 'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"), 'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32), - 'active': fields.boolean('Active', required=True, help="If the active field is set to true, it will allow you to hide the journal period without removing it."), + 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."), 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True, help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), @@ -1669,7 +1669,7 @@ class account_tax(osv.osv): 'name': fields.char('Tax Name', size=64, required=True, translate=True, help="This name will be displayed on reports"), 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."), 'amount': fields.float('Amount', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % ratio between 0-1."), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the tax without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the tax without removing it."), 'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True, help="The computation method for the tax amount."), 'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True, diff --git a/addons/account/project/project.py b/addons/account/project/project.py index 27836d72a1e..9574cc416a9 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -27,7 +27,7 @@ class account_analytic_journal(osv.osv): _columns = { 'name': fields.char('Journal Name', size=64, required=True), 'code': fields.char('Journal Code', size=8), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."), 'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."), 'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'), 'company_id': fields.many2one('res.company', 'Company', required=True), diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 870194fa125..e14799c9c7c 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -217,7 +217,7 @@ class auction_lot_category(osv.osv): _columns = { 'name': fields.char('Category Name', required=True, size=64), 'priority': fields.float('Priority'), - 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."), + 'active' : fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the auction lot category without removing it."), 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'), } _defaults = { diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 0c10862bd05..0147d147134 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -58,7 +58,7 @@ class res_partner_contact(osv.osv): 'job_ids': fields.one2many('res.partner.job', 'contact_id', 'Functions and Addresses'), 'country_id': fields.many2one('res.country','Nationality'), 'birthdate': fields.date('Birth Date'), - 'active': fields.boolean('Active', help="If the active field is set to true,\ + 'active': fields.boolean('Active', help="If the active field is set to False,\ it will allow you to hide the partner contact without removing it."), 'partner_id': fields.related('job_ids', 'address_id', 'partner_id', type='many2one',\ relation='res.partner', string='Main Employer'), diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py index bb2379ba3b8..e31e2f9562c 100644 --- a/addons/base_report_creator/base_report_creator.py +++ b/addons/base_report_creator/base_report_creator.py @@ -406,7 +406,7 @@ class report_creator(osv.osv): _columns = { 'name': fields.char('Report Name', size=64, required=True), 'type': fields.selection([('list', 'Rows And Columns Report'), ], 'Report Type', required=True), #('sum','Summation Report') - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the report without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the report without removing it."), 'view_type1': fields.selection([('form', 'Form'), ('tree', 'Tree'), ('graph', 'Graph'), diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index 6501e0aa230..4ac69d95679 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -60,7 +60,7 @@ class delivery_carrier(osv.osv): 'product_id': fields.many2one('product.product', 'Delivery Product', required=True), 'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'), 'price' : fields.function(get_price, method=True,string='Price'), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the delivery carrier without removing it.") + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it.") } _defaults = { 'active': lambda *args:1 @@ -96,7 +96,7 @@ class delivery_grid(osv.osv): 'zip_from': fields.char('Start Zip', size=12), 'zip_to': fields.char('To Zip', size=12), 'line_ids': fields.one2many('delivery.grid.line', 'grid_id', 'Grid Line'), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the delivery grid without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery grid without removing it."), } _defaults = { 'active': lambda *a: 1, diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 5db7538d952..763d11e277e 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -731,7 +731,7 @@ class email_template_preview(osv.osv_memory): ref_obj_id = self.pool.get('email.template').read(cr, uid, context['template_id'], ['object_name'], context) ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id['object_name'][0], ['model'], context)['model'] model_obj = self.pool.get(ref_obj_name) - ref_obj_ids = model_obj.search(cr, uid, [], 0, 20, 'id desc', context=context) + ref_obj_ids = model_obj.search(cr, uid, [], 0, 20, 'id', context=context) if not ref_obj_ids: ref_obj_ids = [] diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index c71565442e5..72010d823eb 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -69,7 +69,7 @@ class mrp_routing(osv.osv): _description = 'Routing' _columns = { 'name': fields.char('Name', size=64, required=True), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the routing without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the routing without removing it."), 'code': fields.char('Code', size=8), 'note': fields.text('Description'), @@ -178,7 +178,7 @@ class mrp_bom(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'code': fields.char('Reference', size=16), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the bills of material without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."), 'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True, help= "If a sub-product is used in several products, it can be useful to create its own BoM. "\ "Though if you don't want separated production orders for this sub-product, select Set/Phantom as BoM type. "\ diff --git a/addons/process/process.py b/addons/process/process.py index 544ff73e761..3fd368c0117 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -43,7 +43,7 @@ class process_process(osv.osv): _description = "Process" _columns = { 'name': fields.char('Name', size=30,required=True, translate=True), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the process without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the process without removing it."), 'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'), 'note': fields.text('Notes', translate=True), 'node_ids': fields.one2many('process.node', 'process_id', 'Nodes') diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 359586fae7e..55ffd6d1f55 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -491,7 +491,7 @@ class stock_warehouse_orderpoint(osv.osv): _columns = { 'name': fields.char('Name', size=32, required=True), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the orderpoint without removing it."), 'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True), 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"), 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"), diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 4831123e07c..f2eb3f28793 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -97,7 +97,7 @@ class product_pricelist(osv.osv): _description = "Pricelist" _columns = { 'name': fields.char('Pricelist Name',size=64, required=True, translate=True), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the pricelist without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the pricelist without removing it."), 'type': fields.selection(_pricelist_type_get, 'Pricelist Type', required=True), 'version_id': fields.one2many('product.pricelist.version', 'pricelist_id', 'Pricelist Versions'), 'currency_id': fields.many2one('res.currency', 'Currency', required=True), diff --git a/addons/product/product.py b/addons/product/product.py index b43f40b1cbc..09e7c3d8e19 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -427,7 +427,7 @@ class product_product(osv.osv): 'code': fields.function(_product_code, method=True, type='char', string='Reference'), 'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'), 'default_code' : fields.char('Reference', size=64), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."), 'variants': fields.char('Variants', size=64), 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"), 'ean13': fields.char('EAN13', size=13), diff --git a/addons/project/project.py b/addons/project/project.py index bc131741df7..2e034872d1f 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -127,7 +127,7 @@ class project(osv.osv): _columns = { 'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."), + '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', 'Analytic Account', 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 a list of task"), diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index 75f9cfd4a63..28ab6cb5338 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -43,7 +43,7 @@ project_scrum_project() class project_scrum_sprint(osv.osv): _name = 'project.scrum.sprint' _description = 'Project Scrum Sprint' - _order = 'date_start' + _order = 'date_start desc' def _compute(self, cr, uid, ids, fields, arg, context=None): res = {}.fromkeys(ids, 0.0) progress = {} diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index a9f220fd3c0..122f68edc16 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -112,7 +112,7 @@ -