From d7600ad56e9298e917869026a4eaf814b2df4042 Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (OpenERP)" Date: Thu, 21 Mar 2013 18:58:24 +0530 Subject: [PATCH 01/48] [FIX] point_of_sale: Return product from POS previous session should be linked to current opened session, if not found an active session then raise a warning message. (Maintenance Case: 589810) lp bug: https://launchpad.net/bugs/1123575 fixed bzr revid: rgo@tinyerp.com-20130321132824-9lvtpbu7yse3cupl --- addons/point_of_sale/point_of_sale.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 44139f7a499..188906a4942 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -772,9 +772,14 @@ class pos_order(osv.osv): """Create a copy of order for refund order""" clone_list = [] line_obj = self.pool.get('pos.order.line') - for order in self.browse(cr, uid, ids, context=context): + pos_orders = self.browse(cr, uid, ids, context=context) + current_session = self.pool.get('pos.session').search(cr, uid, [('config_id', '=', pos_orders[0].session_id.config_id.id), ('state', '!=', 'closed')]) + if not current_session: + raise osv.except_osv(_('Error!'), _('To return product(s), you need to open a session that belongs to the same "Point of Sale" as of the product(s) to be returned.')) + for order in pos_orders: clone_id = self.copy(cr, uid, order.id, { 'name': order.name + ' REFUND', + 'session_id': current_session[0] }, context=context) clone_list.append(clone_id) From 46b8c95d9993f70de73e6e5f91911f1b012e8136 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Tue, 21 May 2013 16:06:31 +0200 Subject: [PATCH 02/48] [FIX] permission denied msgbox when creating stock.move in multicompany setting lp bug: https://launchpad.net/bugs/1182111 fixed bzr revid: alexandre.fayolle@camptocamp.com-20130521140631-k100itymc4qn0f2m --- addons/stock/stock.py | 52 ++++++++++++++++----- addons/stock/wizard/stock_fill_inventory.py | 2 +- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index fca3d9ff073..93b05cd0b40 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -25,7 +25,7 @@ import time from operator import itemgetter from itertools import groupby -from openerp.osv import fields, osv +from openerp.osv import fields, osv, orm from openerp.tools.translate import _ from openerp import netsvc from openerp import tools @@ -1700,7 +1700,11 @@ class stock_move(osv.osv): elif picking_type == 'out': location_xml_id = 'stock_location_customers' if location_xml_id: - location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id) + try: + location_id = mod_obj.get_object(cr, uid, 'stock', location_xml_id).id + except (orm.except_orm, ValueError): + # likely the user does not have read access on the location + location_id = False return location_id def _default_location_source(self, cr, uid, context=None): @@ -1729,7 +1733,11 @@ class stock_move(osv.osv): elif picking_type in ('out', 'internal'): location_xml_id = 'stock_location_stock' if location_xml_id: - location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id) + try: + location_id = mod_obj.get_object(cr, uid, 'stock', location_xml_id).id + except (orm.except_orm, ValueError): + # likely the user does not have read access on the location + location_id = False return location_id def _default_destination_address(self, cr, uid, context=None): @@ -1947,9 +1955,17 @@ class stock_move(osv.osv): elif type == 'out': location_source_id = 'stock_location_stock' location_dest_id = 'stock_location_customers' - source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id) - dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id) - return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}} + try: + source_location_id = mod_obj.get_object(cr, uid, 'stock', location_source_id).id + except (orm.except_orm, ValueError): + # likely the user does not have read access on the location + source_location_id = False + try: + dest_location_id = mod_obj.get_object(cr, uid, 'stock', location_dest_id).id + except (orm.except_orm, ValueError): + # likely the user does not have read access on the location + dest_location_id = False + return {'value':{'location_id': source_location_id, 'location_dest_id': dest_location_id}} def onchange_date(self, cr, uid, ids, date, date_expected, context=None): """ On change of Scheduled Date gives a Move date. @@ -2883,8 +2899,12 @@ class stock_inventory_line(osv.osv): } def _default_stock_location(self, cr, uid, context=None): - stock_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') - return stock_location.id + try: + stock_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock').id + except (ValueError, orm.except_orm): + # likely the user does not have read access on the location + stock_location_id = False + return stock_location_id _defaults = { 'location_id': _default_stock_location @@ -2923,12 +2943,20 @@ class stock_warehouse(osv.osv): } def _default_lot_input_stock_id(self, cr, uid, context=None): - lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') - return lot_input_stock.id + try: + lot_input_stock_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock').id + except (ValueError, orm.except_orm): + # likely the user does not have read access on the location + lot_input_stock_id = False + return lot_input_stock_id def _default_lot_output_id(self, cr, uid, context=None): - lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output') - return lot_output.id + try: + lot_output_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output').id + except (ValueError, orm.except_orm): + # likely the user does not have read access on the location + lot_output_id = False + return lot_output_id _defaults = { 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c), diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py index 237033bb7b0..dc44316b5d7 100644 --- a/addons/stock/wizard/stock_fill_inventory.py +++ b/addons/stock/wizard/stock_fill_inventory.py @@ -28,7 +28,7 @@ class stock_fill_inventory(osv.osv_memory): def _default_location(self, cr, uid, ids, context=None): try: - loc_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock') + location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock').id except ValueError, e: return False return location_id or False From 68b3155d2064413883b8db62ab6b77ce096dba21 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Tue, 21 May 2013 16:44:18 +0200 Subject: [PATCH 03/48] [TEST] add test for issue 1182111 bzr revid: alexandre.fayolle@camptocamp.com-20130521144418-x8pqpk632g3ew87j --- addons/stock/__openerp__.py | 1 + addons/stock/stock_demo.xml | 10 ++++++++++ addons/stock/test/multicompany.yml | 14 ++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 addons/stock/test/multicompany.yml diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index b3d7e30f1ce..db7117ce2b3 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -94,6 +94,7 @@ Dashboard / Reports for Warehouse Management will include: # 'test/opening_stock.yml', # 'test/shipment.yml', # 'test/stock_report.yml', + 'test/multicompany.yml' ], 'installable': True, 'application': True, diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index eb5a6c46380..d770ecc90fa 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -287,6 +287,16 @@ + + multicomp + multicomp + multicomp + + + + + + diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml new file mode 100644 index 00000000000..66e88d98ff1 --- /dev/null +++ b/addons/stock/test/multicompany.yml @@ -0,0 +1,14 @@ + +- + Set the current user as multicompany user +- + !context + 'uid': 'stock.multicompany_user' +- + check no error on getting default stock.move values for internal move +- + !python {model: stock.move}: + context['picking_type'] = 'internal' + defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) + assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'} + From af6335c44af18ca1e9a56b7e27278aa9b45ddf9f Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Tue, 21 May 2013 17:11:01 +0200 Subject: [PATCH 04/48] [FIX] fix stock demo data used by new test bzr revid: alexandre.fayolle@camptocamp.com-20130521151101-fjhr2q6t7g0jf9au --- addons/stock/stock_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index d770ecc90fa..94844ee8904 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -291,8 +291,8 @@ multicomp multicomp multicomp - - + + From 92b2d800728d55690b7344d45656ad0227d0dbdc Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 22 May 2013 08:25:30 +0200 Subject: [PATCH 05/48] [FIX] yaml syntax error bzr revid: alexandre.fayolle@camptocamp.com-20130522062530-jqya3wbwka91ydor --- addons/stock/test/multicompany.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index 66e88d98ff1..e7918647db4 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -7,7 +7,7 @@ - check no error on getting default stock.move values for internal move - - !python {model: stock.move}: + !python {model: stock.move}: | context['picking_type'] = 'internal' defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'} From 51a96dc5cd84d852e56adaf9dccd3ab00a8414b1 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 22 May 2013 08:57:22 +0200 Subject: [PATCH 06/48] [TEST] enhance error message bzr revid: alexandre.fayolle@camptocamp.com-20130522065722-vuxha3lht56as98o --- addons/stock/test/multicompany.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index e7918647db4..35df6c67b83 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -10,5 +10,5 @@ !python {model: stock.move}: | context['picking_type'] = 'internal' defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) - assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'} + assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'}, "did not get the correct default (got: %s)" % defaults From 0e3d497beb923af1063ffc93ae8dc113ef735a16 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 22 May 2013 13:06:08 +0200 Subject: [PATCH 07/48] enhanced tests bzr revid: alexandre.fayolle@camptocamp.com-20130522110608-acb2odz0tksm6sc2 --- addons/stock/test/multicompany.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index 35df6c67b83..962bb825dac 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -3,12 +3,21 @@ Set the current user as multicompany user - !context - 'uid': 'stock.multicompany_user' + uid: 'stock.multicompany_user' - check no error on getting default stock.move values for internal move - !python {model: stock.move}: | + multicomp_user = ref('stock.multicompany_user') context['picking_type'] = 'internal' + log('multicompany user: %s, uid: %s', multicomp_user, uid) + log('current context: %s', context) + defaults = self.default_get(cr, multicomp_user, ['location_id', 'location_dest_id', 'type'], context) + assertion_msg = "did not get the correct default (got: %s)" % defaults + log('got defaults: %s', defaults) + assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'}, assertion_msg defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) - assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'}, "did not get the correct default (got: %s)" % defaults + assertion_msg = "did not get the correct default with uid %s (got: %s)" % (uid, defaults) + log('got defaults: %s', defaults) + assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'}, assertion_msg From 1658325f392ba60bd58b486aaebcda1f5765b405 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 22 May 2013 17:12:16 +0200 Subject: [PATCH 08/48] [FIX] actually fix lp:118211 by adding an explicit call to check_access_rule bzr revid: alexandre.fayolle@camptocamp.com-20130522151216-6cz0kb6abwwr5zsv --- addons/mrp/mrp.py | 18 ++++++++++--- addons/stock/stock.py | 28 +++++++++++++++------ addons/stock/wizard/stock_fill_inventory.py | 4 ++- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 44fbaafbcfe..77e3dd4965a 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -409,12 +409,22 @@ class mrp_production(osv.osv): return result def _src_id_default(self, cr, uid, ids, context=None): - src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) - return src_location_id.id + try: + src_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) + src_location.check_access_rule('read', context=context) + except (orm.except_orm, ValueError): + # no read access + return False + return src_location.id def _dest_id_default(self, cr, uid, ids, context=None): - dest_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) - return dest_location_id.id + try: + dest_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) + dest_location.check_access_rule('read', context=context) + except (orm.except_orm, ValueError): + # no read access + return False + return dest_location.id _columns = { 'name': fields.char('Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 93b05cd0b40..172d8bd9c27 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1701,7 +1701,9 @@ class stock_move(osv.osv): location_xml_id = 'stock_location_customers' if location_xml_id: try: - location_id = mod_obj.get_object(cr, uid, 'stock', location_xml_id).id + location = mod_obj.get_object(cr, uid, 'stock', location_xml_id, context=context) + location.check_access_rule('read', context=context) + location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location location_id = False @@ -1734,7 +1736,9 @@ class stock_move(osv.osv): location_xml_id = 'stock_location_stock' if location_xml_id: try: - location_id = mod_obj.get_object(cr, uid, 'stock', location_xml_id).id + location = mod_obj.get_object(cr, uid, 'stock', location_xml_id) + location.check_access_rule('read', context=context) + location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location location_id = False @@ -1956,12 +1960,16 @@ class stock_move(osv.osv): location_source_id = 'stock_location_stock' location_dest_id = 'stock_location_customers' try: - source_location_id = mod_obj.get_object(cr, uid, 'stock', location_source_id).id + location = mod_obj.get_object(cr, uid, 'stock', location_source_id) + location.check_access_rule('read', context=context) + source_location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location source_location_id = False try: - dest_location_id = mod_obj.get_object(cr, uid, 'stock', location_dest_id).id + location = mod_obj.get_object(cr, uid, 'stock', location_dest_id) + location.check_access_rule('read', context=context) + dest_location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location dest_location_id = False @@ -2900,7 +2908,9 @@ class stock_inventory_line(osv.osv): def _default_stock_location(self, cr, uid, context=None): try: - stock_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock').id + location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') + location.check_access_rule('read', context=context) + stock_location_id = location.id except (ValueError, orm.except_orm): # likely the user does not have read access on the location stock_location_id = False @@ -2944,7 +2954,9 @@ class stock_warehouse(osv.osv): def _default_lot_input_stock_id(self, cr, uid, context=None): try: - lot_input_stock_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock').id + lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') + lot_input_stock.check_access_rule('read', context=context) + lot_input_stock_id = lot_input_stock.id except (ValueError, orm.except_orm): # likely the user does not have read access on the location lot_input_stock_id = False @@ -2952,7 +2964,9 @@ class stock_warehouse(osv.osv): def _default_lot_output_id(self, cr, uid, context=None): try: - lot_output_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output').id + lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output') + lot_output.check_access_rule('read', context=context) + lot_output_id = lot_output.id except (ValueError, orm.except_orm): # likely the user does not have read access on the location lot_output_id = False diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py index dc44316b5d7..d0062c82538 100644 --- a/addons/stock/wizard/stock_fill_inventory.py +++ b/addons/stock/wizard/stock_fill_inventory.py @@ -28,7 +28,9 @@ class stock_fill_inventory(osv.osv_memory): def _default_location(self, cr, uid, ids, context=None): try: - location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock').id + location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') + location.check_access_rule('read', context=context) + location_id = location.id except ValueError, e: return False return location_id or False From 486116588f04251d724a8fd2aa4938165f8a262b Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 22 May 2013 17:32:03 +0200 Subject: [PATCH 09/48] [TEST] add new tests and refactor bzr revid: alexandre.fayolle@camptocamp.com-20130522153203-wp45pyicciktg8m8 --- addons/stock/test/multicompany.yml | 55 +++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index 962bb825dac..8c5df8fe5c2 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -4,20 +4,49 @@ - !context uid: 'stock.multicompany_user' + - - check no error on getting default stock.move values for internal move + check no error on getting default stock.move values in multicompany setting - !python {model: stock.move}: | - multicomp_user = ref('stock.multicompany_user') - context['picking_type'] = 'internal' - log('multicompany user: %s, uid: %s', multicomp_user, uid) - log('current context: %s', context) - defaults = self.default_get(cr, multicomp_user, ['location_id', 'location_dest_id', 'type'], context) - assertion_msg = "did not get the correct default (got: %s)" % defaults - log('got defaults: %s', defaults) - assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'}, assertion_msg - defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) - assertion_msg = "did not get the correct default with uid %s (got: %s)" % (uid, defaults) - log('got defaults: %s', defaults) - assert defaults == {'location_id': False, 'location_dest_id': False, 'type': 'internal'}, assertion_msg + location_obj = self.pool.get('stock.location') + fields = ['location_id', 'location_dest_id'] + for type in ('in', 'internal', 'out'): + context['picking_type'] = type + defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) + for field in fields: + if defaults[field] != False: + assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field + assert defaults['type'] == type}, "wrong move type" +- + check onchange_move_type does not return unreadable in multicompany setting +- + !python {model: stock.move}: | + location_obj = self.pool.get('stock.location') + fields = ['location_id', 'location_dest_id'] + for type in ('in', 'internal', 'out'): + result = self.onchange_move_type(cr, uid, [], type, context)['value'] + for field in fields: + if defaults[field] != False: + assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable default %s" % field + +- + check default location readability for stock_fill_inventory in multicompany setting +- + !python {model: stock.fill.inventory}: | + location_obj = self.pool.get('stock.location') + defaults = self.default_get(cr, uid, ['location_id'], context) + if defaults['location_id'] != False: + assert location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read', context), "unreadable default source location" + +- + check default locations for warehouse in multicompany setting +- + !python {model: stock.warehouse}: | + fields = ['lot_input_id', 'lot_stock_id', 'lot_output_id'] + defaults = self.default_get(cr, uid, fields, context) + for field in fields: + for field in fields: + if defaults[field] != False: + assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable default %s" % field From 0418aee3c7b8fd1cc73f42846cfd91040dd136d6 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 22 May 2013 17:37:05 +0200 Subject: [PATCH 10/48] [TEST] new tests for lp:118211 on mrp bzr revid: alexandre.fayolle@camptocamp.com-20130522153705-vivt0a2wb4xwesco --- addons/mrp/__openerp__.py | 1 + addons/mrp/test/multicompany.yml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 addons/mrp/test/multicompany.yml diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index 6e025ae2d90..2fde404bf12 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -77,6 +77,7 @@ Dashboard / Reports for MRP will include: #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company # so the ymls are too complex to change at this stage 'test': [ + 'test/multicompany.yml', # 'test/order_demo.yml', # 'test/order_process.yml', # 'test/cancel_order.yml', diff --git a/addons/mrp/test/multicompany.yml b/addons/mrp/test/multicompany.yml new file mode 100644 index 00000000000..06d927afc65 --- /dev/null +++ b/addons/mrp/test/multicompany.yml @@ -0,0 +1,16 @@ +- + Set the current user as multicompany user +- + !context + uid: 'stock.multicompany_user' + +- + check no error on getting default mrp.production values in multicompany setting +- + !python {model: mrp.production}: | + location_obj = self.pool.get('stock.location') + fields = ['location_src_id', 'location_dest_id'] + defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) + for field in fields: + if defaults[field] != False: + assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field From d46d9882348d45b3e379dbef31bdd1bd5f23d0a7 Mon Sep 17 00:00:00 2001 From: "alexandre.fayolle@camptocamp.com" <> Date: Wed, 22 May 2013 22:21:08 +0200 Subject: [PATCH 11/48] [FIX] syntax error in test bzr revid: alexandre.fayolle@camptocamp.com-20130522202108-kv2oasnuxuf7erke --- addons/stock/test/multicompany.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index 8c5df8fe5c2..8b65849cbff 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -17,7 +17,7 @@ for field in fields: if defaults[field] != False: assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field - assert defaults['type'] == type}, "wrong move type" + assert defaults['type'] == type, "wrong move type" - check onchange_move_type does not return unreadable in multicompany setting From 653495b23f35fe36153234556e6361ea72a00157 Mon Sep 17 00:00:00 2001 From: "alexandre.fayolle@camptocamp.com" <> Date: Thu, 23 May 2013 07:39:49 +0200 Subject: [PATCH 12/48] [FIX] missing import in previous commmit bzr revid: alexandre.fayolle@camptocamp.com-20130523053949-cvvc8k9y0clx5pot --- addons/mrp/mrp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 77e3dd4965a..b99a91e9633 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -23,7 +23,7 @@ import time from datetime import datetime import openerp.addons.decimal_precision as dp -from openerp.osv import fields, osv +from openerp.osv import fields, osv, orm from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP from openerp.tools import float_compare from openerp.tools.translate import _ From aa33867973a9bb5e202800ead379ce21155bd4c4 Mon Sep 17 00:00:00 2001 From: "alexandre.fayolle@camptocamp.com" <> Date: Thu, 23 May 2013 07:53:45 +0200 Subject: [PATCH 13/48] [FIX] check_access does not return bool, it raises bzr revid: alexandre.fayolle@camptocamp.com-20130523055345-gg007ad9j457l0gl --- addons/mrp/test/multicompany.yml | 5 ++++- addons/stock/test/multicompany.yml | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/addons/mrp/test/multicompany.yml b/addons/mrp/test/multicompany.yml index 06d927afc65..95a499aba50 100644 --- a/addons/mrp/test/multicompany.yml +++ b/addons/mrp/test/multicompany.yml @@ -13,4 +13,7 @@ defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) for field in fields: if defaults[field] != False: - assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field + try: + location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + except Exception, exc: + assert False, "unreadable location %s: %s" % (field, exc) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index 8b65849cbff..bab3638765f 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -16,7 +16,10 @@ defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) for field in fields: if defaults[field] != False: - assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field + try: + location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + except Exception, exc: + assert False, "unreadable location %s: %s" % (field, exc) assert defaults['type'] == type, "wrong move type" - @@ -29,7 +32,10 @@ result = self.onchange_move_type(cr, uid, [], type, context)['value'] for field in fields: if defaults[field] != False: - assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable default %s" % field + try: + location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + except Exception, exc: + assert False, "unreadable location %s: %s" % (field, exc) - check default location readability for stock_fill_inventory in multicompany setting @@ -38,7 +44,10 @@ location_obj = self.pool.get('stock.location') defaults = self.default_get(cr, uid, ['location_id'], context) if defaults['location_id'] != False: - assert location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read', context), "unreadable default source location" + try: + location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read' + except Exception, exc: + assert False, "unreadable source location: %s" % exc - check default locations for warehouse in multicompany setting @@ -49,4 +58,7 @@ for field in fields: for field in fields: if defaults[field] != False: - assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable default %s" % field + try: + location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + except Exception, exc: + assert False, "unreadable default %s: %s" % (field, exc) From a1c18b87f22268f0d423e97caba157ff4e75e1b6 Mon Sep 17 00:00:00 2001 From: "alexandre.fayolle@camptocamp.com" <> Date: Thu, 23 May 2013 08:17:48 +0200 Subject: [PATCH 14/48] [TEST] fix name error in test bzr revid: alexandre.fayolle@camptocamp.com-20130523061748-0dzsi5hk18u3cdv2 --- addons/stock/test/multicompany.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index bab3638765f..0c90b47c96c 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -31,9 +31,9 @@ for type in ('in', 'internal', 'out'): result = self.onchange_move_type(cr, uid, [], type, context)['value'] for field in fields: - if defaults[field] != False: + if result[field] != False: try: - location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + location_obj.check_access_rule(cr, uid, result[field], 'read', context) except Exception, exc: assert False, "unreadable location %s: %s" % (field, exc) From eeb9d9149470c50735dfa807821c58a22f51e529 Mon Sep 17 00:00:00 2001 From: "alexandre.fayolle@camptocamp.com" <> Date: Thu, 23 May 2013 08:18:09 +0200 Subject: [PATCH 15/48] [FIX] bad call to check_access_rules bzr revid: alexandre.fayolle@camptocamp.com-20130523061809-jf3qt56ruiwjnpg4 --- addons/mrp/mrp.py | 4 ++-- addons/stock/stock.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index b99a91e9633..a6fab88c7d3 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -411,7 +411,7 @@ class mrp_production(osv.osv): def _src_id_default(self, cr, uid, ids, context=None): try: src_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) - src_location.check_access_rule('read', context=context) + src_location._model.check_access_rule(cr, uid, [src_location.id], 'read', context=context) except (orm.except_orm, ValueError): # no read access return False @@ -420,7 +420,7 @@ class mrp_production(osv.osv): def _dest_id_default(self, cr, uid, ids, context=None): try: dest_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) - dest_location.check_access_rule('read', context=context) + dest_location._model.check_access_rule(cr, uid, [dest_location.id], 'read', context=context) except (orm.except_orm, ValueError): # no read access return False diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 172d8bd9c27..360845d1a5c 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1737,7 +1737,7 @@ class stock_move(osv.osv): if location_xml_id: try: location = mod_obj.get_object(cr, uid, 'stock', location_xml_id) - location.check_access_rule('read', context=context) + location._model.check_access_rule(cr, uid, [location.id], 'read', context=context) location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location @@ -1961,14 +1961,14 @@ class stock_move(osv.osv): location_dest_id = 'stock_location_customers' try: location = mod_obj.get_object(cr, uid, 'stock', location_source_id) - location.check_access_rule('read', context=context) + location._model.check_access_rule(cr, uid, [location.id], 'read', context=context) source_location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location source_location_id = False try: location = mod_obj.get_object(cr, uid, 'stock', location_dest_id) - location.check_access_rule('read', context=context) + location._model.check_access_rule(cr, uid, [location.id], 'read', context=context) dest_location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location @@ -2909,7 +2909,7 @@ class stock_inventory_line(osv.osv): def _default_stock_location(self, cr, uid, context=None): try: location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') - location.check_access_rule('read', context=context) + location._model.check_access_rule(cr, uid, [location.id], 'read', context=context) stock_location_id = location.id except (ValueError, orm.except_orm): # likely the user does not have read access on the location @@ -2955,7 +2955,7 @@ class stock_warehouse(osv.osv): def _default_lot_input_stock_id(self, cr, uid, context=None): try: lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') - lot_input_stock.check_access_rule('read', context=context) + lot_input_stock._model.check_access_rule(cr, uid, [lot_input_stock.id], 'read', context=context) lot_input_stock_id = lot_input_stock.id except (ValueError, orm.except_orm): # likely the user does not have read access on the location @@ -2965,7 +2965,7 @@ class stock_warehouse(osv.osv): def _default_lot_output_id(self, cr, uid, context=None): try: lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output') - lot_output.check_access_rule('read', context=context) + lot_output._model.check_access_rule(cr, uid, [lot_output.id], 'read', context=context) lot_output_id = lot_output.id except (ValueError, orm.except_orm): # likely the user does not have read access on the location From def3ef900371e2dd9068b7658b379275989b216c Mon Sep 17 00:00:00 2001 From: "alexandre.fayolle@camptocamp.com" <> Date: Thu, 23 May 2013 08:20:22 +0200 Subject: [PATCH 16/48] [FIX] bad call to check_access_rules bzr revid: alexandre.fayolle@camptocamp.com-20130523062022-u5bqrgpc3ctffhmi --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 360845d1a5c..bd79cea8a89 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1702,7 +1702,7 @@ class stock_move(osv.osv): if location_xml_id: try: location = mod_obj.get_object(cr, uid, 'stock', location_xml_id, context=context) - location.check_access_rule('read', context=context) + location._model.check_access_rule(cr, uid, [location.id], 'read', context=context) location_id = location.id except (orm.except_orm, ValueError): # likely the user does not have read access on the location From cebc5dd29c8ad582c2569e33fc2dfcf59d7df70e Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Thu, 23 May 2013 10:34:30 +0200 Subject: [PATCH 17/48] [TEST] more test fixing bzr revid: alexandre.fayolle@camptocamp.com-20130523083430-r8towg1vxicmjkhw --- addons/mrp/test/multicompany.yml | 3 ++- addons/stock/test/multicompany.yml | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/addons/mrp/test/multicompany.yml b/addons/mrp/test/multicompany.yml index 95a499aba50..66f06fd1206 100644 --- a/addons/mrp/test/multicompany.yml +++ b/addons/mrp/test/multicompany.yml @@ -11,8 +11,9 @@ location_obj = self.pool.get('stock.location') fields = ['location_src_id', 'location_dest_id'] defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) + log('got defaults: %s', defaults) for field in fields: - if defaults[field] != False: + if defaults.get(field): try: location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) except Exception, exc: diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index 0c90b47c96c..c4d50a45d79 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -14,8 +14,9 @@ for type in ('in', 'internal', 'out'): context['picking_type'] = type defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context) + log('type: %s got defaults: %s', type, defaults) for field in fields: - if defaults[field] != False: + if defaults.get(field): try: location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) except Exception, exc: @@ -30,8 +31,9 @@ fields = ['location_id', 'location_dest_id'] for type in ('in', 'internal', 'out'): result = self.onchange_move_type(cr, uid, [], type, context)['value'] + log('type: %s got: %s', type, result) for field in fields: - if result[field] != False: + if result.get(field): try: location_obj.check_access_rule(cr, uid, result[field], 'read', context) except Exception, exc: @@ -43,9 +45,10 @@ !python {model: stock.fill.inventory}: | location_obj = self.pool.get('stock.location') defaults = self.default_get(cr, uid, ['location_id'], context) - if defaults['location_id'] != False: + log('got defaults: %s', defaults) + if defaults.get('location_id'): try: - location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read' + location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read', context) except Exception, exc: assert False, "unreadable source location: %s" % exc @@ -53,12 +56,13 @@ check default locations for warehouse in multicompany setting - !python {model: stock.warehouse}: | + location_obj = self.pool.get('stock.location') fields = ['lot_input_id', 'lot_stock_id', 'lot_output_id'] defaults = self.default_get(cr, uid, fields, context) + log('got defaults: %s', defaults) for field in fields: - for field in fields: - if defaults[field] != False: - try: - location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) - except Exception, exc: - assert False, "unreadable default %s: %s" % (field, exc) + if defaults.get(field): + try: + location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + except Exception, exc: + assert False, "unreadable default %s: %s" % (field, exc) From cea92690f76942583dfc82ef49660de362c33c32 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Thu, 23 May 2013 11:00:55 +0200 Subject: [PATCH 18/48] [FIX] fix exception check bzr revid: alexandre.fayolle@camptocamp.com-20130523090055-4m418aninaczbzcy --- addons/stock/wizard/stock_fill_inventory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py index d0062c82538..07dcb3965d7 100644 --- a/addons/stock/wizard/stock_fill_inventory.py +++ b/addons/stock/wizard/stock_fill_inventory.py @@ -19,7 +19,7 @@ # ############################################################################## -from openerp.osv import fields, osv +from openerp.osv import fields, osv, orm from openerp.tools.translate import _ class stock_fill_inventory(osv.osv_memory): @@ -31,7 +31,7 @@ class stock_fill_inventory(osv.osv_memory): location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') location.check_access_rule('read', context=context) location_id = location.id - except ValueError, e: + except (ValueError, orm.except_orm), e: return False return location_id or False From 1bf62e51a74926b441bf8361c1267f2618ff4217 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Thu, 23 May 2013 11:01:23 +0200 Subject: [PATCH 19/48] [TEST] [FIX] check_access_rules does not cope with a single id bzr revid: alexandre.fayolle@camptocamp.com-20130523090123-e2o2fzekgy7zqtl8 --- addons/mrp/test/multicompany.yml | 2 +- addons/stock/stock.py | 2 +- addons/stock/test/multicompany.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/mrp/test/multicompany.yml b/addons/mrp/test/multicompany.yml index 66f06fd1206..7ed9cf86023 100644 --- a/addons/mrp/test/multicompany.yml +++ b/addons/mrp/test/multicompany.yml @@ -15,6 +15,6 @@ for field in fields: if defaults.get(field): try: - location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + location_obj.check_access_rule(cr, uid, [defaults[field]], 'read', context) except Exception, exc: assert False, "unreadable location %s: %s" % (field, exc) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index bd79cea8a89..9ac610dec83 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1704,7 +1704,7 @@ class stock_move(osv.osv): location = mod_obj.get_object(cr, uid, 'stock', location_xml_id, context=context) location._model.check_access_rule(cr, uid, [location.id], 'read', context=context) location_id = location.id - except (orm.except_orm, ValueError): + except (orm.except_orm, ValueError), exc: # likely the user does not have read access on the location location_id = False return location_id diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml index c4d50a45d79..2c0353aa71d 100644 --- a/addons/stock/test/multicompany.yml +++ b/addons/stock/test/multicompany.yml @@ -18,7 +18,7 @@ for field in fields: if defaults.get(field): try: - location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + location_obj.check_access_rule(cr, uid, [defaults[field]], 'read', context) except Exception, exc: assert False, "unreadable location %s: %s" % (field, exc) assert defaults['type'] == type, "wrong move type" @@ -35,7 +35,7 @@ for field in fields: if result.get(field): try: - location_obj.check_access_rule(cr, uid, result[field], 'read', context) + location_obj.check_access_rule(cr, uid, [result[field]], 'read', context) except Exception, exc: assert False, "unreadable location %s: %s" % (field, exc) @@ -48,7 +48,7 @@ log('got defaults: %s', defaults) if defaults.get('location_id'): try: - location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read', context) + location_obj.check_access_rule(cr, uid, [defaults['location_id']], 'read', context) except Exception, exc: assert False, "unreadable source location: %s" % exc @@ -63,6 +63,6 @@ for field in fields: if defaults.get(field): try: - location_obj.check_access_rule(cr, uid, defaults[field], 'read', context) + location_obj.check_access_rule(cr, uid, [defaults[field]], 'read', context) except Exception, exc: assert False, "unreadable default %s: %s" % (field, exc) From 19ae69201c1feff1ff005b765b76055d60d5aa35 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Fri, 5 Jul 2013 17:40:36 +0530 Subject: [PATCH 20/48] [IMP]Add parent-id attribute to get childrens of that parentid and show selected parent's childrens rather than else. lp bug: https://launchpad.net/bugs/1183156 fixed bzr revid: bth@tinyerp.com-20130705121036-0pn454ts3z9wkwxr --- addons/web/static/src/js/view_tree.js | 22 +++++++++++----------- addons/web/static/src/xml/base.xml | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js index 2f9efad9171..a9ec2bb6001 100644 --- a/addons/web/static/src/js/view_tree.js +++ b/addons/web/static/src/js/view_tree.js @@ -163,12 +163,13 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie var is_loaded = 0, $this = $(this), record_id = $this.data('id'), + parent_id = $this.data('parent-id'), record = self.records[record_id], children_ids = record[self.children_field]; _(children_ids).each(function(childid) { - if (self.$el.find('#treerow_' + childid).length) { - if (self.$el.find('#treerow_' + childid).is(':hidden')) { + if (self.$el.find('[id=treerow_' + childid + '][data-parent-id='+ record_id +']').length ) { + if (self.$el.find('[id=treerow_' + childid + '][data-parent-id='+ record_id +']').is(':hidden')) { is_loaded = -1; } else { is_loaded++; @@ -180,7 +181,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie self.getdata(record_id, children_ids); } } else { - self.showcontent(record_id, is_loaded < 0); + self.showcontent($this, record_id, is_loaded < 0); } }); }, @@ -201,9 +202,9 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie 'fields': self.fields, 'level': $curr_node.data('level') || 0, 'render': instance.web.format_value, - 'color_for': self.color_for + 'color_for': self.color_for, + 'parent_id': id }); - if ($curr_node.length) { $curr_node.addClass('oe_open'); $curr_node.after(children_rows); @@ -243,14 +244,13 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie }, // show & hide the contents - showcontent: function (record_id, show) { - this.$el.find('#treerow_' + record_id) - .toggleClass('oe_open', show); - + showcontent: function (curnode,record_id, show) { + curnode.parent('tr').toggleClass('oe_open', show); _(this.records[record_id][this.children_field]).each(function (child_id) { - var $child_row = this.$el.find('#treerow_' + child_id); + var $child_row = this.$el.find('[id=treerow_' + child_id + '][data-parent-id='+ curnode.data('id') +']'); if ($child_row.hasClass('oe_open')) { - this.showcontent(child_id, false); + $child_row.toggleClass('oe_open',show); + this.showcontent($child_row, child_id, false); } $child_row.toggle(show); }, this); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 8f89ee23323..470c6e83d07 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -684,7 +684,8 @@ + t-att-data-id="record.id" t-att-data-level="level + 1" + t-att-data-parent-id="parent_id"> From edff0d2831ffd2b3798a4c10244230d21fea18e2 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 24 Jul 2013 15:14:07 +0530 Subject: [PATCH 21/48] [IMP] return new duplicate id in copy() from partner bzr revid: fka@tinyerp.com-20130724094407-k2xykldtq185sipy --- addons/purchase/partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py index e05f6b9c9c6..30a877ef9d1 100644 --- a/addons/purchase/partner.py +++ b/addons/purchase/partner.py @@ -41,7 +41,7 @@ class res_partner(osv.osv): default.update({'purchase_order_ids': []}) - super(res_partner, self).copy(cr, uid, id, default=default, context=context) + return super(res_partner, self).copy(cr, uid, id, default=default, context=context) def _commercial_fields(self, cr, uid, context=None): return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase'] From 2cec1eb0456b09d9e4dc53ccb4668285a1c903b0 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 23 Aug 2013 05:52:41 +0000 Subject: [PATCH 22/48] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130822054004-iy1tgkww8vf91e5g bzr revid: launchpad_translations_on_behalf_of_openerp-20130823055241-t379yr3ksuppirw0 --- addons/account/i18n/hu.po | 8 +- addons/account/i18n/ru.po | 8 +- addons/account_asset/i18n/hu.po | 758 ++++++++++++++++++++++++++++++ addons/account_payment/i18n/lt.po | 10 +- addons/base_calendar/i18n/fr.po | 28 +- addons/base_setup/i18n/fr.po | 10 +- addons/crm/i18n/fr.po | 10 +- addons/crm/i18n/lt.po | 34 +- addons/document_page/i18n/fr.po | 12 +- addons/email_template/i18n/fr.po | 13 +- addons/hr_expense/i18n/hu.po | 10 +- addons/lunch/i18n/ru.po | 12 +- addons/mail/i18n/lt.po | 12 +- addons/mrp/i18n/lt.po | 109 +++-- addons/mrp_operations/i18n/ru.po | 10 +- addons/purchase/i18n/ru.po | 8 +- 16 files changed, 911 insertions(+), 141 deletions(-) create mode 100644 addons/account_asset/i18n/hu.po diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 1ff1fe49f15..3adcc7a56cb 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-08-16 14:15+0000\n" +"PO-Revision-Date: 2013-08-22 11:02+0000\n" "Last-Translator: Herczeg Péter \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-17 06:16+0000\n" -"X-Generator: Launchpad (build 16723)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -9765,7 +9765,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing msgid "Periodic Processing" -msgstr "" +msgstr "Időszakos feldolgozás" #. module: account #: view:account.invoice.report:0 diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index d0dae16fdd3..06739854344 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-08-13 08:09+0000\n" +"PO-Revision-Date: 2013-08-22 11:30+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-14 06:11+0000\n" -"X-Generator: Launchpad (build 16723)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -10549,7 +10549,7 @@ msgstr "" #. module: account #: field:account.invoice,check_total:0 msgid "Verification Total" -msgstr "" +msgstr "Всего (проверка)" #. module: account #: report:account.analytic.account.balance:0 diff --git a/addons/account_asset/i18n/hu.po b/addons/account_asset/i18n/hu.po new file mode 100644 index 00000000000..135bc865d73 --- /dev/null +++ b/addons/account_asset/i18n/hu.po @@ -0,0 +1,758 @@ +# Hungarian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2013-08-22 11:22+0000\n" +"Last-Translator: Herczeg Péter \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in draft and open states" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_end:0 +#: field:account.asset.history,method_end:0 +#: field:asset.modify,method_end:0 +msgid "Ending date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,value_residual:0 +msgid "Residual Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_expense_depreciation_id:0 +msgid "Depr. Expense Account" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Group By..." +msgstr "Csoportosítás" + +#. module: account_asset +#: field:asset.asset.report,gross_value:0 +msgid "Gross Amount" +msgstr "Bruttó összeg" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.depreciation.line,asset_id:0 +#: field:account.asset.history,asset_id:0 +#: field:account.move.line,asset_id:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,asset_id:0 +#: model:ir.model,name:account_asset.model_account_asset_asset +msgid "Asset" +msgstr "Eszköz" + +#. module: account_asset +#: help:account.asset.asset,prorata:0 +#: help:account.asset.category,prorata:0 +msgid "" +"Indicates that the first depreciation entry for this asset have to be done " +"from the purchase date instead of the first January" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Linear" +msgstr "Lineáris" + +#. module: account_asset +#: field:account.asset.asset,company_id:0 +#: field:account.asset.category,company_id:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,company_id:0 +msgid "Company" +msgstr "Vállalat" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Modify" +msgstr "Módosítás" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Running" +msgstr "Folyamatban lévő" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Draft" +msgstr "Beállítás tervezetnek" + +#. module: account_asset +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report +#: model:ir.model,name:account_asset.model_asset_asset_report +#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report +msgid "Assets Analysis" +msgstr "Eszközök elemzése" + +#. module: account_asset +#: field:asset.modify,name:0 +msgid "Reason" +msgstr "Indoklás" + +#. module: account_asset +#: field:account.asset.asset,method_progress_factor:0 +#: field:account.asset.category,method_progress_factor:0 +msgid "Degressive Factor" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Asset Categories" +msgstr "Eszköz kategóriák" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,account_move_line_ids:0 +#: field:account.move.line,entry_ids:0 +#: model:ir.actions.act_window,name:account_asset.act_entries_open +msgid "Entries" +msgstr "Tételek" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,depreciation_line_ids:0 +msgid "Depreciation Lines" +msgstr "Értékcsökkénés sorai" + +#. module: account_asset +#: help:account.asset.asset,salvage_value:0 +msgid "It is the amount you plan to have that you cannot depreciate." +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_period:0 +msgid "The amount of time between two depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciation_date:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_date:0 +msgid "Depreciation Date" +msgstr "Értékcsökkenés dátuma" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "Error ! You cannot create recursive assets." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,posted_value:0 +msgid "Posted Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_finance_assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets +msgid "Assets" +msgstr "Eszközök" + +#. module: account_asset +#: field:account.asset.category,account_depreciation_id:0 +msgid "Depreciation Account" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:account.asset.category:0 +#: view:account.asset.history:0 +#: view:asset.modify:0 +#: field:asset.modify,note:0 +msgid "Notes" +msgstr "Megjegyzések" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_id:0 +msgid "Depreciation Entry" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/account_asset.py:82 +#, python-format +msgid "Error!" +msgstr "Hiba!" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,nbr:0 +msgid "# of Depreciation Lines" +msgstr "# értékcsökkenési sorok száma" + +#. module: account_asset +#: field:account.asset.asset,method_period:0 +msgid "Number of Months in a Period" +msgstr "Hónapok száma az időszakban" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in draft state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_end:0 +#: selection:account.asset.asset,method_time:0 +#: selection:account.asset.category,method_time:0 +#: selection:account.asset.history,method_time:0 +msgid "Ending Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,code:0 +msgid "Reference" +msgstr "Hivatkozás" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Account Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard +#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard +msgid "Compute Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_period:0 +#: field:account.asset.history,method_period:0 +#: field:asset.modify,method_period:0 +msgid "Period Length" +msgstr "Időszak hossza" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Draft" +msgstr "Tervezet" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of asset purchase" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change Duration" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_number:0 +#: help:account.asset.category,method_number:0 +#: help:account.asset.history,method_number:0 +msgid "The number of depreciations needed to depreciate your asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Analytic Information" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_analytic_id:0 +msgid "Analytic account" +msgstr "Gyűjtőkód" + +#. module: account_asset +#: field:account.asset.asset,method:0 +#: field:account.asset.category,method:0 +msgid "Computation Method" +msgstr "Számítási módszer" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "" +"Prorata temporis can be applied only for time method \"number of " +"depreciations\"." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,remaining_value:0 +msgid "Next Period Depreciation" +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_period:0 +msgid "Time in month between two depreciations" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_modify +#: model:ir.model,name:account_asset.model_asset_modify +msgid "Modify Asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,salvage_value:0 +msgid "Salvage Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 +#: view:account.asset.category:0 +#: field:account.invoice.line,asset_category_id:0 +#: view:asset.asset.report:0 +msgid "Asset Category" +msgstr "Eszköz kategória" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in closed state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.history:0 +#: model:ir.model,name:account_asset.model_account_asset_history +msgid "Asset history" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Search Asset Category" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "months" +msgstr "hónapok" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice_line +msgid "Invoice Line" +msgstr "Számlasor" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation Board" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,unposted_value:0 +msgid "Unposted Amount" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_time:0 +#: field:account.asset.category,method_time:0 +#: field:account.asset.history,method_time:0 +msgid "Time Method" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +#: view:asset.modify:0 +msgid "or" +msgstr "vagy" + +#. module: account_asset +#: field:account.asset.asset,note:0 +#: field:account.asset.category,note:0 +#: field:account.asset.history,note:0 +msgid "Note" +msgstr "Jegyzet" + +#. module: account_asset +#: help:account.asset.history,method_time:0 +msgid "" +"The method to use to compute the dates and number of depreciation lines.\n" +"Number of Depreciations: Fix the number of depreciation lines and the time " +"between 2 depreciations.\n" +"Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_time:0 +#: help:account.asset.category,method_time:0 +msgid "" +"Choose the method to use to compute the dates and number of depreciation " +"lines.\n" +" * Number of Depreciations: Fix the number of depreciation lines and the " +"time between 2 depreciations.\n" +" * Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in running state" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Closed" +msgstr "Lezárt" + +#. module: account_asset +#: help:account.asset.asset,state:0 +msgid "" +"When an asset is created, the status is 'Draft'.\n" +"If the asset is confirmed, the status goes in 'Running' and the depreciation " +"lines can be posted in the accounting.\n" +"You can manually close an asset when the depreciation is over. If the last " +"line of depreciation is posted, the asset automatically goes in that status." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,state:0 +#: field:asset.asset.report,state:0 +msgid "Status" +msgstr "Státusz" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +#: field:asset.asset.report,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Posted depreciation lines" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Children Assets" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,user_id:0 +msgid "User" +msgstr "Felhasználó" + +#. module: account_asset +#: field:account.asset.category,account_asset_id:0 +msgid "Asset Account" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Extended Filters..." +msgstr "Kiterjesztett szűrők…" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute" +msgstr "Kiszámítás" + +#. module: account_asset +#: view:account.asset.history:0 +msgid "Asset History" +msgstr "Eszköz történet" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard +msgid "asset.depreciation.confirmation.wizard" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "Aktív" + +#. module: account_asset +#: field:account.asset.depreciation.line,parent_state:0 +msgid "State of Asset" +msgstr "Eszköz státusza" + +#. module: account_asset +#: field:account.asset.depreciation.line,name:0 +msgid "Depreciation Name" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,history_ids:0 +msgid "History" +msgstr "Előzmény" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" +msgstr "" + +#. module: account_asset +#: field:asset.depreciation.confirmation.wizard,period_id:0 +msgid "Period" +msgstr "Időszak" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General" +msgstr "Általános" + +#. module: account_asset +#: field:account.asset.asset,prorata:0 +#: field:account.asset.category,prorata:0 +msgid "Prorata Temporis" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice +msgid "Invoice" +msgstr "Számla" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Close" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +#: view:asset.modify:0 +msgid "Cancel" +msgstr "Mégsem" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: selection:asset.asset.report,state:0 +msgid "Close" +msgstr "Lezár" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_move_line +msgid "Journal Items" +msgstr "Könyvelési tételsorok" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Asset Durations to Modify" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_date:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,purchase_date:0 +msgid "Purchase Date" +msgstr "Vásárlás dátuma" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Degressive" +msgstr "Degresszív" + +#. module: account_asset +#: help:asset.depreciation.confirmation.wizard,period_id:0 +msgid "" +"Choose the period for which you want to automatically post the depreciation " +"lines of running assets" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Current" +msgstr "Jelenlegi" + +#. module: account_asset +#: code:addons/account_asset/account_asset.py:82 +#, python-format +msgid "You cannot delete an asset that contains posted depreciation lines." +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Depreciation Method" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,amount:0 +msgid "Current Depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,name:0 +msgid "Asset Name" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,open_asset:0 +msgid "Skip Draft State" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Depreciation Dates" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,currency_id:0 +msgid "Currency" +msgstr "Pénznem" + +#. module: account_asset +#: field:account.asset.category,journal_id:0 +msgid "Journal" +msgstr "Napló" + +#. module: account_asset +#: field:account.asset.history,name:0 +msgid "History name" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciated_value:0 +msgid "Amount Already Depreciated" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method:0 +#: help:account.asset.category,method:0 +msgid "" +"Choose the method to use to compute the amount of depreciation lines.\n" +" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" +" * Degressive: Calculated on basis of: Residual Value * Degressive Factor" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_check:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,move_check:0 +msgid "Posted" +msgstr "Könyvelt" + +#. module: account_asset +#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report +msgid "" +"

