diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 870194fa125..20090def512 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -190,7 +190,7 @@ class aie_category(osv.osv): 'name': fields.char('Name', size=64, required=True), 'code':fields.char('Code', size=64), 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'), - 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category") + 'child_ids': fields.one2many('aie.category', 'parent_id', help="children aie category") } def name_get(self, cr, uid, ids, context=None): diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot index 8c8e0dc2a96..ba25f39b356 100644 --- a/addons/auction/i18n/auction.pot +++ b/addons/auction/i18n/auction.pot @@ -1461,7 +1461,7 @@ msgstr "" #. module: auction #: help:aie.category,child_ids:0 -msgid "Childs aie category" +msgid "children aie category" msgstr "" #. module: auction diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 5d7fa2b5ec6..6b2a204b12f 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -307,7 +307,7 @@ class openerp_dav_handler(dav_interface): fp = node.full_path() if fp and len(fp): fp = '/'.join(fp) - self.parent.log_message('childs for: %s' % fp) + self.parent.log_message('children for: %s' % fp) else: fp = None domain = None @@ -345,7 +345,7 @@ class openerp_dav_handler(dav_interface): except DAV_Error: raise except Exception, e: - self.parent.log_error("cannot get_childs: "+ str(e)) + self.parent.log_error("cannot get_children: "+ str(e)) raise finally: if cr: cr.close() diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index a8b2a3e2c69..e8066a7299f 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -211,15 +211,15 @@ class hr_evaluation(osv.osv): for evaluation in self.browse(cr, uid, ids, context=context): wait = False for phase in evaluation.plan_id.phase_ids: - childs = [] + children = [] if phase.action == "bottom-up": - childs = evaluation.employee_id.child_ids + children = evaluation.employee_id.child_ids elif phase.action in ("top-down", "final"): if evaluation.employee_id.parent_id: - childs = [evaluation.employee_id.parent_id] + children = [evaluation.employee_id.parent_id] elif phase.action == "self": - childs = [evaluation.employee_id] - for child in childs: + children = [evaluation.employee_id] + for child in children: # if not child.user_id: # continue diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po index 726b4b10daf..e6deaabe800 100644 --- a/addons/product/i18n/el.po +++ b/addons/product/i18n/el.po @@ -1927,7 +1927,7 @@ msgstr "Έκπτωση Τιμής" #~ "αποθηκευόμενα προϊόντα με απεριόριστο στόκ ή χωρίς διαχείριση αποθήκευσης " #~ "στο σύστημα." -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Υποκατηγορίες" #~ msgid "" diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po index 4a86e904af0..d15982674be 100644 --- a/addons/product/i18n/es_EC.po +++ b/addons/product/i18n/es_EC.po @@ -1749,7 +1749,7 @@ msgstr "Cantidad mín." #: help:product.pricelist.item,categ_id:0 msgid "" "Set a category of product if this rule only apply to products of a category " -"and his childs. Keep empty for all products" +"and his children. Keep empty for all products" msgstr "" "Indicar una categoría de producto si esta regla sólo se aplica a productos " "de una categoría y a sus descendientes. Dejarlo vacío para todos los " diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po index f01bcd3abda..5ea59fb6dd2 100644 --- a/addons/product/i18n/eu.po +++ b/addons/product/i18n/eu.po @@ -1675,7 +1675,7 @@ msgstr "Kopuru Minimoa" #: help:product.pricelist.item,categ_id:0 msgid "" "Set a category of product if this rule only apply to products of a category " -"and his childs. Keep empty for all products" +"and his children. Keep empty for all products" msgstr "" #. module: product diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po index b46d2160e96..4cdc4ed2849 100644 --- a/addons/product/i18n/fi.po +++ b/addons/product/i18n/fi.po @@ -1808,7 +1808,7 @@ msgstr "Hinnanalennus" #~ "tuotteita joilla on loppumaton varasto, tai ne ovat järjestelmässä ilman " #~ "varastonhallintaa." -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Alakategoriat" #~ msgid "You can not have 2 pricelist version that overlaps!" diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po index 82ba1557ac2..09f2388f102 100644 --- a/addons/product/i18n/ko.po +++ b/addons/product/i18n/ko.po @@ -1744,7 +1744,7 @@ msgstr "가격 할인" #~ msgid "Rentable product" #~ msgstr "대여 가능한 상품" -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "차일드 카테고리" #~ msgid "Price Max. Margin" diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po index da9bb9f8b4a..4247b7290c0 100644 --- a/addons/product/i18n/mn.po +++ b/addons/product/i18n/mn.po @@ -1735,7 +1735,7 @@ msgstr "Хамгийн бага тоо" #: help:product.pricelist.item,categ_id:0 msgid "" "Set a category of product if this rule only apply to products of a category " -"and his childs. Keep empty for all products" +"and his children. Keep empty for all products" msgstr "" "Энэ дүрэм үйлчлэх барааны ангиллыг сонгоно. Хэрэв бүх бараанд хамаатай бол " "хоосон орхино." diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po index 8f242661526..57faa736d86 100644 --- a/addons/product/i18n/nb.po +++ b/addons/product/i18n/nb.po @@ -1712,7 +1712,7 @@ msgstr "" #~ "ferdigstillingen av det ferdige produktet. Dette er tiden du lover deg til " #~ "ovenfor kunden." -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Barnekategori" #~ msgid "Price Min. Margin" diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po index d895f25efde..29d295e4965 100644 --- a/addons/product/i18n/vi.po +++ b/addons/product/i18n/vi.po @@ -1727,7 +1727,7 @@ msgstr "Giảm giá" #~ msgid "Rentable product" #~ msgstr "Sản phẩm có thể cho thuê" -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Danh mục con" #~ msgid "Price Max. Margin" diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 759057fbaef..c36bd9eb594 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -68,12 +68,12 @@ class report_account_analytic_planning(osv.osv): ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context) if ids_dept: data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context) - childs = map(lambda x: x['member_ids'], data_dept) - childs = tools.flatten(childs) - childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context) - if user_id in childs: - childs.remove(user_id) - child_ids.extend(tools.flatten(childs)) + children = map(lambda x: x['member_ids'], data_dept) + children = tools.flatten(children) + children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context) + if user_id in children: + children.remove(user_id) + child_ids.extend(tools.flatten(children)) set = {} map(set.__setitem__, child_ids, []) child_ids = set.keys() diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po index ac5aab45c8e..f6b7ad99c70 100644 --- a/addons/stock/i18n/es_EC.po +++ b/addons/stock/i18n/es_EC.po @@ -359,7 +359,7 @@ msgstr "Líneas movimiento" #. module: stock #: wizard_field:stock.fill_inventory,init,recursive:0 -msgid "Include all childs for the location" +msgid "Include all children for the location" msgstr "Incluir todos los descendientes de la ubicación" #. module: stock diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po index 33e60ea3573..70d9d21bb1b 100644 --- a/addons/stock/i18n/mn.po +++ b/addons/stock/i18n/mn.po @@ -359,7 +359,7 @@ msgstr "Шилжих шугамууд" #. module: stock #: wizard_field:stock.fill_inventory,init,recursive:0 -msgid "Include all childs for the location" +msgid "Include all children for the location" msgstr "" #. module: stock diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml index f6bcd60ad5e..41acade696a 100644 --- a/addons/stock/test/stock_report.yml +++ b/addons/stock/test/stock_report.yml @@ -1,5 +1,5 @@ - - In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report + In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(children) report - !python {model: stock.location}: | import netsvc, tools, os diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index 2d814485a7c..d05121a3a70 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -88,7 +88,7 @@ class wiki_group(osv.osv): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')]) + view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)] value['view_type'] = 'tree' diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py index 7cee4f88e96..cc0cea87ec5 100644 --- a/addons/wiki/wizard/wiki_create_menu.py +++ b/addons/wiki/wizard/wiki_create_menu.py @@ -70,7 +70,7 @@ class wiki_create_menu(osv.osv_memory): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')]) + view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)] value['view_type'] = 'tree'