\n" +" From this report, you can have an overview on all depreciation. " +"The\n" +" tool search can also be used to personalise your Assets reports " +"and\n" +" so, match this analysis to your needs;\n" +"

\n" +" " +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross Value" +msgstr "Bruttó érték" + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "Név" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,name:0 +msgid "Year" +msgstr "Év" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "Eszköz kategória" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:50 +#, python-format +msgid "Created Asset Moves" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Add an internal note here..." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence" +msgstr "Sorszám" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "Dátum" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po index 4175906b114..36367a2adf5 100644 --- a/addons/account_payment/i18n/lt.po +++ b/addons/account_payment/i18n/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-08-21 12:13+0000\n" +"Last-Translator: Justas \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:48+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-22 05:39+0000\n" +"X-Generator: Launchpad (build 16734)\n" #. module: account_payment #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree @@ -177,7 +177,7 @@ msgstr "" #. module: account_payment #: view:payment.line:0 msgid "Amount Total" -msgstr "" +msgstr "Viso" #. module: account_payment #: help:payment.order,state:0 diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po index c20bca4e097..af25daf3545 100644 --- a/addons/base_calendar/i18n/fr.po +++ b/addons/base_calendar/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-07-28 13:08+0000\n" +"PO-Revision-Date: 2013-08-22 07:32+0000\n" "Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-29 05:54+0000\n" -"X-Generator: Launchpad (build 16700)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 @@ -302,12 +302,12 @@ msgstr "Courriel à" #. module: base_calendar #: field:crm.meeting,name:0 msgid "Meeting Subject" -msgstr "" +msgstr "Titre de l'évènement" #. module: base_calendar #: view:calendar.event:0 msgid "End of Recurrence" -msgstr "" +msgstr "Fin de la récurrence" #. module: base_calendar #: view:calendar.event:0 @@ -328,7 +328,7 @@ msgstr "Choisir le jour où répéter le rendez-vous" #: view:crm.meeting:0 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting msgid "Meetings" -msgstr "" +msgstr "Évènements" #. module: base_calendar #: field:calendar.event,recurrent_id_date:0 @@ -589,7 +589,7 @@ msgstr "Jeu" #. module: base_calendar #: view:crm.meeting:0 msgid "Meeting Details" -msgstr "" +msgstr "Détails de l'évènement" #. module: base_calendar #: field:calendar.attendee,child_ids:0 @@ -850,7 +850,7 @@ msgstr "Nombre de répétitions" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet2 msgid "Internal Meeting" -msgstr "" +msgstr "Réunion interne" #. module: base_calendar #: view:calendar.event:0 @@ -928,7 +928,7 @@ msgstr "Date de l'événement" #. module: base_calendar #: view:crm.meeting:0 msgid "Invitations" -msgstr "" +msgstr "Invitations" #. module: base_calendar #: view:calendar.event:0 @@ -1103,7 +1103,7 @@ msgstr "Défini l'action à exécuter lorsque l'alarme se déclenche" #. module: base_calendar #: view:crm.meeting:0 msgid "Starting at" -msgstr "" +msgstr "Heure de début" #. module: base_calendar #: selection:calendar.event,end_type:0 @@ -1132,12 +1132,12 @@ msgstr "" #: field:calendar.todo,end_type:0 #: field:crm.meeting,end_type:0 msgid "Recurrence Termination" -msgstr "" +msgstr "Fin de la récurrence" #. module: base_calendar #: view:crm.meeting:0 msgid "Until" -msgstr "" +msgstr "Jusqu'à" #. module: base_calendar #: view:res.alarm:0 @@ -1204,7 +1204,7 @@ msgstr "Responsable" #. module: base_calendar #: view:crm.meeting:0 msgid "Select Weekdays" -msgstr "" +msgstr "Sélectionner les jours de la semaine" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:1521 @@ -1564,7 +1564,7 @@ msgstr "Samedi" #: field:calendar.todo,interval:0 #: field:crm.meeting,interval:0 msgid "Repeat Every" -msgstr "" +msgstr "Répéter tous les" #. module: base_calendar #: selection:calendar.event,byday:0 diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po index 1374638434a..33175afc48f 100644 --- a/addons/base_setup/i18n/fr.po +++ b/addons/base_setup/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-07-13 21:43+0000\n" -"Last-Translator: Gilles Major (OpenERP) \n" +"PO-Revision-Date: 2013-08-22 07:33+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-14 05:58+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: base_setup #: view:sale.config.settings:0 @@ -134,7 +134,7 @@ msgstr "Sur le client de messagerie" #. module: base_setup #: view:base.config.settings:0 msgid "--db-filter=YOUR_DATABAE" -msgstr "" +msgstr "--db-filter=VOTRE_BASE_DE_DONNEES" #. module: base_setup #: field:sale.config.settings,module_web_linkedin:0 diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po index 730940e8308..a3f76d40af6 100644 --- a/addons/crm/i18n/fr.po +++ b/addons/crm/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-03 15:44+0000\n" -"Last-Translator: Coignat \n" +"PO-Revision-Date: 2013-08-22 07:34+0000\n" +"Last-Translator: WANTELLET Sylvain \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-04 05:37+0000\n" -"X-Generator: Launchpad (build 16718)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: crm #: view:crm.lead.report:0 @@ -461,7 +461,7 @@ msgstr "Chef d'équipe" #: code:addons/crm/crm_lead.py:1052 #, python-format msgid "%s a call for %s.%s" -msgstr "" +msgstr "%s un appel pour %s. %s" #. module: crm #: help:crm.case.stage,probability:0 diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po index 8312257deb2..79ddb2d135b 100644 --- a/addons/crm/i18n/lt.po +++ b/addons/crm/i18n/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-16 13:48+0000\n" -"Last-Translator: Mantas Kriaučiūnas \n" +"PO-Revision-Date: 2013-08-21 13:44+0000\n" +"Last-Translator: Eimis \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:54+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-22 05:39+0000\n" +"X-Generator: Launchpad (build 16734)\n" #. module: crm #: view:crm.lead.report:0 @@ -87,7 +87,7 @@ msgstr "Delsimas užverti" #. module: crm #: view:crm.lead:0 msgid "Available for mass mailing" -msgstr "" +msgstr "Galimas masiniams siuntimams" #. module: crm #: view:crm.case.stage:0 @@ -155,7 +155,7 @@ msgstr "Taisyklės pavadinimas" #: code:addons/crm/crm_phonecall.py:280 #, python-format msgid "It's only possible to convert one phonecall at a time." -msgstr "" +msgstr "Konvertuoti įmanoma tik vieną telefono skambutį vienu metu." #. module: crm #: view:crm.case.resource.type:0 @@ -237,12 +237,12 @@ msgstr "Man priskirtos pardavimų galimybės" #. module: crm #: field:res.partner,meeting_count:0 msgid "# Meetings" -msgstr "" +msgstr "# Susitikimai" #. module: crm #: model:ir.actions.server,name:crm.action_email_reminder_lead msgid "Reminder to User" -msgstr "" +msgstr "Priminimas vartotojui" #. module: crm #: field:crm.segmentation,segmentation_line:0 @@ -559,7 +559,7 @@ msgstr "Planuojamos pajamos" #: code:addons/crm/crm_lead.py:988 #, python-format msgid "Customer Email" -msgstr "" +msgstr "Kliento el. pašto adresas" #. module: crm #: field:crm.lead,planned_revenue:0 @@ -782,7 +782,7 @@ msgstr "Konvertuoti į pardavimų galimybes" #. module: crm #: model:ir.model,name:crm.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: crm #: view:crm.segmentation:0 @@ -792,7 +792,7 @@ msgstr "Stabdyti procesą" #. module: crm #: field:crm.case.section,alias_id:0 msgid "Alias" -msgstr "" +msgstr "Alternatyvus vardas" #. module: crm #: view:crm.phonecall:0 @@ -1345,7 +1345,7 @@ msgstr "Data" #. module: crm #: model:crm.case.section,name:crm.crm_case_section_4 msgid "Online Support" -msgstr "" +msgstr "Online palaikymas" #. module: crm #: view:crm.lead.report:0 @@ -1379,7 +1379,7 @@ msgstr "" #. module: crm #: model:crm.case.section,name:crm.crm_case_section_1 msgid "Sales Marketing Department" -msgstr "" +msgstr "Pardavimų rinkodaros skyrius" #. module: crm #: code:addons/crm/crm_lead.py:585 @@ -1428,7 +1428,7 @@ msgstr "Kodas" #. module: crm #: view:sale.config.settings:0 msgid "Features" -msgstr "" +msgstr "Požymiai" #. module: crm #: field:crm.case.section,child_ids:0 @@ -2070,7 +2070,7 @@ msgstr "El. laiškai - Paslaugos" #: selection:crm.lead.report,state:0 #: selection:crm.phonecall.report,state:0 msgid "Pending" -msgstr "Laukianti" +msgstr "Laukiama" #. module: crm #: view:crm.lead:0 @@ -2167,7 +2167,7 @@ msgstr "Įvairūs" #: view:crm.lead.report:0 #: selection:crm.lead.report,state:0 msgid "Open" -msgstr "Atidaryta" +msgstr "Atvira" #. module: crm #: view:crm.lead:0 @@ -2382,7 +2382,7 @@ msgstr "Įmonė" #. module: crm #: selection:crm.segmentation,state:0 msgid "Running" -msgstr "Veikiantis" +msgstr "Vykdomas" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po index 03de7d19b70..11ddd4675fa 100644 --- a/addons/document_page/i18n/fr.po +++ b/addons/document_page/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-04-22 15:40+0000\n" -"Last-Translator: WANTELLET Sylvain \n" +"PO-Revision-Date: 2013-08-22 07:35+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:57+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: document_page #: view:document.page:0 @@ -231,6 +231,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"Cliquez pour créer une nouvelle page Web.\n" +"

\n" +" " #. module: document_page #: view:document.page.create.menu:0 diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po index d3f5ef62f99..0a626eb843a 100644 --- a/addons/email_template/i18n/fr.po +++ b/addons/email_template/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-07-28 13:34+0000\n" +"PO-Revision-Date: 2013-08-22 07:36+0000\n" "Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-29 05:54+0000\n" -"X-Generator: Launchpad (build 16700)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: email_template #: field:email.template,email_from:0 @@ -28,6 +28,7 @@ msgstr "De" msgid "" "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +"Partenaires qui n'ont pas demandé à être exclus des campagnes de prospection" #. module: email_template #: help:email.template,ref_ir_value:0 @@ -43,7 +44,7 @@ msgstr "Retirer des campagnes marketing" #. module: email_template #: view:email.template:0 msgid "Email contents (in raw HTML format)" -msgstr "" +msgstr "Contenu du courriel (au format HTML)" #. module: email_template #: help:email.template,email_from:0 @@ -90,7 +91,7 @@ msgstr "Nom du fichier du rapport" #: field:email.template,email_to:0 #: field:email_template.preview,email_to:0 msgid "To (Emails)" -msgstr "" +msgstr "Pour (courriels)" #. module: email_template #: view:email.template:0 @@ -382,7 +383,7 @@ msgstr "" #: field:email.template,email_recipients:0 #: field:email_template.preview,email_recipients:0 msgid "To (Partners)" -msgstr "" +msgstr "Pour (partenaires)" #. module: email_template #: field:email.template,auto_delete:0 diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po index 53048f31086..18794231bff 100644 --- a/addons/hr_expense/i18n/hu.po +++ b/addons/hr_expense/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-03-10 20:41+0000\n" -"Last-Translator: krnkris \n" +"PO-Revision-Date: 2013-08-22 11:00+0000\n" +"Last-Translator: Herczeg Péter \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:00+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: hr_expense #: view:hr.expense.expense:0 @@ -888,7 +888,7 @@ msgstr "Elutasított" #. module: hr_expense #: field:product.product,hr_expense_ok:0 msgid "Can be Expensed" -msgstr "Készpénzessé tehető" +msgstr "Költségként elszámolható" #. module: hr_expense #: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po index 9213a86a3e5..59c331deb2a 100644 --- a/addons/lunch/i18n/ru.po +++ b/addons/lunch/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-26 09:08+0000\n" -"Last-Translator: Olga \n" +"PO-Revision-Date: 2013-08-22 12:16+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:07+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: lunch #: field:lunch.product,category_id:0 @@ -625,7 +625,7 @@ msgstr "Дата заказа" #. module: lunch #: view:lunch.cancel:0 msgid "Cancel Orders" -msgstr "" +msgstr "Отмена заказов" #. module: lunch #: model:ir.actions.act_window,help:lunch.action_lunch_alert @@ -860,7 +860,7 @@ msgstr "" #. module: lunch #: view:lunch.cancel:0 msgid "cancel order lines" -msgstr "" +msgstr "Отмена позиций заказа" #. module: lunch #: model:ir.model,name:lunch.model_lunch_product_category diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po index 93ecd890258..8b97cfc0ed7 100644 --- a/addons/mail/i18n/lt.po +++ b/addons/mail/i18n/lt.po @@ -8,25 +8,25 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-05-10 05:45+0000\n" -"Last-Translator: Andrius Preimantas @ hbee \n" +"PO-Revision-Date: 2013-08-21 12:36+0000\n" +"Last-Translator: Eimis \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:08+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-22 05:39+0000\n" +"X-Generator: Launchpad (build 16734)\n" #. module: mail #: view:mail.followers:0 msgid "Followers Form" -msgstr "" +msgstr "Sekėjų forma" #. module: mail #: code:addons/mail/mail_thread.py:246 #, python-format msgid "%s created" -msgstr "" +msgstr "%s sukurta" #. module: mail #: field:mail.compose.message,author_id:0 diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po index 84ab1e19b2f..147f9bf513f 100644 --- a/addons/mrp/i18n/lt.po +++ b/addons/mrp/i18n/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-04-30 16:27+0000\n" -"Last-Translator: Giedrius Slavinskas - inovera.lt \n" +"PO-Revision-Date: 2013-08-21 13:03+0000\n" +"Last-Translator: Eimis \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:10+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-22 05:40+0000\n" +"X-Generator: Launchpad (build 16734)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -68,7 +68,7 @@ msgstr "" #: code:addons/mrp/report/price.py:130 #, python-format msgid "Hourly Cost" -msgstr "" +msgstr "Valandinė kaina" #. module: mrp #: view:mrp.production:0 @@ -78,7 +78,7 @@ msgstr "Nurašyti produktus" #. module: mrp #: view:mrp.workcenter:0 msgid "Mrp Workcenter" -msgstr "" +msgstr "Mrp darbo centras" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_routing_action @@ -115,7 +115,7 @@ msgstr "" #. module: mrp #: view:product.product:0 msgid "False" -msgstr "" +msgstr "Ne" #. module: mrp #: view:mrp.bom:0 @@ -149,7 +149,7 @@ msgstr "" #: model:process.transition,name:mrp.process_transition_servicerfq0 #: model:process.transition,name:mrp.process_transition_stockrfq0 msgid "To Buy" -msgstr "" +msgstr "Pirkti" #. module: mrp #: model:process.transition,note:mrp.process_transition_purchaseprocure0 @@ -159,7 +159,7 @@ msgstr "" #. module: mrp #: view:mrp.production:0 msgid "Products to Finish" -msgstr "" +msgstr "Produktai Baigti" #. module: mrp #: selection:mrp.bom,method:0 @@ -191,7 +191,7 @@ msgstr "Matavimo vienetas" #. module: mrp #: model:process.node,note:mrp.process_node_purchaseprocure0 msgid "For purchased material" -msgstr "" +msgstr "Įsigytoms medžiagos" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action @@ -201,13 +201,13 @@ msgstr "Užsakymų planavimas" #. module: mrp #: field:mrp.config.settings,module_mrp_operations:0 msgid "Allow detailed planning of work order" -msgstr "" +msgstr "Leisti darbų užsakymų išsamius planus" #. module: mrp #: code:addons/mrp/mrp.py:633 #, python-format msgid "Cannot cancel manufacturing order!" -msgstr "" +msgstr "Negalite atšaukti gamybos užsakymo!" #. module: mrp #: field:mrp.workcenter,costs_cycle_account_id:0 @@ -218,7 +218,7 @@ msgstr "Ciklinių kaštų sąskaita" #: code:addons/mrp/report/price.py:130 #, python-format msgid "Work Cost" -msgstr "" +msgstr "Darbų išlaidos" #. module: mrp #: model:process.transition,name:mrp.process_transition_procureserviceproduct0 @@ -279,7 +279,7 @@ msgstr "Produktų duomenys" #. module: mrp #: field:mrp.config.settings,module_mrp_byproduct:0 msgid "Produce several products from one manufacturing order" -msgstr "" +msgstr "Gaminti keletą produktų iš vieno gamybos užsakymo" #. module: mrp #: help:mrp.config.settings,group_mrp_properties:0 @@ -331,22 +331,22 @@ msgstr "" #. module: mrp #: model:res.groups,name:mrp.group_mrp_routings msgid "Manage Routings" -msgstr "" +msgstr "Valdyti maršrutus" #. module: mrp #: model:ir.model,name:mrp.model_mrp_product_produce msgid "Product Produce" -msgstr "" +msgstr "Produkto gamyba" #. module: mrp #: constraint:mrp.bom:0 msgid "Error ! You cannot create recursive BoM." -msgstr "" +msgstr "Klaida! Jūs negalite sukurti grįžtamojo BoM." #. module: mrp #: model:ir.model,name:mrp.model_mrp_routing_workcenter msgid "Work Center Usage" -msgstr "" +msgstr "Darbo centro naudojimas" #. module: mrp #: model:process.transition,name:mrp.process_transition_procurestockableproduct0 @@ -386,7 +386,7 @@ msgstr "" #. module: mrp #: sql_constraint:mrp.production:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Nuoroda turi būti unikali kiekvienai įmonei!" #. module: mrp #: code:addons/mrp/report/price.py:139 @@ -520,7 +520,7 @@ msgstr "Suplanuota data" #: code:addons/mrp/procurement.py:129 #, python-format msgid "Manufacturing Order %s created." -msgstr "" +msgstr "Gamybos užsakymas %s sukurtas." #. module: mrp #: view:mrp.bom:0 @@ -552,7 +552,7 @@ msgstr "KS struktūra" #. module: mrp #: model:process.node,note:mrp.process_node_serviceproduct0 msgid "Product type is service" -msgstr "" +msgstr "Produkto tipas yra paslauga" #. module: mrp #: help:mrp.workcenter,costs_cycle:0 @@ -562,12 +562,12 @@ msgstr "Įveskite darbo centro patiriamus kaštus per ciklą." #. module: mrp #: model:process.transition,name:mrp.process_transition_bom0 msgid "Manufacturing decomposition" -msgstr "" +msgstr "Gamybos skaidymas" #. module: mrp #: model:process.node,note:mrp.process_node_serviceproduct1 msgid "For Services." -msgstr "" +msgstr "Už paslaugas." #. module: mrp #: model:process.node,note:mrp.process_node_orderrfq0 @@ -626,7 +626,7 @@ msgstr "Produkto KS struktūra" #. module: mrp #: view:mrp.production:0 msgid "Search Production" -msgstr "" +msgstr "Gamybos paieška" #. module: mrp #: help:mrp.routing.workcenter,sequence:0 @@ -637,12 +637,12 @@ msgstr "Eilės tvarka, pagal kurią išdėstomas darbo centrų operacijų sąra #. module: mrp #: field:mrp.bom,child_complete_ids:0 msgid "BoM Hierarchy" -msgstr "" +msgstr "BoM hierarchija" #. module: mrp #: model:process.transition,name:mrp.process_transition_stockproduction0 msgid "To Produce" -msgstr "" +msgstr "Gaminti" #. module: mrp #: help:mrp.config.settings,module_stock_no_autopicking:0 @@ -774,7 +774,7 @@ msgstr "" #. module: mrp #: constraint:mrp.bom:0 msgid "BoM line product should not be same as BoM product." -msgstr "" +msgstr "BoM produktų linija neturėtų būti tokia pati kaip BoM produktas." #. module: mrp #: view:mrp.production:0 @@ -880,12 +880,12 @@ msgstr "Spausdinimo data" #: model:process.node,name:mrp.process_node_orderrfq0 #: model:process.node,name:mrp.process_node_rfq0 msgid "RFQ" -msgstr "" +msgstr "RFQ" #. module: mrp #: model:process.transition,name:mrp.process_transition_producttostockrules0 msgid "Procurement rule" -msgstr "" +msgstr "Pirkimų taisyklės" #. module: mrp #: help:mrp.workcenter,costs_cycle_account_id:0 @@ -937,6 +937,8 @@ msgid "" "The Product Unit of Measure you chose has a different category than in the " "product form." msgstr "" +"Produkto matavimo vienetas, kurį pasirinkote, priklauso kitai kategorijai " +"nei esantis produktų formoje." #. module: mrp #: model:ir.model,name:mrp.model_mrp_production @@ -959,6 +961,9 @@ msgid "" "You should install the mrp_byproduct module if you want to manage extra " "products on BoMs !" msgstr "" +"Visas produktų kiekis turi būti didesnis už 0.\n" +"Jūs turite įdiegti mrp_byproduct modulį, jei norite valdyti papildomus BoM " +"produktus!" #. module: mrp #: view:mrp.production:0 @@ -1034,7 +1039,7 @@ msgstr "Paieška" #. module: mrp #: model:process.node,note:mrp.process_node_billofmaterial0 msgid "Product's structure" -msgstr "" +msgstr "Produkto struktūra" #. module: mrp #: model:ir.model,name:mrp.model_res_company @@ -1053,7 +1058,7 @@ msgstr "" #: model:process.node,name:mrp.process_node_minimumstockrule0 #: model:process.node,name:mrp.process_node_productminimumstockrule0 msgid "Minimum Stock" -msgstr "" +msgstr "Minimalūs ištekliai" #. module: mrp #: code:addons/mrp/report/price.py:160 @@ -1073,7 +1078,7 @@ msgstr "Sandėliuojamas produktas" #: code:addons/mrp/report/price.py:130 #, python-format msgid "Work Center name" -msgstr "" +msgstr "Darbo centro pavadinimas" #. module: mrp #: field:mrp.routing,code:0 @@ -1098,7 +1103,7 @@ msgstr "" #. module: mrp #: model:process.node,note:mrp.process_node_production0 msgid "Manufacturing Plan." -msgstr "" +msgstr "Gamybos planas." #. module: mrp #: view:mrp.routing:0 @@ -1149,7 +1154,7 @@ msgstr "Gamybos užsakymai" #. module: mrp #: selection:mrp.production,state:0 msgid "Awaiting Raw Materials" -msgstr "" +msgstr "Laukiama Žaliavos" #. module: mrp #: field:mrp.bom,position:0 @@ -1221,12 +1226,12 @@ msgstr "" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_action3 msgid "Manufacturing Orders in Progress" -msgstr "" +msgstr "Vykdomi gamybos užsakymai" #. module: mrp #: model:ir.actions.client,name:mrp.action_client_mrp_menu msgid "Open MRP Menu" -msgstr "" +msgstr "Atidarykite MRP meniu" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_action4 @@ -1381,7 +1386,7 @@ msgstr "" #: code:addons/mrp/report/price.py:187 #, python-format msgid "Components Cost of %s %s" -msgstr "" +msgstr "Komponentų savikaina %s %s" #. module: mrp #: selection:mrp.workcenter.load,time_unit:0 @@ -1417,13 +1422,13 @@ msgstr "%s (kopija)" #. module: mrp #: model:ir.model,name:mrp.model_mrp_production_product_line msgid "Production Scheduled Product" -msgstr "" +msgstr "Planuojama produkto gamyba" #. module: mrp #: code:addons/mrp/report/price.py:204 #, python-format msgid "Work Cost of %s %s" -msgstr "" +msgstr "Darbo sąnaudos %s %s" #. module: mrp #: help:res.company,manufacturing_lead:0 @@ -1440,7 +1445,7 @@ msgstr "Iš atsargų" #. module: mrp #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero!" -msgstr "" +msgstr "Užsakymo kiekis negali būti neigiamas arba lygus nuliui!" #. module: mrp #: model:process.transition,note:mrp.process_transition_stockrfq0 @@ -1448,6 +1453,8 @@ msgid "" "In case the Supply method of the product is Buy, the system creates a " "purchase order." msgstr "" +"Tuo atveju, jei tiekimo metodas šiems produktams yra Pirkti, sistema sukuria " +"pirkimo pavedimą." #. module: mrp #: model:ir.model,name:mrp.model_procurement_order @@ -1457,7 +1464,7 @@ msgstr "Planinis užsakymas" #. module: mrp #: field:mrp.config.settings,module_product_manufacturer:0 msgid "Define manufacturers on products " -msgstr "" +msgstr "Nustatykite produktų gamintojus " #. module: mrp #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard @@ -1474,12 +1481,12 @@ msgstr "Komponentų tiekėjai" #. module: mrp #: view:mrp.production:0 msgid "Production Work Centers" -msgstr "" +msgstr "Gamybos darbo centrai" #. module: mrp #: view:mrp.workcenter:0 msgid "Search for mrp workcenter" -msgstr "" +msgstr "Ieškoti MRP darbo centro" #. module: mrp #: view:mrp.bom:0 @@ -1568,7 +1575,7 @@ msgstr "Papildoma informacija" #. module: mrp #: model:ir.model,name:mrp.model_change_production_qty msgid "Change Quantity of Products" -msgstr "" +msgstr "Pakeisti produktų kiekį" #. module: mrp #: model:process.node,note:mrp.process_node_productionorder0 @@ -1594,7 +1601,7 @@ msgstr "Pardavimo užsakymo numeris" #: code:addons/mrp/mrp.py:505 #, python-format msgid "Cannot delete a manufacturing order in state '%s'." -msgstr "" +msgstr "Negalima ištrinti gamybos užsakymo būklės '%s'." #. module: mrp #: selection:mrp.production,state:0 @@ -1723,7 +1730,7 @@ msgstr "Pardavimo matai" #. module: mrp #: view:mrp.production:0 msgid "Consume Products" -msgstr "" +msgstr "Plataus vartojimo prekės" #. module: mrp #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce @@ -2209,7 +2216,7 @@ msgstr "Pavėluotai pradėta gamyba" #. module: mrp #: model:process.node,note:mrp.process_node_routing0 msgid "Manufacturing Steps." -msgstr "" +msgstr "Gamybos etapai." #. module: mrp #: code:addons/mrp/report/price.py:146 @@ -2344,12 +2351,12 @@ msgstr "Neįvykdyti planiniai užsakymai" #. module: mrp #: model:ir.model,name:mrp.model_mrp_product_price msgid "Product Price" -msgstr "" +msgstr "Produkto kaina" #. module: mrp #: view:change.production.qty:0 msgid "Change Quantity" -msgstr "" +msgstr "Pakeisti kiekį" #. module: mrp #: view:change.production.qty:0 @@ -2373,7 +2380,7 @@ msgstr "" #: code:addons/mrp/wizard/change_production_qty.py:68 #, python-format msgid "Active Id not found" -msgstr "" +msgstr "Aktyvus ID nerastas" #. module: mrp #: model:process.node,note:mrp.process_node_procureproducts0 @@ -2515,7 +2522,7 @@ msgstr "" #. module: mrp #: model:ir.model,name:mrp.model_mrp_config_settings msgid "mrp.config.settings" -msgstr "" +msgstr "mrp.config.settings" #. module: mrp #: view:mrp.production:0 diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po index d5a52970cd7..b4bc687501c 100644 --- a/addons/mrp_operations/i18n/ru.po +++ b/addons/mrp_operations/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-08-22 12:16+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:11+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: mrp_operations #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form @@ -113,7 +113,7 @@ msgstr "День" #. module: mrp_operations #: view:mrp.production:0 msgid "Cancel Order" -msgstr "" +msgstr "Отменить заказ" #. module: mrp_operations #: model:process.node,name:mrp_operations.process_node_productionorder0 diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po index 1b365f227b2..862dd683e93 100644 --- a/addons/purchase/i18n/ru.po +++ b/addons/purchase/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-07-24 10:58+0000\n" +"PO-Revision-Date: 2013-08-22 12:14+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-25 05:44+0000\n" -"X-Generator: Launchpad (build 16700)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: purchase #: model:res.groups,name:purchase.group_analytic_accounting @@ -69,7 +69,7 @@ msgstr "День" #. module: purchase #: view:purchase.order:0 msgid "Cancel Order" -msgstr "" +msgstr "Отменить заказ" #. module: purchase #: view:purchase.report:0 From cac1f1f1ba7fa1f660c3666fa574d95d5780f2e0 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 23 Aug 2013 05:52:46 +0000 Subject: [PATCH 23/48] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130822054012-klsl0p3ylzlwe9w5 bzr revid: launchpad_translations_on_behalf_of_openerp-20130823055246-8rlzajaxcyy6zkja --- addons/web/i18n/lt.po | 224 ++++++++++++++++++++------------------- addons/web/i18n/zh_CN.po | 8 +- 2 files changed, 121 insertions(+), 111 deletions(-) diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po index 1c6f84ab96b..29328bde821 100644 --- a/addons/web/i18n/lt.po +++ b/addons/web/i18n/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-05-18 07:51+0000\n" -"Last-Translator: Mantas Kriaučiūnas \n" +"PO-Revision-Date: 2013-08-21 11:49+0000\n" +"Last-Translator: Eimis \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-06-08 07:49+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-08-22 05:40+0000\n" +"X-Generator: Launchpad (build 16734)\n" #. module: web #. openerp-web @@ -29,7 +29,7 @@ msgstr "Numatytoji kalba:" #: code:addons/web/static/src/js/coresetup.js:592 #, python-format msgid "%d minutes ago" -msgstr "prieš %d minutes" +msgstr "Prieš %d min." #. module: web #. openerp-web @@ -95,7 +95,7 @@ msgstr "Šiandien" #: code:addons/web/static/src/js/chrome.js:513 #, python-format msgid "Do you really want to delete the database: %s ?" -msgstr "" +msgstr "Ar tikrai norite ištrinti duomenų bazę: %s ?" #. module: web #. openerp-web @@ -109,7 +109,7 @@ msgstr "Ieškoti %(field)s ties: %(value)s" #: code:addons/web/static/src/js/chrome.js:559 #, python-format msgid "Access Denied" -msgstr "" +msgstr "Prieiga uždrausta" #. module: web #. openerp-web @@ -154,7 +154,7 @@ msgstr "%(view_type)s rodinys" #: code:addons/web/static/src/js/dates.js:53 #, python-format msgid "'%s' is not a valid date" -msgstr "" +msgstr "„%s“ nėra tinkama data" #. module: web #. openerp-web @@ -175,7 +175,7 @@ msgstr "Failo, kurio nepavyko importuoti, peržiūra:" #: code:addons/web/static/src/js/chrome.js:410 #, python-format msgid "Please enter your previous password" -msgstr "" +msgstr "Prašome įvesti seną slaptažodį" #. module: web #. openerp-web @@ -188,7 +188,7 @@ msgstr "prieš minutę" #: code:addons/web/controllers/main.py:869 #, python-format msgid "You cannot leave any password empty." -msgstr "" +msgstr "Jūs negalite palikti slaptažodio lauko tuščio." #. module: web #. openerp-web @@ -241,27 +241,28 @@ msgstr "Paskutinio keitimo data:" #, python-format msgid "M2O search fields do not currently handle multiple default values" msgstr "" +"M2O paieškos laukai šiuo metu negali apdoroti kelių numatytųjų reikšmių" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:1241 #, python-format msgid "Widget type '%s' is not implemented" -msgstr "" +msgstr "Valdiklis '%s' neįdiegtas" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:134 #, python-format msgid "e.g. mycompany" -msgstr "" +msgstr "pvz. mano įmonė" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_list_editable.js:793 #, python-format msgid "The form's data can not be discarded" -msgstr "" +msgstr "Formos duomenys negali būti sunaikinti" #. module: web #. openerp-web @@ -283,7 +284,7 @@ msgstr "" #: code:addons/web/static/src/js/formats.js:286 #, python-format msgid "'%s' is not a correct time" -msgstr "" +msgstr "'%s' netinkamas laiko formatas" #. module: web #. openerp-web @@ -304,7 +305,7 @@ msgstr "Naujas slaptažodis:" #: code:addons/web/static/src/xml/base.xml:632 #, python-format msgid "Attachment :" -msgstr "" +msgstr "Priedas:" #. module: web #. openerp-web @@ -353,21 +354,21 @@ msgstr "Mygtuko tipas:" #: code:addons/web/static/src/xml/base.xml:441 #, python-format msgid "OpenERP SA Company" -msgstr "" +msgstr "OpenERP SA Įmonė" #. module: web #. openerp-web #: code:addons/web/static/src/js/search.js:1663 #, python-format msgid "Custom Filter" -msgstr "" +msgstr "Pasirinktinis filtras" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:177 #, python-format msgid "Duplicate Database" -msgstr "" +msgstr "Duomenų bazė dubliuojasi" #. module: web #. openerp-web @@ -389,14 +390,14 @@ msgstr "Pakeisti slaptažodį" #: code:addons/web/static/src/js/view_form.js:3528 #, python-format msgid "View type '%s' is not supported in One2Many." -msgstr "" +msgstr "Užklausos tipas '%s' nepalaikomas vienas-su-daug ryšyje." #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:189 #, python-format msgid "Original database name:" -msgstr "" +msgstr "Duomenų bazės pavadinimas:" #. module: web #. openerp-web @@ -411,7 +412,7 @@ msgstr "Atsisiųsti" #: code:addons/web/static/src/js/formats.js:270 #, python-format msgid "'%s' is not a correct datetime" -msgstr "" +msgstr "'%s' nėra teisingas datos ir laiko formatas" #. module: web #. openerp-web @@ -432,7 +433,7 @@ msgstr "Sav." #: code:addons/web/static/src/xml/base.xml:949 #, python-format msgid "Unhandled widget" -msgstr "" +msgstr "Nepalaikomas valdiklis" #. module: web #. openerp-web @@ -452,7 +453,7 @@ msgstr "Šių laukų reikšmės neteisingos:" #: code:addons/web/controllers/main.py:890 #, python-format msgid "Languages" -msgstr "" +msgstr "Kalbos" #. module: web #. openerp-web @@ -466,7 +467,7 @@ msgstr "Rodyti sekantį mėnesį" #: code:addons/web/static/src/xml/base.xml:1298 #, python-format msgid "...Upload in progress..." -msgstr "" +msgstr "...Įkeliama..." #. module: web #. openerp-web @@ -480,21 +481,21 @@ msgstr "Importuoti" #: code:addons/web/static/src/js/chrome.js:565 #, python-format msgid "Could not restore the database" -msgstr "" +msgstr "Nepavyko atkurti duomenų bazės" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:4982 #, python-format msgid "File upload" -msgstr "" +msgstr "Nusiųsti failą" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:3925 #, python-format msgid "Action Button" -msgstr "" +msgstr "Veiksmo mygtukas" #. module: web #. openerp-web @@ -516,7 +517,7 @@ msgstr "turi" #: code:addons/web/static/src/js/coresetup.js:623 #, python-format msgid "Take a minute to get a coffee,
because it's loading..." -msgstr "" +msgstr "Minutėlę palaukite,
kraunama..." #. module: web #. openerp-web @@ -621,7 +622,7 @@ msgstr "Atkurta" #: code:addons/web/static/src/js/view_list.js:409 #, python-format msgid "%d-%d of %d" -msgstr "" +msgstr "%d-%d iš %d" #. module: web #. openerp-web @@ -635,7 +636,7 @@ msgstr "Sukurti ir keisti..." #: code:addons/web/static/src/js/pyeval.js:736 #, python-format msgid "Unknown nonliteral type " -msgstr "" +msgstr "Nežinomas tipas " #. module: web #. openerp-web @@ -656,21 +657,21 @@ msgstr "Spausdinti darbų seką" #: code:addons/web/static/src/js/chrome.js:413 #, python-format msgid "Please confirm your new password" -msgstr "" +msgstr "Prašome patvirtinti savo naują slaptažodį" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1825 #, python-format msgid "UTF-8" -msgstr "" +msgstr "UTF-8" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:443 #, python-format msgid "For more information visit" -msgstr "" +msgstr "Daugiau informacijos rasite" #. module: web #. openerp-web @@ -691,14 +692,14 @@ msgstr "Eksportavimo formatai" #: code:addons/web/static/src/xml/base.xml:996 #, python-format msgid "On change:" -msgstr "" +msgstr "Pakeitus:" #. module: web #. openerp-web #: code:addons/web/static/src/js/views.js:939 #, python-format msgid "Model %s fields" -msgstr "" +msgstr "Modelio %s laukeliai" #. module: web #. openerp-web @@ -716,7 +717,7 @@ msgstr "ne tuščias" #: code:addons/web/static/src/js/view_list.js:906 #, python-format msgid "Setting 'id' attribute on existing record %s" -msgstr "" +msgstr "Nustatomas 'id' atributas esamam įrašui %s" #. module: web #. openerp-web @@ -739,7 +740,7 @@ msgstr "daugiau" #: code:addons/web/static/src/js/chrome.js:585 #, python-format msgid "Changed Password" -msgstr "" +msgstr "Slaptažodis pakeistas" #. module: web #. openerp-web @@ -769,7 +770,7 @@ msgstr "" #: code:addons/web/static/src/js/view_form.js:1237 #, python-format msgid "Field '%s' specified in view could not be found." -msgstr "" +msgstr "Luakas '%s' nurodytas užklausoje nerastas." #. module: web #. openerp-web @@ -790,14 +791,14 @@ msgstr "Senas slaptažodis:" #: code:addons/web/static/src/js/formats.js:113 #, python-format msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb" -msgstr "" +msgstr "Bitai,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb" #. module: web #. openerp-web #: code:addons/web/static/src/js/chrome.js:503 #, python-format msgid "The database has been duplicated." -msgstr "" +msgstr "Duomenų bazė buvo dubliuota." #. module: web #. openerp-web @@ -818,7 +819,7 @@ msgstr "Įrašyti ir kurti naują" #: code:addons/web/static/src/js/view_form.js:2432 #, python-format msgid "Erase the current date" -msgstr "" +msgstr "Ištrinkite esamą datą" #. module: web #. openerp-web @@ -833,14 +834,14 @@ msgstr "Įrašyti kaip" #: code:addons/web/static/src/xml/base.xml:109 #, python-format msgid "Create a New Database" -msgstr "" +msgstr "Sukurti naują duomenų bazę" #. module: web #. openerp-web #: code:addons/web/doc/module/static/src/xml/web_example.xml:3 #, python-format msgid "00:00:00" -msgstr "" +msgstr "00:00:00" #. module: web #. openerp-web @@ -854,7 +855,7 @@ msgstr "prieš dieną" #: code:addons/web/static/src/xml/base.xml:138 #, python-format msgid "Load demonstration data:" -msgstr "" +msgstr "Įkelti demonstracinius duomenis:" #. module: web #. openerp-web @@ -961,7 +962,7 @@ msgstr "OpenERP.com" #: code:addons/web/static/src/js/view_form.js:2349 #, python-format msgid "Can't send email to invalid e-mail address" -msgstr "" +msgstr "Nepavyksta išsiųsti laiško netinkamu elektroninio pašto adresu" #. module: web #. openerp-web @@ -982,14 +983,14 @@ msgstr "Nustatymai" #: code:addons/web/static/src/xml/base.xml:1704 #, python-format msgid "Only export selection:" -msgstr "" +msgstr "Tik eksportuoti:" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:435 #, python-format msgid "Wrong on change format: %s" -msgstr "" +msgstr "Blogai pakeistas formatas: %s" #. module: web #. openerp-web @@ -1059,21 +1060,21 @@ msgstr "Naudotojo vardas" #: code:addons/web/static/src/js/chrome.js:503 #, python-format msgid "Duplicating database" -msgstr "" +msgstr "Duomenų bazė dubliuojasi" #. module: web #. openerp-web #: code:addons/web/static/src/js/chrome.js:585 #, python-format msgid "Password has been changed successfully" -msgstr "" +msgstr "Slaptažodis buvo sėkmingai pakeistas" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:2379 #, python-format msgid "Resource Error" -msgstr "" +msgstr "šaltinio klaida" #. module: web #. openerp-web @@ -1087,7 +1088,7 @@ msgstr "Valanda" #: code:addons/web/static/src/xml/base.xml:555 #, python-format msgid "Debug View#" -msgstr "" +msgstr "Derinti užklausą#" #. module: web #. openerp-web @@ -1110,7 +1111,7 @@ msgstr "Ištrinti" #: code:addons/web/static/src/xml/base.xml:425 #, python-format msgid "My OpenERP.com account" -msgstr "" +msgstr "Mano OpenERP.com profilis" #. module: web #. openerp-web @@ -1142,7 +1143,7 @@ msgstr "Įrašyti laukų sarašą" #: code:addons/web/doc/module/static/src/xml/web_example.xml:5 #, python-format msgid "Start" -msgstr "" +msgstr "Pradėti" #. module: web #. openerp-web @@ -1163,14 +1164,14 @@ msgstr "Sukūrimo data:" #: code:addons/web/controllers/main.py:878 #, python-format msgid "Error, password not changed !" -msgstr "" +msgstr "Klaida, slaptažodžis nepakeistas!" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:4981 #, python-format msgid "The selected file exceed the maximum file size of %s." -msgstr "" +msgstr "Pasirinktas failas viršija maksimalų failo dydį %s." #. module: web #. openerp-web @@ -1209,6 +1210,8 @@ msgid "" "By default, the master password is 'admin'. This password\n" " is required to created, delete dump or restore databases." msgstr "" +"Numatyta, kad pagrindinis slaptažodis 'admin'. šis slaptažodis\n" +" reikalingas sukurti, ištrinti arba atkurti duomenų bazes." #. module: web #. openerp-web @@ -1224,14 +1227,14 @@ msgstr "Daryti atsarginę kopiją" #: code:addons/web/static/src/js/dates.js:80 #, python-format msgid "'%s' is not a valid time" -msgstr "" +msgstr "'%s' nėra tinkamas laiko formatas" #. module: web #. openerp-web #: code:addons/web/static/src/js/formats.js:278 #, python-format msgid "'%s' is not a correct date" -msgstr "" +msgstr "'%s' nėra teisingas datos formatas" #. module: web #. openerp-web @@ -1306,7 +1309,7 @@ msgstr "Rodyti ankstesnį mėnesį" #: code:addons/web/static/src/js/view_form.js:427 #, python-format msgid "%d / %d" -msgstr "" +msgstr "%d / %d" #. module: web #. openerp-web @@ -1360,7 +1363,7 @@ msgstr "Pridėti sudėtingą filtrą" #: code:addons/web/controllers/main.py:871 #, python-format msgid "The new password and its confirmation must be identical." -msgstr "" +msgstr "Naujas slaptažodis ir jo patvirtinimas turi sutapti." #. module: web #. openerp-web @@ -1382,7 +1385,7 @@ msgstr "Prisijungimas" #: code:addons/web/static/src/xml/base.xml:442 #, python-format msgid "Licenced under the terms of" -msgstr "" +msgstr "Licencijuota pagal" #. module: web #. openerp-web @@ -1425,7 +1428,7 @@ msgstr "Rodyti kitą mėnesį" #: code:addons/web/static/src/js/view_form.js:154 #, python-format msgid "No data provided." -msgstr "" +msgstr "Neturima duomenų." #. module: web #. openerp-web @@ -1454,7 +1457,7 @@ msgstr "Turite pasirinkti bent vieną įrašą." #: code:addons/web/static/src/js/coresetup.js:621 #, python-format msgid "Don't leave yet,
it's still loading..." -msgstr "" +msgstr "Neišeikite kolkas
puslapis vis dar kraunamas ..." #. module: web #. openerp-web @@ -1483,6 +1486,7 @@ msgstr "Ištrinti viską" #, python-format msgid "Your OpenERP session expired. Please refresh the current web page." msgstr "" +"Jūsų OpenERP laikas pasibaigė. Prašome perkrauti dabartinį tinklalapį." #. module: web #. openerp-web @@ -1503,7 +1507,7 @@ msgstr "" #: code:addons/web/static/src/js/chrome.js:414 #, python-format msgid "The confirmation does not match the password" -msgstr "" +msgstr "Slaptažodžiai nesutampa" #. module: web #. openerp-web @@ -1524,7 +1528,7 @@ msgstr "Įrašyti kaip..." #: code:addons/web/static/src/js/view_form.js:5138 #, python-format msgid "Could not display the selected image." -msgstr "" +msgstr "Nepavyko parodyti pasirinkto vaizdo." #. module: web #. openerp-web @@ -1547,7 +1551,7 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:414 #, python-format msgid "99+" -msgstr "" +msgstr "99+" #. module: web #. openerp-web @@ -1568,7 +1572,7 @@ msgstr "" #: code:addons/web/static/src/js/chrome.js:702 #, python-format msgid "No database selected !" -msgstr "" +msgstr "Nepasirinkta duomenų bazė!" #. module: web #. openerp-web @@ -1582,7 +1586,7 @@ msgstr "(%d įrašai)" #: code:addons/web/static/src/xml/base.xml:992 #, python-format msgid "Change default:" -msgstr "" +msgstr "Keisti numatytąsias reikšmes:" #. module: web #. openerp-web @@ -1628,6 +1632,7 @@ msgstr "Pakartoti naują pagrindinį slaptažodį:" #, python-format msgid "Maybe you should consider reloading the application by pressing F5..." msgstr "" +"Gal jūs turėtumėte apsvarstyti puslapio perkrovimą paspausdami F5 ..." #. module: web #. openerp-web @@ -1673,14 +1678,14 @@ msgstr "Uždaryti nekeičiant" #: code:addons/web/static/src/xml/base.xml:159 #, python-format msgid "Choose a password:" -msgstr "" +msgstr "Pasirinkite slaptažodį:" #. module: web #. openerp-web #: code:addons/web/static/src/js/view_form.js:2451 #, python-format msgid "Select D, M d" -msgstr "" +msgstr "Pasirinkite D, M d" #. module: web #. openerp-web @@ -1689,6 +1694,7 @@ msgstr "" msgid "" "You may not believe it,
but the application is actually loading..." msgstr "" +"Jūs galite nepatikėti,
tačiau programa iš tikrųjų kraunama ..." #. module: web #. openerp-web @@ -1715,14 +1721,14 @@ msgstr "Medis" #: code:addons/web/controllers/main.py:793 #, python-format msgid "Could not drop database !" -msgstr "" +msgstr "Nepavyko ištrinti duomenų bazės!" #. module: web #. openerp-web #: code:addons/web/static/src/js/formats.js:231 #, python-format msgid "'%s' is not a correct integer" -msgstr "" +msgstr "'%s' nėra sveikasis skaičius" #. module: web #. openerp-web @@ -1757,7 +1763,7 @@ msgstr "Išsami paieška..." #: code:addons/web/static/src/js/chrome.js:521 #, python-format msgid "Dropping database" -msgstr "" +msgstr "Trinama duomenų bazė" #. module: web #. openerp-web @@ -1780,7 +1786,7 @@ msgstr "Taip" #: code:addons/web/static/src/js/chrome.js:1350 #, python-format msgid "Timezone Mismatch" -msgstr "" +msgstr "Laiko juostos neatitikimas" #. module: web #. openerp-web @@ -1794,7 +1800,7 @@ msgstr "Įkeliant failą kilo problema" #: code:addons/web/static/src/xml/base.xml:580 #, python-format msgid "XML ID:" -msgstr "" +msgstr "XML identifikatorius:" #. module: web #. openerp-web @@ -1829,7 +1835,7 @@ msgstr "prieš %d metus" #: code:addons/web/static/src/js/view_list.js:1050 #, python-format msgid "Unknown m2m command %s" -msgstr "" +msgstr "Nežinomas m2m komanda %s" #. module: web #. openerp-web @@ -1851,7 +1857,7 @@ msgstr "Naujos duomenų bazės pavadinimas:" #: code:addons/web/static/src/js/chrome.js:411 #, python-format msgid "Please enter your new password" -msgstr "" +msgstr "Prašome įvesti naują slaptažodį" #. module: web #. openerp-web @@ -1872,7 +1878,7 @@ msgstr "Tvarkyti rodinius" #: code:addons/web/static/src/js/view_form.js:2349 #, python-format msgid "E-mail Error" -msgstr "" +msgstr "El.pašto klaida" #. module: web #. openerp-web @@ -1900,14 +1906,14 @@ msgstr "Sukurti \"%s\"" #: code:addons/web/static/src/js/data_export.js:362 #, python-format msgid "Please select fields to save export list..." -msgstr "" +msgstr "Prašome pasirinkti laukus eksportuojamo sąrašo išsaugojimui..." #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:440 #, python-format msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved." -msgstr "" +msgstr "Visos teisės saugomos © 2004-TODAY OpenERP SA." #. module: web #. openerp-web @@ -1936,7 +1942,7 @@ msgstr "Importavimas nepavyko dėl:" #: code:addons/web/static/src/xml/base.xml:561 #, python-format msgid "JS Tests" -msgstr "" +msgstr "JS testai" #. module: web #. openerp-web @@ -1973,14 +1979,14 @@ msgstr "Atlikta" #: code:addons/web/static/src/xml/base.xml:562 #, python-format msgid "View Fields" -msgstr "" +msgstr "Užklausos laukai" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:348 #, python-format msgid "Confirm New Password:" -msgstr "" +msgstr "Patvirtinkite naują slaptažodį:" #. module: web #. openerp-web @@ -2031,7 +2037,7 @@ msgstr "Numatyta:" #: code:addons/web/static/src/xml/base.xml:468 #, python-format msgid "OpenERP" -msgstr "" +msgstr "OpenERP" #. module: web #. openerp-web @@ -2091,7 +2097,7 @@ msgstr "-- Filtrai --" #: code:addons/web/static/src/js/search.js:2165 #, python-format msgid "%(field)s %(operator)s" -msgstr "" +msgstr "%(field)s %(operator)s" #. module: web #. openerp-web @@ -2108,13 +2114,15 @@ msgid "" "Grouping on field '%s' is not possible because that field does not appear in " "the list view." msgstr "" +"Grupavimas pagal laukus '%s' nėra įmanomas, nes ši sritis nėra rodoma sąrašo " +"rodinyje." #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:559 #, python-format msgid "Set Defaults" -msgstr "" +msgstr "Nustatyti numatytuosius" #. module: web #. openerp-web @@ -2164,7 +2172,7 @@ msgstr "Tipas:" #: code:addons/web/static/src/js/chrome.js:560 #, python-format msgid "Incorrect super-administrator password" -msgstr "" +msgstr "Neteisingas super-administratoriaus slaptažodis" #. module: web #. openerp-web @@ -2228,7 +2236,7 @@ msgstr "Valyti" #: code:addons/web/static/src/xml/base.xml:132 #, python-format msgid "Select a database name:" -msgstr "" +msgstr "Pasirinkite duomenų bazės pavadinimą:" #. module: web #. openerp-web @@ -2257,7 +2265,7 @@ msgstr "Greitas pridėjimas" #: code:addons/web/static/src/xml/base.xml:1826 #, python-format msgid "Latin 1" -msgstr "" +msgstr "Latin 1" #. module: web #. openerp-web @@ -2284,7 +2292,7 @@ msgstr "Įkeliama..." #: code:addons/web/static/src/xml/base.xml:637 #, python-format msgid "Created by :" -msgstr "" +msgstr "Sukūrė:" #. module: web #. openerp-web @@ -2292,7 +2300,7 @@ msgstr "" #: code:addons/web/static/src/js/dates.js:26 #, python-format msgid "'%s' is not a valid datetime" -msgstr "" +msgstr "'%s' nėra teisingas datos ir laiko formatas" #. module: web #. openerp-web @@ -2337,7 +2345,7 @@ msgstr "yra teigiamas" #: code:addons/web/static/src/js/view_form.js:4030 #, python-format msgid "Add an item" -msgstr "" +msgstr "Pridėti objektą" #. module: web #. openerp-web @@ -2358,7 +2366,7 @@ msgstr "Patvirtinti" #: code:addons/web/static/src/js/data_export.js:127 #, python-format msgid "Please enter save field list name" -msgstr "" +msgstr "Prašome įvesti saugomo lauko sąrašo pavadinimą" #. module: web #. openerp-web @@ -2379,7 +2387,7 @@ msgstr "Nauja" #: code:addons/web/static/src/js/view_list.js:1777 #, python-format msgid "Can't convert value %s to context" -msgstr "" +msgstr "Negalima konvertuoti vertės %s kontekste" #. module: web #. openerp-web @@ -2417,7 +2425,7 @@ msgstr "Mygtukas" #: code:addons/web/static/src/xml/base.xml:440 #, python-format msgid "OpenERP is a trademark of the" -msgstr "" +msgstr "OpenERP yra prekinis ženklas" #. module: web #. openerp-web @@ -2470,13 +2478,13 @@ msgstr "Apie OpenERP" #: code:addons/web/static/src/js/formats.js:301 #, python-format msgid "'%s' is not a correct date, datetime nor time" -msgstr "" +msgstr "'%s' nėra teisinga datos, datos ir laiko arba tik laiko formatas" #. module: web #: code:addons/web/controllers/main.py:1307 #, python-format msgid "No content found for field '%s' on '%s:%s'" -msgstr "" +msgstr "Nėra rasta turinio nurodytiems laukams '%s' iš '%s:%s'" #. module: web #. openerp-web @@ -2504,7 +2512,7 @@ msgstr "Tvarkyti duomenų bazes" #: code:addons/web/static/src/js/pyeval.js:770 #, python-format msgid "Evaluation Error" -msgstr "" +msgstr "Vertinimo klaida" #. module: web #. openerp-web @@ -2538,6 +2546,7 @@ msgstr "Ne" #, python-format msgid "'%s' is not convertible to date, datetime nor time" msgstr "" +"'%s' nėra konvertuojamas į datos, datos ir laiko ar tik laiko formatą" #. module: web #. openerp-web @@ -2562,7 +2571,7 @@ msgstr "Atmesti" #: code:addons/web/static/src/js/view_form.js:5314 #, python-format msgid "Uploading Error" -msgstr "" +msgstr "Siuntimo klaida" #. module: web #. openerp-web @@ -2597,7 +2606,7 @@ msgstr "" #: code:addons/web/static/src/js/chrome.js:531 #, python-format msgid "Backed" -msgstr "" +msgstr "Palaiko" #. module: web #. openerp-web @@ -2622,7 +2631,7 @@ msgstr "Atverti: " #: code:addons/web/static/src/js/view_list.js:1358 #, python-format msgid "%s (%d)" -msgstr "" +msgstr "%s (%d)" #. module: web #. openerp-web @@ -2643,7 +2652,7 @@ msgstr "Filtras" #: code:addons/web/static/src/xml/base.xml:972 #, python-format msgid "Widget:" -msgstr "" +msgstr "Valdiklis:" #. module: web #. openerp-web @@ -2658,14 +2667,14 @@ msgstr "Keisti veiksmą" #, python-format msgid "" "This filter is global and will be removed for everybody if you continue." -msgstr "" +msgstr "Šis filtras yra bendras ir bus pašalintas visiems jei tęsite." #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:577 #, python-format msgid "ID:" -msgstr "" +msgstr "Identifikatorius:" #. module: web #. openerp-web @@ -2707,14 +2716,14 @@ msgstr "Laukas:" #: code:addons/web/static/src/xml/base.xml:642 #, python-format msgid "Modified by :" -msgstr "" +msgstr "Pakeistas:" #. module: web #. openerp-web #: code:addons/web/static/src/js/chrome.js:521 #, python-format msgid "The database %s has been dropped" -msgstr "" +msgstr "Duomenų bazė %s buvo panaikinta" #. module: web #. openerp-web @@ -2743,7 +2752,7 @@ msgstr "Spausdinti" #: code:addons/web/static/src/xml/base.xml:1359 #, python-format msgid "Special:" -msgstr "" +msgstr "Specialus:" #. module: web #: code:addons/web/controllers/main.py:877 @@ -2751,6 +2760,7 @@ msgstr "" msgid "" "The old password you provided is incorrect, your password was not changed." msgstr "" +"Senas slaptažodis yra neteisingas, jūsų slaptažodis nebuvo pakeistas." #. module: web #. openerp-web @@ -2852,7 +2862,7 @@ msgstr "Sukurti duomenų bazę" #: code:addons/web/static/src/xml/base.xml:442 #, python-format msgid "GNU Affero General Public License" -msgstr "" +msgstr "GNU Affero General Public licenzija" #. module: web #. openerp-web diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po index b814014f100..8421049646e 100644 --- a/addons/web/i18n/zh_CN.po +++ b/addons/web/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-08-14 17:18+0000\n" +"PO-Revision-Date: 2013-08-22 05:31+0000\n" "Last-Translator: 盈通 ccdos \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-15 05:51+0000\n" -"X-Generator: Launchpad (build 16723)\n" +"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" +"X-Generator: Launchpad (build 16737)\n" #. module: web #. openerp-web @@ -972,7 +972,7 @@ msgstr "不能发送email到错误的email第hi" #: code:addons/web/static/src/xml/base.xml:658 #, python-format msgid "Add..." -msgstr "添加..." +msgstr "添加附件..." #. module: web #. openerp-web From 569d85440322a0fb1cdf14b7d89b4a1885894783 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 23 Aug 2013 10:51:38 +0200 Subject: [PATCH 24/48] [IMP] mrp: allow searching by components, better view for BoM structure bzr revid: mat@openerp.com-20130823085138-bhxhitqof4m2hd7v --- addons/mrp/mrp_view.xml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 16d7bae8cce..08ac487566a 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -422,6 +422,7 @@ + @@ -513,7 +514,18 @@

- + + product.search.bom + product.product + + + + + + + + + Products product.product @@ -537,15 +549,15 @@ action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" parent="menu_mrp_configuration" - groups="base.group_no_one" sequence="20"/> Bill of Materials Structure ir.actions.act_window mrp.bom - [('bom_id', '=',active_ids)] + [('id', 'in', active_ids)] + tree @@ -1031,6 +1043,7 @@ Bill of Materials [('bom_id','=',False)] mrp.bom + tree From 4bc20f2e2fdd9596d8ea44837b6f4ac167add17a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 23 Aug 2013 11:22:31 +0200 Subject: [PATCH 25/48] [MERGE] backport of revision 8862 mrp, sale_stock: minor usability improvements + properties in sale order lines bzr revid: mat@openerp.com-20130823092231-w5aet41ivk4f7nd9 --- addons/mrp/mrp_view.xml | 8 ++++---- addons/mrp/res_config.py | 4 ++-- addons/mrp_repair/mrp_repair_view.xml | 2 +- addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 2 +- addons/product_manufacturer/product_manufacturer_view.xml | 2 +- addons/sale/security/sale_security.xml | 1 + addons/sale_stock/sale_stock.py | 1 + 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 08ac487566a..31570a5e9ec 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -189,7 +189,7 @@ - + @@ -248,7 +248,7 @@ mrp.routing.workcenter
- + @@ -280,7 +280,7 @@ - + @@ -1006,7 +1006,7 @@ - Work Center + Work Centers ir.actions.act_window mrp.workcenter form diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index c780576099c..cb5c35a3b0d 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -37,7 +37,7 @@ class mrp_config_settings(osv.osv_memory): * Repair quotation report * Notes for the technician and for the final customer. This installs the module mrp_repair."""), - 'module_mrp_operations': fields.boolean("Allow detailed planning of work order", + 'module_mrp_operations': fields.boolean("Allow detailed planning of work orders", help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). This installs the module mrp_operations."""), 'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order", @@ -61,7 +61,7 @@ class mrp_config_settings(osv.osv_memory): help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."""), - 'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties", + 'group_mrp_properties': fields.boolean("Allow several bill of materials per product using properties", implied_group='product.group_mrp_properties', help="""The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."""), 'module_product_manufacturer': fields.boolean("Define manufacturers on products ", diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index a4526b5b581..b7a667ce308 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -31,7 +31,7 @@