From dde556db2e2cf78426d59c468da7950e5b2f8d21 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 14 Nov 2011 17:58:23 +0530 Subject: [PATCH 001/170] [FIX] hr_attendance : timesheet - sign in - out : must not allow overlaps bzr revid: mdi@tinyerp.com-20111114122823-7ehd1axt0l0b2euz --- addons/hr_attendance/hr_attendance.py | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index a138d66a285..31061459426 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -64,19 +64,21 @@ class hr_attendance(osv.osv): } def _altern_si_so(self, cr, uid, ids, context=None): - for id in ids: - sql = ''' - SELECT action, name - FROM hr_attendance AS att - WHERE employee_id = (SELECT employee_id FROM hr_attendance WHERE id=%s) - AND action IN ('sign_in','sign_out') - AND name <= (SELECT name FROM hr_attendance WHERE id=%s) - ORDER BY name DESC - LIMIT 2 ''' - cr.execute(sql,(id,id)) - atts = cr.fetchall() - if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (len(atts)==2 and atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])): - return False + current_attendance_data = self.browse(cr, uid, ids, context=context)[0] + obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context) + obj_attendance_ids.remove(ids[0]) + hr_attendance_data = self.browse(cr, uid, obj_attendance_ids, context=context) + + for old_attendance in hr_attendance_data: + if old_attendance.employee_id.id == current_attendance_data['employee_id'].id: + if old_attendance.action == current_attendance_data['action']: + return False + elif old_attendance.name >= current_attendance_data['name']: + return False + else: + return True + if current_attendance_data['action'] == 'sign_out': + return False return True _constraints = [(_altern_si_so, 'Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])] From 8cfb45d5504376a9ade6e486af0375140a7d91c8 Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Wed, 30 Nov 2011 16:13:34 +0530 Subject: [PATCH 002/170] [ADD]:demo data for the product with account information bzr revid: ksa@tinyerp.com-20111130104334-h7zjiuvq922n43nq --- addons/purchase/purchase_demo.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index 6999f85b076..406e8d89abc 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -14,6 +14,13 @@ + + + + + + + From 8029e57b00f9a2fddfec3f9034dc36e1930fbc6b Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Wed, 30 Nov 2011 16:16:18 +0530 Subject: [PATCH 003/170] [ADD]:yml for stock real time accounting valuation bzr revid: ksa@tinyerp.com-20111130104618-r3p550bnov9wjjhf --- addons/purchase/__openerp__.py | 1 + .../test/process/real_time_valuation.yml | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 addons/purchase/test/process/real_time_valuation.yml diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index b4f3a9adf30..68e490d23f1 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -67,6 +67,7 @@ Dashboard for purchase management that includes: 'test/process/run_scheduler.yml', 'test/process/merge_order.yml', 'test/process/edi_purchase_order.yml', + 'test/process/real_time_valuation.yml', 'test/ui/print_report.yml', 'test/ui/duplicate_order.yml', 'test/ui/delete_order.yml', diff --git a/addons/purchase/test/process/real_time_valuation.yml b/addons/purchase/test/process/real_time_valuation.yml new file mode 100644 index 00000000000..d1b4cb267f1 --- /dev/null +++ b/addons/purchase/test/process/real_time_valuation.yml @@ -0,0 +1,42 @@ +- + In order to test real time stock valuation flow,I start by creating a new product 'Sugar' +- + !record {model: product.product, id: product_sugar_id_50kg}: + name: Sugar + procure_method: make_to_stock + supply_method: buy + cost_method: standard + standard_price: 3600.0 + uom_id: product.product_uom_kgm + uom_po_id: product.product_uom_gram + valuation: real_time + categ_id: product.product_category_rawmaterial0 +- + I create a draft Purchase Order +- + !record {model: purchase.order, id: purchase_order_sugar}: + partner_id: base.res_partner_agrolait + partner_address_id: base.res_partner_address_8invoice + pricelist_id: 1 + order_line: + - product_id: product_sugar_id_50kg + product_qty: 1.0 + product_uom: product.product_uom_gram + price_unit: 3600000 + name: 'Sugar' + date_planned: '2011-08-31' +- + I confirm the purchase order +- + !workflow {model: purchase.order, ref: purchase_order_sugar, action: purchase_confirm} +- + I check that the invoice of order and values. +- + !python {model: purchase.order}: | + purchase_order = self.browse(cr, uid, ref("purchase_order_sugar")) + for purchase_line in purchase_order.order_line: + assert purchase_line.price_unit == 3600000.0 + assert len(purchase_order.invoice_ids) == 1, "Invoice should be generated." + for invoice_line in purchase_order.invoice_ids: + for data in invoice_line.invoice_line: + assert data.price_unit == 3600000.0, "unit price is not same, got %s, expected 3600000.0"%(purchase_line.price_unit,) From 296622e5f755ed7bab5f44a7825e80bbe6c9ed0d Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Mon, 5 Dec 2011 16:13:22 +0530 Subject: [PATCH 004/170] [ADD]: demo data for different uom bzr revid: ksa@tinyerp.com-20111205104322-f63d4ujlt64kl0p1 --- addons/product/product_demo.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index 3aebec13715..a95b41e546c 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -636,6 +636,20 @@ + + SUGAR50KG + buy + + 110.0 + 3600.0 + + + SUGAR of 50KG + + product + + + @@ -777,6 +791,15 @@ 5 + + + 10 + 1 + 5 + + 5 + + From 8af8d336375d6f0ddc4e278b9bfddb695713cccd Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Mon, 5 Dec 2011 16:14:59 +0530 Subject: [PATCH 005/170] [IMP]:code for product onchange when uom is different bzr revid: ksa@tinyerp.com-20111205104459-p2hnekd0tazuia2n --- addons/purchase/purchase.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 0dc015834a0..cea5aeeef4f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -727,10 +727,12 @@ class purchase_order_line(osv.osv): # - name of method should "onchange_product_id" # - docstring # - merge 'product_uom_change' method - # - split into small internal methods for clearity + # - split into small internal methods for clearity def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom, partner_id, date_order=False, fiscal_position=False, date_planned=False, - name=False, price_unit=False, notes=False, context={}): + name=False, price_unit=False, notes=False, context=None): + if context is None: + context = {} if not pricelist: raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.')) if not partner_id: @@ -744,11 +746,14 @@ class purchase_order_line(osv.osv): lang=False if partner_id: lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang'] - context={'lang':lang} + context['lang'] = lang context['partner_id'] = partner_id prod = self.pool.get('product.product').browse(cr, uid, product, context=context) prod_uom_po = prod.uom_po_id.id + + if uom and prod and (uom <> prod_uom_po): + uom = prod_uom_po if not uom: uom = prod_uom_po if not date_order: @@ -773,6 +778,7 @@ class purchase_order_line(osv.osv): if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal. qty = temp_qty res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s, you should not purchase less.') % qty}}) + uom = context.get('uom_change', uom) qty_in_product_uom = product_uom_pool._compute_qty(cr, uid, uom, qty, to_uom_id=prod.uom_id.id) price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist], product, qty_in_product_uom or 1.0, partner_id, { @@ -786,7 +792,7 @@ class purchase_order_line(osv.osv): 'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id), 'date_planned': date_planned or dt,'notes': notes or prod.description_purchase, 'product_qty': qty, - 'product_uom': prod.uom_id.id}}) + 'product_uom': uom or prod_uom_po}}) domain = {} taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id)) @@ -808,7 +814,7 @@ class purchase_order_line(osv.osv): name=False, price_unit=False, notes=False, context={}): res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, date_order=date_order, fiscal_position=fiscal_position, date_planned=date_planned, - name=name, price_unit=price_unit, notes=notes, context=context) + name=name, price_unit=price_unit, notes=notes, context={'uom_change': uom}) if 'product_uom' in res['value']: if uom and (uom != res['value']['product_uom']) and res['value']['product_uom']: seller_uom_name = self.pool.get('product.uom').read(cr, uid, [res['value']['product_uom']], ['name'])[0]['name'] From 6709a80bbcb8f7f2fe3dccd528cd7743c54182d9 Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Mon, 5 Dec 2011 16:15:41 +0530 Subject: [PATCH 006/170] [IMP]:yml for real time valuation value bzr revid: ksa@tinyerp.com-20111205104541-suka3mhly9ry8xdc --- addons/purchase/purchase_order_demo.yml | 5 +++ .../test/process/real_time_valuation.yml | 42 ++----------------- 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml index abfaa102033..8cd9271de45 100644 --- a/addons/purchase/purchase_order_demo.yml +++ b/addons/purchase/purchase_order_demo.yml @@ -74,3 +74,8 @@ - product_id: product.product_product_1 product_qty: 15 +- + !record {model: purchase.order, id: order_purchase8}: + partner_id: base.res_partner_asus + order_line: + - product_id: product.product_sugar_id_50kg diff --git a/addons/purchase/test/process/real_time_valuation.yml b/addons/purchase/test/process/real_time_valuation.yml index d1b4cb267f1..69b04071f40 100644 --- a/addons/purchase/test/process/real_time_valuation.yml +++ b/addons/purchase/test/process/real_time_valuation.yml @@ -1,42 +1,8 @@ - - In order to test real time stock valuation flow,I start by creating a new product 'Sugar' -- - !record {model: product.product, id: product_sugar_id_50kg}: - name: Sugar - procure_method: make_to_stock - supply_method: buy - cost_method: standard - standard_price: 3600.0 - uom_id: product.product_uom_kgm - uom_po_id: product.product_uom_gram - valuation: real_time - categ_id: product.product_category_rawmaterial0 -- - I create a draft Purchase Order -- - !record {model: purchase.order, id: purchase_order_sugar}: - partner_id: base.res_partner_agrolait - partner_address_id: base.res_partner_address_8invoice - pricelist_id: 1 - order_line: - - product_id: product_sugar_id_50kg - product_qty: 1.0 - product_uom: product.product_uom_gram - price_unit: 3600000 - name: 'Sugar' - date_planned: '2011-08-31' -- - I confirm the purchase order -- - !workflow {model: purchase.order, ref: purchase_order_sugar, action: purchase_confirm} -- - I check that the invoice of order and values. + In order to test real time stock valuation flow, when default UoM and purchase UoM is different - !python {model: purchase.order}: | - purchase_order = self.browse(cr, uid, ref("purchase_order_sugar")) + purchase_order = self.browse(cr, uid, ref("order_purchase8")) + assert len(purchase_order.order_line) == 1, "orderline should be generated." for purchase_line in purchase_order.order_line: - assert purchase_line.price_unit == 3600000.0 - assert len(purchase_order.invoice_ids) == 1, "Invoice should be generated." - for invoice_line in purchase_order.invoice_ids: - for data in invoice_line.invoice_line: - assert data.price_unit == 3600000.0, "unit price is not same, got %s, expected 3600000.0"%(purchase_line.price_unit,) + assert purchase_line.price_unit == 3.6 ,"unit price is not same, got %s, expected 3.6"%(purchase_line.price_unit,) \ No newline at end of file From 31f3f8651031f4c4de3c16f6e90bf4d1f6619600 Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Thu, 8 Dec 2011 15:25:59 +0530 Subject: [PATCH 007/170] [IMP]:check the flow when default UoM and purchase UoM is different bzr revid: ksa@tinyerp.com-20111208095559-9qt47pftmtr55yh1 --- addons/product/product_demo.xml | 23 ----------- addons/purchase/purchase_demo.xml | 7 ---- addons/purchase/purchase_order_demo.yml | 19 ++++++++- .../test/process/real_time_valuation.yml | 39 ++++++++++++++++--- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index a95b41e546c..3aebec13715 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -636,20 +636,6 @@ - - SUGAR50KG - buy - - 110.0 - 3600.0 - - - SUGAR of 50KG - - product - - - @@ -791,15 +777,6 @@ 5 - - - 10 - 1 - 5 - - 5 - - diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index 406e8d89abc..6999f85b076 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -14,13 +14,6 @@ - - - - - - - diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml index 8cd9271de45..0ea29b2a242 100644 --- a/addons/purchase/purchase_order_demo.yml +++ b/addons/purchase/purchase_order_demo.yml @@ -75,7 +75,22 @@ product_qty: 15 - - !record {model: purchase.order, id: order_purchase8}: + !record {model: product.product, id: product_sugar_id_50kg}: + default_code: SUGAR50KG + supply_method: buy + list_price: 110.0 + standard_price: 3600.0 + uom_id: product.product_uom_kgm + uom_po_id: product.product_uom_gram + name: SUGAR of 50KG + valuation: real_time + property_stock_account_input: account.o_expense + property_stock_account_output: account.o_income + categ_id: product.product_category_rawmaterial0 + +- + !record {model: purchase.order, id: order_purchase_sugar}: partner_id: base.res_partner_asus order_line: - - product_id: product.product_sugar_id_50kg + - product_id: product_sugar_id_50kg + diff --git a/addons/purchase/test/process/real_time_valuation.yml b/addons/purchase/test/process/real_time_valuation.yml index 69b04071f40..f0234888ba6 100644 --- a/addons/purchase/test/process/real_time_valuation.yml +++ b/addons/purchase/test/process/real_time_valuation.yml @@ -1,8 +1,37 @@ - - In order to test real time stock valuation flow, when default UoM and purchase UoM is different + In order to test real time stock valuation flow, I confirmed the purchase order. +- + !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase_sugar} +- + I check that the order which was initially in the draft state has transmit to approved state. +- + !assert {model: purchase.order, id: order_purchase_sugar}: + - state == 'approved' +- + In order to test check that picking is generated or not. - !python {model: purchase.order}: | - purchase_order = self.browse(cr, uid, ref("order_purchase8")) - assert len(purchase_order.order_line) == 1, "orderline should be generated." - for purchase_line in purchase_order.order_line: - assert purchase_line.price_unit == 3.6 ,"unit price is not same, got %s, expected 3.6"%(purchase_line.price_unit,) \ No newline at end of file + purchase_order = self.browse(cr, uid, ref("order_purchase_sugar")) + assert len(purchase_order.picking_ids) >= 1, "You should have only one reception order" + for picking in purchase_order.picking_ids: + assert picking.purchase_id.id == purchase_order.id +- + Reception is ready for process so now done the reception. +- + !python {model: stock.partial.picking}: | + pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("order_purchase_sugar")).picking_ids + partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]}) + self.do_partial(cr, uid, [partial_id]) +- + Check the Journal having proper amount or not. +- + !python {model: account.move.line}: | + pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("order_purchase_sugar")).picking_ids + for data in pick_ids: + for moveline in data.move_lines: + ids = self.pool.get('account.move.line').search(cr, uid, [('ref','=',data.name),('partner_id','=',data.partner_id.id)]) + item_data = self.pool.get('account.move.line').browse(cr, uid, ids) + for item in item_data: + if item.account_id.id == moveline.product_id.property_stock_account_input.id: + assert item.credit == 3.6, "Journal items have not proper credit amount" + assert item.debit == 0.0, "Journal items have not proper debit amount" From 573227209615c0f30bb5b9d2efd28dd2ea36ed8d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 20 Dec 2011 15:15:52 +0530 Subject: [PATCH 008/170] [FIX] hr_attendance : timesheet - sign in - out : must not allow overlaps lp bug: https://launchpad.net/bugs/885387 fixed bzr revid: mdi@tinyerp.com-20111220094552-jfwpgzy7f0lmig44 --- addons/hr_attendance/hr_attendance.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index 31061459426..9987beae248 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -63,6 +63,14 @@ class hr_attendance(osv.osv): 'employee_id': _employee_get, } + def write(self, cr, uid, ids, vals, context=None): + current_attendance_data = self.browse(cr, uid, ids, context=context)[0] + obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context) + if obj_attendance_ids[0] != ids[0]: + if ('name' in vals) or ('action' in vals): + raise osv.except_osv(_('Warning !'), _('You can not modify existing entries. To modify the entry , remove the prior entries.')) + return super(hr_attendance, self).write(cr, uid, ids, vals, context=context) + def _altern_si_so(self, cr, uid, ids, context=None): current_attendance_data = self.browse(cr, uid, ids, context=context)[0] obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context) @@ -70,13 +78,13 @@ class hr_attendance(osv.osv): hr_attendance_data = self.browse(cr, uid, obj_attendance_ids, context=context) for old_attendance in hr_attendance_data: - if old_attendance.employee_id.id == current_attendance_data['employee_id'].id: - if old_attendance.action == current_attendance_data['action']: - return False - elif old_attendance.name >= current_attendance_data['name']: - return False - else: - return True + if old_attendance.action == current_attendance_data['action']: + return False + elif old_attendance.name >= current_attendance_data['name']: + return False + else: + return True + # First entry in the system must not be 'sign_out' if current_attendance_data['action'] == 'sign_out': return False return True From 3d54f085653b6bbfcbd0154af90792ad9c6796a0 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 6 Jan 2012 15:48:50 +0530 Subject: [PATCH 009/170] [IMP]delivery:add size 64 on name field bzr revid: mma@tinyerp.com-20120106101850-qubjt41c739ky7fu --- addons/delivery/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index e747e6871b3..dc28d1efb93 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -223,7 +223,7 @@ class delivery_grid_line(osv.osv): _name = "delivery.grid.line" _description = "Delivery Grid Line" _columns = { - 'name': fields.char('Name', size=32, required=True), + 'name': fields.char('Name', size=64, required=True), 'grid_id': fields.many2one('delivery.grid', 'Grid',required=True, ondelete='cascade'), 'type': fields.selection([('weight','Weight'),('volume','Volume'),\ ('wv','Weight * Volume'), ('price','Price')],\ From 64ec5f36dfaaf100a7fe802065fce3f288746846 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 09:12:06 +0100 Subject: [PATCH 010/170] [IMP] modules: began to replace sys.path appending with an import hook. bzr revid: vmt@openerp.com-20120109081206-p10yack8lhip11gt --- openerp-server | 53 +++++++++++++++++++++++++++++++++++++++ openerp/modules/module.py | 23 +---------------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/openerp-server b/openerp-server index 71a52d5f06b..9a4a04f2970 100755 --- a/openerp-server +++ b/openerp-server @@ -42,6 +42,9 @@ import openerp __author__ = openerp.release.author __version__ = openerp.release.version +import sys +import imp + def check_root_user(): """ Exit if the process's user is 'root' (on POSIX system).""" if os.name == 'posix': @@ -213,6 +216,56 @@ if __name__ == "__main__": check_root_user() openerp.tools.config.parse_config(sys.argv[1:]) + + + class ImportHook(object): + + def find_module(self, module_name, package_path): + module_parts = module_name.split('.') + if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): + return self # We act as a loader too. + + # TODO list of loadable modules can be cached instead of always + # calling get_module_path(). + if len(module_parts) == 1 and \ + openerp.modules.module.get_module_path(module_parts[0]): + return self # We act as a loader too. + + def load_module(self, module_name): + + module_parts = module_name.split('.') + if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): + module_part = module_parts[2] + if module_name in sys.modules: + return sys.modules[module_name] + + if len(module_parts) == 1: + module_part = module_parts[0] + if module_part in sys.modules: + return sys.modules[module_part] + + try: + # Check if the bare module name clashes with another module. + f, path, descr = imp.find_module(module_part) + print "Warning: ambiguous import:", module_name, f, path, descr + except ImportError, e: + # Using `import openerp.addons.` instead of + # `import ` is ugly but not harmful. + pass + + f, path, descr = imp.find_module(module_part, openerp.modules.module.ad_paths) + mod = imp.load_module(module_name, f, path, descr) + sys.modules[module_part] = mod + sys.modules['openerp.addons.' + module_part] = mod + return mod + + openerp.modules.module.initialize_sys_path() + sys.meta_path.append(ImportHook()) + + import openerp.addons.hr + print sys.modules.get('openerp.addons.hr') + print sys.modules.get('hr') + check_postgres_user() openerp.netsvc.init_logger() report_configuration() diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 7f934275894..2282067c3b6 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -63,21 +63,11 @@ def initialize_sys_path(): not in the PYTHONPATH. """ global ad_paths - if ad_paths: return ad_paths = map(lambda m: os.path.abspath(tools.ustr(m.strip())), tools.config['addons_path'].split(',')) - - sys.path.insert(1, _ad) - - ad_cnt=1 - for adp in ad_paths: - if adp != _ad: - sys.path.insert(ad_cnt, adp) - ad_cnt+=1 - - ad_paths.append(_ad) # for get_module_path + ad_paths.append(_ad) # for get_module_path def get_module_path(module, downloaded=False): @@ -298,17 +288,6 @@ def init_module_models(cr, module_name, obj_list): t[1](cr, *t[2]) cr.commit() -# Import hook to write a addon m in both sys.modules['m'] and -# sys.modules['openerp.addons.m']. Otherwise it could be loaded twice -# if imported twice using different names. -#class MyImportHook(object): -# def find_module(self, module_name, package_path): -# print ">>>", module_name, package_path -# def load_module(self, module_name): -# raise ImportError("Restricted") - -#sys.meta_path.append(MyImportHook()) - def register_module_classes(m): """ Register module named m, if not already registered. From e50025945aa7ba328bed87db5a69fcea411d19e6 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 10:03:33 +0100 Subject: [PATCH 011/170] [FIX] modules: removed temporary line/print. bzr revid: vmt@openerp.com-20120109090333-8ptsvj3yokjd59rm --- openerp-server | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openerp-server b/openerp-server index 9a4a04f2970..8d710141500 100755 --- a/openerp-server +++ b/openerp-server @@ -262,10 +262,6 @@ if __name__ == "__main__": openerp.modules.module.initialize_sys_path() sys.meta_path.append(ImportHook()) - import openerp.addons.hr - print sys.modules.get('openerp.addons.hr') - print sys.modules.get('hr') - check_postgres_user() openerp.netsvc.init_logger() report_configuration() From f24a29717ebf506e310cca40638db6ccdf17d4b6 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 11:16:47 +0100 Subject: [PATCH 012/170] [FIX] orm: correctly set the module name on the model, even when imported with `import openerp.modules.`. bzr revid: vmt@openerp.com-20120109101647-4hvy3n6eifzeozzq --- openerp-server | 18 +++++++++++------- openerp/addons/__init__.py | 6 +++--- openerp/modules/module.py | 5 +++-- openerp/osv/orm.py | 11 ++++++++++- openerp/tools/config.py | 3 --- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/openerp-server b/openerp-server index 8d710141500..641bc7e97e2 100755 --- a/openerp-server +++ b/openerp-server @@ -222,19 +222,20 @@ if __name__ == "__main__": def find_module(self, module_name, package_path): module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): + if len(module_parts) == 3 and module_name.startswith('openerp.modules.'): return self # We act as a loader too. # TODO list of loadable modules can be cached instead of always # calling get_module_path(). if len(module_parts) == 1 and \ - openerp.modules.module.get_module_path(module_parts[0]): + openerp.modules.module.get_module_path(module_parts[0], + display_warning=False): return self # We act as a loader too. def load_module(self, module_name): module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): + if len(module_parts) == 3 and module_name.startswith('openerp.modules.'): module_part = module_parts[2] if module_name in sys.modules: return sys.modules[module_name] @@ -247,16 +248,19 @@ if __name__ == "__main__": try: # Check if the bare module name clashes with another module. f, path, descr = imp.find_module(module_part) - print "Warning: ambiguous import:", module_name, f, path, descr + logger = logging.getLogger('init') + logger.warning(""" + Ambiguous import: the OpenERP module `%s` is shadowing another module + (available at %s).""" % (module_name, path)) except ImportError, e: - # Using `import openerp.addons.` instead of - # `import ` is ugly but not harmful. + # Using `import ` instead of + # `import openerp.modules.` is ugly but not harmful. pass f, path, descr = imp.find_module(module_part, openerp.modules.module.ad_paths) mod = imp.load_module(module_name, f, path, descr) sys.modules[module_part] = mod - sys.modules['openerp.addons.' + module_part] = mod + sys.modules['openerp.modules.' + module_part] = mod return mod openerp.modules.module.initialize_sys_path() diff --git a/openerp/addons/__init__.py b/openerp/addons/__init__.py index 1f863eca509..02a5c9aa0a7 100644 --- a/openerp/addons/__init__.py +++ b/openerp/addons/__init__.py @@ -25,9 +25,9 @@ This module serves to contain all OpenERP addons, across all configured addons paths. For the code to manage those addons, see openerp.modules. -Addons are made available here (i.e. under openerp.addons) after -openerp.tools.config.parse_config() is called (so that the addons paths -are known). +Addons are made available under `openerp.modules` after +openerp.tools.config.parse_config() is called (so that the addons paths are +known). This module also conveniently reexports some symbols from openerp.modules. Importing them from here is deprecated. diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 43b11b0d1b0..936c798767a 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -70,7 +70,7 @@ def initialize_sys_path(): ad_paths.append(_ad) # for get_module_path -def get_module_path(module, downloaded=False): +def get_module_path(module, downloaded=False, display_warning=True): """Return the path of the given module. Search the addons paths and return the first path where the given @@ -85,7 +85,8 @@ def get_module_path(module, downloaded=False): if downloaded: return opj(_ad, module) - logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: module not found' % (module,)) + if display_warning: + logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: module not found' % (module,)) return False diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 8236f096abf..23cc040af47 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -608,7 +608,16 @@ class MetaModel(type): super(MetaModel, self).__init__(name, bases, attrs) return - module_name = self.__module__.split('.')[0] + # The (OpenERP) module name can be in the `openerp.modules` namespace + # or not. For instance module `sale` can be imported as + # `openerp.modules.sale` (the good way) or `sale` (for backward + # compatibility). + module_parts = self.__module__.split('.') + if len(module_parts) > 2 and module_parts[0] == 'openerp' and \ + module_parts[1] == 'modules': + module_name = self.__module__.split('.')[2] + else: + module_name = self.__module__.split('.')[0] if not hasattr(self, '_module'): self._module = module_name diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 00815ed2055..8c980447f52 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -461,9 +461,6 @@ class configmanager(object): if complete: openerp.modules.module.initialize_sys_path() openerp.modules.loading.open_openerp_namespace() - # openerp.addons.__path__.extend(openerp.conf.addons_paths) # This - # is not compatible with initialize_sys_path(): import crm and - # import openerp.addons.crm load twice the module. def _generate_pgpassfile(self): """ From 1560538f8a336e9e44c35bc8fd9b48b7bc2a2d82 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 13:31:23 +0100 Subject: [PATCH 013/170] [IMP] module: use the `openerp.addons.` namespace to load addons. (openerp.modules will be changed in openerp.addons in the next commit). bzr revid: vmt@openerp.com-20120109123123-jt3canjbg0ozs05j --- openerp-server | 61 ++++++++++++++++++++++++++++++--------- openerp/modules/module.py | 2 +- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/openerp-server b/openerp-server index 641bc7e97e2..44ba179830d 100755 --- a/openerp-server +++ b/openerp-server @@ -219,6 +219,28 @@ if __name__ == "__main__": class ImportHook(object): + """ + Import hook to load OpenERP addons from multiple paths. + + OpenERP implements its own import-hook to load its addons. OpenERP + addons are Python modules. Originally, they were each living in their + own top-level namespace, e.g. the sale module, or the hr module. For + backward compatibility, `import ` is still supported. Now they + are living in `openerp.addons`. The good way to import such modules is + thus `import openerp.addons.module`. + + For backward compatibility, loading an addons puts it in `sys.modules` + under both the legacy (short) name, and the new (longer) name. This + ensures that + import hr + import openerp.addons.hr + loads the hr addons only once. + + When an OpenERP addons name clashes with some other installed Python + module (for instance this is the case of the `resource` addons), + obtaining the OpenERP addons is only possible with the long name. The + short name will give the expected Python module. + """ def find_module(self, module_name, package_path): module_parts = module_name.split('.') @@ -230,7 +252,20 @@ if __name__ == "__main__": if len(module_parts) == 1 and \ openerp.modules.module.get_module_path(module_parts[0], display_warning=False): - return self # We act as a loader too. + try: + # Check if the bare module name clashes with another module. + f, path, descr = imp.find_module(module_parts[0]) + logger = logging.getLogger('init') + logger.warning(""" + Ambiguous import: the OpenERP module `%s` is shadowed by another + module (available at %s). + To import it, use `import openerp.modules..`.""" % (module_name, path)) + return + except ImportError, e: + # Using `import ` instead of + # `import openerp.modules.` is ugly but not harmful + # and kept for backward compatibility. + return self # We act as a loader too. def load_module(self, module_name): @@ -245,21 +280,21 @@ if __name__ == "__main__": if module_part in sys.modules: return sys.modules[module_part] - try: - # Check if the bare module name clashes with another module. - f, path, descr = imp.find_module(module_part) - logger = logging.getLogger('init') - logger.warning(""" - Ambiguous import: the OpenERP module `%s` is shadowing another module - (available at %s).""" % (module_name, path)) - except ImportError, e: - # Using `import ` instead of - # `import openerp.modules.` is ugly but not harmful. - pass + try: + # Check if the bare module name shadows another module. + f, path, descr = imp.find_module(module_part) + is_shadowing = True + except ImportError, e: + # Using `import ` instead of + # `import openerp.modules.` is ugly but not harmful + # and kept for backward compatibility. + is_shadowing = False + # Note: we don't support circular import. f, path, descr = imp.find_module(module_part, openerp.modules.module.ad_paths) mod = imp.load_module(module_name, f, path, descr) - sys.modules[module_part] = mod + if not is_shadowing: + sys.modules[module_part] = mod sys.modules['openerp.modules.' + module_part] = mod return mod diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 936c798767a..a5c432722ea 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -314,7 +314,7 @@ def register_module_classes(m): try: zip_mod_path = mod_path + '.zip' if not os.path.isfile(zip_mod_path): - __import__(m) + __import__('openerp.modules.' + m) else: zimp = zipimport.zipimporter(zip_mod_path) zimp.load_module(m) From 455e47e5e83bbf70203f7513b876c420bd6abb06 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 13:41:20 +0100 Subject: [PATCH 014/170] [IMP] openerp.addons: openerp.addons is used instead of openerp.modules as the namespace of the OpenERP addons. bzr revid: vmt@openerp.com-20120109124120-06gguu3lzxv49i3j --- openerp-server | 12 ++++++------ openerp/addons/__init__.py | 2 +- openerp/modules/module.py | 2 +- openerp/osv/orm.py | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openerp-server b/openerp-server index 44ba179830d..c44e6909687 100755 --- a/openerp-server +++ b/openerp-server @@ -244,7 +244,7 @@ if __name__ == "__main__": def find_module(self, module_name, package_path): module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.modules.'): + if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): return self # We act as a loader too. # TODO list of loadable modules can be cached instead of always @@ -259,18 +259,18 @@ if __name__ == "__main__": logger.warning(""" Ambiguous import: the OpenERP module `%s` is shadowed by another module (available at %s). - To import it, use `import openerp.modules..`.""" % (module_name, path)) + To import it, use `import openerp.addons..`.""" % (module_name, path)) return except ImportError, e: # Using `import ` instead of - # `import openerp.modules.` is ugly but not harmful + # `import openerp.addons.` is ugly but not harmful # and kept for backward compatibility. return self # We act as a loader too. def load_module(self, module_name): module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.modules.'): + if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): module_part = module_parts[2] if module_name in sys.modules: return sys.modules[module_name] @@ -286,7 +286,7 @@ if __name__ == "__main__": is_shadowing = True except ImportError, e: # Using `import ` instead of - # `import openerp.modules.` is ugly but not harmful + # `import openerp.addons.` is ugly but not harmful # and kept for backward compatibility. is_shadowing = False @@ -295,7 +295,7 @@ if __name__ == "__main__": mod = imp.load_module(module_name, f, path, descr) if not is_shadowing: sys.modules[module_part] = mod - sys.modules['openerp.modules.' + module_part] = mod + sys.modules['openerp.addons.' + module_part] = mod return mod openerp.modules.module.initialize_sys_path() diff --git a/openerp/addons/__init__.py b/openerp/addons/__init__.py index 02a5c9aa0a7..9554e9bd850 100644 --- a/openerp/addons/__init__.py +++ b/openerp/addons/__init__.py @@ -25,7 +25,7 @@ This module serves to contain all OpenERP addons, across all configured addons paths. For the code to manage those addons, see openerp.modules. -Addons are made available under `openerp.modules` after +Addons are made available under `openerp.addons` after openerp.tools.config.parse_config() is called (so that the addons paths are known). diff --git a/openerp/modules/module.py b/openerp/modules/module.py index a5c432722ea..5c50384c2bc 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -314,7 +314,7 @@ def register_module_classes(m): try: zip_mod_path = mod_path + '.zip' if not os.path.isfile(zip_mod_path): - __import__('openerp.modules.' + m) + __import__('openerp.addons.' + m) else: zimp = zipimport.zipimporter(zip_mod_path) zimp.load_module(m) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 23cc040af47..05da35a5aeb 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -608,13 +608,13 @@ class MetaModel(type): super(MetaModel, self).__init__(name, bases, attrs) return - # The (OpenERP) module name can be in the `openerp.modules` namespace + # The (OpenERP) module name can be in the `openerp.addons` namespace # or not. For instance module `sale` can be imported as - # `openerp.modules.sale` (the good way) or `sale` (for backward + # `openerp.addons.sale` (the good way) or `sale` (for backward # compatibility). module_parts = self.__module__.split('.') if len(module_parts) > 2 and module_parts[0] == 'openerp' and \ - module_parts[1] == 'modules': + module_parts[1] == 'addons': module_name = self.__module__.split('.')[2] else: module_name = self.__module__.split('.')[0] From d348a0de79139db57e5d736e36b44ef7fa35d494 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 13:52:43 +0100 Subject: [PATCH 015/170] [IMP] import hook: moved to a proper location (openerp.modules.module instead of openerp-server). bzr revid: vmt@openerp.com-20120109125243-qhtr070dvtc3akb5 --- openerp-server | 84 ------------------------------------- openerp/modules/module.py | 87 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 85 deletions(-) diff --git a/openerp-server b/openerp-server index c44e6909687..87e75a5cf7b 100755 --- a/openerp-server +++ b/openerp-server @@ -217,90 +217,6 @@ if __name__ == "__main__": check_root_user() openerp.tools.config.parse_config(sys.argv[1:]) - - class ImportHook(object): - """ - Import hook to load OpenERP addons from multiple paths. - - OpenERP implements its own import-hook to load its addons. OpenERP - addons are Python modules. Originally, they were each living in their - own top-level namespace, e.g. the sale module, or the hr module. For - backward compatibility, `import ` is still supported. Now they - are living in `openerp.addons`. The good way to import such modules is - thus `import openerp.addons.module`. - - For backward compatibility, loading an addons puts it in `sys.modules` - under both the legacy (short) name, and the new (longer) name. This - ensures that - import hr - import openerp.addons.hr - loads the hr addons only once. - - When an OpenERP addons name clashes with some other installed Python - module (for instance this is the case of the `resource` addons), - obtaining the OpenERP addons is only possible with the long name. The - short name will give the expected Python module. - """ - - def find_module(self, module_name, package_path): - module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): - return self # We act as a loader too. - - # TODO list of loadable modules can be cached instead of always - # calling get_module_path(). - if len(module_parts) == 1 and \ - openerp.modules.module.get_module_path(module_parts[0], - display_warning=False): - try: - # Check if the bare module name clashes with another module. - f, path, descr = imp.find_module(module_parts[0]) - logger = logging.getLogger('init') - logger.warning(""" - Ambiguous import: the OpenERP module `%s` is shadowed by another - module (available at %s). - To import it, use `import openerp.addons..`.""" % (module_name, path)) - return - except ImportError, e: - # Using `import ` instead of - # `import openerp.addons.` is ugly but not harmful - # and kept for backward compatibility. - return self # We act as a loader too. - - def load_module(self, module_name): - - module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): - module_part = module_parts[2] - if module_name in sys.modules: - return sys.modules[module_name] - - if len(module_parts) == 1: - module_part = module_parts[0] - if module_part in sys.modules: - return sys.modules[module_part] - - try: - # Check if the bare module name shadows another module. - f, path, descr = imp.find_module(module_part) - is_shadowing = True - except ImportError, e: - # Using `import ` instead of - # `import openerp.addons.` is ugly but not harmful - # and kept for backward compatibility. - is_shadowing = False - - # Note: we don't support circular import. - f, path, descr = imp.find_module(module_part, openerp.modules.module.ad_paths) - mod = imp.load_module(module_name, f, path, descr) - if not is_shadowing: - sys.modules[module_part] = mod - sys.modules['openerp.addons.' + module_part] = mod - return mod - - openerp.modules.module.initialize_sys_path() - sys.meta_path.append(ImportHook()) - check_postgres_user() openerp.netsvc.init_logger() report_configuration() diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 5c50384c2bc..1e46d3c8478 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -56,6 +56,91 @@ loaded = [] logger = netsvc.Logger() +class AddonsImportHook(object): + """ + Import hook to load OpenERP addons from multiple paths. + + OpenERP implements its own import-hook to load its addons. OpenERP + addons are Python modules. Originally, they were each living in their + own top-level namespace, e.g. the sale module, or the hr module. For + backward compatibility, `import ` is still supported. Now they + are living in `openerp.addons`. The good way to import such modules is + thus `import openerp.addons.module`. + + For backward compatibility, loading an addons puts it in `sys.modules` + under both the legacy (short) name, and the new (longer) name. This + ensures that + import hr + import openerp.addons.hr + loads the hr addons only once. + + When an OpenERP addons name clashes with some other installed Python + module (for instance this is the case of the `resource` addons), + obtaining the OpenERP addons is only possible with the long name. The + short name will give the expected Python module. + + Instead of relying on some addons path, an alternative approach would be + to use pkg_resources entry points from already installed Python libraries + (and install our addons as such). Even when implemented, we would still + have to support the addons path approach for backward compatibility. + """ + + def find_module(self, module_name, package_path): + module_parts = module_name.split('.') + if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): + return self # We act as a loader too. + + # TODO list of loadable modules can be cached instead of always + # calling get_module_path(). + if len(module_parts) == 1 and \ + get_module_path(module_parts[0], + display_warning=False): + try: + # Check if the bare module name clashes with another module. + f, path, descr = imp.find_module(module_parts[0]) + logger = logging.getLogger('init') + logger.warning(""" +Ambiguous import: the OpenERP module `%s` is shadowed by another +module (available at %s). +To import it, use `import openerp.addons..`.""" % (module_name, path)) + return + except ImportError, e: + # Using `import ` instead of + # `import openerp.addons.` is ugly but not harmful + # and kept for backward compatibility. + return self # We act as a loader too. + + def load_module(self, module_name): + + module_parts = module_name.split('.') + if len(module_parts) == 3 and module_name.startswith('openerp.addons.'): + module_part = module_parts[2] + if module_name in sys.modules: + return sys.modules[module_name] + + if len(module_parts) == 1: + module_part = module_parts[0] + if module_part in sys.modules: + return sys.modules[module_part] + + try: + # Check if the bare module name shadows another module. + f, path, descr = imp.find_module(module_part) + is_shadowing = True + except ImportError, e: + # Using `import ` instead of + # `import openerp.addons.` is ugly but not harmful + # and kept for backward compatibility. + is_shadowing = False + + # Note: we don't support circular import. + f, path, descr = imp.find_module(module_part, ad_paths) + mod = imp.load_module(module_name, f, path, descr) + if not is_shadowing: + sys.modules[module_part] = mod + sys.modules['openerp.addons.' + module_part] = mod + return mod + def initialize_sys_path(): """ Add all addons paths in sys.path. @@ -68,7 +153,7 @@ def initialize_sys_path(): ad_paths = map(lambda m: os.path.abspath(tools.ustr(m.strip())), tools.config['addons_path'].split(',')) ad_paths.append(_ad) # for get_module_path - + sys.meta_path.append(AddonsImportHook()) def get_module_path(module, downloaded=False, display_warning=True): """Return the path of the given module. From 6ab102ec11ceaaa9618f4eabc9ba9bef329cf128 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 14:09:30 +0100 Subject: [PATCH 016/170] [IMP] addons: use `openerp.addons.` instead of `` with __import__. bzr revid: vmt@openerp.com-20120109130930-xt13kjrxww2whdf0 --- addons/web/common/http.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 0c239decb64..1e84689caad 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -478,8 +478,6 @@ class Root(object): """ statics = {} for addons_path in self.config.addons_path: - if addons_path not in sys.path: - sys.path.insert(0, addons_path) for module in os.listdir(addons_path): if module not in addons_module: manifest_path = os.path.join(addons_path, module, '__openerp__.py') @@ -488,7 +486,7 @@ class Root(object): manifest = ast.literal_eval(open(manifest_path).read()) manifest['addons_path'] = addons_path _logger.info("Loading %s", module) - m = __import__(module) + m = __import__('openerp.addons.' + module) addons_module[module] = m addons_manifest[module] = manifest statics['/%s/static' % module] = path_static From a0d18681ee7e4a815832d4188b80062ecd87a916 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 14:12:05 +0100 Subject: [PATCH 017/170] [IMP] import: use `openerp.addons.` instead of `` with __import__. bzr revid: vmt@openerp.com-20120109131205-6j78jiw4gxxod1s4 --- addons/mail/wizard/mail_compose_message.py | 3 ++- addons/project/project.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index f5906d2b186..2c554c5f0c7 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -22,13 +22,14 @@ import re import tools -from mail.mail_message import to_email from osv import osv from osv import fields from tools.safe_eval import safe_eval as eval from tools.safe_eval import literal_eval from tools.translate import _ +from ..mail_message import to_email + # main mako-like expression pattern EXPRESSION_PATTERN = re.compile('(\$\{.+?\})') diff --git a/addons/project/project.py b/addons/project/project.py index aabea22da8e..dbd209a6691 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -25,7 +25,7 @@ from datetime import datetime, date from tools.translate import _ from osv import fields, osv -from resource.faces import task as Task +from openerp.addons.resource.faces import task as Task # I think we can remove this in v6.1 since VMT's improvements in the framework ? #class project_project(osv.osv): @@ -316,7 +316,7 @@ class project(osv.osv): resource_pool = self.pool.get('resource.resource') - result = "from resource.faces import *\n" + result = "from openerp.addons.resource.faces import *\n" result += "import datetime\n" for project in self.browse(cr, uid, ids, context=context): u_ids = [i.id for i in project.members] From 85295192d81b1c2c5408489a965848d5a4348587 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 16:10:55 +0100 Subject: [PATCH 018/170] [IMP] crm: avoid circular import (which is not supported by the AddonsImportHook). bzr revid: vmt@openerp.com-20120109151055-fmt3vgi3cffhb5zb --- addons/base_calendar/wizard/base_calendar_invite_attendee.py | 2 +- addons/crm/report/crm_lead_report.py | 2 +- addons/crm/report/crm_phonecall_report.py | 2 +- addons/crm/wizard/crm_add_note.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py index a429db8e925..e3a38c069b8 100644 --- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py +++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py @@ -19,7 +19,7 @@ # ############################################################################## -from base_calendar import base_calendar +from .. import base_calendar from osv import fields, osv from tools.translate import _ import tools diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index a2215d28740..ab8c7ca7c83 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -21,7 +21,7 @@ from osv import fields,osv import tools -from crm import crm +from .. import crm AVAILABLE_STATES = [ ('draft','Draft'), diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index ef3bcccdc9a..ccf0775cfd5 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -21,7 +21,7 @@ from osv import fields,osv import tools -from crm import crm +from .. import crm AVAILABLE_STATES = [ ('draft','Draft'), diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py index 6bd84bda21d..02f592f0136 100644 --- a/addons/crm/wizard/crm_add_note.py +++ b/addons/crm/wizard/crm_add_note.py @@ -1,4 +1,4 @@ -from crm import crm +from .. import crm from osv import fields, osv from tools.translate import _ from mail.mail_message import truncate_text From ca7b405aff962cefada1c0e634fe12306c53beed Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 16:16:42 +0100 Subject: [PATCH 019/170] [IMP] hr_recruitment: avoid circular import (which is not supported by the AddonsImportHook). bzr revid: vmt@openerp.com-20120109151642-6axabx8zevb9jmy5 --- addons/hr_recruitment/report/hr_recruitment_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 5234e933813..6ea03bbf114 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -20,7 +20,7 @@ ############################################################################## import tools from osv import fields,osv -from hr_recruitment import hr_recruitment +from .. import hr_recruitment from decimal_precision import decimal_precision as dp From a9a9ed989e3f651bb79f7467e8ed281fa75bd80d Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 16:22:16 +0100 Subject: [PATCH 020/170] [FIX] base_module_doc_rst: removed unnecessary import. bzr revid: vmt@openerp.com-20120109152216-5hqhg5a9ssb4ywgy --- addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py index bb02d7c33d2..39933c39a3e 100644 --- a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py +++ b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py @@ -30,9 +30,6 @@ import pooler import os import tools -import base_module_doc_rst - - choose_file_form = '''
From d8a66f14c721b0f55d5c38aaa2e7f2bdb4016a81 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 9 Jan 2012 16:33:02 +0100 Subject: [PATCH 021/170] [FIX] project_long_term: avoid name clash between resource modules. bzr revid: vmt@openerp.com-20120109153302-wrgfheqkl6x2hzw3 --- addons/project_long_term/project_long_term.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 1be274bc4f6..612bd784bb0 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -22,7 +22,7 @@ from datetime import datetime from tools.translate import _ from osv import fields, osv -from resource.faces import task as Task +from openerp.addons.resource.faces import task as Task class project_phase(osv.osv): _name = "project.phase" From 6c1ad196bf39563d62159ef1b988af39360849aa Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 10 Jan 2012 10:27:30 +0100 Subject: [PATCH 022/170] [IMP] openerp.modules: updated initialize_sys_path() docstring (although its name is now inaccurate). bzr revid: vmt@openerp.com-20120110092730-rqewzuo1wa5wy2q5 --- openerp/modules/module.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 1e46d3c8478..b82597d656d 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -142,10 +142,13 @@ To import it, use `import openerp.addons..`.""" % (module_name, path)) return mod def initialize_sys_path(): - """ Add all addons paths in sys.path. + """ + Setup an import-hook to be able to import OpenERP addons from the different + addons paths. - This ensures something like ``import crm`` works even if the addons are - not in the PYTHONPATH. + This ensures something like ``import crm`` (or even + ``import openerp.addons.crm``) works even if the addons are not in the + PYTHONPATH. """ global ad_paths if ad_paths: From 85993fb85ff4a9697b70b4982f5df20acb1e0cf5 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 11 Jan 2012 14:50:08 +0530 Subject: [PATCH 023/170] [IMP]auction: added a separator and changes in password field bzr revid: mma@tinyerp.com-20120111092008-hr7jxcos2ccvuy8d --- addons/auction/auction_view.xml | 6 ++++-- addons/auction/wizard/auction_lots_sms_send_view.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index abcf53490a5..d52b3a3b36b 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -307,13 +307,14 @@ - + + @@ -560,7 +561,8 @@ - + + diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml index f0bf665a882..d7d0ab06e5c 100644 --- a/addons/auction/wizard/auction_lots_sms_send_view.xml +++ b/addons/auction/wizard/auction_lots_sms_send_view.xml @@ -11,7 +11,7 @@ - + From 45a9b89cf499d551589e381c656c5913388e5a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Wed, 11 Jan 2012 12:10:28 +0100 Subject: [PATCH 024/170] [IMP] content management configuration should be accesible by all content management group members bzr revid: rlo@openerp.com-20120111111028-y76miqurbaghbafo --- addons/document/security/document_security.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml index 74f3426fc50..9fba954aa0e 100644 --- a/addons/document/security/document_security.xml +++ b/addons/document/security/document_security.xml @@ -11,10 +11,6 @@ - - - - ['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&', ('user_id', '=', False), ('group_ids','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] From 7438ed5e88f7153b216b5079ccc95b880b431489 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 11 Jan 2012 17:18:37 +0530 Subject: [PATCH 025/170] [IMP]auction: remove a separator bzr revid: mma@tinyerp.com-20120111114837-joly8423b415k31o --- addons/auction/auction_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index d52b3a3b36b..995ffa78959 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -307,14 +307,13 @@ + - - From eb6c9087f2247b077e15662f01ca13f65a92f3bb Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 11 Jan 2012 17:31:22 +0530 Subject: [PATCH 026/170] [IMP]crm: added a email_from field in convert_opportunity method bzr revid: mma@tinyerp.com-20120111120122-8kneus873a5mhsl9 --- addons/crm/crm_phonecall.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 4246fa43a98..8d9a47b15eb 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -251,6 +251,7 @@ class crm_phonecall(crm_base, osv.osv): 'priority': call.priority, 'type': 'opportunity', 'phone': call.partner_phone or False, + 'email_from': default_contact and default_contact.email, }) vals = { 'partner_id': partner_id, From 20ed63d59809061118cb32c3734c874b4ddc966d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 11 Jan 2012 14:01:21 +0100 Subject: [PATCH 027/170] [IMP] Refactored _altern_si_so code. Added limits to searches. Code now validates only new data, not all past data. Cleaned algorithm documentation. bzr revid: tde@openerp.com-20120111130121-8bcgnjt233nv0izj --- addons/hr_attendance/hr_attendance.py | 37 ++++++++++++--------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index 9987beae248..80741510785 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -63,30 +63,25 @@ class hr_attendance(osv.osv): 'employee_id': _employee_get, } - def write(self, cr, uid, ids, vals, context=None): - current_attendance_data = self.browse(cr, uid, ids, context=context)[0] - obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context) - if obj_attendance_ids[0] != ids[0]: - if ('name' in vals) or ('action' in vals): - raise osv.except_osv(_('Warning !'), _('You can not modify existing entries. To modify the entry , remove the prior entries.')) - return super(hr_attendance, self).write(cr, uid, ids, vals, context=context) - def _altern_si_so(self, cr, uid, ids, context=None): - current_attendance_data = self.browse(cr, uid, ids, context=context)[0] - obj_attendance_ids = self.search(cr, uid, [('employee_id', '=', current_attendance_data.employee_id.id)], context=context) - obj_attendance_ids.remove(ids[0]) - hr_attendance_data = self.browse(cr, uid, obj_attendance_ids, context=context) - - for old_attendance in hr_attendance_data: - if old_attendance.action == current_attendance_data['action']: + """ Alternance sign_in/sign_out check + Previous (if exists) must be of opposite action + Next (if exists) must be of opposite action + """ + atts = self.browse(cr, uid, ids, context=context) + for att in atts: + # search and browse for first previous and first next records + prev_att_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '<', att.name), ('action', 'in', ('sign_in', 'sign_out'))], limit=1, order='name DESC') + next_add_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '>', att.name), ('action', 'in', ('sign_in', 'sign_out'))], limit=1, order='name ASC') + prev_atts = self.browse(cr, uid, prev_att_ids, context=context) if (len(prev_att_ids) != 0) else [] + next_atts = self.browse(cr, uid, next_add_ids, context=context) if (len(next_add_ids) != 0) else [] + # perform alternance check, return False if at least one condition is not satisfied + if len(prev_atts) != 0 and prev_atts[0].action == att.action: # previous exists and is same action return False - elif old_attendance.name >= current_attendance_data['name']: + if len(next_atts) != 0 and next_atts[0].action == att.action: # next exists and is same action + return False + if len(prev_atts) == 0 and len(next_atts) == 0 and att.action != 'sign_in': # first attendance must be sign_in return False - else: - return True - # First entry in the system must not be 'sign_out' - if current_attendance_data['action'] == 'sign_out': - return False return True _constraints = [(_altern_si_so, 'Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])] From afd266bf6a544937ce26d4948c356fdac3a7f0b8 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Thu, 12 Jan 2012 11:46:36 +0530 Subject: [PATCH 028/170] [FIX]import_google: i have change the external_id_field in initialize. bzr revid: nco@tinyerp.com-20120112061636-xw78p1gog5til567 --- addons/import_google/wizard/import_google.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py index 936a6d17649..cfeaa623f76 100644 --- a/addons/import_google/wizard/import_google.py +++ b/addons/import_google/wizard/import_google.py @@ -51,7 +51,7 @@ class google_import(import_framework): def initialize(self): google = self.obj.pool.get('google.login') - self.external_id_field = 'Id' + self.external_id_field = 'id' self.gd_client = google.google_login(self.context.get('user'), self.context.get('password'), self.context.get('instance')) From a4eb2a04b56483dacfe00e999cf396c299e96104 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 12 Jan 2012 12:32:40 +0530 Subject: [PATCH 029/170] [REF] purchase: refactor product_id_change and rename with onchange_product_id bzr revid: hmo@tinyerp.com-20120112070240-zgsic6tjiy7j7g30 --- addons/purchase/purchase.py | 101 ++++++++++++++++++------------ addons/purchase/purchase_view.xml | 6 +- 2 files changed, 63 insertions(+), 44 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index bb748d68329..f63b86f11f2 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -697,56 +697,74 @@ class purchase_order_line(osv.osv): default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]}) return super(purchase_order_line, self).copy_data(cr, uid, id, default, context) - #TOFIX: - # - name of method should "onchange_product_id" - # - docstring - # - split into small internal methods for clearity - def product_id_change(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id, + + def _onchange_check_partner_pricelist(self, pricelist_id, partner_id): + return True + + def onchange_product_uom(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id, partner_id, date_order=False, fiscal_position_id=False, date_planned=False, name=False, price_unit=False, notes=False, context=None): + """ + onchange handler of product_uom. + """ + if not uom_id: + return {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or'', 'product_uom' : uom_id or False}} + return self.onchange_product_id(cr, uid, ids, pricelist_id, product_id, qty, uom_id, + partner_id, date_order=date_order, fiscal_position_id=fiscal_position_id, date_planned=date_planned, + name=name, price_unit=price_unit, notes=notes, context=context) + + def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id, + partner_id, date_order=False, fiscal_position_id=False, date_planned=False, + name=False, price_unit=False, notes=False, context=None): + """ + onchange handler of product_id. + """ + res = {} if context is None: context = {} - - res = {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or'', 'product_uom' : uom_id or False} - uom_change = context.get('uom_change', False) + res_value = {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or'', 'product_uom' : uom_id or False} + if not product_id: + return {'value': res_value} + + product_product = self.pool.get('product.product') + product_uom = self.pool.get('product.uom') + res_partner = self.pool.get('res.partner') + product_supplierinfo = self.pool.get('product.supplierinfo') + product_pricelist = self.pool.get('product.pricelist') + account_fiscal_position = self.pool.get('account.fiscal.position') + account_tax = self.pool.get('account.tax') + + # - check for the presence of partner_id and pricelist_id if not pricelist_id: raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.')) if not partner_id: raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.')) - if not product_id: - return {'value': res} - - product_uom_pool = self.pool.get('product.uom') - product_supplierinfo = self.pool.get('product.supplierinfo') - res_partner = self.pool.get('res.partner') - product_product = self.pool.get('product.product') - account_fiscal_position = self.pool.get('account.fiscal.position') - account_tax = self.pool.get('account.tax') - - # set supplier langauage in context + # - determine name and notes based on product in partner lang. lang = res_partner.browse(cr, uid, partner_id).lang if lang: context['lang'] = lang context['partner_id'] = partner_id - product = product_product.browse(cr, uid, product_id, context=context) + res_value.update({'name': product.name, 'notes': notes or product.description_purchase}) + + # - set a domain on product_uom domain = {'product_uom':[('category_id','=',product.uom_id.category_id.id)]} - res['domain'] = domain - - if uom_change and not uom_id: - return {'value': res} + res.update({'domain': domain}) + # - check that uom and product uom belong to the same category product_uom_po_id = product.uom_po_id.id if not uom_id: uom_id = product_uom_po_id - # checking UOM category - if product.uom_id.category_id.id != product_uom_pool.browse(cr, uid, uom_id).category_id.id: + if product.uom_id.category_id.id != product_uom.browse(cr, uid, uom_id, context=context).category_id.id: res.update({'warning': {'title': _('Warning'), 'message': _('Selected UOM does not have same category of default UOM')}}) uom_id = product_uom_po_id - + + res_value.update({'product_uom': uom_id}) + + # - determine product_qty and date_planned based on seller info if not date_order: date_order = time.strftime('%Y-%m-%d') @@ -758,31 +776,32 @@ class purchase_order_line(osv.osv): seller_delay = supplierinfo.delay if supplierinfo.product_uom.id != uom_id: res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name }}) - min_qty = product_uom_pool._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) + min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)}}) qty = min_qty - - price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist_id], + + dt = (datetime.strptime(date_order, '%Y-%m-%d') + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S') + res_value.update({'date_planned': date_planned or dt, 'product_qty': qty}) + + # - determine price_unit and taxes_id + price = product_pricelist.price_get(cr, uid, [pricelist_id], product.id, qty or 1.0, partner_id, { 'uom': uom_id, 'date': date_order, })[pricelist_id] - dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S') - - - res.update({'value': {'price_unit': price, 'name': product.name, - 'taxes_id':map(lambda x: x.id, product.supplier_taxes_id), - 'date_planned': date_planned or dt,'notes': notes or product.description_purchase, - 'product_qty': qty, - 'product_uom': uom_id}}) - + taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id)) fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False - res['value']['taxes_id'] = account_fiscal_position.map_tax(cr, uid, fpos, taxes) + taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes) + res_value.update({'price_unit': price, 'taxes_id': taxes_ids}) + + + res.update({'value': res_value}) return res - product_uom_change = product_id_change + product_id_change = onchange_product_id + product_uom_change = onchange_product_uom def action_confirm(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state': 'confirmed'}, context=context) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 14f5354f970..221c0b854a1 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -359,9 +359,9 @@
- - - + + + From cdabe44260423cebf266f80e0655fc3d3a15a53b Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 12 Jan 2012 12:48:56 +0530 Subject: [PATCH 030/170] [IMP] purchase: remove unused method bzr revid: hmo@tinyerp.com-20120112071856-zh0bl7tn7zv0x21i --- addons/purchase/purchase.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3895fd39667..908720eccd1 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -697,10 +697,6 @@ class purchase_order_line(osv.osv): default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]}) return super(purchase_order_line, self).copy_data(cr, uid, id, default, context) - - def _onchange_check_partner_pricelist(self, pricelist_id, partner_id): - return True - def onchange_product_uom(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id, partner_id, date_order=False, fiscal_position_id=False, date_planned=False, name=False, price_unit=False, notes=False, context=None): From 4cc5c14273ea39b9fcbba5c117c1b1c2b22dd2fd Mon Sep 17 00:00:00 2001 From: "hbto(humbertoarocha)" <> Date: Thu, 12 Jan 2012 14:51:49 +0530 Subject: [PATCH 031/170] [FIX] account: add Missing date on fiscalyear clousure wizard account.fiscalyear.close lp bug: https://launchpad.net/bugs/912623 fixed bzr revid: jap@tinyerp.com-20120112092149-ism5impd38iliz2u --- addons/account/wizard/account_fiscalyear_close.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index d2295b5bbf2..849a7a9f514 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -105,6 +105,7 @@ class account_fiscalyear_close(osv.osv_memory): 'name': '/', 'ref': '', 'period_id': period.id, + 'date': period.date_start, 'journal_id': new_journal.id, } move_id = obj_acc_move.create(cr, uid, vals, context=context) @@ -118,7 +119,6 @@ class account_fiscalyear_close(osv.osv_memory): AND a.type != 'view' AND t.close_method = %s''', ('unreconciled', )) account_ids = map(lambda x: x[0], cr.fetchall()) - if account_ids: cr.execute(''' INSERT INTO account_move_line ( @@ -130,11 +130,11 @@ class account_fiscalyear_close(osv.osv_memory): (SELECT name, create_uid, create_date, write_uid, write_date, statement_id, %s,currency_id, date_maturity, partner_id, blocked, credit, 'draft', debit, ref, account_id, - %s, date, %s, amount_currency, quantity, product_id, company_id + %s, (%s) AS date, %s, amount_currency, quantity, product_id, company_id FROM account_move_line WHERE account_id IN %s AND ''' + query_line + ''' - AND reconcile_id IS NULL)''', (new_journal.id, period.id, move_id, tuple(account_ids),)) + AND reconcile_id IS NULL)''', (new_journal.id, period.id, period.date_start, move_id, tuple(account_ids),)) #We have also to consider all move_lines that were reconciled #on another fiscal year, and report them too @@ -149,7 +149,7 @@ class account_fiscalyear_close(osv.osv_memory): b.name, b.create_uid, b.create_date, b.write_uid, b.write_date, b.statement_id, %s, b.currency_id, b.date_maturity, b.partner_id, b.blocked, b.credit, 'draft', b.debit, - b.ref, b.account_id, %s, b.date, %s, b.amount_currency, + b.ref, b.account_id, %s, (%s) AS date, %s, b.amount_currency, b.quantity, b.product_id, b.company_id FROM account_move_line b WHERE b.account_id IN %s @@ -157,7 +157,7 @@ class account_fiscalyear_close(osv.osv_memory): AND b.period_id IN ('''+fy_period_set+''') AND b.reconcile_id IN (SELECT DISTINCT(reconcile_id) FROM account_move_line a - WHERE a.period_id IN ('''+fy2_period_set+''')))''', (new_journal.id, period.id, move_id, tuple(account_ids),)) + WHERE a.period_id IN ('''+fy2_period_set+''')))''', (new_journal.id, period.id, period.date_start, move_id, tuple(account_ids),)) #2. report of the accounts with defferal method == 'detail' cr.execute(''' @@ -180,11 +180,11 @@ class account_fiscalyear_close(osv.osv_memory): (SELECT name, create_uid, create_date, write_uid, write_date, statement_id, %s,currency_id, date_maturity, partner_id, blocked, credit, 'draft', debit, ref, account_id, - %s, date, %s, amount_currency, quantity, product_id, company_id + %s, (%s) AS date, %s, amount_currency, quantity, product_id, company_id FROM account_move_line WHERE account_id IN %s AND ''' + query_line + ''') - ''', (new_journal.id, period.id, move_id, tuple(account_ids),)) + ''', (new_journal.id, period.id, period.date_start, move_id, tuple(account_ids),)) #3. report of the accounts with defferal method == 'balance' From 59cbdd3341721226ef6f8ddfdd8f143273077806 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 12 Jan 2012 15:19:04 +0530 Subject: [PATCH 032/170] [ADD] hr_attendance : Added Test Cases For Hr Attendance bzr revid: mdi@tinyerp.com-20120112094904-b10x1mx4c2uxitzj --- .../hr_attendance/test/attendance_process.yml | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml index 1d8308c2f45..5c83ba25aa1 100644 --- a/addons/hr_attendance/test/attendance_process.yml +++ b/addons/hr_attendance/test/attendance_process.yml @@ -28,4 +28,57 @@ - !assert {model: hr.employee, id: hr.employee_al, severity: error, string: Employee should be in absent state}: - state == 'absent' - +- + In order to check that first attendance must be Sign In. +- + !python {model: hr.attendance}: | + try: + self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 09:59:25'), action: 'sign_out'}, None) + except Exception, e: + assert e, 'The first attendance must be Sign In' +- + First of all, Employee Sign's In. +- + !record {model: hr.attendance, id: hr_attendance_1}: + employee_id: hr.employee_fp + name: !eval time.strftime('%Y-%m-%d 09:59:25') + action: 'sign_in' +- + Now Employee is going to Sign In prior to First Sign In. +- + !python {model: hr.attendance}: | + try: + self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 08:59:25'), action: 'sign_in'}, None) + except Exception, e: + assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' +- + After that Employee is going to Sign In after First Sign In. +- + !python {model: hr.attendance}: | + try: + self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 10:59:25'), action: 'sign_in'}, None) + except Exception, e: + assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' +- + After two hours, Employee Sign's Out. +- + !record {model: hr.attendance, id: hr_attendance_4}: + employee_id: hr.employee_fp + name: !eval time.strftime('%Y-%m-%d 11:59:25') + action: 'sign_out' +- + Now Employee is going to Sign Out prior to First Sign Out. +- + !python {model: hr.attendance}: | + try: + self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 10:59:25'), action: 'sign_out'}, None) + except Exception, e: + assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' +- + After that Employee is going to Sign Out After First Sign Out. +- + !python {model: hr.attendance}: | + try: + self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 12:59:25'), action: 'sign_out'}, None) + except Exception, e: + assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' From 447cf0e2b32f384ff209bb66608260b294106dd8 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 12 Jan 2012 17:28:34 +0530 Subject: [PATCH 033/170] [IMP]mrp_repair: pass a workflow in make invoice wizard bzr revid: mma@tinyerp.com-20120112115834-8gma20bjj0bbf64h --- addons/mrp_repair/wizard/make_invoice.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py index 61f82a3d57c..6b49aab5aba 100644 --- a/addons/mrp_repair/wizard/make_invoice.py +++ b/addons/mrp_repair/wizard/make_invoice.py @@ -45,6 +45,8 @@ class make_invoice(osv.osv_memory): order_obj = self.pool.get('mrp.repair') newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'], group=inv.group,context=context) + wf_service = netsvc.LocalService("workflow") + wf_service.trg_validate(uid, 'mrp.repair', context.get('active_id'), 'action_invoice_create' , cr) return { 'domain': [('id','in', newinv.values())], From f1b0a82ff6b4786d8283ffc646066f9fde671175 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 13 Jan 2012 14:14:42 +0530 Subject: [PATCH 034/170] [FIX]:Survey: if send invitation log in with that account it shows only that survey bzr revid: sgo@tinyerp.com-20120113084442-9uhynv0ut54h9dad --- addons/survey/wizard/survey_selection.py | 26 ++++++++++++++++++++++- addons/survey/wizard/survey_selection.xml | 3 +-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py index 82c9fd385ed..e865330fac9 100644 --- a/addons/survey/wizard/survey_selection.py +++ b/addons/survey/wizard/survey_selection.py @@ -22,12 +22,13 @@ from osv import osv from osv import fields from tools.translate import _ +from lxml import etree class survey_name_wiz(osv.osv_memory): _name = 'survey.name.wiz' _columns = { - 'survey_id': fields.many2one('survey', 'Survey', required=True, ondelete='cascade'), + 'survey_id': fields.many2one('survey', 'Survey', required=True, ondelete='cascade' ,domain= [('state', '=', 'open')]), 'page_no': fields.integer('Page Number'), 'note': fields.text("Description"), 'page': fields.char('Page Position',size = 12), @@ -44,6 +45,27 @@ class survey_name_wiz(osv.osv_memory): 'store_ans': '{}' #Setting the default pattern as '{}' as the field is of type text. The field always gets the value in dict format } + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + survey_obj = self.pool.get('survey') + lines_ids=[] + res = super(survey_name_wiz, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) + survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')]) + group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))]) + user_obj = self.pool.get('res.users') + user_rec = user_obj.read(cr, uid, uid) + if uid!=1: + if survey_user_group_id: + if survey_user_group_id == user_rec['groups_id']: + lines_ids=survey_obj.search(cr, uid, [ ('invited_user_ids','in',uid)], context=context) + domain = '[("id", "in", '+ str(lines_ids)+')]' + doc = etree.XML(res['arch']) + nodes = doc.xpath("//field[@name='survey_id']") + for node in nodes: + node.set('domain', domain) + res['arch'] = etree.tostring(doc) + return res + + def action_next(self, cr, uid, ids, context=None): """ Start the survey, Increment in started survey field but if set the max_response_limit of @@ -87,5 +109,7 @@ class survey_name_wiz(osv.osv_memory): return {} notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note'] return {'value': {'note': notes}} + +survey_name_wiz() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml index 144525979dd..a72566f7888 100644 --- a/addons/survey/wizard/survey_selection.xml +++ b/addons/survey/wizard/survey_selection.xml @@ -15,8 +15,7 @@ + on_change="on_change_survey(survey_id)" width="250"/> From 37530335e1ece8ada40e2b0f4110738141a0b40d Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Fri, 13 Jan 2012 14:46:45 +0530 Subject: [PATCH 035/170] survey set nolable=1 with questations bzr revid: tta@openerp.com-20120113091645-qza696j2ju2dvdi5 --- addons/survey/survey_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 3dd7ca17f6f..0f1a68145aa 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -39,7 +39,7 @@ - + From e5f375ce0d07ee60e2cf242258d3f13f1bb6316a Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 13 Jan 2012 15:09:11 +0530 Subject: [PATCH 036/170] [FIX]Survey: improve code remove unused code remove users bzr revid: sgo@tinyerp.com-20120113093911-cd1vvavmqo5p735p --- addons/survey/wizard/survey_selection.py | 29 +++++++++--------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py index e865330fac9..37d8e3bade2 100644 --- a/addons/survey/wizard/survey_selection.py +++ b/addons/survey/wizard/survey_selection.py @@ -46,23 +46,18 @@ class survey_name_wiz(osv.osv_memory): } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + survey_obj = self.pool.get('survey') - lines_ids=[] - res = super(survey_name_wiz, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) - survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')]) - group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))]) - user_obj = self.pool.get('res.users') - user_rec = user_obj.read(cr, uid, uid) - if uid!=1: - if survey_user_group_id: - if survey_user_group_id == user_rec['groups_id']: - lines_ids=survey_obj.search(cr, uid, [ ('invited_user_ids','in',uid)], context=context) - domain = '[("id", "in", '+ str(lines_ids)+')]' - doc = etree.XML(res['arch']) - nodes = doc.xpath("//field[@name='survey_id']") - for node in nodes: - node.set('domain', domain) - res['arch'] = etree.tostring(doc) + lines_ids = [] + res = super(survey_name_wiz, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) + if uid != 1: + lines_ids = survey_obj.search(cr, uid,[('invited_user_ids','in',uid)], context=context) + domain = '[("id", "in", '+ str(lines_ids)+')]' + doc = etree.XML(res['arch']) + nodes = doc.xpath("//field[@name='survey_id']") + for node in nodes: + node.set('domain',domain) + res['arch'] = etree.tostring(doc) return res @@ -110,6 +105,4 @@ class survey_name_wiz(osv.osv_memory): notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note'] return {'value': {'note': notes}} -survey_name_wiz() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file From cf252dd6c14779619483820abaecc856692d9456 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Fri, 13 Jan 2012 19:06:15 +0530 Subject: [PATCH 037/170] [FIX]crm_partner_assign: Add user_id insted of "partner_id" in crm_lead_view.xml under the crm.lead Search View. bzr revid: atp@tinyerp.com-20120113133615-twtc2sntv373y5b3 --- addons/crm_partner_assign/crm_lead_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index 14e160fb397..224a52a104c 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -61,7 +61,7 @@ - + From 40c1de87d821dea9933d920aac13cab1f149f9d9 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sun, 15 Jan 2012 22:42:14 +0100 Subject: [PATCH 038/170] [REF] remove unused import, always import literal_eval from tools.safe_eval. bzr revid: florent.xicluna@gmail.com-20120115214214-0rjwn80choc9g0fs --- openerp/addons/base/ir/ir_actions.py | 5 ++--- openerp/netsvc.py | 1 - openerp/service/http_server.py | 14 +++++--------- openerp/service/web_services.py | 1 + openerp/service/websrv_lib.py | 3 --- openerp/sql_db.py | 5 ++--- openerp/tests/common.py | 1 - openerp/tests/test_ir_sequence.py | 3 --- openerp/tests/test_xmlrpc.py | 1 - 9 files changed, 10 insertions(+), 24 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index f02269fa9bc..96b6bae848f 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -import ast import copy import logging import os @@ -31,7 +30,7 @@ import netsvc from osv import fields,osv from report.report_sxw import report_sxw, report_rml from tools.config import config -from tools.safe_eval import safe_eval as eval +from tools.safe_eval import safe_eval as eval, literal_eval from tools.translate import _ from socket import gethostname @@ -920,7 +919,7 @@ class act_client(osv.osv): def _get_params(self, cr, uid, ids, field_name, arg, context): return dict([ - ((record.id, ast.literal_eval(record.params_store)) + ((record.id, literal_eval(record.params_store)) if record.params_store else (record.id, False)) for record in self.browse(cr, uid, ids, context=context) ]) diff --git a/openerp/netsvc.py b/openerp/netsvc.py index c1120763ad4..ca08a362771 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -30,7 +30,6 @@ import socket import sys import threading import time -import traceback import types from pprint import pformat diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py index 506138b7fb4..66d701e0681 100644 --- a/openerp/service/http_server.py +++ b/openerp/service/http_server.py @@ -39,21 +39,17 @@ static HTTP, DAV or other. """ -from websrv_lib import * -import openerp.netsvc as netsvc -import errno -import threading -import openerp.tools as tools +import base64 import posixpath import urllib import os -import select -import socket -import xmlrpclib import logging - from SimpleXMLRPCServer import SimpleXMLRPCDispatcher +from websrv_lib import * +import openerp.netsvc as netsvc +import openerp.tools as tools + try: import fcntl except ImportError: diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index f486a050a7f..3fa65d8c9ce 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -39,6 +39,7 @@ import openerp.sql_db as sql_db import openerp.tools as tools import openerp.modules import openerp.exceptions +from openerp.service import http_server #.apidoc title: Exported Service methods #.apidoc module-mods: member-order: bysource diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py index a4bdebcec27..1e276ab7fa2 100644 --- a/openerp/service/websrv_lib.py +++ b/openerp/service/websrv_lib.py @@ -32,9 +32,6 @@ usable in other projects, too. """ -import socket -import base64 -import errno import SocketServer from BaseHTTPServer import * from SimpleHTTPServer import SimpleHTTPRequestHandler diff --git a/openerp/sql_db.py b/openerp/sql_db.py index 63ab2a13fb9..82851abd034 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -37,8 +37,7 @@ __all__ = ['db_connect', 'close_db'] from threading import currentThread import logging -from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE,\ - ISOLATION_LEVEL_REPEATABLE_READ +from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_REPEATABLE_READ from psycopg2.psycopg1 import cursor as psycopg1cursor from psycopg2.pool import PoolError @@ -421,7 +420,7 @@ class ConnectionPool(object): try: result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection) - except psycopg2.Error, e: + except psycopg2.Error: self.__logger.exception('Connection to the database failed') raise self._connections.append((result, True)) diff --git a/openerp/tests/common.py b/openerp/tests/common.py index 57ebead925e..44696384ce7 100644 --- a/openerp/tests/common.py +++ b/openerp/tests/common.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import os import time -import unittest2 import xmlrpclib import openerp diff --git a/openerp/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py index c926a52ed64..2e9623c09b9 100644 --- a/openerp/tests/test_ir_sequence.py +++ b/openerp/tests/test_ir_sequence.py @@ -7,11 +7,8 @@ # > OPENERP_ADDONS_PATH='../../../addons/trunk' OPENERP_PORT=8069 \ # OPENERP_DATABASE=yy PYTHONPATH=../:. unit2 test_ir_sequence # This assume an existing database. -import os import psycopg2 -import time import unittest2 -import xmlrpclib import openerp import common diff --git a/openerp/tests/test_xmlrpc.py b/openerp/tests/test_xmlrpc.py index 65d40af866a..954d3447360 100644 --- a/openerp/tests/test_xmlrpc.py +++ b/openerp/tests/test_xmlrpc.py @@ -6,7 +6,6 @@ # OPENERP_DATABASE=yy nosetests tests/test_xmlrpc.py # > OPENERP_ADDONS_PATH='../../../addons/trunk' OPENERP_PORT=8069 \ # OPENERP_DATABASE=yy PYTHONPATH=../:. unit2 test_xmlrpc -import os import time import unittest2 import xmlrpclib From 290961f08a60720c7bcf1c892645219537514c68 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sun, 15 Jan 2012 22:47:02 +0100 Subject: [PATCH 039/170] [REF] consistently use simplejson as json library. bzr revid: florent.xicluna@gmail.com-20120115214702-dh7i7w17ubepc6eo --- openerp/osv/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 3a8448e22e5..c8226d27dfe 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -46,7 +46,7 @@ import openerp.netsvc as netsvc import openerp.tools as tools from openerp.tools.translate import _ from openerp.tools import float_round, float_repr -import json +import simplejson as json def _symbol_set(symb): if symb == None or symb == False: From 9f3096d31f10fd08ee2b6015c48f35a7b4f3669f Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 16 Jan 2012 00:52:15 +0100 Subject: [PATCH 040/170] [FIX] missing import and remove unused vars. bzr revid: florent.xicluna@gmail.com-20120115235215-6dgoxyu270bsquba --- openerp/wsgi.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openerp/wsgi.py b/openerp/wsgi.py index 193d30fb285..b2624e13612 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -30,12 +30,12 @@ import urllib import xmlrpclib import StringIO +import errno import logging import os import signal import sys import threading -import time import traceback import openerp @@ -261,7 +261,7 @@ def http_to_wsgi(http_dir): def wsgi_handler(environ, start_response): # Extract from the WSGI environment the necessary data. - scheme = environ['wsgi.url_scheme'] + # scheme = environ['wsgi.url_scheme'] headers = {} for key, value in environ.items(): @@ -426,7 +426,7 @@ def serve(): import werkzeug.serving httpd = werkzeug.serving.make_server(interface, port, application, threaded=True) logging.getLogger('wsgi').info('HTTP service (werkzeug) running on %s:%s', interface, port) - except ImportError, e: + except ImportError: import wsgiref.simple_server logging.getLogger('wsgi').warn('Werkzeug module unavailable, falling back to wsgiref.') httpd = wsgiref.simple_server.make_server(interface, port, application) @@ -457,7 +457,6 @@ arbiter_pid = None def on_starting(server): global arbiter_pid arbiter_pid = os.getpid() # TODO check if this is true even after replacing the executable - config = openerp.tools.config #openerp.tools.cache = kill_workers_cache openerp.netsvc.init_logger() openerp.osv.osv.start_object_proxy() @@ -499,7 +498,7 @@ def kill_workers(): except OSError, e: if e.errno == errno.ESRCH: # no such pid return - raise + raise class kill_workers_cache(openerp.tools.ormcache): def clear(self, dbname, *args, **kwargs): From f51dc9a0bd7a19a9e3a5dacba4ecd83a0c9e0edc Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 16 Jan 2012 00:52:35 +0100 Subject: [PATCH 041/170] [FIX] handle correctly the case when the PATH_INFO ends with a slash. bzr revid: florent.xicluna@gmail.com-20120115235235-kw4vvmp622q8843f --- openerp/wsgi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/wsgi.py b/openerp/wsgi.py index b2624e13612..09d9264966b 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -152,7 +152,7 @@ def wsgi_xmlrpc_1(environ, start_response): path = environ['PATH_INFO'][len(XML_RPC_PATH_1):] if path.startswith('/'): path = path[1:] - if path.endswith('/'): p = path[:-1] + if path.endswith('/'): path = path[:-1] path = path.split('/') # All routes are hard-coded. @@ -196,7 +196,7 @@ def wsgi_xmlrpc(environ, start_response): path = environ['PATH_INFO'][len(XML_RPC_PATH):] if path.startswith('/'): path = path[1:] - if path.endswith('/'): p = path[:-1] + if path.endswith('/'): path = path[:-1] path = path.split('/') # All routes are hard-coded. From 293ee2f2d457038c14df853733688175d0b2a02f Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 16 Jan 2012 12:15:26 +0530 Subject: [PATCH 042/170] [IMP] hr_attendance : Improved Test Cases. bzr revid: mdi@tinyerp.com-20120116064526-i1o9qwq4nxlv01yx --- .../hr_attendance/test/attendance_process.yml | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml index 5c83ba25aa1..7d76ee79e74 100644 --- a/addons/hr_attendance/test/attendance_process.yml +++ b/addons/hr_attendance/test/attendance_process.yml @@ -43,42 +43,62 @@ employee_id: hr.employee_fp name: !eval time.strftime('%Y-%m-%d 09:59:25') action: 'sign_in' +- + In order to check that first attendance must be Sign In. +- + !python {model: hr.attendance}: | + import time + try: + self.create(cr, uid, {'employee_id': ref('hr.employee_niv'), 'name': time.strftime('%Y-%m-%d 09:59:25'), 'action': 'sign_out'}, None) + except Exception, e: + assert e[0]=='ValidateError', e +- + First of all, Employee Sign's In. +- + !record {model: hr.attendance, id: hr_attendance_0}: + employee_id: hr.employee_niv + name: !eval time.strftime('%Y-%m-%d 09:59:25') + action: 'sign_in' - Now Employee is going to Sign In prior to First Sign In. - !python {model: hr.attendance}: | + import time try: - self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 08:59:25'), action: 'sign_in'}, None) + self.create(cr, uid, {'employee_id': ref('hr.employee_niv'), 'name': time.strftime('%Y-%m-%d 08:59:25'), 'action': 'sign_in'}, None) except Exception, e: - assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' + assert e[0]=='ValidateError', e - After that Employee is going to Sign In after First Sign In. - !python {model: hr.attendance}: | + import time try: - self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 10:59:25'), action: 'sign_in'}, None) + self.create(cr, uid, {'employee_id': ref('hr.employee_niv'), 'name': time.strftime('%Y-%m-%d 10:59:25'), 'action': 'sign_in'}, None) except Exception, e: - assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' + assert e[0]=='ValidateError', e - After two hours, Employee Sign's Out. - - !record {model: hr.attendance, id: hr_attendance_4}: - employee_id: hr.employee_fp + !record {model: hr.attendance, id: hr_attendance_1}: + employee_id: hr.employee_niv name: !eval time.strftime('%Y-%m-%d 11:59:25') action: 'sign_out' - Now Employee is going to Sign Out prior to First Sign Out. - !python {model: hr.attendance}: | + import time try: - self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 10:59:25'), action: 'sign_out'}, None) + self.create(cr, uid, {'employee_id': ref('hr.employee_niv'), 'name': time.strftime('%Y-%m-%d 10:59:25'), 'action': 'sign_out'}, None) except Exception, e: - assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' + assert e[0]=='ValidateError', e - After that Employee is going to Sign Out After First Sign Out. - !python {model: hr.attendance}: | + import time try: - self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 12:59:25'), action: 'sign_out'}, None) + self.create(cr, uid, {'employee_id': ref('hr.employee_niv'), 'name': time.strftime('%Y-%m-%d 12:59:25'), 'action': 'sign_out'}, None) except Exception, e: - assert e, 'Sign In (resp. Sign Out) must follow Sign Out (resp. Sign In)' + assert e[0]=='ValidateError', e From 7db3e24af994a60cdb26cb8074717aa153e506c8 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 16 Jan 2012 12:30:12 +0530 Subject: [PATCH 043/170] [IMP] hr_attendance : Improved Test Cases. bzr revid: mdi@tinyerp.com-20120116070012-8blt2ov12b0qx74b --- addons/hr_attendance/test/attendance_process.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml index 7d76ee79e74..4ad765d65df 100644 --- a/addons/hr_attendance/test/attendance_process.yml +++ b/addons/hr_attendance/test/attendance_process.yml @@ -30,21 +30,6 @@ - state == 'absent' - In order to check that first attendance must be Sign In. -- - !python {model: hr.attendance}: | - try: - self.create(cr, uid, {employee_id: hr.employee_fp, name: time.strftime('%Y-%m-%d 09:59:25'), action: 'sign_out'}, None) - except Exception, e: - assert e, 'The first attendance must be Sign In' -- - First of all, Employee Sign's In. -- - !record {model: hr.attendance, id: hr_attendance_1}: - employee_id: hr.employee_fp - name: !eval time.strftime('%Y-%m-%d 09:59:25') - action: 'sign_in' -- - In order to check that first attendance must be Sign In. - !python {model: hr.attendance}: | import time From 61f200141499e8476a24039d4de67ba7aeccd6e7 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 16 Jan 2012 14:51:55 +0530 Subject: [PATCH 044/170] [FIX] account_followup : Cannot create a followup if i am not admin lp bug: https://launchpad.net/bugs/915426 fixed bzr revid: mdi@tinyerp.com-20120116092155-bcjql4skjlvottgh --- addons/account_followup/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv index 75af9bf44f2..57292899825 100644 --- a/addons/account_followup/security/ir.model.access.csv +++ b/addons/account_followup/security/ir.model.access.csv @@ -2,5 +2,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_user,1,0,0,0 access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1 access_account_followup_followup_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_user,1,0,0,0 +access_account_followup_followup_manager,account_followup.followup.manager,model_account_followup_followup,account.group_account_manager,1,1,1,1 access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,1,1 access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_manager,1,1,1,1 From 1497062ba1dbfd814c69fa4250c4eb6a09a5206a Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 16 Jan 2012 11:43:29 +0100 Subject: [PATCH 045/170] [IMP] Removed the openerp.addons prefix when loading modules in stand-alone mode. Changed the import web.common to relative import (because the the import-hook in the server is not able to load modules with self-referential import). bzr revid: vmt@openerp.com-20120116104329-k68li2vul4b3j7ry --- addons/web/common/http.py | 11 ++++++---- addons/web/controllers/main.py | 40 +++++++++++++++++----------------- openerp-web | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 1e84689caad..f3ac8d0bcd9 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -403,7 +403,7 @@ class Root(object): only used in case the list of databases is requested by the server, will be filtered by this pattern """ - def __init__(self, options): + def __init__(self, options, openerp_addons_namespace=True): self.root = '/web/webclient/home' self.config = options @@ -417,7 +417,7 @@ class Root(object): self.session_cookie = 'sessionid' self.addons = {} - static_dirs = self._load_addons() + static_dirs = self._load_addons(openerp_addons_namespace) if options.serve_static: self.dispatch = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs) @@ -471,7 +471,7 @@ class Root(object): return response(environ, start_response) - def _load_addons(self): + def _load_addons(self, openerp_addons_namespace=True): """ Loads all addons at the specified addons path, returns a mapping of static URLs to the corresponding directories @@ -486,7 +486,10 @@ class Root(object): manifest = ast.literal_eval(open(manifest_path).read()) manifest['addons_path'] = addons_path _logger.info("Loading %s", module) - m = __import__('openerp.addons.' + module) + if openerp_addons_namespace: + m = __import__('openerp.addons.' + module) + else: + m = __import__(module) addons_module[module] = m addons_manifest[module] = manifest statics['/%s/static' % module] = path_static diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 852d5138177..e8760eca203 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -19,8 +19,8 @@ from cStringIO import StringIO import babel.messages.pofile import werkzeug.utils -import web.common -openerpweb = web.common.http +from .. import common +openerpweb = common.http #---------------------------------------------------------- # OpenERP Web web Controllers @@ -249,7 +249,7 @@ class WebClient(openerpweb.Controller): @openerpweb.jsonrequest def version_info(self, req): return { - "version": web.common.release.version + "version": common.release.version } class Proxy(openerpweb.Controller): @@ -382,7 +382,7 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def authenticate(self, req, db, login, password, base_location=None): wsgienv = req.httprequest.environ - release = web.common.release + release = common.release env = dict( base_location=base_location, HTTP_HOST=wsgienv['HTTP_HOST'], @@ -476,8 +476,8 @@ class Session(openerpweb.Controller): no group by should be performed) """ context, domain = eval_context_and_domain(req.session, - web.common.nonliterals.CompoundContext(*(contexts or [])), - web.common.nonliterals.CompoundDomain(*(domains or []))) + common.nonliterals.CompoundContext(*(contexts or [])), + common.nonliterals.CompoundDomain(*(domains or []))) group_by_sequence = [] for candidate in (group_by_seq or []): @@ -837,14 +837,14 @@ class DataSet(openerpweb.Controller): def _call_kw(self, req, model, method, args, kwargs): for i in xrange(len(args)): - if isinstance(args[i], web.common.nonliterals.BaseContext): + if isinstance(args[i], common.nonliterals.BaseContext): args[i] = req.session.eval_context(args[i]) - elif isinstance(args[i], web.common.nonliterals.BaseDomain): + elif isinstance(args[i], common.nonliterals.BaseDomain): args[i] = req.session.eval_domain(args[i]) for k in kwargs.keys(): - if isinstance(kwargs[k], web.common.nonliterals.BaseContext): + if isinstance(kwargs[k], common.nonliterals.BaseContext): kwargs[k] = req.session.eval_context(kwargs[k]) - elif isinstance(kwargs[k], web.common.nonliterals.BaseDomain): + elif isinstance(kwargs[k], common.nonliterals.BaseDomain): kwargs[k] = req.session.eval_domain(kwargs[k]) return getattr(req.session.model(model), method)(*args, **kwargs) @@ -923,7 +923,7 @@ class View(openerpweb.Controller): xml = self.transform_view(arch, session, evaluation_context) else: xml = ElementTree.fromstring(arch) - fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, preserve_whitespaces) + fvg['arch'] = common.xml2json.Xml2Json.convert_element(xml, preserve_whitespaces) for field in fvg['fields'].itervalues(): if field.get('views'): @@ -1014,7 +1014,7 @@ class View(openerpweb.Controller): def parse_domain(domain, session): """ Parses an arbitrary string containing a domain, transforms it - to either a literal domain or a :class:`web.common.nonliterals.Domain` + to either a literal domain or a :class:`common.nonliterals.Domain` :param domain: the domain to parse, if the domain is not a string it is assumed to be a literal domain and is returned as-is @@ -1027,11 +1027,11 @@ def parse_domain(domain, session): return ast.literal_eval(domain) except ValueError: # not a literal - return web.common.nonliterals.Domain(session, domain) + return common.nonliterals.Domain(session, domain) def parse_context(context, session): """ Parses an arbitrary string containing a context, transforms it - to either a literal context or a :class:`web.common.nonliterals.Context` + to either a literal context or a :class:`common.nonliterals.Context` :param context: the context to parse, if the context is not a string it is assumed to be a literal domain and is returned as-is @@ -1043,7 +1043,7 @@ def parse_context(context, session): try: return ast.literal_eval(context) except ValueError: - return web.common.nonliterals.Context(session, context) + return common.nonliterals.Context(session, context) class ListView(View): _cp_path = "/web/listview" @@ -1107,10 +1107,10 @@ class SearchView(View): @openerpweb.jsonrequest def save_filter(self, req, model, name, context_to_save, domain): Model = req.session.model("ir.filters") - ctx = web.common.nonliterals.CompoundContext(context_to_save) + ctx = common.nonliterals.CompoundContext(context_to_save) ctx.session = req.session ctx = ctx.evaluate() - domain = web.common.nonliterals.CompoundDomain(domain) + domain = common.nonliterals.CompoundDomain(domain) domain.session = req.session domain = domain.evaluate() uid = req.session._uid @@ -1125,10 +1125,10 @@ class SearchView(View): @openerpweb.jsonrequest def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''): - ctx = web.common.nonliterals.CompoundContext(context_to_save) + ctx = common.nonliterals.CompoundContext(context_to_save) ctx.session = req.session ctx = ctx.evaluate() - domain = web.common.nonliterals.CompoundDomain(domain) + domain = common.nonliterals.CompoundDomain(domain) domain.session = req.session domain = domain.evaluate() @@ -1554,7 +1554,7 @@ class Reports(View): report_srv = req.session.proxy("report") context = req.session.eval_context( - web.common.nonliterals.CompoundContext( + common.nonliterals.CompoundContext( req.context or {}, action[ "context"])) report_data = {} diff --git a/openerp-web b/openerp-web index a3b3d2fa1d5..ec72085db2c 100755 --- a/openerp-web +++ b/openerp-web @@ -86,7 +86,7 @@ if __name__ == "__main__": else: logging.basicConfig(level=getattr(logging, options.log_level.upper())) - app = web.common.http.Root(options) + app = web.common.http.Root(options, openerp_addons_namespace=False) if options.proxy_mode: app = werkzeug.contrib.fixers.ProxyFix(app) From 7d11edee231e341df3f91f25de0c723acb9e0266 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 16 Jan 2012 15:06:02 +0100 Subject: [PATCH 046/170] [FIX] link between binary field and its name is @filename, not @fieldname bzr revid: xmo@openerp.com-20120116140602-c25sjyrp3l6wpnow --- addons/account_coda/account_coda_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index dad84f8f727..0df8d0acdb4 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -243,7 +243,7 @@ - + From 4910de7f3c6a6f8fd8c53906b367168223de733b Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 16 Jan 2012 15:55:24 +0100 Subject: [PATCH 047/170] [FIX] NameError in jsonp POST. bzr revid: florent.xicluna@gmail.com-20120116145524-razqfr39bf4b4t9v --- addons/web/common/http.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 681a38384a2..3e6ee257ea3 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -146,7 +146,8 @@ class JsonRequest(WebRequest): if jsonp and self.httprequest.method == 'POST': # jsonp 2 steps step1 POST: save call self.init(args) - req.session.jsonp_requests[args.get('id')] = self.httprequest.form['r'] + request_id = args.get('id') + self.session.jsonp_requests[request_id] = self.httprequest.form['r'] headers=[('Content-Type', 'text/plain; charset=utf-8')] r = werkzeug.wrappers.Response(request_id, headers=headers) return r From 299026589d9e9e8574f5ebcfed79a605c4a1f59f Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Mon, 16 Jan 2012 16:37:35 +0100 Subject: [PATCH 048/170] [FIX] l10n_fr: incorrect name for chart of accounts template bzr revid: ls@numerigraphe.fr-20120116153735-htsceg2a8fpu3r5b --- addons/l10n_fr/fr_pcg_taxes_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_fr/fr_pcg_taxes_demo.xml b/addons/l10n_fr/fr_pcg_taxes_demo.xml index 54a8d2d7444..de078b4a82a 100644 --- a/addons/l10n_fr/fr_pcg_taxes_demo.xml +++ b/addons/l10n_fr/fr_pcg_taxes_demo.xml @@ -358,7 +358,7 @@ - France PCMN + Plan Comptable Général (France) From 4d208734ec79a5d2fc8e9a3c4507c517d19fb8e2 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 16 Jan 2012 19:33:28 +0100 Subject: [PATCH 049/170] =?UTF-8?q?[FIX]=C2=A0missing=20imports=20and=20ty?= =?UTF-8?q?po=20in=20=5F=5Fall=5F=5F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: florent.xicluna@gmail.com-20120116183328-m9isnoipj8taeke3 --- addons/web/__init__.py | 1 - addons/web/common/nonliterals.py | 2 +- addons/web/common/xml2json.py | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web/__init__.py b/addons/web/__init__.py index b09c8c213bc..36dead8ab74 100644 --- a/addons/web/__init__.py +++ b/addons/web/__init__.py @@ -1,7 +1,6 @@ import common import controllers import logging -import optparse _logger = logging.getLogger(__name__) diff --git a/addons/web/common/nonliterals.py b/addons/web/common/nonliterals.py index f6e81894a4c..0f5248edf33 100644 --- a/addons/web/common/nonliterals.py +++ b/addons/web/common/nonliterals.py @@ -8,7 +8,7 @@ import binascii import hashlib import simplejson.encoder -__all__ = ['Domain', 'Context', 'NonLiteralEncoder, non_literal_decoder', 'CompoundDomain', 'CompoundContext'] +__all__ = ['Domain', 'Context', 'NonLiteralEncoder', 'non_literal_decoder', 'CompoundDomain', 'CompoundContext'] #: 48 bits should be sufficient to have almost no chance of collision #: with a million hashes, according to hg@67081329d49a diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py index 1f2e74691b9..d67d78480d4 100644 --- a/addons/web/common/xml2json.py +++ b/addons/web/common/xml2json.py @@ -3,6 +3,9 @@ # New BSD Licensed # # URL: http://code.google.com/p/xml2json-direct/ +import simplejson +from xml.etree import ElementTree + class Xml2Json(object): @staticmethod From 5cb4d484d8158c776591b2ec08953453f661bfa6 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 17 Jan 2012 05:08:29 +0000 Subject: [PATCH 050/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120117050829-rk831bjkq228jk0l --- addons/web/po/pt_BR.po | 36 +++++++++++++++++++++++------ addons/web_dashboard/po/pt_BR.po | 32 +++++++++++++------------ addons/web_default_home/po/pt_BR.po | 4 ++-- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/addons/web/po/pt_BR.po b/addons/web/po/pt_BR.po index 4be0c66826c..eb3e427a769 100644 --- a/addons/web/po/pt_BR.po +++ b/addons/web/po/pt_BR.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-15 02:47+0000\n" -"Last-Translator: Renato Lima - http://www.akretion.com " -"\n" +"PO-Revision-Date: 2012-01-16 13:38+0000\n" +"Last-Translator: Rafael Sales \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-16 05:27+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-17 05:08+0000\n" +"X-Generator: Launchpad (build 14676)\n" #: addons/web/static/src/js/chrome.js:162 #: addons/web/static/src/js/chrome.js:175 @@ -626,7 +625,7 @@ msgstr "Visão de Depuração#" #: addons/web/static/src/xml/base.xml:0 msgid "- Fields View Get" -msgstr "" +msgstr "- Fields View Get" #: addons/web/static/src/xml/base.xml:0 msgid "- Edit" @@ -786,7 +785,7 @@ msgstr "Botão" #: addons/web/static/src/xml/base.xml:0 msgid "(no string)" -msgstr "" +msgstr "(sem string)" #: addons/web/static/src/xml/base.xml:0 msgid "Special:" @@ -875,6 +874,10 @@ msgid "" " You can export all data or only the fields that can be " "reimported after modification." msgstr "" +"Este assistente irá exportar todos os dados que corresponda aos critérios de " +"pesquisa atual em um arquivo CSV.\n" +" Você pode exportar todos os dados ou apenas os campos que podem " +"ser reimportados após a modificação." #: addons/web/static/src/xml/base.xml:0 msgid "Export Type:" @@ -945,6 +948,10 @@ msgid "" "Select a .CSV file to import. If you need a sample of file to import,\n" " you should use the export tool with the \"Import Compatible\" option." msgstr "" +"Selecionar um arquivo .CSV para importar. Se você precisar de uma amostra do " +"arquivo para importação,\n" +" você deve usar a ferramenta de exportação com a opção \"Importação " +"Compatível\"." #: addons/web/static/src/xml/base.xml:0 msgid "CSV File:" @@ -1039,6 +1046,13 @@ msgid "" "supply chain,\n" " project management, production, services, CRM, etc..." msgstr "" +"é um sistema de software livre de escala empresarial que é projetado para " +"aumentar\n" +" produtividade e lucro através da integração de dados. Ele se " +"conecta, melhora e\n" +" gerencia os processos de negócio em áreas como vendas, " +"finanças, supply chain,\n" +" gerenciamento de projetos, produção, serviços, CRM, etc .." #: addons/web/static/src/xml/base.xml:0 msgid "" @@ -1051,6 +1065,14 @@ msgid "" " production system and migration to a new version to be " "straightforward." msgstr "" +"É um sistema independente de plataforma, onde pode ser instalado em " +"ambientes Windows, Mac OS X,\n" +" e várias distribuições Linux ou baseadas em Unix. Sua " +"arquitetura permite que\n" +" novas funcionalidades sejam criadas rapidamente, e modificações " +"possam ser realizadas em um\n" +" sistema de produção e sua migração para uma nova versão de " +"forma simples." #: addons/web/static/src/xml/base.xml:0 msgid "" diff --git a/addons/web_dashboard/po/pt_BR.po b/addons/web_dashboard/po/pt_BR.po index 2d089f77849..615b35f2306 100644 --- a/addons/web_dashboard/po/pt_BR.po +++ b/addons/web_dashboard/po/pt_BR.po @@ -8,34 +8,34 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-14 15:57+0000\n" +"PO-Revision-Date: 2012-01-16 13:49+0000\n" "Last-Translator: Rafael Sales \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-15 05:35+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-17 05:08+0000\n" +"X-Generator: Launchpad (build 14676)\n" #: addons/web_dashboard/static/src/js/dashboard.js:63 msgid "Edit Layout" -msgstr "" +msgstr "Editar Layout" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Reset" -msgstr "" +msgstr "Restaurar" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Change layout" -msgstr "" +msgstr "Mudar Layout" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid " " -msgstr "" +msgstr " " #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Create" -msgstr "" +msgstr "Criar" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Choose dashboard layout" @@ -43,34 +43,36 @@ msgstr "Escolha o Layout do Painel" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "progress:" -msgstr "" +msgstr "progresso:" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "%" -msgstr "" +msgstr "%" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "" "Click on the functionalites listed below to launch them and configure your " "system" msgstr "" +"Clique em alguma funcionalidade listada abaixo para ativa-lá e configurar no " +"seu sistema" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Welcome to OpenERP" -msgstr "" +msgstr "Bem Vindo ao OpenERP" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Remember to bookmark this page." -msgstr "" +msgstr "Lembre-se de adicionar esta página as seus favoritos." #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Remember your login:" -msgstr "" +msgstr "Lembre-se de seu login:" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Choose the first OpenERP Application you want to install.." -msgstr "" +msgstr "Escolha a primeira Aplicação OpenERP que você deseja instalar.." #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Please choose the first application to install." -msgstr "" +msgstr "Por favor, escolha a primeira aplicação para instalar." diff --git a/addons/web_default_home/po/pt_BR.po b/addons/web_default_home/po/pt_BR.po index 286fdf4f1e0..0d245f81e9d 100644 --- a/addons/web_default_home/po/pt_BR.po +++ b/addons/web_default_home/po/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-16 05:27+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-17 05:08+0000\n" +"X-Generator: Launchpad (build 14676)\n" #: addons/web_default_home/static/src/xml/web_default_home.xml:0 msgid "Welcome to your new OpenERP instance." From 5f4c443a02c572f3255c5c730e79afe2c3ba4c55 Mon Sep 17 00:00:00 2001 From: "ksa (OpenERP)" Date: Tue, 17 Jan 2012 14:10:38 +0530 Subject: [PATCH 051/170] [FIX]:mrp unclear text lp bug: https://launchpad.net/bugs/916539 fixed bzr revid: ksa@tinyerp.com-20120117084038-r65jh2j7dcnrion1 --- addons/mrp_operations/mrp_operations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 12e30ca9b0b..e8e83cef7ff 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -97,7 +97,7 @@ class mrp_production_workcenter_line(osv.osv): 'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'), 'date_start': fields.datetime('Start Date'), 'date_finished': fields.datetime('End Date'), - 'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this Work Center",readonly=True), + 'delay': fields.float('Working Hours',help="This is delay time between operation start and stop in this Work Center",readonly=True), 'production_state':fields.related('production_id','state', type='selection', selection=[('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')], From 20e0358e9ce18ab27d6ea7e57a29f32d60eb793d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 09:58:12 +0100 Subject: [PATCH 052/170] [FIX] finish implementing xmo@openerp.com-20120116095337-ko0y6xha6oqx4vw1 for real bzr revid: xmo@openerp.com-20120117085812-gh3cowtxfcs84sss --- addons/web/static/src/js/data_export.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 78be735edc7..3d15a4e3607 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -364,9 +364,8 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ on_click_export_data: function() { var self = this; var exported_fields = this.$element.find('#fields_list option').map(function () { - var name = self.records[this.value] || this.value // DOM property is textContent, but IE8 only knows innerText - return {name: this.value, + return {name: self.records[this.value] || this.value, label: this.textContent || this.innerText}; }).get(); From e99358e2fa673e611ca4fd94d849151a0374d89f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 10:47:48 +0100 Subject: [PATCH 053/170] [IMP] Xml2JSON: remove useless class indirection and unused methods bzr revid: xmo@openerp.com-20120117094748-g9470elsdpx78im8 --- addons/web/common/xml2json.py | 54 +++++++++++++--------------------- addons/web/controllers/main.py | 2 +- 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py index ab134b09786..df3aad67fa5 100644 --- a/addons/web/common/xml2json.py +++ b/addons/web/common/xml2json.py @@ -3,38 +3,24 @@ # New BSD Licensed # # URL: http://code.google.com/p/xml2json-direct/ -import simplejson -from xml.etree import ElementTree -class Xml2Json(object): - @staticmethod - def convert_to_json(s): - return simplejson.dumps( - Xml2Json.convert_to_structure(s), sort_keys=True, indent=4) - - @staticmethod - def convert_to_structure(s): - root = ElementTree.fromstring(s) - return Xml2Json.convert_element(root) - - @staticmethod - def convert_element(el, preserve_whitespaces=False): - res = {} - if el.tag[0] == "{": - ns, name = el.tag.rsplit("}", 1) - res["tag"] = name - res["namespace"] = ns[1:] - else: - res["tag"] = el.tag - res["attrs"] = {} - for k, v in el.items(): - res["attrs"][k] = v - kids = [] - if el.text and (preserve_whitespaces or el.text.strip() != ''): - kids.append(el.text) - for kid in el: - kids.append(Xml2Json.convert_element(kid, preserve_whitespaces)) - if kid.tail and (preserve_whitespaces or kid.tail.strip() != ''): - kids.append(kid.tail) - res["children"] = kids - return res +def from_elementtree(el, preserve_whitespaces=False): + res = {} + if el.tag[0] == "{": + ns, name = el.tag.rsplit("}", 1) + res["tag"] = name + res["namespace"] = ns[1:] + else: + res["tag"] = el.tag + res["attrs"] = {} + for k, v in el.items(): + res["attrs"][k] = v + kids = [] + if el.text and (preserve_whitespaces or el.text.strip() != ''): + kids.append(el.text) + for kid in el: + kids.append(from_elementtree(kid, preserve_whitespaces)) + if kid.tail and (preserve_whitespaces or kid.tail.strip() != ''): + kids.append(kid.tail) + res["children"] = kids + return res diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 191f184da5b..7b2ad5b311c 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -933,7 +933,7 @@ class View(openerpweb.Controller): xml = self.transform_view(arch, session, evaluation_context) else: xml = ElementTree.fromstring(arch) - fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, preserve_whitespaces) + fvg['arch'] = web.common.xml2json.from_elementtree(xml, preserve_whitespaces) for field in fvg['fields'].itervalues(): if field.get('views'): From 246fee51c655adb4a1dd64f39db191299199ecc9 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 17 Jan 2012 11:32:17 +0100 Subject: [PATCH 054/170] [IMP] Updated jquery.tipTip bzr revid: fme@openerp.com-20120117103217-jmjhm6i1baaljmty --- .../lib/jquery.tipTip/jquery.tipTip.fme.patch | 58 -- .../static/lib/jquery.tipTip/jquery.tipTip.js | 513 +++++++++++------- .../lib/jquery.tipTip/jquery.tipTip_old.js | 191 ------- .../web/static/lib/jquery.tipTip/tipTip.css | 27 +- addons/web/static/src/js/view_form.js | 1 - 5 files changed, 345 insertions(+), 445 deletions(-) delete mode 100644 addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch delete mode 100644 addons/web/static/lib/jquery.tipTip/jquery.tipTip_old.js diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch deleted file mode 100644 index 1a62870a6b0..00000000000 --- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- jquery.tipTip_old.js 2011-12-01 14:15:35.000000000 +0100 -+++ jquery.tipTip.js 2011-12-07 12:32:32.000000000 +0100 -@@ -20,6 +20,9 @@ - */ - - (function($){ -+ $.tipTipClear = function() { -+ $("#tiptip_holder").remove(); -+ } - $.fn.tipTip = function(options) { - var defaults = { - activation: "hover", -@@ -31,7 +34,7 @@ - fadeIn: 200, - fadeOut: 200, - attribute: "title", -- content: false, // HTML or String to fill TipTIp with -+ content: false, // HTML String or function to fill TipTIp with - enter: function(){}, - exit: function(){} - }; -@@ -51,12 +54,7 @@ - - return this.each(function(){ - var org_elem = $(this); -- if(opts.content){ -- var org_title = opts.content; -- } else { -- var org_title = org_elem.attr(opts.attribute); -- } -- if(org_title != ""){ -+ if(opts.content || org_elem.attr(opts.attribute)){ - if(!opts.content){ - org_elem.removeAttr(opts.attribute); //remove original Attribute - } -@@ -99,6 +97,8 @@ - - function active_tiptip(){ - opts.enter.call(this); -+ var org_title = typeof opts.content === 'function' ? opts.content.call(org_elem, opts) : opts.content; -+ org_title = org_title || org_elem.attr(opts.attribute); - tiptip_content.html(org_title); - tiptip_holder.hide().removeAttr("class").css("margin","0"); - tiptip_arrow.removeAttr("style"); -@@ -177,7 +177,12 @@ - tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class); - - if (timeout){ clearTimeout(timeout); } -- timeout = setTimeout(function(){ tiptip_holder.stop(true,true).fadeIn(opts.fadeIn); }, opts.delay); -+ timeout = setTimeout(function() { -+ tiptip_holder.stop(true,true); -+ if ($.contains(document.documentElement, org_elem[0])) { -+ tiptip_holder.fadeIn(opts.fadeIn); -+ } -+ }, opts.delay); - } - - function deactive_tiptip(){ diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js index 522df828003..ff8cc1b0ba6 100644 --- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js +++ b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js @@ -1,196 +1,325 @@ - /* - * TipTip - * Copyright 2010 Drew Wilson - * www.drewwilson.com - * code.drewwilson.com/entry/tiptip-jquery-plugin - * - * Version 1.3 - Updated: Mar. 23, 2010 - * - * This Plug-In will create a custom tooltip to replace the default - * browser tooltip. It is extremely lightweight and very smart in - * that it detects the edges of the browser window and will make sure - * the tooltip stays within the current window size. As a result the - * tooltip will adjust itself to be displayed above, below, to the left - * or to the right depending on what is necessary to stay within the - * browser window. It is completely customizable as well via CSS. - * - * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ +/* +* TipTip +* Copyright 2010 Drew Wilson +* www.drewwilson.com +* code.drewwilson.com/entry/tiptip-jquery-plugin +* +* Version 1.3 - Updated: Mar. 23, 2010 +* +* This Plug-In will create a custom tooltip to replace the default +* browser tooltip. It is extremely lightweight and very smart in +* that it detects the edges of the browser window and will make sure +* the tooltip stays within the current window size. As a result the +* tooltip will adjust itself to be displayed above, below, to the left +* or to the right depending on what is necessary to stay within the +* browser window. It is completely customizable as well via CSS. +* +* This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: +* http://www.opensource.org/licenses/mit-license.php +* http://www.gnu.org/licenses/gpl.html +*/ -(function($){ - $.tipTipClear = function() { - $("#tiptip_holder").remove(); +(function ($) { + $.fn.tipTip = function (options) { + + var defaults = { + activation: 'hover', // How to show (and hide) the tooltip. Can be: hover, focus, click and manual. + keepAlive: false, // When true the tooltip won't disapper when the mouse moves away from the element. Instead it will be hidden when it leaves the tooltip. + maxWidth: '200px', // The max-width to set on the tooltip. You may also use the option cssClass to set this. + edgeOffset: 0, // The offset between the tooltip arrow edge and the element that has the tooltip. + defaultPosition: 'bottom', // The position of the tooltip. Can be: top, right, bottom and left. + delay: 400, // The delay in msec to show a tooltip. + fadeIn: 200, // The length in msec of the fade in. + fadeOut: 200, // The length in msec of the fade out. + attribute: 'title', // The attribute to fetch the tooltip text if the option content is false. + content: false, // HTML or String or Function (that returns HTML or String) to fill TipTIp with + enter: function () { }, // Callback function before a tooltip is shown. + afterEnter: function () { }, // Callback function after a tooltip is shown. + exit: function () { }, // Callback function before a tooltip is hidden. + afterExit: function () { }, // Callback function after a tooltip is hidden. + cssClass: '', // CSS class that will be applied on the tooltip before showing only for this instance of tooltip. + detectTextDir: true // When false auto-detection for right-to-left text will be disable (When true affects a bit the performance). + }; + + // Setup tip tip elements and render them to the DOM + if ($('#tiptip_holder').length <= 0) { + var tiptip_inner_arrow = $('
', { id: 'tiptip_arrow_inner' }), + tiptip_arrow = $('
', { id: 'tiptip_arrow' }).append(tiptip_inner_arrow), + tiptip_content = $('
', { id: 'tiptip_content' }), + tiptip_holder = $('
', { id: 'tiptip_holder' }).append(tiptip_arrow).append(tiptip_content); + $('body').append(tiptip_holder); + } else { + var tiptip_holder = $('#tiptip_holder'), + tiptip_content = $('#tiptip_content'), + tiptip_arrow = $('#tiptip_arrow'); + } + + return this.each(function () { + var org_elem = $(this), + data = org_elem.data('tipTip'), + opts = data && data.options || $.extend({}, defaults, options), + callback_data = { + holder: tiptip_holder, + content: tiptip_content, + arrow: tiptip_arrow, + options: opts + }; + + if (data) { + switch (options) { + case 'show': + activate(); + break; + case 'hide': + deactivate(); + break; + case 'destroy': + org_elem.unbind('.tipTip').removeData('tipTip'); + break; + case 'position': + position_tiptip(); + } + } else { + var timeout = false; + + org_elem.data('tipTip', { options: opts }); + + if (opts.activation == 'hover') { + org_elem.bind('mouseenter.tipTip', function () { + activate(); + }).bind('mouseleave.tipTip', function () { + if (!opts.keepAlive) { + deactivate(); + } else { + tiptip_holder.one('mouseleave.tipTip', function () { + deactivate(); + }); + } + }); + } else if (opts.activation == 'focus') { + org_elem.bind('focus.tipTip', function () { + activate(); + }).bind('blur.tipTip', function () { + deactivate(); + }); + } else if (opts.activation == 'click') { + org_elem.bind('click.tipTip', function (e) { + e.preventDefault(); + activate(); + return false; + }).bind('mouseleave.tipTip', function () { + if (!opts.keepAlive) { + deactivate(); + } else { + tiptip_holder.one('mouseleave.tipTip', function () { + deactivate(); + }); + } + }); + } else if (opts.activation == 'manual') { + // Nothing to register actually. We decide when to show or hide. + } + } + + function activate() { + if (opts.enter.call(org_elem, callback_data) === false) { + return; + } + + // Get the text and append it in the tiptip_content. + var org_title; + if (opts.content) { + org_title = $.isFunction(opts.content) ? opts.content.call(org_elem, callback_data) : opts.content; + } else { + org_title = opts.content = org_elem.attr(opts.attribute); + org_elem.removeAttr(opts.attribute); //remove original Attribute + } + if (!org_title) { + return; // don't show tip when no content. + } + + tiptip_content.html(org_title); + tiptip_holder.hide().removeAttr('class').css({ 'max-width': opts.maxWidth }); + if (opts.cssClass) { + tiptip_holder.addClass(opts.cssClass); + } + + // Calculate the position of the tooltip. + position_tiptip(); + + // Show the tooltip. + if (timeout) { + clearTimeout(timeout); + } + + timeout = setTimeout(function () { + tiptip_holder.stop(true, true).fadeIn(opts.fadeIn); + }, opts.delay); + + $(window).bind('resize.tipTip scroll.tipTip', position_tiptip); + + // Ensure clicking on anything makes tipTip deactivate + $(document).unbind("click.tipTip dblclick.tipTip").bind("click.tiptip dblclick.tiptip", deactivate); + + + org_elem.addClass('tiptip_visible'); // Add marker class to easily find the target element with visible tooltip. It will be remove later on deactivate(). + + opts.afterEnter.call(org_elem, callback_data); + } + + function deactivate() { + if (opts.exit.call(org_elem, callback_data) === false) { + return; + } + + if (timeout) { + clearTimeout(timeout); + } + + tiptip_holder.fadeOut(opts.fadeOut); + + $(window).unbind('resize.tipTip scroll.tipTip'); + $(document).unbind("click.tipTip").unbind("dblclick.tipTip"); + + org_elem.removeClass('tiptip_visible'); + + opts.afterExit.call(org_elem, callback_data); + } + + function position_tiptip() { + var org_offset = org_elem.offset(), + org_top = org_offset.top, + org_left = org_offset.left, + org_width = org_elem.outerWidth(), + org_height = org_elem.outerHeight(), + tip_top, + tip_left, + tip_width = tiptip_holder.outerWidth(), + tip_height = tiptip_holder.outerHeight(), + tip_class, + tip_classes = { top: 'tip_top', bottom: 'tip_bottom', left: 'tip_left', right: 'tip_right' }, + arrow_top, + arrow_left, + arrow_width = 12, // tiptip_arrow.outerHeight() and tiptip_arrow.outerWidth() don't work because they need the element to be visible. + arrow_height = 12, + win = $(window), + win_top = win.scrollTop(), + win_left = win.scrollLeft(), + win_width = win.width(), + win_height = win.height(), + is_rtl = opts.detectTextDir && isRtlText(tiptip_content.text()); + + function moveTop() { + tip_class = tip_classes.top; + tip_top = org_top - tip_height - opts.edgeOffset - (arrow_height / 2); + tip_left = org_left + ((org_width - tip_width) / 2); + } + + function moveBottom() { + tip_class = tip_classes.bottom; + tip_top = org_top + org_height + opts.edgeOffset + (arrow_height / 2); + tip_left = org_left + ((org_width - tip_width) / 2); + } + + function moveLeft() { + tip_class = tip_classes.left; + tip_top = org_top + ((org_height - tip_height) / 2); + tip_left = org_left - tip_width - opts.edgeOffset - (arrow_width / 2); + } + + function moveRight() { + tip_class = tip_classes.right; + tip_top = org_top + ((org_height - tip_height) / 2); + tip_left = org_left + org_width + opts.edgeOffset + (arrow_width / 2); + } + + // Calculate the position of the tooltip. + if (opts.defaultPosition == 'bottom') { + moveBottom(); + } else if (opts.defaultPosition == 'top') { + moveTop(); + } else if (opts.defaultPosition == 'left' && !is_rtl) { + moveLeft(); + } else if (opts.defaultPosition == 'left' && is_rtl) { + moveRight(); + } else if (opts.defaultPosition == 'right' && !is_rtl) { + moveRight(); + } else if (opts.defaultPosition == 'right' && is_rtl) { + moveLeft(); + } else { + moveBottom(); + } + + // Flip the tooltip if off the window's viewport. (left <-> right and top <-> bottom). + if (tip_class == tip_classes.left && !is_rtl && tip_left < win_left) { + moveRight(); + } else if (tip_class == tip_classes.left && is_rtl && tip_left - tip_width < win_left) { + moveRight(); + } else if (tip_class == tip_classes.right && !is_rtl && tip_left > win_left + win_width) { + moveLeft(); + } else if (tip_class == tip_classes.right && is_rtl && tip_left + tip_width > win_left + win_width) { + moveLeft(); + } else if (tip_class == tip_classes.top && tip_top < win_top) { + moveBottom(); + } else if (tip_class == tip_classes.bottom && tip_top > win_top + win_height) { + moveTop(); + } + + // Fix the vertical position if the tooltip is off the top or bottom sides of the window's viewport. + if (tip_class == tip_classes.left || tip_class == tip_classes.right) { // If positioned left or right check if the tooltip is off the top or bottom window's viewport. + if (tip_top + tip_height > win_height + win_top) { // If the bottom edge of the tooltip is off the bottom side of the window's viewport. + tip_top = org_top + org_height > win_height + win_top ? org_top + org_height - tip_height : win_height + win_top - tip_height; // Make 'bottom edge of the tooltip' == 'bottom side of the window's viewport'. + } else if (tip_top < win_top) { // If the top edge of the tooltip if off the top side of the window's viewport. + tip_top = org_top < win_top ? org_top : win_top; // Make 'top edge of the tooltip' == 'top side of the window's viewport'. + } + } + + // Fix the horizontal position if the tooltip is off the right or left sides of the window's viewport. + if (tip_class == tip_classes.top || tip_class == tip_classes.bottom) { + if (tip_left + tip_width > win_width + win_left) { // If the right edge of the tooltip is off the right side of the window's viewport. + tip_left = org_left + org_width > win_width + win_left ? org_left + org_width - tip_width : win_width + win_left - tip_width; // Make 'right edge of the tooltip' == 'right side of the window's viewport'. + } else if (tip_left < win_left) { // If the left edge of the tooltip if off the left side of the window's viewport. + tip_left = org_left < win_left ? org_left : win_left; // Make 'left edge of the tooltip' == 'left side of the window's viewport'. + } + } + + // Apply the new position. + tiptip_holder + .css({ left: Math.round(tip_left), top: Math.round(tip_top) }) + .removeClass(tip_classes.top) + .removeClass(tip_classes.bottom) + .removeClass(tip_classes.left) + .removeClass(tip_classes.right) + .addClass(tip_class); + + // Position the arrow + if (tip_class == tip_classes.top) { + arrow_top = tip_height; // Position the arrow vertically on the top of the tooltip. + arrow_left = org_left - tip_left + ((org_width - arrow_width) / 2); // Center the arrow horizontally on the center of the target element. + } else if (tip_class == tip_classes.bottom) { + arrow_top = -arrow_height; // Position the arrow vertically on the bottom of the tooltip. + arrow_left = org_left - tip_left + ((org_width - arrow_width) / 2); // Center the arrow horizontally on the center of the target element. + } else if (tip_class == tip_classes.left) { + arrow_top = org_top - tip_top + ((org_height - arrow_height) / 2); // Center the arrow vertically on the center of the target element. + arrow_left = tip_width; // Position the arrow vertically on the left of the tooltip. + } else if (tip_class == tip_classes.right) { + arrow_top = org_top - tip_top + ((org_height - arrow_height) / 2); // Center the arrow vertically on the center of the target element. + arrow_left = -arrow_width; // Position the arrow vertically on the right of the tooltip. + } + + tiptip_arrow + .css({ left: Math.round(arrow_left), top: Math.round(arrow_top) }); + } + }); } - $.fn.tipTip = function(options) { - var defaults = { - activation: "hover", - keepAlive: false, - maxWidth: "200px", - edgeOffset: 3, - defaultPosition: "bottom", - delay: 400, - fadeIn: 200, - fadeOut: 200, - attribute: "title", - content: false, // HTML String or function to fill TipTIp with - enter: function(){}, - exit: function(){} - }; - var opts = $.extend(defaults, options); - - // Setup tip tip elements and render them to the DOM - if($("#tiptip_holder").length <= 0){ - var tiptip_holder = $('
'); - var tiptip_content = $('
'); - var tiptip_arrow = $('
'); - $("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('
'))); - } else { - var tiptip_holder = $("#tiptip_holder"); - var tiptip_content = $("#tiptip_content"); - var tiptip_arrow = $("#tiptip_arrow"); - } - - return this.each(function(){ - var org_elem = $(this); - if(opts.content || org_elem.attr(opts.attribute)){ - if(!opts.content){ - org_elem.removeAttr(opts.attribute); //remove original Attribute - } - var timeout = false; - - if(opts.activation == "hover"){ - org_elem.hover(function(){ - active_tiptip(); - }, function(){ - if(!opts.keepAlive){ - deactive_tiptip(); - } - }); - if(opts.keepAlive){ - tiptip_holder.hover(function(){}, function(){ - deactive_tiptip(); - }); - } - } else if(opts.activation == "focus"){ - org_elem.focus(function(){ - active_tiptip(); - }).blur(function(){ - deactive_tiptip(); - }); - } else if(opts.activation == "click"){ - org_elem.click(function(){ - active_tiptip(); - return false; - }).hover(function(){},function(){ - if(!opts.keepAlive){ - deactive_tiptip(); - } - }); - if(opts.keepAlive){ - tiptip_holder.hover(function(){}, function(){ - deactive_tiptip(); - }); - } - } - - function active_tiptip(){ - opts.enter.call(this); - var org_title = typeof opts.content === 'function' ? opts.content.call(org_elem, opts) : opts.content; - org_title = org_title || org_elem.attr(opts.attribute); - tiptip_content.html(org_title); - tiptip_holder.hide().removeAttr("class").css("margin","0"); - tiptip_arrow.removeAttr("style"); - - var top = parseInt(org_elem.offset()['top']); - var left = parseInt(org_elem.offset()['left']); - var org_width = parseInt(org_elem.outerWidth()); - var org_height = parseInt(org_elem.outerHeight()); - var tip_w = tiptip_holder.outerWidth(); - var tip_h = tiptip_holder.outerHeight(); - var w_compare = Math.round((org_width - tip_w) / 2); - var h_compare = Math.round((org_height - tip_h) / 2); - var marg_left = Math.round(left + w_compare); - var marg_top = Math.round(top + org_height + opts.edgeOffset); - var t_class = ""; - var arrow_top = ""; - var arrow_left = Math.round(tip_w - 12) / 2; - if(opts.defaultPosition == "bottom"){ - t_class = "_bottom"; - } else if(opts.defaultPosition == "top"){ - t_class = "_top"; - } else if(opts.defaultPosition == "left"){ - t_class = "_left"; - } else if(opts.defaultPosition == "right"){ - t_class = "_right"; - } - - var right_compare = (w_compare + left) < parseInt($(window).scrollLeft()); - var left_compare = (tip_w + left) > parseInt($(window).width()); - - if((right_compare && w_compare < 0) || (t_class == "_right" && !left_compare) || (t_class == "_left" && left < (tip_w + opts.edgeOffset + 5))){ - t_class = "_right"; - arrow_top = Math.round(tip_h - 13) / 2; - arrow_left = -12; - marg_left = Math.round(left + org_width + opts.edgeOffset); - marg_top = Math.round(top + h_compare); - } else if((left_compare && w_compare < 0) || (t_class == "_left" && !right_compare)){ - t_class = "_left"; - arrow_top = Math.round(tip_h - 13) / 2; - arrow_left = Math.round(tip_w); - marg_left = Math.round(left - (tip_w + opts.edgeOffset + 5)); - marg_top = Math.round(top + h_compare); - } + var ltrChars = 'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF', + rtlChars = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC', + rtlDirCheckRe = new RegExp('^[^' + ltrChars + ']*[' + rtlChars + ']'); + + function isRtlText(text) { + return rtlDirCheckRe.test(text); + }; + +})(jQuery); - var top_compare = (top + org_height + opts.edgeOffset + tip_h + 8) > parseInt($(window).height() + $(window).scrollTop()); - var bottom_compare = ((top + org_height) - (opts.edgeOffset + tip_h + 8)) < 0; - - if(top_compare || (t_class == "_bottom" && top_compare) || (t_class == "_top" && !bottom_compare)){ - if(t_class == "_top" || t_class == "_bottom"){ - t_class = "_top"; - } else { - t_class = t_class+"_top"; - } - arrow_top = tip_h; - marg_top = Math.round(top - (tip_h + 5 + opts.edgeOffset)); - } else if(bottom_compare | (t_class == "_top" && bottom_compare) || (t_class == "_bottom" && !top_compare)){ - if(t_class == "_top" || t_class == "_bottom"){ - t_class = "_bottom"; - } else { - t_class = t_class+"_bottom"; - } - arrow_top = -12; - marg_top = Math.round(top + org_height + opts.edgeOffset); - } - - if(t_class == "_right_top" || t_class == "_left_top"){ - marg_top = marg_top + 5; - } else if(t_class == "_right_bottom" || t_class == "_left_bottom"){ - marg_top = marg_top - 5; - } - if(t_class == "_left_top" || t_class == "_left_bottom"){ - marg_left = marg_left + 5; - } - tiptip_arrow.css({"margin-left": arrow_left+"px", "margin-top": arrow_top+"px"}); - tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class); - - if (timeout){ clearTimeout(timeout); } - timeout = setTimeout(function() { - tiptip_holder.stop(true,true); - if ($.contains(document.documentElement, org_elem[0])) { - tiptip_holder.fadeIn(opts.fadeIn); - } - }, opts.delay); - } - - function deactive_tiptip(){ - opts.exit.call(this); - if (timeout){ clearTimeout(timeout); } - tiptip_holder.fadeOut(opts.fadeOut); - } - } - }); - } -})(jQuery); diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip_old.js b/addons/web/static/lib/jquery.tipTip/jquery.tipTip_old.js deleted file mode 100644 index d2b460d1261..00000000000 --- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip_old.js +++ /dev/null @@ -1,191 +0,0 @@ - /* - * TipTip - * Copyright 2010 Drew Wilson - * www.drewwilson.com - * code.drewwilson.com/entry/tiptip-jquery-plugin - * - * Version 1.3 - Updated: Mar. 23, 2010 - * - * This Plug-In will create a custom tooltip to replace the default - * browser tooltip. It is extremely lightweight and very smart in - * that it detects the edges of the browser window and will make sure - * the tooltip stays within the current window size. As a result the - * tooltip will adjust itself to be displayed above, below, to the left - * or to the right depending on what is necessary to stay within the - * browser window. It is completely customizable as well via CSS. - * - * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -(function($){ - $.fn.tipTip = function(options) { - var defaults = { - activation: "hover", - keepAlive: false, - maxWidth: "200px", - edgeOffset: 3, - defaultPosition: "bottom", - delay: 400, - fadeIn: 200, - fadeOut: 200, - attribute: "title", - content: false, // HTML or String to fill TipTIp with - enter: function(){}, - exit: function(){} - }; - var opts = $.extend(defaults, options); - - // Setup tip tip elements and render them to the DOM - if($("#tiptip_holder").length <= 0){ - var tiptip_holder = $('
'); - var tiptip_content = $('
'); - var tiptip_arrow = $('
'); - $("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('
'))); - } else { - var tiptip_holder = $("#tiptip_holder"); - var tiptip_content = $("#tiptip_content"); - var tiptip_arrow = $("#tiptip_arrow"); - } - - return this.each(function(){ - var org_elem = $(this); - if(opts.content){ - var org_title = opts.content; - } else { - var org_title = org_elem.attr(opts.attribute); - } - if(org_title != ""){ - if(!opts.content){ - org_elem.removeAttr(opts.attribute); //remove original Attribute - } - var timeout = false; - - if(opts.activation == "hover"){ - org_elem.hover(function(){ - active_tiptip(); - }, function(){ - if(!opts.keepAlive){ - deactive_tiptip(); - } - }); - if(opts.keepAlive){ - tiptip_holder.hover(function(){}, function(){ - deactive_tiptip(); - }); - } - } else if(opts.activation == "focus"){ - org_elem.focus(function(){ - active_tiptip(); - }).blur(function(){ - deactive_tiptip(); - }); - } else if(opts.activation == "click"){ - org_elem.click(function(){ - active_tiptip(); - return false; - }).hover(function(){},function(){ - if(!opts.keepAlive){ - deactive_tiptip(); - } - }); - if(opts.keepAlive){ - tiptip_holder.hover(function(){}, function(){ - deactive_tiptip(); - }); - } - } - - function active_tiptip(){ - opts.enter.call(this); - tiptip_content.html(org_title); - tiptip_holder.hide().removeAttr("class").css("margin","0"); - tiptip_arrow.removeAttr("style"); - - var top = parseInt(org_elem.offset()['top']); - var left = parseInt(org_elem.offset()['left']); - var org_width = parseInt(org_elem.outerWidth()); - var org_height = parseInt(org_elem.outerHeight()); - var tip_w = tiptip_holder.outerWidth(); - var tip_h = tiptip_holder.outerHeight(); - var w_compare = Math.round((org_width - tip_w) / 2); - var h_compare = Math.round((org_height - tip_h) / 2); - var marg_left = Math.round(left + w_compare); - var marg_top = Math.round(top + org_height + opts.edgeOffset); - var t_class = ""; - var arrow_top = ""; - var arrow_left = Math.round(tip_w - 12) / 2; - - if(opts.defaultPosition == "bottom"){ - t_class = "_bottom"; - } else if(opts.defaultPosition == "top"){ - t_class = "_top"; - } else if(opts.defaultPosition == "left"){ - t_class = "_left"; - } else if(opts.defaultPosition == "right"){ - t_class = "_right"; - } - - var right_compare = (w_compare + left) < parseInt($(window).scrollLeft()); - var left_compare = (tip_w + left) > parseInt($(window).width()); - - if((right_compare && w_compare < 0) || (t_class == "_right" && !left_compare) || (t_class == "_left" && left < (tip_w + opts.edgeOffset + 5))){ - t_class = "_right"; - arrow_top = Math.round(tip_h - 13) / 2; - arrow_left = -12; - marg_left = Math.round(left + org_width + opts.edgeOffset); - marg_top = Math.round(top + h_compare); - } else if((left_compare && w_compare < 0) || (t_class == "_left" && !right_compare)){ - t_class = "_left"; - arrow_top = Math.round(tip_h - 13) / 2; - arrow_left = Math.round(tip_w); - marg_left = Math.round(left - (tip_w + opts.edgeOffset + 5)); - marg_top = Math.round(top + h_compare); - } - - var top_compare = (top + org_height + opts.edgeOffset + tip_h + 8) > parseInt($(window).height() + $(window).scrollTop()); - var bottom_compare = ((top + org_height) - (opts.edgeOffset + tip_h + 8)) < 0; - - if(top_compare || (t_class == "_bottom" && top_compare) || (t_class == "_top" && !bottom_compare)){ - if(t_class == "_top" || t_class == "_bottom"){ - t_class = "_top"; - } else { - t_class = t_class+"_top"; - } - arrow_top = tip_h; - marg_top = Math.round(top - (tip_h + 5 + opts.edgeOffset)); - } else if(bottom_compare | (t_class == "_top" && bottom_compare) || (t_class == "_bottom" && !top_compare)){ - if(t_class == "_top" || t_class == "_bottom"){ - t_class = "_bottom"; - } else { - t_class = t_class+"_bottom"; - } - arrow_top = -12; - marg_top = Math.round(top + org_height + opts.edgeOffset); - } - - if(t_class == "_right_top" || t_class == "_left_top"){ - marg_top = marg_top + 5; - } else if(t_class == "_right_bottom" || t_class == "_left_bottom"){ - marg_top = marg_top - 5; - } - if(t_class == "_left_top" || t_class == "_left_bottom"){ - marg_left = marg_left + 5; - } - tiptip_arrow.css({"margin-left": arrow_left+"px", "margin-top": arrow_top+"px"}); - tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class); - - if (timeout){ clearTimeout(timeout); } - timeout = setTimeout(function(){ tiptip_holder.stop(true,true).fadeIn(opts.fadeIn); }, opts.delay); - } - - function deactive_tiptip(){ - opts.exit.call(this); - if (timeout){ clearTimeout(timeout); } - tiptip_holder.fadeOut(opts.fadeOut); - } - } - }); - } -})(jQuery); diff --git a/addons/web/static/lib/jquery.tipTip/tipTip.css b/addons/web/static/lib/jquery.tipTip/tipTip.css index 4fb95d37691..dc41b650615 100644 --- a/addons/web/static/lib/jquery.tipTip/tipTip.css +++ b/addons/web/static/lib/jquery.tipTip/tipTip.css @@ -13,15 +13,15 @@ } #tiptip_holder.tip_bottom { - padding-top: 5px; + padding-bottom: 5px; } #tiptip_holder.tip_right { - padding-left: 5px; + padding-right: 5px; } #tiptip_holder.tip_left { - padding-right: 5px; + padding-left: 5px; } #tiptip_content { @@ -110,4 +110,25 @@ #tiptip_holder.tip_top #tiptip_arrow_inner { border-top-color: rgba(20,20,20,0.92); } +} + +/* Alternative theme for TipTip */ +#tiptip_holder.alt.tip_top #tiptip_arrow_inner { + border-top-color: #444444; +} + +#tiptip_holder.alt.tip_bottom #tiptip_arrow_inner { + border-bottom-color: #444444; +} + +#tiptip_holder.alt.tip_right #tiptip_arrow_inner { + border-right-color: #444444; +} + +#tiptip_holder.alt.tip_left #tiptip_arrow_inner { + border-left-color: #444444; +} + +#tiptip_holder.alt #tiptip_content { + background-color: #444444; border: 1px solid White; border-radius: 3px; box-shadow: 0 0 3px #555555; color: #FFFFFF; font-size: 11px; padding: 4px 8px; text-shadow: 0 0 1px Black; } \ No newline at end of file diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0e25027967f..e9819d43198 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1062,7 +1062,6 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({ this.execute_action().always(function() { self.force_disabled = false; self.check_disable(); - $.tipTipClear(); }); }, execute_action: function() { From 1a5158aa366af897e427ffe0b215b1355149bed5 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 17 Jan 2012 16:19:40 +0530 Subject: [PATCH 055/170] [FIX] sale : Invoicing - item not in translations lp bug: https://launchpad.net/bugs/916704 fixed bzr revid: mdi@tinyerp.com-20120117104940-bi26zopapb49r18g --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index f5b797c9f66..90d3838f5a0 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -498,7 +498,7 @@ src_model="product.product" groups="base.group_sale_salesman"/> - + From ecfcf9c409b64b2b8bd026c92e329d608a017c92 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 12:19:38 +0100 Subject: [PATCH 056/170] [REM] wiki field from form and page bzr revid: xmo@openerp.com-20120117111938-rmjgsw309q6gltxe --- addons/web/static/src/js/view_form.js | 1 - addons/web/static/src/js/view_page.js | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e9819d43198..e761173e042 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3212,7 +3212,6 @@ openerp.web.form.widgets = new openerp.web.Registry({ 'email' : 'openerp.web.form.FieldEmail', 'url' : 'openerp.web.form.FieldUrl', 'text' : 'openerp.web.form.FieldText', - 'text_wiki' : 'openerp.web.form.FieldText', 'date' : 'openerp.web.form.FieldDate', 'datetime' : 'openerp.web.form.FieldDatetime', 'selection' : 'openerp.web.form.FieldSelection', diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js index d3ee79effca..31190d70f85 100644 --- a/addons/web/static/src/js/view_page.js +++ b/addons/web/static/src/js/view_page.js @@ -241,7 +241,6 @@ openerp.web.page = function (openerp) { 'email': 'openerp.web.page.FieldEmailReadonly', 'url': 'openerp.web.page.FieldUrlReadonly', 'text': 'openerp.web.page.FieldCharReadonly', - 'text_wiki' : 'openerp.web.page.FieldCharReadonly', 'date': 'openerp.web.page.FieldCharReadonly', 'datetime': 'openerp.web.page.FieldCharReadonly', 'selection' : 'openerp.web.page.FieldSelectionReadonly', From 24ef362e7f3c05decf176a9e2ff94440fe749e6a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 12:22:46 +0100 Subject: [PATCH 057/170] [ADD] extremely basic wikitext support for web client, in page view * Headers work (kinda) * Lists work * Text decoration (bold, italics) work * Indentation works BUT Internal links, OpenERP actions, images, attachments and tables don't work lp bug: https://launchpad.net/bugs/910527 fixed bzr revid: xmo@openerp.com-20120117112246-mrpjld9382ibupr6 --- addons/wiki/__openerp__.py | 1 + addons/wiki/static/src/js/wiki.js | 14 + addons/wiki/static/src/lib/wiky/Readme.md | 41 +++ addons/wiki/static/src/lib/wiky/autogit.sh | 6 + addons/wiki/static/src/lib/wiky/index.html | 56 ++++ .../wiki/static/src/lib/wiky/input_complete | 35 ++ .../static/src/lib/wiky/jquery-1.4.2.min.js | 170 ++++++++++ addons/wiki/static/src/lib/wiky/wiky.css | 79 +++++ addons/wiki/static/src/lib/wiky/wiky.js | 303 ++++++++++++++++++ 9 files changed, 705 insertions(+) create mode 100644 addons/wiki/static/src/js/wiki.js create mode 100755 addons/wiki/static/src/lib/wiky/Readme.md create mode 100755 addons/wiki/static/src/lib/wiky/autogit.sh create mode 100755 addons/wiki/static/src/lib/wiky/index.html create mode 100755 addons/wiki/static/src/lib/wiky/input_complete create mode 100755 addons/wiki/static/src/lib/wiky/jquery-1.4.2.min.js create mode 100755 addons/wiki/static/src/lib/wiky/wiky.css create mode 100755 addons/wiki/static/src/lib/wiky/wiky.js diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py index ab9203a9afd..11477d535b6 100644 --- a/addons/wiki/__openerp__.py +++ b/addons/wiki/__openerp__.py @@ -53,5 +53,6 @@ Keep track of Wiki groups, pages, and history. 'certificate': '0086363630317', 'web': True, 'images': ['images/create_index.jpeg','images/page_history.jpeg','images/wiki_groups.jpeg','images/wiki_pages.jpeg'], + 'js': ['static/src/lib/wiky/wiky.js', 'static/src/js/wiki.js'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/static/src/js/wiki.js b/addons/wiki/static/src/js/wiki.js new file mode 100644 index 00000000000..7b84ff5080c --- /dev/null +++ b/addons/wiki/static/src/js/wiki.js @@ -0,0 +1,14 @@ +openerp.wiki = function (openerp) { + openerp.web.form.widgets.add( + 'text_wiki', 'openerp.web.form.FieldText'); + openerp.web.page.readonly.add( + 'text_wiki', 'openerp.wiki.FieldWikiReadonly'); + openerp.wiki = {}; + openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({ + set_value: function (value) { + var show_value = wiky.process(value); + this.$element.find('div').html(show_value); + return show_value; + } + }); +}; diff --git a/addons/wiki/static/src/lib/wiky/Readme.md b/addons/wiki/static/src/lib/wiky/Readme.md new file mode 100755 index 00000000000..5d9bfe175a6 --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/Readme.md @@ -0,0 +1,41 @@ +Wiky.js - a javascript library to convert Wiki Markup language to HTML. +======================= + +(It is buggy, please use with care) + +Wiky.js is a javascript library that converts Wiki Markup language to HTML. + + +How to use it +------------------- +Include wiki.js into your HTML file. Wiky.js has only one function, which is wiky.process(wikitext). + +Please see index.html for an example. + +*wiky.js does not depend on jQuery, which is included for testing purpose. + + + +Supported Syntax +------------------- +* == Heading == +* === Subheading === +* [http://www.url.com Name of URLs] +* [[File:http://www.url.com/image.png Alternative Text]] +* -------------------- (Horizontal line) +* : (Indentation) +* # Ordered bullet point +* * Unordered bullet point + + + +License +------------------ +Creative Commons 3.0 + + + +Contributors +------------------- +Tanin Na Nakorn +Tanun Niyomjit (Designer) \ No newline at end of file diff --git a/addons/wiki/static/src/lib/wiky/autogit.sh b/addons/wiki/static/src/lib/wiky/autogit.sh new file mode 100755 index 00000000000..79f59a51a8f --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/autogit.sh @@ -0,0 +1,6 @@ +#!/bin/sh +git add --all +git commit -a -m "prototype changed" +git pull +git mergetool +git push diff --git a/addons/wiki/static/src/lib/wiky/index.html b/addons/wiki/static/src/lib/wiky/index.html new file mode 100755 index 00000000000..97992354fd6 --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/index.html @@ -0,0 +1,56 @@ + + + + + + + Untitled Document + + + + +
+ + + + + + + diff --git a/addons/wiki/static/src/lib/wiky/input_complete b/addons/wiki/static/src/lib/wiky/input_complete new file mode 100755 index 00000000000..c7e860cccf9 --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/input_complete @@ -0,0 +1,35 @@ +=== Heading === +Some content +I would like to add another line + +== Subheading == +Some more content +Some more lines1 +:A line with indent +:: A 2-indented line +:: more +:back to 1-indented line + +This is Taeyeon. +[[File:http://www.oknation.net/blog/home/blog_data/12/2012/images/ty4.jpg Taeyeon]] +Taeyeon is so cute. + +This is a link:[http://www.google.com Google]. +This is a bold link:'''[http://www.google.com Google]'''. +This is a bold-italic link:'''''[http://www.google.com Google]'''''. +This is '''bold''', '''''bold-italic''''', and ''italic'' + + +# First +# second +## Second-First +*** First Point +*** Second Point +#### z +#### y +#### x +*** Third Point +## Second-Second [ftp://www.facebook.com FacebookFTP] +## Second-Third [http://www.google.com Google Here] +# third + diff --git a/addons/wiki/static/src/lib/wiky/jquery-1.4.2.min.js b/addons/wiki/static/src/lib/wiky/jquery-1.4.2.min.js new file mode 100755 index 00000000000..8060d0e5041 --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/jquery-1.4.2.min.js @@ -0,0 +1,170 @@ +/*! + * jQuery JavaScript Library v1.4.2 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Sat Feb 13 22:33:48 2010 -0500 + */ +(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, +Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& +(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, +a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== +"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, +function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
a"; +var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, +parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= +false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= +s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, +applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; +else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, +a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== +w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, +cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= +c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); +a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, +function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); +k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), +C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= +e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& +f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; +if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", +e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, +"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, +d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, +e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); +t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| +g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, +CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, +g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, +text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, +setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= +h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== +"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, +h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& +q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; +if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); +(function(){var g=s.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: +function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= +{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== +"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", +d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? +a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== +1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, +""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); +return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", +""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= +c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? +c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= +function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= +Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, +"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= +a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= +a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== +"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, +serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), +function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, +global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& +e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? +"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== +false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= +false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", +c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| +d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); +g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== +1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== +"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; +if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== +"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| +c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; +this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= +this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, +e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
"; +a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); +c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, +d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- +f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": +"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in +e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); + +// jquery.escape 1.0 - escape strings for use in jQuery selectors +// http://ianloic.com/tag/jquery.escape +// Copyright 2009 Ian McKellar +// Just like jQuery you can use it under either the MIT license or the GPL +// (see: http://docs.jquery.com/License) +(function() { +escape_re = /[#;&,\.\+\*~':"!\^\$\[\]\(\)=>|\/\\]/; +jQuery.escape = function jQuery$escape(s) { + var left = s.split(escape_re, 1)[0]; + if (left == s) return s; + return left + '\\' + + s.substr(left.length, 1) + + jQuery.escape(s.substr(left.length+1)); +} +})(); diff --git a/addons/wiki/static/src/lib/wiky/wiky.css b/addons/wiki/static/src/lib/wiky/wiky.css new file mode 100755 index 00000000000..0adc7896df0 --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/wiky.css @@ -0,0 +1,79 @@ +@charset "UTF-8"; +.wiky_preview_area { + font-family: "Helvetica Neue", Arial, Helvetica, 'Liberation Sans', FreeSans, sans-serif; + font-size: 13px; + line-height: 1.5em; + color: #666; + font-weight:350; + width:600px; + display:block; +} +.wiky_preview_area h2{ + font-size:24px; + color:#333; + font-weight:400; + + text-shadow:0 1px 0 rgba(000, 000, 000, .4); +} +.wiky_preview_area h3{ + font-size:18px; + color:#555; + font-weight:400; + + text-shadow:0 1px 0 rgba(000, 000, 000, .4); +} +.wiky_preview_area img{ + background-repeat: repeat; + width: 400px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, .8); + -moz-box-shadow:0 1px 3px rgba(0, 0, 0, .8); + box-shadow:0 1px 3px rgba(0, 0, 0, .8); +} +.wiky_preview_area a{ + padding:5px; + font-weight:400; + + background: #999; /* for non-css3 browsers */ + + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#000000'); /* for IE */ + background: -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#000)); /* for webkit browsers */ + background: -moz-linear-gradient(top, #ccc, #000); /* for firefox 3.6+ */ + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + + -webkit-box-shadow:none; + -moz-box-shadow:none; + box-shadow:none; + + text-shadow:0 1px 0 rgba(255, 255, 255, 1); +} + +.wiky_preview_area a:hover{ + color:#333; + padding:5px; + font-weight:400; + text-decoration:none; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + + -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, .3); + -moz-box-shadow:0 1px 3px rgba(0, 0, 0, .3); + box-shadow:0 1px 3px rgba(0, 0, 0, .3); + + text-shadow:0 1px 0 rgba(255, 255, 255, 1); +} + + +.wiky_preview_area > ol, +.wiky_preview_area > ul, +.wiky_preview_area > ul > li, +.wiky_preview_area > ol > li { + list-style: disc inside none; +} \ No newline at end of file diff --git a/addons/wiki/static/src/lib/wiky/wiky.js b/addons/wiki/static/src/lib/wiky/wiky.js new file mode 100755 index 00000000000..5bc9c6f167d --- /dev/null +++ b/addons/wiki/static/src/lib/wiky/wiky.js @@ -0,0 +1,303 @@ +/** + * Wiky.js - Javascript library to converts Wiki MarkUp language to HTML. + * You can do whatever with it. Please give me some credits (Apache License) + * - Tanin Na Nakorn + */ + +var wiky = {}; + + +wiky.process = function(wikitext) { + var lines = wikitext.split(/\r?\n/); + var start; + var html = ""; + + for (var i=0;i"; + } + else if (line.match(/^==/)!=null && line.match(/==$/)!=null) + { + html += "

"+line.substring(2,line.length-2)+"

"; + } + else if (line.match(/^:+/)!=null) + { + // find start line and ending line + start = i; + while (i < lines.length && lines[i].match(/^:+/)!=null) i++; + i--; + + html += wiky.process_indent(lines,start,i); + } + else if (line.match(/^----+(\s*)$/)!=null) + { + html += "
"; + } + else if (line.match(/^(\*+) /)!=null) + { + // find start line and ending line + start = i; + while (i < lines.length && lines[i].match(/^(\*+|##+):? /)!=null) i++; + i--; + + html += wiky.process_bullet_point(lines,start,i); + } + else if (line.match(/^(#+) /)!=null) + { + // find start line and ending line + start = i; + while (i < lines.length && lines[i].match(/^(#+|\*\*+):? /)!=null) i++; + i--; + + html += wiky.process_bullet_point(lines,start,i); + } + else + { + html += wiky.process_normal(line); + } + + html += "
\n"; + } + + return html; +}; + +wiky.process_indent = function(lines,start,end) { + var html = "
"; + + for(var i=start;i<=end;i++) { + + html += "
"; + + var this_count = lines[i].match(/^(:+)/)[1].length; + + html += wiky.process_normal(lines[i].substring(this_count)); + + var nested_end = i; + for (var j=i+1;j<=end;j++) { + var nested_count = lines[j].match(/^(:+)/)[1].length; + if (nested_count <= this_count) break; + else nested_end = j; + } + + if (nested_end > i) { + html += wiky.process_indent(lines,i+1,nested_end); + i = nested_end; + } + + html += "
"; + } + + html += "
"; + return html; +}; + +wiky.process_bullet_point = function(lines,start,end) { + var html = (lines[start].charAt(0)=='*')?"
    ":"
      "; + + for(var i=start;i<=end;i++) { + + html += "
    1. "; + + var this_count = lines[i].match(/^(\*+|#+) /)[1].length; + + html += wiky.process_normal(lines[i].substring(this_count+1)); + + // continue previous with #: + { + var nested_end = i; + for (var j = i + 1; j <= end; j++) { + var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length; + + if (nested_count < this_count) + break; + else { + if (lines[j].charAt(nested_count) == ':') { + html += "
      " + wiky.process_normal(lines[j].substring(nested_count + 2)); + nested_end = j; + } else { + break; + } + } + + } + + i = nested_end; + } + + // nested bullet point + { + var nested_end = i; + for (var j = i + 1; j <= end; j++) { + var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length; + if (nested_count <= this_count) + break; + else + nested_end = j; + } + + if (nested_end > i) { + html += wiky.process_bullet_point(lines, i + 1, nested_end); + i = nested_end; + } + } + + // continue previous with #: + { + var nested_end = i; + for (var j = i + 1; j <= end; j++) { + var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length; + + if (nested_count < this_count) + break; + else { + if (lines[j].charAt(nested_count) == ':') { + html += wiky.process_normal(lines[j].substring(nested_count + 2)); + nested_end = j; + } else { + break; + } + } + + } + + i = nested_end; + } + + html += "
      2. "; + } + + html += (lines[start].charAt(0)=='*')?"
":""; + return html; +}; + +wiky.process_url = function(txt) { + + var index = txt.indexOf(" "); + + if (index == -1) + { + return ""; + } + else + { + var url = txt.substring(0,index); + var label = txt.substring(index+1); + return ""+label+""; + } +}; + +wiky.process_image = function(txt) { + var index = txt.indexOf(" "); + var url = txt; + var label = ""; + + if (index > -1) + { + url = txt.substring(0,index); + label = txt.substring(index+1); + } + + + return "\""+label+"\""; +}; + +wiky.process_video = function(url) { + + if (url.match(/^(https?:\/\/)?(www.)?youtube.com\//) == null) + { + return ""+url+" is an invalid YouTube URL"; + } + var result; + if ((result = url.match(/^(https?:\/\/)?(www.)?youtube.com\/watch\?(.*)v=([^&]+)/)) != null) + { + url = "http://www.youtube.com/embed/"+result[4]; + } + + + return ''; +}; + +wiky.process_normal = function(wikitext) { + + // Image + { + var index = wikitext.indexOf("[[File:"); + var end_index = wikitext.indexOf("]]", index + 7); + while (index > -1 && end_index > -1) { + + wikitext = wikitext.substring(0,index) + + wiky.process_image(wikitext.substring(index+7,end_index)) + + wikitext.substring(end_index+2); + + index = wikitext.indexOf("[[File:"); + end_index = wikitext.indexOf("]]", index + 7); + } + } + + // Video + { + var index = wikitext.indexOf("[[Video:"); + var end_index = wikitext.indexOf("]]", index + 8); + while (index > -1 && end_index > -1) { + + wikitext = wikitext.substring(0,index) + + wiky.process_video(wikitext.substring(index+8,end_index)) + + wikitext.substring(end_index+2); + + index = wikitext.indexOf("[[Video:"); + end_index = wikitext.indexOf("]]", index + 8); + } + } + + + // URL + var protocols = ["http","ftp","news"]; + + for (var i=0;i -1 && end_index > -1) { + + wikitext = wikitext.substring(0,index) + + wiky.process_url(wikitext.substring(index+1,end_index)) + + wikitext.substring(end_index+1); + + index = wikitext.indexOf("["+protocols[i]+"://",end_index+1); + end_index = wikitext.indexOf("]", index + 1); + + } + } + + var count_b = 0; + var index = wikitext.indexOf("'''"); + while(index > -1) { + + if ((count_b%2)==0) wikitext = wikitext.replace(/'''/,""); + else wikitext = wikitext.replace(/'''/,""); + + count_b++; + + index = wikitext.indexOf("'''",index); + } + + var count_i = 0; + var index = wikitext.indexOf("''"); + while(index > -1) { + + if ((count_i%2)==0) wikitext = wikitext.replace(/''/,""); + else wikitext = wikitext.replace(/''/,""); + + count_i++; + + index = wikitext.indexOf("''",index); + } + + wikitext = wikitext.replace(/<\/b><\/i>/g,""); + + return wikitext; +}; From 1a0e9063d4592aba5c594ce45cc4135edfab7cab Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 13:00:35 +0100 Subject: [PATCH 058/170] [FIX] forbid spaces in db names lp bug: https://launchpad.net/bugs/916771 fixed bzr revid: xmo@openerp.com-20120117120035-n7kk3uzfqwdgkm88 --- addons/web/static/src/js/chrome.js | 3 +++ addons/web/static/src/xml/base.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 39bc0181e16..588af765978 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -280,6 +280,9 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database init: function(parent, element_id, option_id) { this._super(parent, element_id); this.unblockUIFunction = $.unblockUI; + $.validator.addMethod('matches', function (s, _, re) { + return new RegExp(re).test(s); + }, _t("Invalid database name")); }, start: function() { this.$option_id = $("#oe_db_options"); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f460d6ba435..b119e5aae3c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -70,7 +70,8 @@ - + From 4a16a74de03749e4e4cc18f1575af2566df97563 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 13:43:12 +0100 Subject: [PATCH 059/170] [IMP] only display group paginator if there are more than 80 records in the group bzr revid: xmo@openerp.com-20120117124312-n4h9r1g9ovk09xli --- addons/web/static/src/js/view_list.js | 31 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index aa970c31649..1f8a6020f46 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1316,19 +1316,24 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L if (!self.datagroup.openable) { view.configure_pager(dataset); } else { - var pages = Math.ceil(dataset.ids.length / limit); - self.$row - .find('.oe-pager-state') - .text(_.str.sprintf(_t("%(page)d/%(page_count)d"), { - page: page + 1, - page_count: pages - })) - .end() - .find('button[data-pager-action=previous]') - .attr('disabled', page === 0) - .end() - .find('button[data-pager-action=next]') - .attr('disabled', page === pages - 1); + if (dataset.ids.length == records.length) { + // only one page + self.$row.find('td.oe-group-pagination').empty(); + } else { + var pages = Math.ceil(dataset.ids.length / limit); + self.$row + .find('.oe-pager-state') + .text(_.str.sprintf(_t("%(page)d/%(page_count)d"), { + page: page + 1, + page_count: pages + })) + .end() + .find('button[data-pager-action=previous]') + .attr('disabled', page === 0) + .end() + .find('button[data-pager-action=next]') + .attr('disabled', page === pages - 1); + } } self.records.add(records, {silent: true}); From 809968ecfd8ab4e6bc667a5d8d30077edc6d7e6b Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 17 Jan 2012 13:44:17 +0100 Subject: [PATCH 060/170] [FIX] Char fields don't correctly retain their values in Firefox 3.6 Unknown bug in old version of firefox : input type=text onchange event not fired when tootip is shown Disabled tooltips for gecko version < 2 lp bug: https://launchpad.net/bugs/911327 fixed bzr revid: fme@openerp.com-20120117124417-k3vdiktc93gl99fi --- addons/web/static/src/js/view_form.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e761173e042..290af47c04c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -790,6 +790,11 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form. return QWeb.render(template, { "widget": this }); }, do_attach_tooltip: function(widget, trigger, options) { + if ($.browser.mozilla && parseInt($.browser.version.split('.')[0], 10) < 2) { + // Unknown bug in old version of firefox : + // input type=text onchange event not fired when tootip is shown + return; + } widget = widget || this; trigger = trigger || this.$element; options = _.extend({ From 07a459f2d49977ac108756d4d03a70ede133b617 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 14:28:43 +0100 Subject: [PATCH 061/170] [FIX] trailing commas bzr revid: xmo@openerp.com-20120117132843-obecwigtts1rf9ja --- addons/web/static/src/js/chrome.js | 6 +++--- addons/web/static/src/js/core.js | 6 +++--- addons/web/static/src/js/data.js | 4 ++-- addons/web/static/src/js/view_editor.js | 12 ++++++------ addons/web/static/src/js/view_form.js | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 588af765978..6dce78a1c5e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -205,7 +205,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ buttons: buttons }).open(); dialog.$element.html(QWeb.render('CrashManagerError', {session: openerp.connection, error: error})); - }, + } }); openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# */{ @@ -649,7 +649,7 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ } } }); - }, + } }); openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# */{ @@ -1215,7 +1215,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({ self.am.do_action(action); }); - }, + } }); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index b36e576ae47..3005fc80d13 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -491,7 +491,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. dataType: 'json', contentType: 'application/json', data: JSON.stringify(payload), - processData: false, + processData: false }, url); if (this.synch) ajax.async = false; @@ -502,7 +502,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. // extracted from payload to set on the url var data = { session_id: this.session_id, - id: payload.id, + id: payload.id }; url.url = this.get_url(url.url); var ajax = _.extend({ @@ -864,7 +864,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. } finally { this.synch = synch; } - }, + } }); /** diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 447b95d17cf..bb53fb2175a 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -829,9 +829,9 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({ model: this.model_name, method: method, args: args, - kwargs: kwargs, + kwargs: kwargs }); - }, + } }); openerp.web.CompoundContext = openerp.web.Class.extend({ diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index bf920380ff9..6e58886fadd 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -806,7 +806,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'}, 'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'}, 'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]}, - 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'}, + 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'} }; var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); this.edit_node_dialog.$element.append('
'); @@ -928,7 +928,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ type: 'ir.actions.act_window', target: "new", flags: { - action_buttons: true, + action_buttons: true } } var action_manager = new openerp.web.ActionManager(self); @@ -982,7 +982,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({ }, render: function() { return _.str.sprintf("%s", this.name, QWeb.render(this.template, {widget: this})) - }, + } }); openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({ template : "vieweditor_boolean", @@ -1084,7 +1084,7 @@ var _PROPERTIES = { 'action' : ['name', 'string', 'colspan', 'groups'], 'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'], 'graph' : ['string', 'type'], - 'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'], + 'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'] }; var _CHILDREN = { 'form': ['notebook', 'group', 'field', 'label', 'button','board', 'newline', 'separator'], @@ -1100,7 +1100,7 @@ var _CHILDREN = { 'label': [], 'button' : [], 'newline': [], - 'separator': [], + 'separator': [] }; var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', 'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER', @@ -1134,6 +1134,6 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({ 'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', 'selection' : 'openerp.web.ViewEditor.FieldSelect', 'char' : 'openerp.web.ViewEditor.FieldChar', - 'float' : 'openerp.web.ViewEditor.FieldFloat', + 'float' : 'openerp.web.ViewEditor.FieldFloat' }); }; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e761173e042..467edcebd8c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1279,7 +1279,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f this.definition_options = JSON.parse(str); } return this.definition_options; - }, + } }); openerp.web.form.FieldChar = openerp.web.form.Field.extend({ @@ -2422,7 +2422,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({ var self = this; var def = $.Deferred().then(callback).then(function() {self.o2m.view.reload();}); return this._super(name, id, _.bind(def.resolve, def)); - }, + } }); openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({ From 56fb6cba857b76d0ee406aad4d85cacca573da79 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 17 Jan 2012 14:45:41 +0100 Subject: [PATCH 062/170] [IMP] Kanban images not being reloaded when saved in form view Kanban view now uses write_date if defined in model in order to force reload of images lp bug: https://launchpad.net/bugs/912705 fixed bzr revid: fme@openerp.com-20120117134541-yvernouqxuegoep4 --- addons/web_kanban/static/src/js/kanban.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 5e5abfb292b..a2e6f00e8c0 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -47,7 +47,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ }, on_loaded: function(data) { this.fields_view = data; - this.fields_keys = _.keys(this.fields_view.fields); + this.fields_keys = _.keys(this.fields_view.fields).concat(['write_date']); this.add_qweb_template(); this.has_been_loaded.resolve(); }, @@ -531,7 +531,12 @@ openerp.web_kanban.KanbanRecord = openerp.web.Widget.extend({ }, kanban_image: function(model, field, id) { id = id || ''; - return openerp.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; + var url = openerp.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; + if (this.record.write_date && this.record.write_date.raw_value) { + var time = openerp.web.str_to_datetime(this.record.write_date.raw_value).getTime(); + url += '&t=' + time; + } + return url; }, kanban_text_ellipsis: function(s, size) { size = size || 160; From a76f9d6112db7fdadf1f8c13f2807384062aa1cd Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 17 Jan 2012 14:47:13 +0100 Subject: [PATCH 063/170] [ADD] Add write_date to hr.employee and product.product in order to allow image reloading in kanban views bzr revid: fme@openerp.com-20120117134713-uewdqmv08r6r5hmq --- addons/hr/hr.py | 1 + addons/product/product.py | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 76f9295a829..15c7c254f85 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -175,6 +175,7 @@ class hr_employee(osv.osv): 'color': fields.integer('Color Index'), 'city': fields.related('address_id', 'city', type='char', string='City'), 'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1), + 'write_date': fields.datetime('Update Date' , readonly=True), } def unlink(self, cr, uid, ids, context=None): diff --git a/addons/product/product.py b/addons/product/product.py index e6b4b4c6348..977e408de6f 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -513,6 +513,7 @@ class product_product(osv.osv): 'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True), 'color': fields.integer('Color Index'), 'product_image': fields.binary('Image'), + 'write_date': fields.datetime('Update Date' , readonly=True), } def unlink(self, cr, uid, ids, context=None): From 439f23d77b268aff1417d9cbf65e540dcf3c3dff Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 14:53:12 +0100 Subject: [PATCH 064/170] [FIX] root css on .openerp, not body.openerp bzr revid: xmo@openerp.com-20120117135312-f9pmqgmy4704vfyh --- addons/web/static/src/css/base.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 84e4da5b711..0994ed41b1a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,5 @@ -body.openerp { +body { padding: 0; margin: 0; } +.openerp { padding: 0; margin: 0; height: 100%; @@ -7,7 +8,8 @@ body.openerp { font-family: Ubuntu, Helvetica, sans-serif; } -body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget { +.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, +.openerp button, .openerp .ui-widget { font-family: Ubuntu, Helvetica, sans-serif; font-size:85%; } From 7d305cbbee66251870e825cd44a99a57a41f407c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 14:58:17 +0100 Subject: [PATCH 065/170] [FIX] MSIE does not like calling .html on the page's title, set the string on the document's title directly (as a property) bzr revid: xmo@openerp.com-20120117135817-t3ggfjp71r6io6b4 --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6dce78a1c5e..be570e3dd84 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1092,7 +1092,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie self.bind_hashchange(); if (!self.session.openerp_entreprise) { self.$element.find('.oe_footer_powered').append(' - Unsupported/Community Version'); - $('title').html('OpenERP - Unsupported/Community Version'); + document.title = _t("OpenERP - Unsupported/Community Version"); } }); }, From 425b6b4b334f3f1baf5f13ffdd572d0e4211d2f4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 17 Jan 2012 14:59:58 +0100 Subject: [PATCH 066/170] [FIX] QWeb: Internet Explorer DOM converts tags to uppercase bzr revid: fme@openerp.com-20120117135958-gv2iv4ixomqzcnny --- addons/web/static/lib/qweb/qweb2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js index 093b3651fa0..6518ee5d939 100644 --- a/addons/web/static/lib/qweb/qweb2.js +++ b/addons/web/static/lib/qweb/qweb2.js @@ -194,7 +194,7 @@ var QWeb2 = { QWeb2.Engine = (function() { function Engine() { - // TODO: handle prefix at template level : t-prefix="x" + // TODO: handle prefix at template level : t-prefix="x", don't forget to lowercase it this.prefix = 't'; this.debug = false; this.templates_resources = []; // TODO: implement this.reload() @@ -620,7 +620,7 @@ QWeb2.Element = (function() { } } } - if (this.tag !== this.engine.prefix) { + if (this.tag.toLowerCase() !== this.engine.prefix) { var tag = "<" + this.tag; for (var a in this.attributes) { tag += this.engine.tools.gen_attribute([a, this.attributes[a]]); From aeebcf3dccbd1adfdb4fd62e29043449ef96c603 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 15:02:13 +0100 Subject: [PATCH 067/170] [FIX] un-nivity call of WebClient, IE8 does not like nobody to mess with its body: bzr revid: xmo@openerp.com-20120117140213-u2n1l4cg1nz1xrea --- addons/web/controllers/main.py | 4 ++-- addons/web/static/src/js/chrome.js | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7b2ad5b311c..b0a12802db4 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -99,7 +99,7 @@ html_template = """ }); - + """ @@ -207,7 +207,7 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), - 'init': 'new s.web.WebClient().replace($("body"));', + 'init': 'new s.web.WebClient().start();', } return r diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index be570e3dd84..8b9a0d4efc6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1062,13 +1062,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie this._current_state = null; }, - render_element: function() { - this.$element = $(''); - this.$element.attr("id", "oe"); - this.$element.addClass("openerp"); - }, start: function() { var self = this; + this.$element = $(document.body); if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { From c82878388a5a26ec424453eafe4ae71779c62824 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 15:38:06 +0100 Subject: [PATCH 068/170] [FIX] qweb: benchmark on browsers without console.time & console/timeEnd bzr revid: xmo@openerp.com-20120117143806-x5hqclaw6a8hdu98 --- addons/web/static/lib/qweb/qweb-benchmark.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/addons/web/static/lib/qweb/qweb-benchmark.html b/addons/web/static/lib/qweb/qweb-benchmark.html index 0cc67e7e54f..4f7fb56ac1f 100644 --- a/addons/web/static/lib/qweb/qweb-benchmark.html +++ b/addons/web/static/lib/qweb/qweb-benchmark.html @@ -5,11 +5,25 @@ - + + + + + \ No newline at end of file diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index a514cafb6c8..2af7ac115d8 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -84,24 +84,9 @@ def concat_files(file_list, reader=None, intersperse=""): files_concat = intersperse.join(files_content) return files_concat,files_timestamp -html_template = """ - - - - OpenERP - - %(css)s - %(js)s - - - - -""" +html_template = None +with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "main.html")) as html_file: + html_template = html_file.read() class WebClient(openerpweb.Controller): _cp_path = "/web/webclient" @@ -207,7 +192,6 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), - 'init': 'new s.web.WebClient().start();', } return r diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 8b9a0d4efc6..6a9e860aadc 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1064,7 +1064,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie }, start: function() { var self = this; - this.$element = $(document.body); if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { From f1dc3773b83e571e1b1a4da2fb17cf22dcec7117 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 18 Jan 2012 17:22:03 +0100 Subject: [PATCH 105/170] [FIX] email_template: properly pass target model in composition wizard reloading action This fixes reloading of the composition wizard after selecting templating options in the new web client. lp bug: https://launchpad.net/bugs/886144 fixed bzr revid: odo@openerp.com-20120118162203-17d1tug4lw40wpex --- addons/email_template/wizard/mail_compose_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index 61006f96782..beb59ba1eea 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -37,7 +37,7 @@ def _reopen(self,res_id,model): # save original model in context, otherwise # it will be lost on the action's context switch - 'mail.compose.target.model': model, + 'context': {'mail.compose.target.model': model} } class mail_compose_message(osv.osv_memory): From d0eb54d4c4f4502e6c920d16f0d48b0467120b22 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Wed, 18 Jan 2012 20:04:09 +0100 Subject: [PATCH 106/170] =?UTF-8?q?[FIX]=C2=A0a=20typo=20between=20'id'=20?= =?UTF-8?q?and=20builtin=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: florent.xicluna@gmail.com-20120118190409-ddg3bbvb7r9jzyjc --- addons/web/common/http.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 3e6ee257ea3..50a6b43e909 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -142,11 +142,11 @@ class JsonRequest(WebRequest): jsonp = args.get('jsonp') requestf = None request = None + request_id = args.get('id') if jsonp and self.httprequest.method == 'POST': # jsonp 2 steps step1 POST: save call self.init(args) - request_id = args.get('id') self.session.jsonp_requests[request_id] = self.httprequest.form['r'] headers=[('Content-Type', 'text/plain; charset=utf-8')] r = werkzeug.wrappers.Response(request_id, headers=headers) @@ -154,10 +154,10 @@ class JsonRequest(WebRequest): elif jsonp and args.get('r'): # jsonp method GET request = args.get('r') - elif jsonp and args.get('id'): + elif jsonp and request_id: # jsonp 2 steps step2 GET: run and return result self.init(args) - request = self.session.jsonp_requests.pop(args.get(id), "") + request = self.session.jsonp_requests.pop(request_id, "") else: # regular jsonrpc2 requestf = self.httprequest.stream From 035b5b8bd5749f6b208228ccab73ff7b1e3d4170 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 19 Jan 2012 04:50:28 +0000 Subject: [PATCH 107/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120119045028-1hxblsnuw1g2r2vj --- openerp/addons/base/i18n/af.po | 12 +- openerp/addons/base/i18n/am.po | 12 +- openerp/addons/base/i18n/ar.po | 18 +-- openerp/addons/base/i18n/bg.po | 12 +- openerp/addons/base/i18n/bs.po | 12 +- openerp/addons/base/i18n/ca.po | 12 +- openerp/addons/base/i18n/cs.po | 12 +- openerp/addons/base/i18n/da.po | 12 +- openerp/addons/base/i18n/de.po | 16 ++- openerp/addons/base/i18n/el.po | 12 +- openerp/addons/base/i18n/en_GB.po | 12 +- openerp/addons/base/i18n/es.po | 12 +- openerp/addons/base/i18n/es_CL.po | 12 +- openerp/addons/base/i18n/es_EC.po | 12 +- openerp/addons/base/i18n/et.po | 12 +- openerp/addons/base/i18n/eu.po | 12 +- openerp/addons/base/i18n/fa.po | 12 +- openerp/addons/base/i18n/fa_AF.po | 12 +- openerp/addons/base/i18n/fi.po | 12 +- openerp/addons/base/i18n/fr.po | 18 +-- openerp/addons/base/i18n/gl.po | 12 +- openerp/addons/base/i18n/he.po | 12 +- openerp/addons/base/i18n/hr.po | 12 +- openerp/addons/base/i18n/hu.po | 12 +- openerp/addons/base/i18n/hy.po | 12 +- openerp/addons/base/i18n/id.po | 12 +- openerp/addons/base/i18n/is.po | 12 +- openerp/addons/base/i18n/it.po | 12 +- openerp/addons/base/i18n/ja.po | 12 +- openerp/addons/base/i18n/kk.po | 12 +- openerp/addons/base/i18n/ko.po | 12 +- openerp/addons/base/i18n/lt.po | 12 +- openerp/addons/base/i18n/lv.po | 12 +- openerp/addons/base/i18n/mk.po | 159 +++++++++++++++++---------- openerp/addons/base/i18n/mn.po | 12 +- openerp/addons/base/i18n/nb.po | 12 +- openerp/addons/base/i18n/nl.po | 12 +- openerp/addons/base/i18n/nl_BE.po | 12 +- openerp/addons/base/i18n/pl.po | 12 +- openerp/addons/base/i18n/pt.po | 12 +- openerp/addons/base/i18n/pt_BR.po | 12 +- openerp/addons/base/i18n/ro.po | 12 +- openerp/addons/base/i18n/ru.po | 12 +- openerp/addons/base/i18n/sk.po | 12 +- openerp/addons/base/i18n/sl.po | 12 +- openerp/addons/base/i18n/sq.po | 12 +- openerp/addons/base/i18n/sr.po | 12 +- openerp/addons/base/i18n/sr@latin.po | 12 +- openerp/addons/base/i18n/sv.po | 12 +- openerp/addons/base/i18n/th.po | 12 +- openerp/addons/base/i18n/tlh.po | 12 +- openerp/addons/base/i18n/tr.po | 12 +- openerp/addons/base/i18n/uk.po | 12 +- openerp/addons/base/i18n/ur.po | 12 +- openerp/addons/base/i18n/vi.po | 12 +- openerp/addons/base/i18n/zh_CN.po | 12 +- openerp/addons/base/i18n/zh_HK.po | 12 +- openerp/addons/base/i18n/zh_TW.po | 12 +- 58 files changed, 449 insertions(+), 410 deletions(-) diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index 6ec0e1c2573..3a58d6aa074 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:26+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:39+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po index d082c64fbff..f0d74f46943 100644 --- a/openerp/addons/base/i18n/am.po +++ b/openerp/addons/base/i18n/am.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:27+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:40+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po index 4001ab9f0c5..eeffd038953 100644 --- a/openerp/addons/base/i18n/ar.po +++ b/openerp/addons/base/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-09 04:49+0000\n" -"X-Generator: Launchpad (build 14640)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:40+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -1526,7 +1526,7 @@ msgstr "أدوات" #. module: base #: selection:ir.property,type:0 msgid "Float" -msgstr "" +msgstr "عشري" #. module: base #: model:ir.module.category,name:base.module_category_warehouse_management @@ -4960,7 +4960,7 @@ msgstr "" #: field:ir.ui.menu,parent_id:0 #: field:wizard.ir.model.menu.create,menu_id:0 msgid "Parent Menu" -msgstr "القائمة الأم" +msgstr "القائمة الرئيسية" #. module: base #: field:res.partner.bank,owner_name:0 @@ -6474,6 +6474,10 @@ msgstr "صلاحيات الإنشاء" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "المحافظة / الولاية" @@ -11426,7 +11430,7 @@ msgstr "" #. module: base #: view:ir.module.module:0 msgid "Created Menus" -msgstr "" +msgstr "أنشاء القوائم" #. module: base #: model:ir.actions.act_window,name:base.action_country_state @@ -11710,10 +11714,6 @@ msgstr "نوع التقرير" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po index 8eba27e5cf8..cacbe8baa49 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:28+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:41+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6486,6 +6486,10 @@ msgstr "Задай достъп" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Област" @@ -11714,10 +11718,6 @@ msgstr "Вид справка" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po index 74b1e3a063a..20cd2d1ecc9 100644 --- a/openerp/addons/base/i18n/bs.po +++ b/openerp/addons/base/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:27+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:40+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6393,6 +6393,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11598,10 +11602,6 @@ msgstr "Tip izvještaja" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po index 726b3554b8f..85db68749fd 100644 --- a/openerp/addons/base/i18n/ca.po +++ b/openerp/addons/base/i18n/ca.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:28+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:41+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6584,6 +6584,10 @@ msgstr "Permís per crear" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Província" @@ -11872,10 +11876,6 @@ msgstr "Tipus d'informe" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index bfea6fcfc76..97ddf259079 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:28+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:41+0000\n" +"X-Generator: Launchpad (build 14692)\n" "X-Poedit-Language: Czech\n" #. module: base @@ -6467,6 +6467,10 @@ msgstr "Vytvořit přístup" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Fed. stát" @@ -11717,10 +11721,6 @@ msgstr "Typ výkazu" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po index 357e3d27506..1d1895430bc 100644 --- a/openerp/addons/base/i18n/da.po +++ b/openerp/addons/base/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:28+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:41+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index cb4b9b411c5..a4d51ad0512 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:29+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:42+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -3639,8 +3639,6 @@ msgid "" "Value Added Tax number. Check the box if the partner is subjected to the " "VAT. Used by the VAT legal statement." msgstr "" -"Umsatzsteuer Identifikationsnummer. Aktivieren Sie die Option, wenn der " -"Partner Ust-pflichtig ist. Wird von der Ust-Voranmeldung verwendet." #. module: base #: selection:ir.sequence,implementation:0 @@ -3728,7 +3726,7 @@ msgstr "EAN Prüfung" #. module: base #: field:res.partner,vat:0 msgid "VAT" -msgstr "USt." +msgstr "USt-IdNr. / UID" #. module: base #: field:res.users,new_password:0 @@ -6576,6 +6574,10 @@ msgstr "Erzeuge Zugriff" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Bundesländer" @@ -11863,10 +11865,6 @@ msgstr "Report Type" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po index 375b4143c81..65c5889d564 100644 --- a/openerp/addons/base/i18n/el.po +++ b/openerp/addons/base/i18n/el.po @@ -12,8 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:29+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n" +"X-Generator: Launchpad (build 14692)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" @@ -6522,6 +6522,10 @@ msgstr "Δημιουργία Πρόσβασης" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Πολιτεία" @@ -11758,10 +11762,6 @@ msgstr "Τύπος Αναφοράς" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po index d08da5154cd..ff4d6c80b4b 100644 --- a/openerp/addons/base/i18n/en_GB.po +++ b/openerp/addons/base/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:35+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6555,6 +6555,10 @@ msgstr "Create Access" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Fed. State" @@ -11832,10 +11836,6 @@ msgstr "Report Type" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po index a28babfe413..c12f9a1440b 100644 --- a/openerp/addons/base/i18n/es.po +++ b/openerp/addons/base/i18n/es.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:43+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:47+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6681,6 +6681,10 @@ msgstr "Permiso para crear" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Provincia" @@ -11970,10 +11974,6 @@ msgstr "Tipo de informe" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index b14861ddc1b..036494342a1 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:36+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6595,6 +6595,10 @@ msgstr "Permiso para crear" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Provincia" @@ -11884,10 +11888,6 @@ msgstr "Tipo de informe" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po index 08094123305..5a5c52a8ec1 100644 --- a/openerp/addons/base/i18n/es_EC.po +++ b/openerp/addons/base/i18n/es_EC.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:36+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6585,6 +6585,10 @@ msgstr "Permiso para crear" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Provincia" @@ -11877,10 +11881,6 @@ msgstr "Tipo de informe" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po index feb800d653e..256c3cb4aae 100644 --- a/openerp/addons/base/i18n/et.po +++ b/openerp/addons/base/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:28+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:42+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6425,6 +6425,10 @@ msgstr "Loomisõigus" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Maakond" @@ -11638,10 +11642,6 @@ msgstr "Aruande tüüp" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po index a0145d39156..7aa3187e1ee 100644 --- a/openerp/addons/base/i18n/eu.po +++ b/openerp/addons/base/i18n/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:27+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:40+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po index 9bf69bd7b5e..0933edad6d7 100644 --- a/openerp/addons/base/i18n/fa.po +++ b/openerp/addons/base/i18n/fa.po @@ -9,8 +9,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:32+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:45+0000\n" +"X-Generator: Launchpad (build 14692)\n" "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" "X-Poedit-Language: Persian\n" @@ -6428,6 +6428,10 @@ msgstr "پدیدن دسترسی" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "ایالت فدرال" @@ -11643,10 +11647,6 @@ msgstr "نوع گزارش" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po index d42874ed09b..f90dfad10a1 100644 --- a/openerp/addons/base/i18n/fa_AF.po +++ b/openerp/addons/base/i18n/fa_AF.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:36+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po index 5102b2646ea..177ee8a4fe7 100644 --- a/openerp/addons/base/i18n/fi.po +++ b/openerp/addons/base/i18n/fi.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-17 04:44+0000\n" -"X-Generator: Launchpad (build 14676)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:42+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6560,6 +6560,10 @@ msgstr "Luo käyttöoikeus" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Osavaltio" @@ -11834,10 +11838,6 @@ msgstr "Raportin tyyppi" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index b6cede61f90..9a1e7479336 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:29+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:42+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -560,7 +560,7 @@ msgstr "" #. module: base #: view:base.module.upgrade:0 msgid "Your system will be updated." -msgstr "Votre système sera mis à jour." +msgstr "Votre système va être mis à jour." #. module: base #: field:ir.actions.todo,note:0 @@ -1269,7 +1269,7 @@ msgstr "Haïti" #: view:ir.ui.view:0 #: selection:ir.ui.view,type:0 msgid "Search" -msgstr "Rechercher" +msgstr "Recherche" #. module: base #: code:addons/osv.py:132 @@ -1846,7 +1846,7 @@ msgstr "Partenaires" #. module: base #: field:res.partner.category,parent_left:0 msgid "Left parent" -msgstr "Parenté de gauche" +msgstr "Parent de gauche" #. module: base #: model:ir.module.module,shortdesc:base.module_project_mrp @@ -6590,6 +6590,10 @@ msgstr "Accès en création" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "État fédéral" @@ -11888,10 +11892,6 @@ msgstr "Type de rapport" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po index 8e9727ff852..3841b7e4677 100644 --- a/openerp/addons/base/i18n/gl.po +++ b/openerp/addons/base/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:29+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6572,6 +6572,10 @@ msgstr "Crear Acceso" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Estado Federal" @@ -11860,10 +11864,6 @@ msgstr "Tipo de informe" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po index fde447de303..249ff1f271f 100644 --- a/openerp/addons/base/i18n/he.po +++ b/openerp/addons/base/i18n/he.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:29+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6413,6 +6413,10 @@ msgstr "צור גישה" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11625,10 +11629,6 @@ msgstr "סוג דוח" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po index e8c0833b066..dc4aecd198e 100644 --- a/openerp/addons/base/i18n/hr.po +++ b/openerp/addons/base/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:33+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:46+0000\n" +"X-Generator: Launchpad (build 14692)\n" "Language: hr\n" #. module: base @@ -6495,6 +6495,10 @@ msgstr "Pravo kreiranja" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Država/Pokrajina/Županija" @@ -11742,10 +11746,6 @@ msgstr "Tip izvještaja" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po index 286c1ec5fae..a888835421f 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:30+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6564,6 +6564,10 @@ msgstr "Létrehozási hozzáférés" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Szöv. állam" @@ -11859,10 +11863,6 @@ msgstr "Jelentés típus" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po index b8aafa8dd87..a836aab8517 100644 --- a/openerp/addons/base/i18n/hy.po +++ b/openerp/addons/base/i18n/hy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:27+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:40+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index 834cf5f8c17..726ee81c716 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:30+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6389,6 +6389,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11594,10 +11598,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po index 12f1109e23f..d2bf11de821 100644 --- a/openerp/addons/base/i18n/is.po +++ b/openerp/addons/base/i18n/is.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:30+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po index 4c832895fd9..77b218e7e52 100644 --- a/openerp/addons/base/i18n/it.po +++ b/openerp/addons/base/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:30+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:44+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6586,6 +6586,10 @@ msgstr "Creazione" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Stato fed." @@ -11880,10 +11884,6 @@ msgstr "Tipo Report" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index de7633ae7e9..44556d092a7 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:44+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po index d4e91a14c7f..bb2e50df775 100644 --- a/openerp/addons/base/i18n/kk.po +++ b/openerp/addons/base/i18n/kk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:31+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:44+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index a1773cab8bc..6deafd6fde5 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:31+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:44+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6442,6 +6442,10 @@ msgstr "접근 생성" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11651,10 +11655,6 @@ msgstr "리포트 타입" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po index 6fffa645c66..2632f0d5725 100644 --- a/openerp/addons/base/i18n/lt.po +++ b/openerp/addons/base/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:31+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:44+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6407,6 +6407,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Savivaldybė" @@ -11624,10 +11628,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po index 83af47cb678..501555cdf61 100644 --- a/openerp/addons/base/i18n/lv.po +++ b/openerp/addons/base/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:31+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:44+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6440,6 +6440,10 @@ msgstr "Izveidot Pieeju" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Fed. Valsts" @@ -11658,10 +11662,6 @@ msgstr "Atskaites Tips" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po index 04e44b8a87c..2f51513d62d 100644 --- a/openerp/addons/base/i18n/mk.po +++ b/openerp/addons/base/i18n/mk.po @@ -14,13 +14,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:31+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:45+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh msgid "Saint Helena" -msgstr "" +msgstr "Света Елена" #. module: base #: view:ir.actions.report.xml:0 @@ -74,7 +74,7 @@ msgstr "" #. module: base #: field:base.language.import,code:0 msgid "Code (eg:en__US)" -msgstr "" +msgstr "Код (пр. en_US)" #. module: base #: view:workflow:0 @@ -94,7 +94,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Hungarian / Magyar" -msgstr "" +msgstr "Унгарски / Magyar" #. module: base #: selection:base.language.install,lang:0 @@ -111,7 +111,7 @@ msgstr "" #. module: base #: field:ir.actions.act_window,display_menu_tip:0 msgid "Display Menu Tips" -msgstr "" +msgstr "Прикажи ги советите во менито" #. module: base #: help:ir.cron,model:0 @@ -122,7 +122,7 @@ msgstr "" #. module: base #: view:ir.module.module:0 msgid "Created Views" -msgstr "" +msgstr "Креирани прикази" #. module: base #: code:addons/base/ir/ir_model.py:519 @@ -131,6 +131,8 @@ msgid "" "You can not write in this document (%s) ! Be sure your user belongs to one " "of these groups: %s." msgstr "" +"Не може да запишете во документот (%s)! Осигурајте се дека вашата кориснича " +"сметка припаѓа на една од овие групи: %s." #. module: base #: model:ir.module.module,description:base.module_event_project @@ -153,7 +155,7 @@ msgstr "" #. module: base #: field:res.partner,ref:0 msgid "Reference" -msgstr "" +msgstr "Референца" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba @@ -163,7 +165,7 @@ msgstr "" #. module: base #: field:ir.actions.act_window,target:0 msgid "Target Window" -msgstr "" +msgstr "Целен прозорец" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans @@ -179,7 +181,7 @@ msgstr "" #: code:addons/base/res/res_users.py:541 #, python-format msgid "Warning!" -msgstr "" +msgstr "Предупредување!" #. module: base #: code:addons/base/ir/ir_model.py:331 @@ -193,7 +195,7 @@ msgstr "" #: code:addons/osv.py:129 #, python-format msgid "Constraint Error" -msgstr "" +msgstr "Грешка при ограничувањето" #. module: base #: model:ir.model,name:base.model_ir_ui_view_custom @@ -203,13 +205,13 @@ msgstr "" #. module: base #: model:res.country,name:base.sz msgid "Swaziland" -msgstr "" +msgstr "Свазиленд" #. module: base #: code:addons/orm.py:4171 #, python-format msgid "created." -msgstr "" +msgstr "креирано." #. module: base #: model:ir.module.module,shortdesc:base.module_mrp_subproduct @@ -223,6 +225,9 @@ msgid "" "Some installed modules depend on the module you plan to Uninstall :\n" " %s" msgstr "" +"Некои инсталирани модули зависат од модулите кои пробувате да ги " +"отстраните:\n" +"%s" #. module: base #: field:ir.sequence,number_increment:0 @@ -233,7 +238,7 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_res_company_tree #: model:ir.ui.menu,name:base.menu_action_res_company_tree msgid "Company's Structure" -msgstr "" +msgstr "Структура на компанијата" #. module: base #: selection:base.language.install,lang:0 @@ -256,7 +261,7 @@ msgstr "" #: code:addons/base/module/wizard/base_export_language.py:60 #, python-format msgid "new" -msgstr "" +msgstr "ново" #. module: base #: field:ir.actions.report.xml,multi:0 @@ -266,17 +271,17 @@ msgstr "" #. module: base #: field:ir.module.category,module_nr:0 msgid "Number of Modules" -msgstr "" +msgstr "Број на модули" #. module: base #: help:multi_company.default,company_dest_id:0 msgid "Company to store the current record" -msgstr "" +msgstr "Компанија за зачувување на тековниот запис" #. module: base #: field:res.partner.bank.type.field,size:0 msgid "Max. Size" -msgstr "" +msgstr "Макс. големина" #. module: base #: model:ir.module.category,name:base.module_category_reporting @@ -296,7 +301,7 @@ msgstr "" #: field:res.partner,subname:0 #: field:res.partner.address,name:0 msgid "Contact Name" -msgstr "" +msgstr "Име на контактот" #. module: base #: code:addons/base/module/wizard/base_export_language.py:56 @@ -320,7 +325,7 @@ msgstr "" #. module: base #: sql_constraint:res.lang:0 msgid "The name of the language must be unique !" -msgstr "" +msgstr "Името на јазикот мора да биде уникатно !" #. module: base #: model:ir.module.module,description:base.module_import_base @@ -365,7 +370,7 @@ msgstr "" #. module: base #: field:res.partner,credit_limit:0 msgid "Credit Limit" -msgstr "" +msgstr "Лимит на кредитот" #. module: base #: model:ir.module.module,description:base.module_web_graph @@ -375,7 +380,7 @@ msgstr "" #. module: base #: field:ir.model.data,date_update:0 msgid "Update Date" -msgstr "" +msgstr "Датум на ажурирање" #. module: base #: model:ir.module.module,shortdesc:base.module_base_action_rule @@ -385,12 +390,12 @@ msgstr "" #. module: base #: view:ir.attachment:0 msgid "Owner" -msgstr "" +msgstr "Сопственик" #. module: base #: field:ir.actions.act_window,src_model:0 msgid "Source Object" -msgstr "" +msgstr "Изворен објект" #. module: base #: model:res.partner.bank.type,format_layout:base.bank_normal @@ -411,13 +416,13 @@ msgstr "" #: field:res.widget.user,widget_id:0 #: field:res.widget.wizard,widgets_list:0 msgid "Widget" -msgstr "" +msgstr "Елемент" #. module: base #: view:ir.model.access:0 #: field:ir.model.access,group_id:0 msgid "Group" -msgstr "" +msgstr "Група" #. module: base #: constraint:res.lang:0 @@ -431,7 +436,7 @@ msgstr "" #: field:ir.translation,name:0 #: field:res.partner.bank.type.field,name:0 msgid "Field Name" -msgstr "" +msgstr "Име на полето" #. module: base #: model:ir.module.module,shortdesc:base.module_pad_project @@ -455,7 +460,7 @@ msgstr "" #. module: base #: model:res.country,name:base.tv msgid "Tuvalu" -msgstr "" +msgstr "Тувалу" #. module: base #: selection:ir.model,state:0 @@ -465,7 +470,7 @@ msgstr "" #. module: base #: field:res.lang,date_format:0 msgid "Date Format" -msgstr "" +msgstr "Формат на датумот" #. module: base #: model:ir.module.module,shortdesc:base.module_base_report_designer @@ -476,12 +481,12 @@ msgstr "" #: field:res.bank,email:0 #: field:res.partner.address,email:0 msgid "E-Mail" -msgstr "" +msgstr "Е-пошта" #. module: base #: model:res.country,name:base.an msgid "Netherlands Antilles" -msgstr "" +msgstr "Холандски антили" #. module: base #: model:res.country,name:base.ro @@ -495,6 +500,8 @@ msgid "" "You can not remove the admin user as it is used internally for resources " "created by OpenERP (updates, module installation, ...)" msgstr "" +"Не може да го отстраните admin корисникот затоа што се користи интерно за " +"ресурси креирани од OpenERP (ажурирања, инсталација на модули, ...)" #. module: base #: view:ir.values:0 @@ -514,7 +521,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Bosnian / bosanski jezik" -msgstr "" +msgstr "Босански / Bosanski jezik" #. module: base #: help:ir.actions.report.xml,attachment_use:0 @@ -522,6 +529,8 @@ msgid "" "If you check this, then the second time the user prints with same attachment " "name, it returns the previous report." msgstr "" +"Ако го штиклирате ова, тогаш вториот пат кога корисникот ќе принта со истото " +"име на приврзокот, ќе биде вратен претходниот извештај." #. module: base #: model:ir.module.module,shortdesc:base.module_sale_layout @@ -531,7 +540,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (VE) / Español (VE)" -msgstr "" +msgstr "Шпански (ВЕ) / Español (VE)" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice @@ -541,13 +550,13 @@ msgstr "" #. module: base #: view:base.module.upgrade:0 msgid "Your system will be updated." -msgstr "" +msgstr "Вашиот систем ќе се ажурира." #. module: base #: field:ir.actions.todo,note:0 #: selection:ir.property,type:0 msgid "Text" -msgstr "" +msgstr "Текст" #. module: base #: model:ir.module.module,description:base.module_account_followup @@ -576,12 +585,12 @@ msgstr "" #. module: base #: field:res.country,name:0 msgid "Country Name" -msgstr "" +msgstr "Име на државата" #. module: base #: model:res.country,name:base.co msgid "Colombia" -msgstr "" +msgstr "Колумбија" #. module: base #: code:addons/orm.py:1357 @@ -595,21 +604,23 @@ msgid "" "The ISO country code in two chars.\n" "You can use this field for quick search." msgstr "" +"ISO државен код со два знака.\n" +"Може да го користите ова поле за брзо пребарување." #. module: base #: model:res.country,name:base.pw msgid "Palau" -msgstr "" +msgstr "Пало" #. module: base #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "" +msgstr "Продажба и набавки" #. module: base #: view:ir.translation:0 msgid "Untranslated" -msgstr "" +msgstr "Непреведено" #. module: base #: help:ir.actions.act_window,context:0 @@ -628,7 +639,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:282 #, python-format msgid "Custom fields must have a name that starts with 'x_' !" -msgstr "" +msgstr "Прилагодените полиња мора да имаат име кое почнува со 'x_' !" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_mx @@ -648,7 +659,7 @@ msgstr "" #. module: base #: view:base.language.export:0 msgid "Export done" -msgstr "" +msgstr "Извезувањето заврши" #. module: base #: model:ir.module.module,shortdesc:base.module_outlook @@ -659,7 +670,7 @@ msgstr "" #: view:ir.model:0 #: field:ir.model,name:0 msgid "Model Description" -msgstr "" +msgstr "Опис на моделот" #. module: base #: model:ir.actions.act_window,help:base.bank_account_update @@ -684,7 +695,7 @@ msgstr "" #. module: base #: model:res.country,name:base.jo msgid "Jordan" -msgstr "" +msgstr "Јордан" #. module: base #: help:ir.cron,nextcall:0 @@ -700,7 +711,7 @@ msgstr "" #. module: base #: model:res.country,name:base.er msgid "Eritrea" -msgstr "" +msgstr "Еритреа" #. module: base #: sql_constraint:res.company:0 @@ -711,13 +722,13 @@ msgstr "" #: view:res.config:0 #: view:res.config.installer:0 msgid "description" -msgstr "" +msgstr "Опис" #. module: base #: model:ir.ui.menu,name:base.menu_base_action_rule #: model:ir.ui.menu,name:base.menu_base_action_rule_admin msgid "Automated Actions" -msgstr "" +msgstr "Автоматизирани дејства" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_ro @@ -762,12 +773,12 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Swedish / svenska" -msgstr "" +msgstr "Шведска / Svenska" #. module: base #: model:res.country,name:base.rs msgid "Serbia" -msgstr "" +msgstr "Србија" #. module: base #: selection:ir.translation,type:0 @@ -777,7 +788,7 @@ msgstr "" #. module: base #: model:res.country,name:base.kh msgid "Cambodia, Kingdom of" -msgstr "" +msgstr "Клаството Камбоџа" #. module: base #: field:base.language.import,overwrite:0 @@ -2084,7 +2095,7 @@ msgstr "" #. module: base #: selection:res.request,state:0 msgid "active" -msgstr "" +msgstr "активно" #. module: base #: code:addons/base/res/res_partner.py:272 @@ -3570,7 +3581,7 @@ msgstr "" #. module: base #: help:res.lang,iso_code:0 msgid "This ISO code is the name of po files to use for translations" -msgstr "" +msgstr "ISO кодот е името на датотеките кои се користат за преведување" #. module: base #: view:ir.rule:0 @@ -4638,7 +4649,7 @@ msgstr "" #. module: base #: selection:ir.model.fields,select_level:0 msgid "Not Searchable" -msgstr "" +msgstr "Не може да се пребарува" #. module: base #: field:ir.config_parameter,key:0 @@ -6385,6 +6396,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11605,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 @@ -13442,7 +13453,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Greek / Ελληνικά" -msgstr "" +msgstr "Грчки / Ελληνικά" #. module: base #: model:res.country,name:base.do @@ -14884,4 +14895,34 @@ msgid "Russian / русский язык" msgstr "" #~ msgid "Metadata" -#~ msgstr "Метаподатоци" +#~ msgstr "Мета податоци" + +#~ msgid "Wood Suppliers" +#~ msgstr "Снабдувачи на дрва" + +#, python-format +#~ msgid "\"smtp_server\" needs to be set to send mails to users" +#~ msgstr "" +#~ "\"smtp_server\" треба да биде подесен да испраќа пошта до корисниците" + +#, python-format +#~ msgid "The read method is not implemented on this object !" +#~ msgstr "Методот за читање не е имплементиран во овој објект !" + +#~ msgid "Schedule Upgrade" +#~ msgstr "Закажана надградба" + +#~ msgid "Miscellaneous Suppliers" +#~ msgstr "Разновидни добавувачи" + +#~ msgid "Certified" +#~ msgstr "Сертифицирано" + +#~ msgid "New User" +#~ msgstr "Нов корисник" + +#~ msgid "Partner Form" +#~ msgstr "Формулар за партнери" + +#~ msgid "Event Type" +#~ msgstr "Тип на настан" diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po index 36f0e3ba50b..56a86246e0a 100644 --- a/openerp/addons/base/i18n/mn.po +++ b/openerp/addons/base/i18n/mn.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:32+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:45+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6465,6 +6465,10 @@ msgstr "Хандалт үүсгэх" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Аймаг/Хот" @@ -11687,10 +11691,6 @@ msgstr "Тайлангийн төрөл" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index 4f1d9ae1cf7..b036bbfdaa2 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:32+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:45+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6461,6 +6461,10 @@ msgstr "Tilgang til å opprette" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Stat (USA)" @@ -11676,10 +11680,6 @@ msgstr "Rapporttype" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 8efc33c5eb2..6c2c21c479c 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:28+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:42+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6577,6 +6577,10 @@ msgstr "Aanmaken" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Staat/Provincie" @@ -11865,10 +11869,6 @@ msgstr "Soort overzicht" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index e4a35618946..5f71c543dad 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:36+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6400,6 +6400,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11605,10 +11609,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index ac7e35f58aa..3756c58ed8a 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:32+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:45+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6512,6 +6512,10 @@ msgstr "Prawo tworzenia" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "woj." @@ -11761,10 +11765,6 @@ msgstr "Typ raportu" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index 022f01f71dd..897941cb327 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:32+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:46+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6500,6 +6500,10 @@ msgstr "Criação" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Estado federal" @@ -11766,10 +11770,6 @@ msgstr "Tipo de relatório" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index 4073ab15725..a5926f77589 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:43+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6576,6 +6576,10 @@ msgstr "Acesso Criação" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Estado(UF)" @@ -11865,10 +11869,6 @@ msgstr "Tipo de Relatório" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index 41b20552b42..72228770172 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:33+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:46+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6590,6 +6590,10 @@ msgstr "Acces creare" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Stat federal" @@ -11888,10 +11892,6 @@ msgstr "Tip de raport" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index f01b11da678..e24d0bc47bf 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:33+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:46+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6566,6 +6566,10 @@ msgstr "Доступ на создание" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Область" @@ -11858,10 +11862,6 @@ msgstr "Тип отчета" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po index 5d1a30ea1ff..aff5c8729ee 100644 --- a/openerp/addons/base/i18n/sk.po +++ b/openerp/addons/base/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:33+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:47+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6508,6 +6508,10 @@ msgstr "Právo vytvárať" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Federálny štát" @@ -11768,10 +11772,6 @@ msgstr "Typ výkazu" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index 6b1c987689c..6421a1ebbd3 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:34+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:47+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6555,6 +6555,10 @@ msgstr "Ustvari dostop" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Zvezna država" @@ -11834,10 +11838,6 @@ msgstr "Vrsta poročila" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po index aa61bfd3455..ce2934835dd 100644 --- a/openerp/addons/base/i18n/sq.po +++ b/openerp/addons/base/i18n/sq.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:27+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:40+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6384,6 +6384,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11589,10 +11593,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po index d2226d586ac..a411ad0eee2 100644 --- a/openerp/addons/base/i18n/sr.po +++ b/openerp/addons/base/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:33+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:46+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6494,6 +6494,10 @@ msgstr "Napravi pristup" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Država" @@ -11739,10 +11743,6 @@ msgstr "Tip izveštaja" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po index c1f27857c24..81f4b11368d 100644 --- a/openerp/addons/base/i18n/sr@latin.po +++ b/openerp/addons/base/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:37+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po index 44670e961da..355106a8f19 100644 --- a/openerp/addons/base/i18n/sv.po +++ b/openerp/addons/base/i18n/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:34+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:47+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6517,6 +6517,10 @@ msgstr "Skapa åtkomst" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Fed. State" @@ -11781,10 +11785,6 @@ msgstr "Rapporttyp" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po index 168ff935025..036e10cfc6d 100644 --- a/openerp/addons/base/i18n/th.po +++ b/openerp/addons/base/i18n/th.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:34+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:47+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index 037da201dd6..bb4c547a638 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:34+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:47+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6384,6 +6384,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11589,10 +11593,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index 973c4c423f6..c4628fb2718 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-12 05:40+0000\n" -"X-Generator: Launchpad (build 14640)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:48+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6597,6 +6597,10 @@ msgstr "Erişim Oluştur" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "Federal Eyalet" @@ -11884,10 +11888,6 @@ msgstr "Rapor Türü" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po index b1616361c8e..f67b6524acf 100644 --- a/openerp/addons/base/i18n/uk.po +++ b/openerp/addons/base/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:35+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:48+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6431,6 +6431,10 @@ msgstr "Доступ для створення" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11641,10 +11645,6 @@ msgstr "Тип звіту" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po index 5408988da69..69c120443cc 100644 --- a/openerp/addons/base/i18n/ur.po +++ b/openerp/addons/base/i18n/ur.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:35+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:48+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po index a81c5a08ceb..da4e08393af 100644 --- a/openerp/addons/base/i18n/vi.po +++ b/openerp/addons/base/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:35+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:48+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6416,6 +6416,10 @@ msgstr "Quyền Tạo" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11625,10 +11629,6 @@ msgstr "Loại báo cáo" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po index c04d21659ae..68d77f23613 100644 --- a/openerp/addons/base/i18n/zh_CN.po +++ b/openerp/addons/base/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6418,6 +6418,10 @@ msgstr "创建权限" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "省／州" @@ -11637,10 +11641,6 @@ msgstr "报表类型" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po index add8f5e99f0..1471a4fa7ec 100644 --- a/openerp/addons/base/i18n/zh_HK.po +++ b/openerp/addons/base/i18n/zh_HK.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:35+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:48+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6385,6 +6385,10 @@ msgstr "" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "" @@ -11590,10 +11594,6 @@ msgstr "" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po index 8d25ab97792..09d42b6903b 100644 --- a/openerp/addons/base/i18n/zh_TW.po +++ b/openerp/addons/base/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-05 05:36+0000\n" -"X-Generator: Launchpad (build 14625)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base #: model:res.country,name:base.sh @@ -6394,6 +6394,10 @@ msgstr "建立存取" #. module: base #: field:res.partner.address,state_id:0 +#: field:res.bank,state:0 +#: field:res.company,state_id:0 +#: view:res.country.state:0 +#: field:res.partner.bank,state_id:0 msgid "Fed. State" msgstr "省或州" @@ -11611,10 +11615,6 @@ msgstr "報表類型" #: field:ir.module.module,state:0 #: field:ir.module.module.dependency,state:0 #: field:publisher_warranty.contract,state:0 -#: field:res.bank,state:0 -#: field:res.company,state_id:0 -#: view:res.country.state:0 -#: field:res.partner.bank,state_id:0 #: view:res.request:0 #: field:res.request,state:0 #: field:workflow.instance,state:0 From d49c7de24de366060b699cf25cb57c26c59b7fac Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 19 Jan 2012 04:51:14 +0000 Subject: [PATCH 108/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120119045114-1uzft0w0d45gb143 --- addons/account/i18n/pt_BR.po | 22 ++-- addons/account_analytic_default/i18n/pt_BR.po | 4 +- addons/account_asset/i18n/pt_BR.po | 4 +- addons/anonymization/i18n/nl.po | 10 +- addons/audittrail/i18n/nl.po | 14 +- addons/base_setup/i18n/nl.po | 28 +++- addons/board/i18n/pt_BR.po | 4 +- addons/crm_claim/i18n/nl.po | 44 +++---- addons/hr_evaluation/i18n/fr.po | 124 +++++++++++------- addons/marketing/i18n/nl.po | 12 +- addons/marketing_campaign/i18n/nl.po | 22 ++-- addons/project_scrum/i18n/pt_BR.po | 4 +- addons/sale_margin/i18n/nl.po | 10 +- addons/web_livechat/i18n/pt_BR.po | 4 +- addons/wiki/i18n/pt_BR.po | 4 +- 15 files changed, 179 insertions(+), 131 deletions(-) diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index c66787e3477..25eac0d0d03 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2012-01-18 02:49+0000\n" +"PO-Revision-Date: 2012-01-19 04:21+0000\n" "Last-Translator: Rafael Sales \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: account #: view:account.invoice.report:0 @@ -48,7 +48,7 @@ msgstr "Estatisticas da conta" #. module: account #: view:account.invoice:0 msgid "Proforma/Open/Paid Invoices" -msgstr "" +msgstr "Proforma / Aberto / Faturas Pagas" #. module: account #: field:report.invoice.created,residual:0 @@ -111,6 +111,8 @@ msgid "" "Configuration error! The currency chosen should be shared by the default " "accounts too." msgstr "" +"Erro de configuração! A moeda escolhida deve ser compartilhada pelas contas " +"padrão também." #. module: account #: report:account.invoice:0 @@ -715,7 +717,7 @@ msgstr "Parceiros Reconciliados Hoje" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Sale journal in this year" -msgstr "" +msgstr "Diário de vendas deste ano" #. module: account #: selection:account.financial.report,display_detail:0 @@ -742,7 +744,7 @@ msgstr "Entradas analíticas por linha" #. module: account #: field:account.invoice.refund,filter_refund:0 msgid "Refund Method" -msgstr "" +msgstr "Método de reembolso" #. module: account #: code:addons/account/wizard/account_change_currency.py:38 @@ -965,7 +967,7 @@ msgstr "" #: code:addons/account/account.py:2578 #, python-format msgid "I can not locate a parent code for the template account!" -msgstr "" +msgstr "Não consigo localizar um código aparente para a conta do modelo!" #. module: account #: view:account.analytic.line:0 @@ -2312,6 +2314,8 @@ msgid "" "In order to delete a bank statement, you must first cancel it to delete " "related journal items." msgstr "" +"Para excluir um texto bancário, primeiro você deve cancelá-lo para excluir " +"itens relacionados ao diário." #. module: account #: field:account.invoice,payment_term:0 @@ -2625,7 +2629,7 @@ msgstr "" #. module: account #: sql_constraint:account.model.line:0 msgid "Wrong credit or debit value in model, they must be positive!" -msgstr "" +msgstr "Crédito errado ou valor do débito deve ser positivo!" #. module: account #: model:ir.ui.menu,name:account.menu_automatic_reconcile @@ -2672,7 +2676,7 @@ msgstr "Conta-pai de Impostos" #: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not configured properly !" -msgstr "" +msgstr "Nova moeda não está configurada corretamente!" #. module: account #: view:account.subscription.generate:0 diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po index ea4c9e78981..01ffe84cab7 100644 --- a/addons/account_analytic_default/i18n/pt_BR.po +++ b/addons/account_analytic_default/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: account_analytic_default #: help:account.analytic.default,partner_id:0 diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po index 68d074a76c2..c337d901a3c 100644 --- a/addons/account_asset/i18n/pt_BR.po +++ b/addons/account_asset/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/anonymization/i18n/nl.po b/addons/anonymization/i18n/nl.po index 86f4fbe29e2..35b54ff7c5c 100644 --- a/addons/anonymization/i18n/nl.po +++ b/addons/anonymization/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-02-16 11:28+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-18 20:01+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: anonymization #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard @@ -211,6 +211,8 @@ msgstr "Bericht" #, python-format msgid "You cannot have two fields with the same name on the same object!" msgstr "" +"Het is niet toegestaan om twee velden met dezelfde naam van hetzelfde object " +"te hebben!" #~ msgid "Database anonymization module" #~ msgstr "Database anonimisatie module" diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po index 1f3819f7545..84f70b5d4f8 100644 --- a/addons/audittrail/i18n/nl.po +++ b/addons/audittrail/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-11 18:42+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-18 20:04+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: audittrail #: code:addons/audittrail/audittrail.py:75 @@ -39,11 +39,13 @@ msgid "" "There is already a rule defined on this object\n" " You cannot define another: please edit the existing one." msgstr "" +"Er is al een regel gedefinieerd voor dit object\n" +" Het is niet mogelijk om een andere te definieren: Wijzig de bestaande." #. module: audittrail #: view:audittrail.rule:0 msgid "Subscribed Rule" -msgstr "" +msgstr "Geaboneerde regel" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_rule @@ -327,7 +329,7 @@ msgstr "AuditTrails-logs" #. module: audittrail #: view:audittrail.rule:0 msgid "Draft Rule" -msgstr "" +msgstr "Concept regel" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po index 5ece536e0f6..f128faeeb54 100644 --- a/addons/base_setup/i18n/nl.po +++ b/addons/base_setup/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-17 17:43+0000\n" +"PO-Revision-Date: 2012-01-18 20:23+0000\n" "Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:43+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 @@ -52,6 +52,8 @@ msgid "" "Set default for new user's timezone, used to perform timezone conversions " "between the server and the client." msgstr "" +"Stel de standaard tijdzone in voor nieuwe gebruikers. Deze wordt gebruikt om " +"tijdzone conversies te maken tussen server en client." #. module: base_setup #: selection:product.installer,customers:0 @@ -75,6 +77,9 @@ msgid "" "printed on your reports. You can click on the button 'Preview Header' in " "order to check the header/footer of PDF documents." msgstr "" +"Vul uw bedrijfsgegevens in (adres, logo, bankrekeningen) zo dat deze kunnen " +"worden afgedrukt op uw rapporten. U kan op de knop 'Voorbeeld kop' klikken " +"om de kop en voet van PDF documenten te controleren." #. module: base_setup #: field:product.installer,customers:0 @@ -98,6 +103,9 @@ msgid "" "you can import your existing partners by CSV spreadsheet from \"Import " "Data\" wizard" msgstr "" +"Maak of import klanten en de contactpersonen handmatig vanuit dit scherm of " +"u kunt uw bestaande partners vanuit een CSV bestand importeren via de " +"\"Import data\" wizard" #. module: base_setup #: view:user.preferences.config:0 @@ -152,6 +160,8 @@ msgid "" "You can use this wizard to change the terminologies for customers in the " "whole application." msgstr "" +"U kunt deze wizard gebruiken om de terminologie voor klanten, in de gehele " +"applicatie, te wijzigen." #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -175,6 +185,9 @@ msgid "" "available. If you want to Add new Language, you can add it from 'Load an " "Official Translation' wizard from 'Administration' menu." msgstr "" +"Dit stelt, wanneer er vertalingen aanwezig zijn, de standaard taal voor de " +"gebruikers weergave in. Als u een nieuwe taal wilt toevoegen, dan kan dit " +"via 'Laad een officiële taal' in het 'beheer' menu." #. module: base_setup #: view:user.preferences.config:0 @@ -183,6 +196,9 @@ msgid "" "ones. Afterwards, users are free to change those values on their own user " "preference form." msgstr "" +"Dit stelt de standaard voorkeuren voor nieuwe gebruikers in en werkt alle " +"bestaande gebruikers bij. Naderhand kunnen gebruikers zelfstandig deze " +"waardes aanpassen in hun voorkeuren scherm." #. module: base_setup #: field:base.setup.terminology,partner:0 @@ -192,7 +208,7 @@ msgstr "Hoe belt u een klant" #. module: base_setup #: field:migrade.application.installer.modules,quickbooks_ippids:0 msgid "Quickbooks Ippids" -msgstr "" +msgstr "Quickbooks Ippids" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -276,12 +292,12 @@ msgstr "Relatie" #. module: base_setup #: view:base.setup.terminology:0 msgid "Specify Your Terminology" -msgstr "" +msgstr "Specificeer uw teminology" #. module: base_setup #: help:migrade.application.installer.modules,sync_google_contact:0 msgid "For Sync Google Contact" -msgstr "" +msgstr "Voor Sync Google contactpersonen" #~ msgid "" #~ "You can start configuring the system or connect directly to the database " diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po index d41957243c7..67bf55e4e19 100644 --- a/addons/board/i18n/pt_BR.po +++ b/addons/board/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: board #: view:res.log.report:0 diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po index 3905e290af2..56d98318213 100644 --- a/addons/crm_claim/i18n/nl.po +++ b/addons/crm_claim/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:52+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-18 20:27+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:21+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -85,12 +85,12 @@ msgstr "" #: code:addons/crm_claim/crm_claim.py:132 #, python-format msgid "The claim '%s' has been opened." -msgstr "" +msgstr "De klacht '%s' is geopend." #. module: crm_claim #: view:crm.claim:0 msgid "Date Closed" -msgstr "" +msgstr "Datum gesloten" #. module: crm_claim #: view:crm.claim.report:0 @@ -151,12 +151,12 @@ msgstr "Referentie" #. module: crm_claim #: view:crm.claim.report:0 msgid "Date of claim" -msgstr "" +msgstr "Datum van de klacht" #. module: crm_claim #: view:crm.claim:0 msgid "All pending Claims" -msgstr "" +msgstr "Alle lopende klachten" #. module: crm_claim #: view:crm.claim.report:0 @@ -187,7 +187,7 @@ msgstr "Relatie" #. module: crm_claim #: view:crm.claim.report:0 msgid "Month of claim" -msgstr "" +msgstr "Maand van de klacht" #. module: crm_claim #: selection:crm.claim,type_action:0 @@ -227,7 +227,7 @@ msgstr "Verstuur nieuwe email" #: selection:crm.claim,state:0 #: view:crm.claim.report:0 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: crm_claim #: view:crm.claim:0 @@ -254,7 +254,7 @@ msgstr "Volgende actie" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim3 @@ -321,7 +321,7 @@ msgstr "Contactpersoon" #. module: crm_claim #: view:crm.claim.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim @@ -380,7 +380,7 @@ msgstr "Wijzigingsdatum" #. module: crm_claim #: view:crm.claim.report:0 msgid "Year of claim" -msgstr "" +msgstr "Jaar van de klacht" #. module: crm_claim #: view:crm.claim.report:0 @@ -402,7 +402,7 @@ msgstr "Waarde klachten" #. module: crm_claim #: view:crm.claim:0 msgid "Responsible User" -msgstr "" +msgstr "Verantwoordelijke gebruiker" #. module: crm_claim #: help:crm.claim,email_cc:0 @@ -490,7 +490,7 @@ msgstr "Gebruiker" #. module: crm_claim #: field:crm.claim,active:0 msgid "Active" -msgstr "" +msgstr "Actief" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -622,7 +622,7 @@ msgstr "Open" #. module: crm_claim #: view:crm.claim:0 msgid "New Claims" -msgstr "" +msgstr "Nieuwe klachten" #. module: crm_claim #: view:crm.claim:0 @@ -639,17 +639,17 @@ msgstr "Verantwoordelijke" #. module: crm_claim #: view:crm.claim.report:0 msgid "Claims created in current year" -msgstr "" +msgstr "Klachten aangemaakt in huidige jaar" #. module: crm_claim #: view:crm.claim:0 msgid "Unassigned Claims" -msgstr "" +msgstr "Niet toegewezen klachten" #. module: crm_claim #: view:crm.claim.report:0 msgid "Claims created in current month" -msgstr "" +msgstr "Klachten aangemaakt in huidige maand" #. module: crm_claim #: field:crm.claim.report,delay_expected:0 @@ -719,7 +719,7 @@ msgstr "Afgewerkte akties" #. module: crm_claim #: view:crm.claim.report:0 msgid "Claims created in last month" -msgstr "" +msgstr "Klachten aangemaakt in afgelopen maand" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim5 @@ -764,7 +764,7 @@ msgstr "Jaar" #. module: crm_claim #: view:crm.claim.report:0 msgid "My company" -msgstr "" +msgstr "Mijn bedrijf" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -814,7 +814,7 @@ msgstr "Aanmaakdatum" #. module: crm_claim #: view:crm.claim:0 msgid "In Progress Claims" -msgstr "" +msgstr "Klachten in behandeling" #~ msgid "Customer & Supplier Relationship Management" #~ msgstr "Customer & Supplier Relationship Management" diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po index b095afc562f..34d9dbe6333 100644 --- a/addons/hr_evaluation/i18n/fr.po +++ b/addons/hr_evaluation/i18n/fr.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-18 16:47+0000\n" -"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) " -"\n" +"PO-Revision-Date: 2012-01-18 16:59+0000\n" +"Last-Translator: gde (OpenERP) \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: 2011-12-23 07:14+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: hr_evaluation #: help:hr_evaluation.plan.phase,send_anonymous_manager:0 @@ -26,7 +25,7 @@ msgstr "Envoyer un résumé anonyme au responsable" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Start Appraisal" -msgstr "" +msgstr "Démarrer les évaluations" #. module: hr_evaluation #: view:hr.evaluation.interview:0 @@ -38,7 +37,7 @@ msgstr "Regrouper par..." #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal that overpassed the deadline" -msgstr "" +msgstr "Evaluations ayant dépassé la limite" #. module: hr_evaluation #: field:hr.evaluation.interview,request_id:0 @@ -65,7 +64,7 @@ msgstr "Délai avant de commencer" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal that are in waiting appreciation state" -msgstr "" +msgstr "Evaluations en attente d'appréciation" #. module: hr_evaluation #: code:addons/hr_evaluation/hr_evaluation.py:244 @@ -97,7 +96,7 @@ msgstr "Jour" #: view:hr_evaluation.plan:0 #: field:hr_evaluation.plan,phase_ids:0 msgid "Appraisal Phases" -msgstr "" +msgstr "Phases d'évaluation" #. module: hr_evaluation #: help:hr_evaluation.plan,month_first:0 @@ -105,8 +104,8 @@ msgid "" "This number of months will be used to schedule the first evaluation date of " "the employee when selecting an evaluation plan. " msgstr "" -"Le nombre de mois sera utilisé pour planifier la date de la première " -"évaluation de l'employé, lors du choix de plan d'évaluation. " +"Ce délai sera utilisé pour planifier la date de la première évaluation de " +"l'employé si cette campagne est choisie. " #. module: hr_evaluation #: view:hr.employee:0 @@ -116,7 +115,7 @@ msgstr "Remarques" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 msgid "(eval_name)s:Appraisal Name" -msgstr "" +msgstr "Nom de l'évaluation" #. module: hr_evaluation #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree @@ -127,6 +126,12 @@ msgid "" "manages all kind of evaluations: bottom-up, top-down, self-evaluation and " "final evaluation by the manager." msgstr "" +"Chaque employé peut se voir assigner une campagne d'évaluation spécifique. " +"Un telle campagne définit la fréquence et la manière de gérer l'évaluation " +"périodique du personnel. Il suffit d'en définir les étapes et d'y ajouter " +"des modèles d'entrevues. \r\n" +"OpenERP gère différents types d'évaluations: bottom up, top down et auto-" +"évaluation suivie d'une évaluation finale par le supérieur hiérarchique." #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -141,7 +146,7 @@ msgstr "Attendre les phases précédentes" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation msgid "Employee Appraisal" -msgstr "" +msgstr "Evaluations des employés" #. module: hr_evaluation #: selection:hr.evaluation.report,state:0 @@ -227,12 +232,12 @@ msgstr "" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal that are in Plan In Progress state" -msgstr "" +msgstr "Evaluations en attente de planification" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Reset to Draft" -msgstr "" +msgstr "Repasser à l'état \"Brouillon\"" #. module: hr_evaluation #: field:hr.evaluation.report,deadline:0 @@ -247,7 +252,7 @@ msgstr " Mois " #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "In progress Evaluations" -msgstr "" +msgstr "Evaluations en cours" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_survey_request @@ -291,7 +296,7 @@ msgstr "Employé" #. module: hr_evaluation #: selection:hr_evaluation.evaluation,state:0 msgid "New" -msgstr "" +msgstr "Brouillon" #. module: hr_evaluation #: field:hr_evaluation.plan.phase,mail_body:0 @@ -315,17 +320,17 @@ msgstr "" #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "Evaluation done in last month" -msgstr "" +msgstr "Evaluations réalisées le mois passé" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "Assistant de composition de message" #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "Creation Date" -msgstr "" +msgstr "Date de création" #. module: hr_evaluation #: help:hr_evaluation.plan.phase,send_answer_manager:0 @@ -336,7 +341,7 @@ msgstr "Envoyer toutes les réponses au responsable" #: selection:hr.evaluation.report,state:0 #: selection:hr_evaluation.evaluation,state:0 msgid "Plan In Progress" -msgstr "Plan en cours" +msgstr "En cours de planification" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 @@ -346,7 +351,7 @@ msgstr "Remarques publiques" #. module: hr_evaluation #: view:hr.evaluation.interview:0 msgid "Send Reminder Email" -msgstr "" +msgstr "Envoyer un message de rappel" #. module: hr_evaluation #: view:hr.evaluation.report:0 @@ -363,7 +368,7 @@ msgstr "Imprimer l'entretien" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Pending" -msgstr "" +msgstr "En attente" #. module: hr_evaluation #: field:hr.evaluation.report,closed:0 @@ -390,7 +395,7 @@ msgstr "Juillet" #. module: hr_evaluation #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer msgid "Review Appraisal Plans" -msgstr "" +msgstr "Revue des campagnes d'évaluations" #. module: hr_evaluation #: view:hr.evaluation.report:0 @@ -410,12 +415,12 @@ msgstr "Plan d'action" #. module: hr_evaluation #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config msgid "Periodic Appraisal" -msgstr "" +msgstr "Evaluations périodiques" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal to close within the next 7 days" -msgstr "" +msgstr "Evaluations à terminer endéans les 7 jours" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 @@ -435,6 +440,10 @@ msgid "" "employee's Appraisal Plan. Each user receives automatic emails and requests " "to evaluate their colleagues periodically." msgstr "" +"Les demandes d'évaluation sont automatiquement créées par le système en " +"fonction de la campagne d'évaluation de chaque employé. Chaque employé " +"reçoit automatiquement les rappels lui demandant d'évaluer périodiquement " +"ses collègues." #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 @@ -465,7 +474,7 @@ msgstr "Décembre" #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "Evaluation done in current year" -msgstr "" +msgstr "Evaluations effectuées dans l'année" #. module: hr_evaluation #: view:hr.evaluation.report:0 @@ -486,7 +495,7 @@ msgstr "Paramètrages des courriels" #. module: hr_evaluation #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders msgid "Appraisal Reminders" -msgstr "" +msgstr "Rappels d'évaluation" #. module: hr_evaluation #: view:hr.evaluation.interview:0 @@ -511,7 +520,7 @@ msgstr "Légende" #. module: hr_evaluation #: field:hr_evaluation.plan,month_first:0 msgid "First Appraisal in (months)" -msgstr "" +msgstr "Délai évaluation initiale (mois)" #. module: hr_evaluation #: selection:hr.evaluation.report,state:0 @@ -536,7 +545,7 @@ msgstr "7 jours" #: field:hr_evaluation.plan.phase,plan_id:0 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan msgid "Appraisal Plan" -msgstr "" +msgstr "Campagne d'évaluation" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -565,7 +574,7 @@ msgstr " (employee_name)s : Nom du partenaire" #: view:hr_evaluation.evaluation:0 #: field:hr_evaluation.evaluation,plan_id:0 msgid "Plan" -msgstr "Plan" +msgstr "Campagne" #. module: hr_evaluation #: field:hr_evaluation.plan,active:0 @@ -591,7 +600,7 @@ msgstr "" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase msgid "Appraisal Plan Phase" -msgstr "" +msgstr "Phases de campagnes d'évaluation" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -601,7 +610,7 @@ msgstr "Janvier" #. module: hr_evaluation #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview msgid "Appraisal Interviews" -msgstr "" +msgstr "Entrevues d'évaluations" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 @@ -639,12 +648,12 @@ msgstr "En attente d'appréciation" #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all msgid "Appraisal Analysis" -msgstr "" +msgstr "Analyse des évaluations" #. module: hr_evaluation #: field:hr_evaluation.evaluation,date:0 msgid "Appraisal Deadline" -msgstr "" +msgstr "Echéance d'évaluation" #. module: hr_evaluation #: field:hr.evaluation.report,rating:0 @@ -682,6 +691,11 @@ msgid "" "\n" " Thanks," msgstr "" +"Bonjour %s,\n" +"\n" +"Pourriez-vous répondre à l'enquête \"%s\"?\n" +"\n" +"Merci," #. module: hr_evaluation #: selection:hr_evaluation.plan.phase,action:0 @@ -696,6 +710,11 @@ msgid "" "OpenERP can automatically generate interview requests to managers and/or " "subordinates." msgstr "" +"Vous pouvez définir des campagnes d'évaluation (ex: première interview dans " +"6 mois, puis chaque année). Chaque employé peut ensuite être lié à une " +"campagne d'évaluation, et le système se chargera de créer automatiquement " +"les demandes d'entrevues d'évaluation pour les employés et leurs supérieurs " +"hiérarchiques." #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -710,7 +729,7 @@ msgstr "Envoyer toutes les réponses à l'employé" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal Data" -msgstr "" +msgstr "Données d'évaluation" #. module: hr_evaluation #: view:hr.evaluation.report:0 @@ -724,12 +743,12 @@ msgstr "Terminée" #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree msgid "Appraisal Plans" -msgstr "" +msgstr "Campagnes d'évaluation" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview msgid "Appraisal Interview" -msgstr "" +msgstr "Entrevue d'évaluation" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 @@ -740,7 +759,7 @@ msgstr "Annuler" #: code:addons/hr_evaluation/wizard/mail_compose_message.py:49 #, python-format msgid "Reminder to fill up Survey" -msgstr "" +msgstr "Rappel de réponse à une enquête" #. module: hr_evaluation #: view:hr.evaluation.report:0 @@ -755,7 +774,7 @@ msgstr "À faire" #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "Final Validation Evaluations" -msgstr "" +msgstr "Entrevues d'évaluation finales" #. module: hr_evaluation #: field:hr_evaluation.plan.phase,mail_feature:0 @@ -779,6 +798,8 @@ msgid "" "The date of the next appraisal is computed by the appraisal plan's dates " "(first appraisal + periodicity)." msgstr "" +"La date de la prochaine évaluation est calculée suivant la campagne " +"d'évaluation (délai première évaluation + périodicité)" #. module: hr_evaluation #: field:hr.evaluation.report,overpass_delay:0 @@ -791,12 +812,13 @@ msgid "" "The number of month that depicts the delay between each evaluation of this " "plan (after the first one)." msgstr "" -"Le nombre de mois séparant chaque évaluation de ce plan (après la première)." +"Le nombre de mois séparant chaque évaluation de cette campagne (après la " +"première)." #. module: hr_evaluation #: field:hr_evaluation.plan,month_next:0 msgid "Periodicity of Appraisal (months)" -msgstr "" +msgstr "Périodicité des évaluations (mois)" #. module: hr_evaluation #: selection:hr_evaluation.plan.phase,action:0 @@ -852,23 +874,25 @@ msgstr "Février" #: view:hr.evaluation.interview:0 #: view:hr_evaluation.evaluation:0 msgid "Interview Appraisal" -msgstr "" +msgstr "Entrevue d'évaluation" #. module: hr_evaluation #: field:survey.request,is_evaluation:0 msgid "Is Appraisal?" -msgstr "" +msgstr "Est une évaluation?" #. module: hr_evaluation #: code:addons/hr_evaluation/hr_evaluation.py:320 #, python-format msgid "You cannot start evaluation without Appraisal." msgstr "" +"Vous ne pouvez démarrer une entrevue d'évaluation sans formulaire " +"d'évaluation" #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "Evaluation done in current month" -msgstr "" +msgstr "Evaluations effectuées ce mois-ci" #. module: hr_evaluation #: field:hr.evaluation.interview,user_to_review_id:0 @@ -883,18 +907,18 @@ msgstr "Avril" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 msgid "Appraisal Plan Phases" -msgstr "" +msgstr "Phases de campagnes d'évaluation" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Validate Appraisal" -msgstr "" +msgstr "Valider évaluation" #. module: hr_evaluation #: view:hr.evaluation.interview:0 #: view:hr_evaluation.evaluation:0 msgid "Search Appraisal" -msgstr "" +msgstr "Recherche d'évaluations" #. module: hr_evaluation #: field:hr_evaluation.plan.phase,sequence:0 @@ -928,12 +952,12 @@ msgstr "Année" #. module: hr_evaluation #: field:hr_evaluation.evaluation,note_summary:0 msgid "Appraisal Summary" -msgstr "" +msgstr "Résumé d'évaluation" #. module: hr_evaluation #: field:hr.employee,evaluation_date:0 msgid "Next Appraisal Date" -msgstr "" +msgstr "Date de prochaine évaluation" #~ msgid "Evaluation Type" #~ msgstr "Type d'évaluation" diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po index 9ed8a0d3540..e570d3104e8 100644 --- a/addons/marketing/i18n/nl.po +++ b/addons/marketing/i18n/nl.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:45+0000\n" -"PO-Revision-Date: 2011-01-14 13:32+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-18 20:28+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:20+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: marketing #: model:res.groups,name:marketing.group_marketing_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: marketing #: model:res.groups,name:marketing.group_marketing_user msgid "User" -msgstr "" +msgstr "Gebruiker" #~ msgid "Image" #~ msgstr "Afbeelding" diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po index 80a907a542e..60367a1985a 100644 --- a/addons/marketing_campaign/i18n/nl.po +++ b/addons/marketing_campaign/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:45+0000\n" -"PO-Revision-Date: 2011-01-14 15:24+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-18 20:30+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: marketing_campaign #: view:marketing.campaign:0 @@ -120,7 +120,7 @@ msgstr "Object" #. module: marketing_campaign #: view:marketing.campaign.segment:0 msgid "Sync mode: only records created after last sync" -msgstr "" +msgstr "Sync mode: alleen records welke zijn aangemaakt na laatste sync" #. module: marketing_campaign #: help:marketing.campaign.activity,condition:0 @@ -364,7 +364,7 @@ msgstr "Marketingrapporten" #: selection:marketing.campaign,state:0 #: selection:marketing.campaign.segment,state:0 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: marketing_campaign #: field:marketing.campaign.activity,type:0 @@ -469,7 +469,7 @@ msgstr "Uur/Uren" #. module: marketing_campaign #: view:campaign.analysis:0 msgid " Month-1 " -msgstr "" +msgstr " Maand-1 " #. module: marketing_campaign #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment @@ -669,12 +669,12 @@ msgstr "Juni" #. module: marketing_campaign #: model:ir.model,name:marketing_campaign.model_email_template msgid "Email Templates" -msgstr "" +msgstr "Email-sjablonen" #. module: marketing_campaign #: view:marketing.campaign.segment:0 msgid "Sync mode: all records" -msgstr "" +msgstr "Sync mode: Alle records" #. module: marketing_campaign #: selection:marketing.campaign.segment,sync_mode:0 @@ -711,7 +711,7 @@ msgstr "Het rapport wordt gegenereerd als de activiteit is geactiveerd" #. module: marketing_campaign #: field:marketing.campaign,unique_field_id:0 msgid "Unique Field" -msgstr "" +msgstr "Uniek veld" #. module: marketing_campaign #: selection:campaign.analysis,state:0 @@ -980,7 +980,7 @@ msgstr "" #. module: marketing_campaign #: view:marketing.campaign.segment:0 msgid "Sync mode: only records updated after last sync" -msgstr "" +msgstr "Sync mode: alleen records welke zijn bijgewerkt na laatste sync" #. module: marketing_campaign #: code:addons/marketing_campaign/marketing_campaign.py:792 diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po index 24305294fe7..965ae41c4d3 100644 --- a/addons/project_scrum/i18n/pt_BR.po +++ b/addons/project_scrum/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:43+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: project_scrum #: view:project.scrum.backlog.assign.sprint:0 diff --git a/addons/sale_margin/i18n/nl.po b/addons/sale_margin/i18n/nl.po index a10bc7d14ef..cc8c56d5323 100644 --- a/addons/sale_margin/i18n/nl.po +++ b/addons/sale_margin/i18n/nl.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 08:35+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-18 21:11+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: sale_margin #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Orderreferentie moet uniek zijn per bedrijf!" #. module: sale_margin #: field:sale.order.line,purchase_price:0 diff --git a/addons/web_livechat/i18n/pt_BR.po b/addons/web_livechat/i18n/pt_BR.po index 72a8ed40405..d816c33c14c 100644 --- a/addons/web_livechat/i18n/pt_BR.po +++ b/addons/web_livechat/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: web_livechat #: sql_constraint:publisher_warranty.contract:0 diff --git a/addons/wiki/i18n/pt_BR.po b/addons/wiki/i18n/pt_BR.po index 3f18e7ce05e..c3f7159ea2e 100644 --- a/addons/wiki/i18n/pt_BR.po +++ b/addons/wiki/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" +"X-Generator: Launchpad (build 14692)\n" #. module: wiki #: field:wiki.groups,template:0 From 3ec4ad320182432293c6d5f0b0dbb4448d6874b9 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 09:52:13 +0100 Subject: [PATCH 109/170] =?UTF-8?q?[REF]=C2=A0code=20review.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: florent.xicluna@gmail.com-20120119085213-94b2p3268q25bni2 --- addons/web/common/openerplib/main.py | 2 +- addons/web/controllers/main.py | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py index 93c2d1da69d..fdcd392973d 100644 --- a/addons/web/common/openerplib/main.py +++ b/addons/web/common/openerplib/main.py @@ -249,7 +249,7 @@ class Model(object): method, args, kw) if method == "read": - if isinstance(result, list) and len(result) > 0 and "id" in result[0]: + if result and isinstance(result, list) and "id" in result[0]: index = {} for r in result: index[r['id']] = r diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 2af7ac115d8..4c7a9647b62 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -213,7 +213,7 @@ class WebClient(openerpweb.Controller): else: lang_obj = None - if lang.count("_") > 0: + if "_" in lang: separator = "_" else: separator = "@" @@ -224,15 +224,15 @@ class WebClient(openerpweb.Controller): for addon_name in mods: transl = {"messages":[]} transs[addon_name] = transl + addons_path = openerpweb.addons_manifest[addon_name]['addons_path'] for l in langs: - addons_path = openerpweb.addons_manifest[addon_name]['addons_path'] f_name = os.path.join(addons_path, addon_name, "po", l + ".po") if not os.path.exists(f_name): continue try: with open(f_name) as t_file: po = babel.messages.pofile.read_po(t_file) - except: + except Exception: continue for x in po: if x.id and x.string: @@ -399,7 +399,7 @@ class Session(openerpweb.Controller): if req.session.model('res.users').change_password( old_password, new_password): return {'new_password':new_password} - except: + except Exception: return {'error': 'Original password incorrect, your password was not changed.', 'title': 'Change Password'} return {'error': 'Error, password not changed !', 'title': 'Change Password'} @@ -508,7 +508,7 @@ class Session(openerpweb.Controller): req.httpsession['saved_actions'] = saved_actions # we don't allow more than 10 stored actions if len(saved_actions["actions"]) >= 10: - del saved_actions["actions"][min(saved_actions["actions"].keys())] + del saved_actions["actions"][min(saved_actions["actions"])] key = saved_actions["next"] saved_actions["actions"][key] = the_action saved_actions["next"] = key + 1 @@ -569,10 +569,9 @@ def clean_action(req, action, do_not_eval=False): if 'domain' in action: action['domain'] = parse_domain(action['domain'], req.session) - if 'type' not in action: - action['type'] = 'ir.actions.act_window_close' + action_type = action.setdefault('type', 'ir.actions.act_window_close') - if action['type'] == 'ir.actions.act_window': + if action_type == 'ir.actions.act_window': return fix_view_modes(action) return action @@ -691,7 +690,7 @@ class Menu(openerpweb.Controller): # sort by sequence a tree using parent_id for menu_item in menu_items: menu_item.setdefault('children', []).sort( - key=lambda x:x["sequence"]) + key=operator.itemgetter('sequence')) return menu_root @@ -744,7 +743,7 @@ class DataSet(openerpweb.Controller): # shortcut read if we only want the ids return { 'ids': ids, - 'records': map(lambda id: {'id': id}, paginated_ids) + 'records': [{'id': id} for id in paginated_ids] } records = Model.read(paginated_ids, fields or False, context) @@ -1015,7 +1014,7 @@ def parse_domain(domain, session): :param session: Current OpenERP session :type session: openerpweb.openerpweb.OpenERPSession """ - if not isinstance(domain, (str, unicode)): + if not isinstance(domain, basestring): return domain try: return ast.literal_eval(domain) @@ -1032,7 +1031,7 @@ def parse_context(context, session): :param session: Current OpenERP session :type session: openerpweb.openerpweb.OpenERPSession """ - if not isinstance(context, (str, unicode)): + if not isinstance(context, basestring): return context try: return ast.literal_eval(context) @@ -1500,7 +1499,7 @@ class CSVExport(Export): d = d.replace('\n',' ').replace('\t',' ') try: d = d.encode('utf-8') - except: + except UnicodeError: pass if d is False: d = None row.append(d) From 4b65b076f0e74179023b921398733fa7c247c96f Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 10:06:48 +0100 Subject: [PATCH 110/170] =?UTF-8?q?[REF]=C2=A0do=20not=20create=20useless?= =?UTF-8?q?=20OpenERPSession=20objects=20on=20each=20request.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: florent.xicluna@gmail.com-20120119090648-jck7ggaigy6zaalw --- addons/web/common/http.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 434edf5e3a7..931b2181d15 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -92,7 +92,9 @@ class WebRequest(object): self.params = dict(params) # OpenERP session setup self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex - self.session = self.httpsession.setdefault(self.session_id, session.OpenERPSession()) + self.session = self.httpsession.get(self.session_id) + if not self.session: + self.httpsession[self.session_id] = self.session = session.OpenERPSession() self.session.config = self.config self.context = self.params.pop('context', None) self.debug = self.params.pop('debug', False) != False From b540f5ad3f34b4797b2c963205ed4beb6dcb9cc3 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 10:35:20 +0100 Subject: [PATCH 111/170] [REF] the openerplib should be fixed upstream. bzr revid: florent.xicluna@gmail.com-20120119093520-92udlqrq8ufyw43s --- addons/web/common/openerplib/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py index fdcd392973d..93c2d1da69d 100644 --- a/addons/web/common/openerplib/main.py +++ b/addons/web/common/openerplib/main.py @@ -249,7 +249,7 @@ class Model(object): method, args, kw) if method == "read": - if result and isinstance(result, list) and "id" in result[0]: + if isinstance(result, list) and len(result) > 0 and "id" in result[0]: index = {} for r in result: index[r['id']] = r From 8568e89ddf6c5b3ec88901ff71b43e530934e399 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 19 Jan 2012 10:57:24 +0100 Subject: [PATCH 112/170] [FIX] document_ftp: break self-import (which is causing a segfault since the import-hook has been merged in the server). bzr revid: vmt@openerp.com-20120119095724-wkbu8oewdxzbvwxd --- addons/document_ftp/wizard/ftp_browse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py index e8f127c3c3b..b1120bc6511 100644 --- a/addons/document_ftp/wizard/ftp_browse.py +++ b/addons/document_ftp/wizard/ftp_browse.py @@ -21,7 +21,7 @@ from osv import osv, fields # from tools.translate import _ -from document_ftp import ftpserver +from .. import ftpserver class document_ftp_browse(osv.osv_memory): _name = 'document.ftp.browse' From 5d743ccc53bf623297bc43c35a1a5b46e7c91bb4 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 19 Jan 2012 11:11:49 +0100 Subject: [PATCH 113/170] [FIX] report_webkit: avoid using report name in temp file path, breaks with non-ASCII (translated) report names bzr revid: odo@openerp.com-20120119101149-6npyju87vz2mi5c2 --- addons/report_webkit/webkit_report.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index c3753f5de3b..9d0b663c481 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -60,16 +60,14 @@ def mako_template(text): tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) - class WebKitParser(report_sxw): """Custom class that use webkit to render HTML reports Code partially taken from report openoffice. Thanks guys :) """ - def __init__(self, name, table, rml=False, parser=False, header=True, store=False): self.parser_instance = False - self.localcontext={} + self.localcontext = {} report_sxw.__init__(self, name, table, rml, parser, header, store) @@ -107,8 +105,7 @@ class WebKitParser(report_sxw): if not webkit_header: webkit_header = report_xml.webkit_header tmp_dir = tempfile.gettempdir() - out = report_xml.name+str(time.time())+'.pdf' - out = os.path.join(tmp_dir, out.replace(' ','')) + out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.") files = [] file_to_del = [] if comm_path: @@ -162,8 +159,7 @@ class WebKitParser(report_sxw): html_file.close() file_to_del.append(html_file.name) command.append(html_file.name) - command.append(out) - generate_command = ' '.join(command) + command.append(out_filename) try: status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr if status : @@ -175,11 +171,11 @@ class WebKitParser(report_sxw): for f_to_del in file_to_del : os.unlink(f_to_del) - pdf = file(out, 'rb').read() + pdf = file(out_filename, 'rb').read() for f_to_del in file_to_del : os.unlink(f_to_del) - os.unlink(out) + os.unlink(out_filename) return pdf def translate_call(self, src): From c5845be2441c613464cdeee88d342503f3b68c0e Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 19 Jan 2012 11:21:45 +0100 Subject: [PATCH 114/170] [FIX] report_webkit: translations lookup should ignore report name for webkit reports Webkit/Mako translations are quite different from RML report translations, and very similar to translations for Python code terms, i.e. with _(). The method to lookup the translations at rendering time should thus be similar to what _() does for Python code terms, and not depend on the name of the report, which is not known when exporting the translation template, and is therefore not available in POT meta-data. This bears no performance penalty, as we are still only looking inside 'report'-typed translations with the matching 'source term'. The only downside is that this prevents per-report translations, but this is not supported by our translation import/export system anyway, so it does not matter (msgid strings must be unique within a PO file, and we don't support context- sensitive PO files yet). lp bug: https://launchpad.net/bugs/819334 fixed bzr revid: odo@openerp.com-20120119102145-tp3w80bhjwq11q84 --- addons/report_webkit/webkit_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 9d0b663c481..d3057e5a1ee 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -182,7 +182,7 @@ class WebKitParser(report_sxw): """Translate String.""" ir_translation = self.pool.get('ir.translation') res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, - self.name, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src) + None, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src) if not res : return src return res From 766c664d6da325c1a1428991eba3221dd1d9cd8f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jan 2012 12:46:14 +0100 Subject: [PATCH 115/170] [FIX] extend revid:fme@openerp.com-20120117124417-k3vdiktc93gl99fi to all instances of Firefox bug randomly happens on FF 9.0.1/OSX as well bzr revid: xmo@openerp.com-20120119114614-6br6qj4byhy0ct1a --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1892c4c085d..17e46f6085c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -792,7 +792,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form. return QWeb.render(template, { "widget": this }); }, do_attach_tooltip: function(widget, trigger, options) { - if ($.browser.mozilla && parseInt($.browser.version.split('.')[0], 10) < 2) { + if ($.browser.mozilla) { // Unknown bug in old version of firefox : // input type=text onchange event not fired when tootip is shown return; From 1fcb2aeee814d463b17c1bf9ed5530de53c61be7 Mon Sep 17 00:00:00 2001 From: vishmita Date: Thu, 19 Jan 2012 17:31:27 +0530 Subject: [PATCH 116/170] [FIX]set property of notification. lp bug: https://launchpad.net/bugs/916352 fixed bzr revid: vja@vja-desktop-20120119120127-8fu41vl6hccf01rr --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/js/chrome.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 13068e123a5..df299bd457b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -83,7 +83,7 @@ body { padding: 0; margin: 0; } border-bottom-left-radius: 8px; } .openerp .oe_notification { - z-index: 1001; + z-index: 1050; display: none; } .openerp .oe_notification * { diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6a9e860aadc..b6d9b89ae7f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -17,7 +17,7 @@ openerp.web.Notification = openerp.web.Widget.extend(/** @lends openerp.web.Not start: function() { this._super.apply(this, arguments); this.$element.notify({ - speed: 500, + speed: 800, expires: 1500 }); }, From c078d23d16c1baaddfc72bbf9fa12b823fbd0c00 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 19 Jan 2012 15:30:57 +0100 Subject: [PATCH 117/170] [FIX] avoid blank page when the database assigned to the session has been removed bzr revid: chs@openerp.com-20120119143057-pbqdh15jptyc7y0a --- addons/web/common/session.py | 7 +++++++ addons/web/controllers/main.py | 1 + 2 files changed, 8 insertions(+) diff --git a/addons/web/common/session.py b/addons/web/common/session.py index ca23a08da4a..24564ba7bf8 100644 --- a/addons/web/common/session.py +++ b/addons/web/common/session.py @@ -80,6 +80,13 @@ class OpenERPSession(object): """ self.build_connection().check_login(force) + def ensure_valid(self): + if self._uid: + try: + self.assert_valid(True) + except Exception: + self._uid = None + def execute(self, model, func, *l, **d): self.assert_valid() model = self.build_connection().get_model(model) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index d578025b3b5..bb08393cae3 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -360,6 +360,7 @@ class Session(openerpweb.Controller): _cp_path = "/web/session" def session_info(self, req): + req.session.ensure_valid() return { "session_id": req.session_id, "uid": req.session._uid, From f9cbad5bf6ea947c66d6057d44bf31f42577bd44 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jan 2012 15:48:37 +0100 Subject: [PATCH 118/170] [FIX] correctly display crash manager in case of report error lp bug: https://launchpad.net/bugs/917227 fixed bzr revid: xmo@openerp.com-20120119144837-dp6r7vqx581b4mrt --- addons/web/common/http.py | 26 +++++++++++++++++++++++++- addons/web/controllers/main.py | 21 +++++++++------------ addons/web/static/src/js/chrome.js | 11 ++++------- addons/web/static/src/js/core.js | 11 +++++++++-- addons/web/static/src/js/views.js | 3 ++- 5 files changed, 49 insertions(+), 23 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 931b2181d15..ac9b95dcb26 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -3,6 +3,7 @@ # OpenERP Web HTTP layer #---------------------------------------------------------- import ast +import cgi import contextlib import functools import logging @@ -254,7 +255,30 @@ class HttpRequest(WebRequest): else: akw[key] = type(value) _logger.debug("%s --> %s.%s %r", self.httprequest.method, controller.__class__.__name__, method.__name__, akw) - r = method(controller, self, **self.params) + try: + r = method(controller, self, **self.params) + except xmlrpclib.Fault, e: + r = werkzeug.exceptions.InternalServerError(cgi.escape(simplejson.dumps({ + 'code': 200, + 'message': "OpenERP Server Error", + 'data': { + 'type': 'server_exception', + 'fault_code': e.faultCode, + 'debug': "Server %s\nClient %s" % ( + e.faultString, traceback.format_exc()) + } + }))) + except Exception: + logging.getLogger(__name__ + '.HttpRequest.dispatch').exception( + "An error occurred while handling a json request") + r = werkzeug.exceptions.InternalServerError(cgi.escape(simplejson.dumps({ + 'code': 300, + 'message': "OpenERP WebClient Error", + 'data': { + 'type': 'client_exception', + 'debug': "Client %s" % traceback.format_exc() + } + }))) if self.debug or 1: if isinstance(r, (werkzeug.wrappers.BaseResponse, werkzeug.exceptions.HTTPException)): _logger.debug('<-- %s', r) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index bb08393cae3..0878ec09725 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -6,6 +6,7 @@ import csv import glob import itertools import operator +import traceback import os import re import simplejson @@ -17,6 +18,7 @@ from xml.etree import ElementTree from cStringIO import StringIO import babel.messages.pofile +import werkzeug.exceptions import werkzeug.utils try: import xlwt @@ -321,18 +323,13 @@ class Database(openerpweb.Controller): @openerpweb.httprequest def backup(self, req, backup_db, backup_pwd, token): - try: - db_dump = base64.b64decode( - req.session.proxy("db").dump(backup_pwd, backup_db)) - return req.make_response(db_dump, - [('Content-Type', 'application/octet-stream; charset=binary'), - ('Content-Disposition', 'attachment; filename="' + backup_db + '.dump"')], - {'fileToken': int(token)} - ) - except xmlrpclib.Fault, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return 'Backup Database|' + e.faultCode - return 'Backup Database|Could not generate database backup' + db_dump = base64.b64decode( + req.session.proxy("db").dump(backup_pwd, backup_db)) + return req.make_response(db_dump, + [('Content-Type', 'application/octet-stream; charset=binary'), + ('Content-Disposition', 'attachment; filename="' + backup_db + '.dump"')], + {'fileToken': int(token)} + ) @openerpweb.httprequest def restore(self, req, db_file, restore_pwd, new_db): diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6a9e860aadc..06fcf518002 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -472,16 +472,13 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database self.blockUI(); self.session.get_file({ form: form, - error: function (body) { - var error = body.firstChild.data.split('|'); - self.display_error({ - title: error[0], - error: error[1] - }); + success: function () { + self.do_notify(_t("Backed"), + _t("Database backed up successfully")); }, + error: openerp.webclient.crashmanager.on_rpc_error, complete: function() { self.unblockUI(); - self.do_notify(_t("Backed"), _t("Database backed up successfully")); } }); } diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 3005fc80d13..43bd8a0abf7 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -809,8 +809,15 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. .attr({id: id, name: id}) .appendTo(document.body) .load(function () { - if (options.error) { options.error(this.contentDocument.body); } - complete(); + try { + if (options.error) { + options.error(JSON.parse( + this.contentDocument.body.childNodes[1].textContent + )); + } + } finally { + complete(); + } }); if (options.form) { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4853eebfab6..1aa76b9a6dd 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -195,7 +195,8 @@ session.web.ActionManager = session.web.Widget.extend({ on_closed(); } self.dialog_stop(); - } + }, + error: session.webclient.crashmanager.on_rpc_error }) }); }, From c68045e4972a60305f8187477255adee47e8a0a2 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 19 Jan 2012 16:10:12 +0100 Subject: [PATCH 119/170] [FIX] expression: properly care for implicitly defined m2m fields used in search() domains Now that m2m fields may be defined without explicitly specifying the name of the relationship table and its foreign key columns, all access to these internal names should be done via m2m._sql_names(). This seems better than lazily initializing these internal names and hoping that nothing accesses them before the init. bzr revid: odo@openerp.com-20120119151012-c38k5zl7rqherhth --- openerp/osv/expression.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py index c81ee897891..9da51ce744c 100644 --- a/openerp/osv/expression.py +++ b/openerp/osv/expression.py @@ -526,12 +526,13 @@ class expression(object): self.__exp[i] = ('id', o2m_op, select_distinct_from_where_not_null(cr, field._fields_id, field_obj._table)) elif field._type == 'many2many': + rel_table, rel_id1, rel_id2 = field._sql_names(working_table) #FIXME if operator == 'child_of': def _rec_convert(ids): if field_obj == table: return ids - return select_from_where(cr, field._id1, field._rel, field._id2, ids, operator) + return select_from_where(cr, rel_id1, rel_table, rel_id2, ids, operator) ids2 = to_ids(right, field_obj) dom = child_of_domain('id', ids2, field_obj) @@ -559,11 +560,11 @@ class expression(object): else: call_null_m2m = False m2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in' - self.__exp[i] = ('id', m2m_op, select_from_where(cr, field._id1, field._rel, field._id2, res_ids, operator) or [0]) + self.__exp[i] = ('id', m2m_op, select_from_where(cr, rel_id1, rel_table, rel_id2, res_ids, operator) or [0]) if call_null_m2m: m2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in' - self.__exp[i] = ('id', m2m_op, select_distinct_from_where_not_null(cr, field._id1, field._rel)) + self.__exp[i] = ('id', m2m_op, select_distinct_from_where_not_null(cr, rel_id1, rel_table)) elif field._type == 'many2one': if operator == 'child_of': From ccde5e2f5ea41e023db7a281b5d357999e85a749 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jan 2012 16:54:25 +0100 Subject: [PATCH 120/170] [REM] unused imports mistakenly added in revision xmo@openerp.com-20120119144837-dp6r7vqx581b4mrt bzr revid: xmo@openerp.com-20120119155425-kud19lwt56du1ym9 --- addons/web/controllers/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 0878ec09725..261d77caa24 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -6,7 +6,6 @@ import csv import glob import itertools import operator -import traceback import os import re import simplejson @@ -18,7 +17,6 @@ from xml.etree import ElementTree from cStringIO import StringIO import babel.messages.pofile -import werkzeug.exceptions import werkzeug.utils try: import xlwt From abdd7ee80aa0ccefaec034839fbef11eea52bedb Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 20 Jan 2012 05:05:47 +0000 Subject: [PATCH 121/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120120043919-2ocn475pp0mg6lxi bzr revid: launchpad_translations_on_behalf_of_openerp-20120120050547-7tx0jp1f156n2hxu --- addons/account/i18n/pt_BR.po | 4 +- addons/base_iban/i18n/nl.po | 16 ++- addons/base_module_record/i18n/nl.po | 11 +- addons/base_report_creator/i18n/nl.po | 10 +- addons/base_setup/i18n/nl.po | 10 +- addons/base_synchro/i18n/nl.po | 10 +- addons/crm/i18n/nl.po | 187 +++++++++++++------------- addons/web/po/zh_CN.po | 41 +++--- addons/web_dashboard/po/zh_CN.po | 10 +- addons/web_diagram/po/zh_CN.po | 10 +- addons/web_graph/po/zh_CN.po | 10 +- 11 files changed, 169 insertions(+), 150 deletions(-) diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 25eac0d0d03..f76912f089e 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" -"X-Generator: Launchpad (build 14692)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:39+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: account #: view:account.invoice.report:0 diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po index 9e84cb89990..4c8e477c5bc 100644 --- a/addons/base_iban/i18n/nl.po +++ b/addons/base_iban/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 05:55+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-19 19:18+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_iban #: constraint:res.partner.bank:0 @@ -27,12 +27,12 @@ msgstr "" #. module: base_iban #: model:res.partner.bank.type,format_layout:base_iban.bank_iban msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" -msgstr "" +msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field msgid "bank_bic" -msgstr "" +msgstr "bank_bic" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field @@ -61,6 +61,8 @@ msgid "" "The IBAN does not seem to be correct. You should have entered something like " "this %s" msgstr "" +"De IBAN lijkt niet juist te zijn. U zou iets moeten ingeven in de trant van " +"%s" #. module: base_iban #: field:res.partner.bank,iban:0 @@ -71,7 +73,7 @@ msgstr "IBAN" #: code:addons/base_iban/base_iban.py:131 #, python-format msgid "The IBAN is invalid, it should begin with the country code" -msgstr "" +msgstr "De IBAN is ongeldig. Het zou moeten beginnen met de landcode" #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po index 93422baa080..b2d1881dfda 100644 --- a/addons/base_module_record/i18n/nl.po +++ b/addons/base_module_record/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 13:42+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-19 18:41+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,category:0 @@ -89,6 +89,9 @@ msgid "" "publish it on http://www.openerp.com, in the 'Modules' section. You can do " "it through the website or using features of the 'base_module_publish' module." msgstr "" +"Als u denkt dat uw module interessant is voor andere mensen, pupliceeer het " +"dan graag op http://www.openerp.com, in de module sectie. Het kan via de " +"website of via de mogelijkheden van de 'base_module_publish' module." #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,check_date:0 diff --git a/addons/base_report_creator/i18n/nl.po b/addons/base_report_creator/i18n/nl.po index 46dda98d849..85b277771c9 100644 --- a/addons/base_report_creator/i18n/nl.po +++ b/addons/base_report_creator/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 16:35+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-19 18:42+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:39+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_report_creator #: help:base_report_creator.report.filter,expression:0 @@ -438,6 +438,8 @@ msgstr "Naam overzicht" #: constraint:base_report_creator.report:0 msgid "You can not display field which are not stored in database." msgstr "" +"Het is niet mogelijk om een veld weer te geven wat niet is opgeslagen in de " +"database." #. module: base_report_creator #: view:base_report_creator.report:0 diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po index f128faeeb54..3406ec819ce 100644 --- a/addons/base_setup/i18n/nl.po +++ b/addons/base_setup/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-18 20:23+0000\n" -"Last-Translator: Erwin (Endian Solutions) \n" +"PO-Revision-Date: 2012-01-19 19:15+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-19 04:50+0000\n" -"X-Generator: Launchpad (build 14692)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 @@ -94,7 +94,7 @@ msgstr "Uitgebreid" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Patient" -msgstr "" +msgstr "Geduld" #. module: base_setup #: model:ir.actions.act_window,help:base_setup.action_import_create_installer diff --git a/addons/base_synchro/i18n/nl.po b/addons/base_synchro/i18n/nl.po index 433300304e4..05c0dd1cebe 100644 --- a/addons/base_synchro/i18n/nl.po +++ b/addons/base_synchro/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 18:49+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-19 18:42+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:39+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_synchro #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro @@ -90,7 +90,7 @@ msgstr "Object" #. module: base_synchro #: view:base.synchro:0 msgid "Synchronization Completed!" -msgstr "" +msgstr "Synchronisatie compleet!" #. module: base_synchro #: field:base.synchro.server,login:0 diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index f61805e6936..da7f4d82d59 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2012-01-15 12:41+0000\n" -"Last-Translator: Erwin (Endian Solutions) \n" +"PO-Revision-Date: 2012-01-19 19:14+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-16 05:18+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm #: view:crm.lead.report:0 @@ -138,7 +138,7 @@ msgstr "De lead '%s' is gesloten." #. module: crm #: view:crm.lead.report:0 msgid "Exp. Closing" -msgstr "" +msgstr "Ver. Besluit" #. module: crm #: selection:crm.meeting,rrule_type:0 @@ -173,17 +173,17 @@ msgstr "Campagne" #. module: crm #: view:crm.lead:0 msgid "Search Opportunities" -msgstr "Zoek kansen" +msgstr "Zoek prospects" #. module: crm #: help:crm.lead.report,deadline_month:0 msgid "Expected closing month" -msgstr "" +msgstr "Verwachte besluit maand" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Assigned opportunities to" -msgstr "" +msgstr "Prospects toegewezen aan" #. module: crm #: view:crm.lead:0 @@ -464,7 +464,7 @@ msgstr "Categorie" #. module: crm #: view:crm.lead:0 msgid "Opportunity / Customer" -msgstr "" +msgstr "Prospect / Klant" #. module: crm #: view:crm.lead.report:0 @@ -510,7 +510,7 @@ msgstr "Gewoon of telefonisch verkoopgesprek" #. module: crm #: view:crm.case.section:0 msgid "Mail Gateway" -msgstr "" +msgstr "Mail Gateway" #. module: crm #: model:process.node,note:crm.process_node_leads0 @@ -549,7 +549,7 @@ msgstr "Mailings" #. module: crm #: view:crm.phonecall:0 msgid "To Do" -msgstr "" +msgstr "Te doen" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -622,7 +622,7 @@ msgstr "" #. module: crm #: field:crm.lead,partner_address_name:0 msgid "Partner Contact Name" -msgstr "" +msgstr "Relatie contactnaam" #. module: crm #: selection:crm.meeting,end_type:0 @@ -669,7 +669,7 @@ msgstr "De afspraak '%s' is bevestigd." #: selection:crm.add.note,state:0 #: selection:crm.lead,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm #: help:crm.case.section,reply_to:0 @@ -683,7 +683,7 @@ msgstr "" #. module: crm #: field:crm.lead.report,creation_month:0 msgid "Creation Month" -msgstr "" +msgstr "Aanmaak maand" #. module: crm #: field:crm.case.section,resource_calendar_id:0 @@ -740,7 +740,7 @@ msgstr "" #. module: crm #: field:crm.lead2opportunity.partner.mass,user_ids:0 msgid "Salesmans" -msgstr "" +msgstr "Verkoper" #. module: crm #: field:crm.lead.report,probable_revenue:0 @@ -750,7 +750,7 @@ msgstr "Verwachte omzet" #. module: crm #: help:crm.lead.report,creation_month:0 msgid "Creation month" -msgstr "" +msgstr "Aanmaak maand" #. module: crm #: help:crm.segmentation,name:0 @@ -766,7 +766,7 @@ msgstr "Slagingskans" #. module: crm #: field:crm.lead,company_currency:0 msgid "Company Currency" -msgstr "" +msgstr "Bedrijfsvaluta" #. module: crm #: view:crm.lead:0 @@ -797,7 +797,7 @@ msgstr "Verkoopkans" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities created in last month" -msgstr "" +msgstr "Leads/Prospects aangemakat in de laatste maand" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead7 @@ -813,7 +813,7 @@ msgstr "Stop proces" #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm #: view:crm.phonecall:0 @@ -856,12 +856,12 @@ msgstr "Exclusief" #: code:addons/crm/crm_lead.py:451 #, python-format msgid "From %s : %s" -msgstr "" +msgstr "Van %s : %s" #. module: crm #: field:crm.lead.report,creation_year:0 msgid "Creation Year" -msgstr "" +msgstr "Aanmaak jaar" #. module: crm #: field:crm.lead.report,create_date:0 @@ -882,7 +882,7 @@ msgstr "Verkoop Inkoop" #. module: crm #: help:crm.case.section,resource_calendar_id:0 msgid "Used to compute open days" -msgstr "" +msgstr "Gebruikt om open dagen te berekenen" #. module: crm #: view:crm.lead:0 @@ -917,7 +917,7 @@ msgstr "Terugkerende afspraak" #. module: crm #: view:crm.phonecall:0 msgid "Unassigned Phonecalls" -msgstr "" +msgstr "Niet toegewezen telefoongesprekken" #. module: crm #: view:crm.lead:0 @@ -981,7 +981,7 @@ msgstr "Waarschuwing!" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in current year" -msgstr "" +msgstr "Telefoongesprekken gemaakt in huidige jaar" #. module: crm #: field:crm.lead,day_open:0 @@ -1022,7 +1022,7 @@ msgstr "Mijn afspraken" #. module: crm #: view:crm.phonecall:0 msgid "Todays's Phonecalls" -msgstr "" +msgstr "Telefoongesprekken van vandaag" #. module: crm #: view:board.board:0 @@ -1084,7 +1084,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Change Color" -msgstr "" +msgstr "Wijzig kleur" #. module: crm #: view:crm.segmentation:0 @@ -1102,7 +1102,7 @@ msgstr "Verantwoordelijke" #. module: crm #: view:crm.lead.report:0 msgid "Show only opportunity" -msgstr "" +msgstr "Toon alleen prospects" #. module: crm #: view:res.partner:0 @@ -1112,7 +1112,7 @@ msgstr "Vorige" #. module: crm #: view:crm.lead:0 msgid "New Leads" -msgstr "" +msgstr "Nieuwe leads" #. module: crm #: view:crm.lead:0 @@ -1127,12 +1127,12 @@ msgstr "Van" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Convert into Opportunities" -msgstr "" +msgstr "Converteer in rospects" #. module: crm #: view:crm.lead:0 msgid "Show Sales Team" -msgstr "" +msgstr "Toon verkoper" #. module: crm #: view:res.partner:0 @@ -1195,7 +1195,7 @@ msgstr "Aanmaakdatum" #. module: crm #: view:board.board:0 msgid "My Opportunities" -msgstr "" +msgstr "Mijn prospects" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor5 @@ -1205,7 +1205,7 @@ msgstr "Heeft website ontwerp nodig" #. module: crm #: view:crm.phonecall.report:0 msgid "Year of call" -msgstr "" +msgstr "Jaaar van telefoongesprek" #. module: crm #: field:crm.meeting,recurrent_uid:0 @@ -1247,7 +1247,7 @@ msgstr "Mail naar relatie" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Call Details" -msgstr "" +msgstr "Telefoongesprek details" #. module: crm #: field:crm.meeting,class:0 @@ -1258,7 +1258,7 @@ msgstr "Markeren als" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Log call" -msgstr "" +msgstr "Log telefoongesprek" #. module: crm #: help:crm.meeting,rrule_type:0 @@ -1341,7 +1341,7 @@ msgstr "Duur in minuten" #. module: crm #: field:crm.case.channel,name:0 msgid "Channel Name" -msgstr "" +msgstr "Kanaalnaam" #. module: crm #: field:crm.partner2opportunity,name:0 @@ -1352,7 +1352,7 @@ msgstr "Naam verkoopkans" #. module: crm #: help:crm.lead.report,deadline_day:0 msgid "Expected closing day" -msgstr "" +msgstr "Verwachte besluit datun" #. module: crm #: help:crm.case.section,active:0 @@ -1418,7 +1418,7 @@ msgstr "Stel het alarm in op een tijd voorafgaand aan de gebeurtenis" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner msgid "Schedule a Call" -msgstr "" +msgstr "Plan een telefoongesprek in" #. module: crm #: view:crm.lead2partner:0 @@ -1492,7 +1492,7 @@ msgstr "Uitgebreide filters..." #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in closed state" -msgstr "" +msgstr "Telefoongesprekken welke in de afgesloten status zijn" #. module: crm #: view:crm.phonecall.report:0 @@ -1507,13 +1507,15 @@ msgstr "Prospects per categorie" #. module: crm #: view:crm.phonecall.report:0 msgid "Date of call" -msgstr "" +msgstr "Datun van telefoongesprek" #. module: crm #: help:crm.lead,section_id:0 msgid "" "When sending mails, the default email address is taken from the sales team." msgstr "" +"Wanneer een e-mail, wordt verstuurd, wordt het standaard adres van het " +"verkoopteam gebruikt." #. module: crm #: view:crm.meeting:0 @@ -1535,12 +1537,12 @@ msgstr "Plan een afspraak" #: code:addons/crm/crm_lead.py:431 #, python-format msgid "Merged opportunities" -msgstr "" +msgstr "Samengevoegde prospects" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer msgid "Define Sales Team" -msgstr "" +msgstr "Definieer het verkoopteam" #. module: crm #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act @@ -1621,12 +1623,12 @@ msgstr "" #. module: crm #: field:crm.phonecall,opportunity_id:0 msgid "Lead/Opportunity" -msgstr "" +msgstr "Lead/Prospect" #. module: crm #: view:crm.lead:0 msgid "Mail" -msgstr "" +msgstr "Mail" #. module: crm #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action @@ -1641,7 +1643,7 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_categ msgid "Opportunities By Categories" -msgstr "" +msgstr "Prospects op categorie" #. module: crm #: help:crm.lead,partner_name:0 @@ -1659,13 +1661,13 @@ msgstr "Fout ! U kunt geen recursief verkoopteam maken." #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Log a call" -msgstr "" +msgstr "Log een telefoongesprek" #. module: crm #: selection:crm.lead2opportunity.partner,action:0 #: selection:crm.lead2opportunity.partner.mass,action:0 msgid "Do not link to a partner" -msgstr "" +msgstr "Koppel niet aan een partner" #. module: crm #: view:crm.meeting:0 @@ -1729,7 +1731,7 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert msgid "Convert opportunities" -msgstr "" +msgstr "Converteer prospects" #. module: crm #: view:crm.lead.report:0 @@ -1769,7 +1771,7 @@ msgstr "Converteer naar prospect naar zakenrelatie" #. module: crm #: view:crm.meeting:0 msgid "Meeting / Partner" -msgstr "" +msgstr "Afspraak / Partner" #. module: crm #: view:crm.phonecall2opportunity:0 @@ -1880,7 +1882,7 @@ msgstr "Inkomend" #. module: crm #: view:crm.phonecall.report:0 msgid "Month of call" -msgstr "" +msgstr "Maand van het telefoongesprek" #. module: crm #: view:crm.phonecall.report:0 @@ -1914,7 +1916,7 @@ msgstr "Hoogste" #. module: crm #: help:crm.lead.report,creation_year:0 msgid "Creation year" -msgstr "" +msgstr "Aanmaak jaar" #. module: crm #: view:crm.case.section:0 @@ -1975,7 +1977,7 @@ msgstr "Herhaaloptie" #. module: crm #: view:crm.lead:0 msgid "Lead / Customer" -msgstr "" +msgstr "Lead / Klant" #. module: crm #: model:process.transition,note:crm.process_transition_leadpartner0 @@ -1993,7 +1995,7 @@ msgstr "Omzetten naar verkoopkans" #: model:ir.model,name:crm.model_crm_case_channel #: model:ir.ui.menu,name:crm.menu_crm_case_channel msgid "Channels" -msgstr "" +msgstr "Kanalen" #. module: crm #: view:crm.phonecall:0 @@ -2050,7 +2052,7 @@ msgstr "Aanmaken" #: code:addons/crm/crm_lead.py:840 #, python-format msgid "Changed Stage to: %s" -msgstr "" +msgstr "Stadium veranderd in: %s" #. module: crm #: view:crm.lead:0 @@ -2173,7 +2175,7 @@ msgstr "" #. module: crm #: view:crm.lead.report:0 msgid "Show only lead" -msgstr "" +msgstr "Toon alleen leads" #. module: crm #: help:crm.meeting,count:0 @@ -2221,7 +2223,7 @@ msgstr "Niet vastgehouden" #: code:addons/crm/crm_lead.py:491 #, python-format msgid "Please select more than one opportunities." -msgstr "" +msgstr "Selecteer aub meer dat een prospect" #. module: crm #: field:crm.lead.report,probability:0 @@ -2284,7 +2286,7 @@ msgstr "Maak een nieuwe relatie" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound msgid "Scheduled Calls" -msgstr "" +msgstr "Ingeplande telefoongesprekken" #. module: crm #: view:crm.meeting:0 @@ -2295,7 +2297,7 @@ msgstr "Startdatum" #. module: crm #: view:crm.phonecall:0 msgid "Scheduled Phonecalls" -msgstr "" +msgstr "Ingeplande telefoongesprekken" #. module: crm #: view:crm.meeting:0 @@ -2305,7 +2307,7 @@ msgstr "Weigeren" #. module: crm #: field:crm.lead,user_email:0 msgid "User Email" -msgstr "" +msgstr "Gebruikers e-mail" #. module: crm #: help:crm.lead,optin:0 @@ -2357,7 +2359,7 @@ msgstr "Totaal geplande omzet" #. module: crm #: view:crm.lead:0 msgid "Open Opportunities" -msgstr "" +msgstr "Open prospects" #. module: crm #: model:crm.case.categ,name:crm.categ_meet2 @@ -2397,7 +2399,7 @@ msgstr "Telefoongesprekken" #. module: crm #: view:crm.case.stage:0 msgid "Stage Search" -msgstr "" +msgstr "Zoek fase" #. module: crm #: help:crm.lead.report,delay_open:0 @@ -2408,7 +2410,7 @@ msgstr "Aantal dagen tot openen dossier" #. module: crm #: selection:crm.meeting,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Aantal herhalingen" #. module: crm #: field:crm.lead,phone:0 @@ -2447,7 +2449,7 @@ msgstr ">" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule call" -msgstr "" +msgstr "Plan telefoongesprek" #. module: crm #: view:crm.meeting:0 @@ -2457,7 +2459,7 @@ msgstr "Onzeker" #. module: crm #: help:crm.case.stage,sequence:0 msgid "Used to order stages." -msgstr "" +msgstr "Gebruikt om fases t rangschikken" #. module: crm #: code:addons/crm/crm_lead.py:276 @@ -2483,7 +2485,7 @@ msgstr "Verminder (0>1)" #. module: crm #: field:crm.lead.report,deadline_day:0 msgid "Exp. Closing Day" -msgstr "" +msgstr "Verw. besluit datum" #. module: crm #: field:crm.case.section,change_responsible:0 @@ -2510,7 +2512,7 @@ msgstr "Overig" #. module: crm #: model:ir.actions.act_window,name:crm.open_board_crm msgid "Sales" -msgstr "" +msgstr "Verkoop" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor8 @@ -2563,7 +2565,7 @@ msgstr "Bezet" #. module: crm #: field:crm.lead.report,creation_day:0 msgid "Creation Day" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm #: field:crm.meeting,interval:0 @@ -2578,7 +2580,7 @@ msgstr "Terugkerend" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in last month" -msgstr "" +msgstr "Gemaakte telefoongesprekken in de laatste maand" #. module: crm #: model:ir.actions.act_window,name:crm.act_my_oppor @@ -2590,6 +2592,7 @@ msgstr "Mijn open prospects" #, python-format msgid "You can not delete this lead. You should better cancel it." msgstr "" +"Het is niet mogelijk deze lead te verwijderen. U kunt deze beter annuleren." #. module: crm #: field:base.action.rule,trg_max_history:0 @@ -2649,7 +2652,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Unassigned Opportunities" -msgstr "" +msgstr "Niet toegewezen prospects" #. module: crm #: view:crm.lead.report:0 @@ -2710,7 +2713,7 @@ msgstr "Segmentatietest" #. module: crm #: field:crm.lead,user_login:0 msgid "User Login" -msgstr "" +msgstr "Gebruikersnaam" #. module: crm #: view:crm.segmentation:0 @@ -2720,7 +2723,7 @@ msgstr "Vervolg proces" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities created in current year" -msgstr "" +msgstr "Leads/Prospects aangemaakt in het huidige jaar" #. module: crm #: model:ir.model,name:crm.model_crm_phonecall2partner @@ -2755,12 +2758,12 @@ msgstr "Duur" #. module: crm #: view:crm.lead:0 msgid "Show countries" -msgstr "" +msgstr "Toon landen" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Select Salesman" -msgstr "" +msgstr "Selecteer verkoper" #. module: crm #: view:board.board:0 @@ -2808,7 +2811,7 @@ msgstr "Fax" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities created in current month" -msgstr "" +msgstr "Leads/Prospects aangemaakt in het huidige maaand" #. module: crm #: view:crm.meeting:0 @@ -2843,12 +2846,12 @@ msgstr "Verplicht / Optioneel" #. module: crm #: view:crm.lead:0 msgid "Unassigned Leads" -msgstr "" +msgstr "Niet toegewezen leads" #. module: crm #: field:crm.lead,subjects:0 msgid "Subject of Email" -msgstr "" +msgstr "Onderwerp van e-mail" #. module: crm #: model:ir.actions.act_window,name:crm.action_view_attendee_form @@ -2907,7 +2910,7 @@ msgstr "Berichten" #. module: crm #: help:crm.lead,channel_id:0 msgid "Communication channel (mail, direct, phone, ...)" -msgstr "" +msgstr "Communicatie kanaal (e-mail, direct, telefoon,...)" #. module: crm #: code:addons/crm/crm_action_rule.py:61 @@ -2971,7 +2974,7 @@ msgstr "" #. module: crm #: field:crm.lead,color:0 msgid "Color Index" -msgstr "" +msgstr "Kleur index" #. module: crm #: view:crm.lead:0 @@ -3027,7 +3030,7 @@ msgstr "Samenvatting gesprek" #. module: crm #: view:crm.lead:0 msgid "Todays' Leads" -msgstr "" +msgstr "Leads van vandaag" #. module: crm #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0 @@ -3138,7 +3141,7 @@ msgstr "Kanaal" #: view:crm.phonecall:0 #: view:crm.phonecall.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm #: help:crm.segmentation,exclusif:0 @@ -3179,7 +3182,7 @@ msgstr "Prospects van leads maken" #: model:ir.actions.act_window,name:crm.open_board_statistical_dash #: model:ir.ui.menu,name:crm.menu_board_statistics_dash msgid "CRM Dashboard" -msgstr "" +msgstr "CRM-dashboard" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor4 @@ -3199,7 +3202,7 @@ msgstr "Zet categorie op" #. module: crm #: view:crm.meeting:0 msgid "Mail To" -msgstr "" +msgstr "E-mail naar" #. module: crm #: field:crm.meeting,th:0 @@ -3233,7 +3236,7 @@ msgstr "Kwalificatie" #. module: crm #: field:crm.lead,partner_address_email:0 msgid "Partner Contact Email" -msgstr "" +msgstr "Partner contactpersoon e-mail" #. module: crm #: code:addons/crm/wizard/crm_lead_to_partner.py:48 @@ -3249,7 +3252,7 @@ msgstr "Eerste" #. module: crm #: field:crm.lead.report,deadline_month:0 msgid "Exp. Closing Month" -msgstr "" +msgstr "Verw. Besluit maand" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3267,7 +3270,7 @@ msgstr "Voorwaarde aan communicatiegeschiedenis" #. module: crm #: view:crm.phonecall:0 msgid "Date of Call" -msgstr "" +msgstr "Datum telefoongesprek" #. module: crm #: help:crm.segmentation,som_interval:0 @@ -3330,7 +3333,7 @@ msgstr "Herhalen" #. module: crm #: field:crm.lead.report,deadline_year:0 msgid "Ex. Closing Year" -msgstr "" +msgstr "Verw. besluit jaar" #. module: crm #: view:crm.lead:0 @@ -3391,7 +3394,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound msgid "Logged Calls" -msgstr "" +msgstr "Gelogte telefoongesprekken" #. module: crm #: field:crm.partner2opportunity,probability:0 @@ -3526,7 +3529,7 @@ msgstr "Twitter Advertenties" #: code:addons/crm/crm_lead.py:336 #, python-format msgid "The opportunity '%s' has been been won." -msgstr "" +msgstr "De prospect '%s' is gewonnen." #. module: crm #: field:crm.case.stage,case_default:0 @@ -3557,7 +3560,7 @@ msgstr "Fout! U kunt geen recursieve profielen maken." #. module: crm #: help:crm.lead.report,deadline_year:0 msgid "Expected closing year" -msgstr "" +msgstr "Verwachte besluit jaar" #. module: crm #: field:crm.lead,partner_address_id:0 @@ -3588,7 +3591,7 @@ msgstr "Afsluiten" #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Schedule a call" -msgstr "" +msgstr "Plan een telefoongesprek in" #. module: crm #: view:crm.lead:0 @@ -3624,7 +3627,7 @@ msgstr "Aan" #. module: crm #: view:crm.lead:0 msgid "Create date" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm #: selection:crm.meeting,class:0 @@ -3677,7 +3680,7 @@ msgstr "Interesse in accessoires" #. module: crm #: view:crm.lead:0 msgid "New Opportunities" -msgstr "" +msgstr "Nieuwe prospects" #. module: crm #: code:addons/crm/crm_action_rule.py:61 @@ -3768,7 +3771,7 @@ msgstr "Verloren" #. module: crm #: view:crm.lead:0 msgid "Edit" -msgstr "" +msgstr "Bewerken" #. module: crm #: field:crm.lead,country_id:0 diff --git a/addons/web/po/zh_CN.po b/addons/web/po/zh_CN.po index 087c66bd3b3..299ff9e0a14 100644 --- a/addons/web/po/zh_CN.po +++ b/addons/web/po/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-12 05:44+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-19 13:35+0000\n" +"Last-Translator: Jeff Wang \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: 2012-01-13 05:01+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web/static/src/js/chrome.js:162 #: addons/web/static/src/js/chrome.js:175 @@ -107,12 +107,12 @@ msgstr "无效的搜索" #: addons/web/static/src/js/search.js:403 msgid "triggered from search view" -msgstr "" +msgstr "在搜索视图进入" #: addons/web/static/src/js/search.js:490 #, python-format msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s" -msgstr "" +msgstr "字段值有误。%(fieldname)s: [%(value)s] : %(message)s" #: addons/web/static/src/js/search.js:822 msgid "not a valid integer" @@ -205,7 +205,7 @@ msgstr "为假" #: addons/web/static/src/js/view_editor.js:42 msgid "ViewEditor" -msgstr "" +msgstr "界面设计器" #: addons/web/static/src/js/view_editor.js:46 #: addons/web/static/src/js/view_list.js:17 @@ -414,7 +414,7 @@ msgstr "#{text}" #: addons/web/static/src/xml/base.xml:0 msgid "Powered by" -msgstr "" +msgstr "自豪地使用" #: addons/web/static/src/xml/base.xml:0 msgid "openerp.com" @@ -617,7 +617,7 @@ msgstr "调试视图#" #: addons/web/static/src/xml/base.xml:0 msgid "- Fields View Get" -msgstr "" +msgstr "界面源代码" #: addons/web/static/src/xml/base.xml:0 msgid "- Edit" @@ -673,7 +673,7 @@ msgstr "“" #: addons/web/static/src/xml/base.xml:0 msgid "Modifiers:" -msgstr "" +msgstr "属性" #: addons/web/static/src/xml/base.xml:0 msgid "?" @@ -681,7 +681,7 @@ msgstr "？" #: addons/web/static/src/xml/base.xml:0 msgid "(nolabel)" -msgstr "" +msgstr "无标签" #: addons/web/static/src/xml/base.xml:0 msgid "Field:" @@ -713,7 +713,7 @@ msgstr "域：" #: addons/web/static/src/xml/base.xml:0 msgid "On change:" -msgstr "" +msgstr "变更时动作：" #: addons/web/static/src/xml/base.xml:0 msgid "Relation:" @@ -721,7 +721,7 @@ msgstr "关系：" #: addons/web/static/src/xml/base.xml:0 msgid "Selection:" -msgstr "" +msgstr "下拉列表：" #: addons/web/static/src/xml/base.xml:0 msgid "[" @@ -777,11 +777,11 @@ msgstr "按钮" #: addons/web/static/src/xml/base.xml:0 msgid "(no string)" -msgstr "" +msgstr "无字符串" #: addons/web/static/src/xml/base.xml:0 msgid "Special:" -msgstr "" +msgstr "特殊：" #: addons/web/static/src/xml/base.xml:0 msgid "Button Type:" @@ -875,7 +875,7 @@ msgstr "导出类型：" #: addons/web/static/src/xml/base.xml:0 msgid "Import Compatible Export" -msgstr "" +msgstr "用可导入的格式导出" #: addons/web/static/src/xml/base.xml:0 msgid "Export all Data" @@ -938,6 +938,8 @@ msgid "" "Select a .CSV file to import. If you need a sample of file to import,\n" " you should use the export tool with the \"Import Compatible\" option." msgstr "" +"选择要导入的CSV文件。如果需要导入文件的模版，\n" +"可以用导出工具并选中 “导入兼容”" #: addons/web/static/src/xml/base.xml:0 msgid "CSV File:" @@ -1032,6 +1034,10 @@ msgid "" "supply chain,\n" " project management, production, services, CRM, etc..." msgstr "" +"是个自由的企业级软件系统，通过信息集成提升企业\n" +"生产力和盈利能力。它连接、改进和管控企业流程的\n" +"方方面面。包括销售、财务、供应链、项目管理、生\n" +"产、服务和客户关系管理等" #: addons/web/static/src/xml/base.xml:0 msgid "" @@ -1044,6 +1050,9 @@ msgid "" " production system and migration to a new version to be " "straightforward." msgstr "" +"该系统是跨平台的，可以安装在Windows、Mac OSX\n" +"和各种Linux或类UNIX发行版上。 它的架构支持\n" +"快速开发新功能、修改现有功能或直接升级到新版本" #: addons/web/static/src/xml/base.xml:0 msgid "" diff --git a/addons/web_dashboard/po/zh_CN.po b/addons/web_dashboard/po/zh_CN.po index c8701dd375e..f201f6994b2 100644 --- a/addons/web_dashboard/po/zh_CN.po +++ b/addons/web_dashboard/po/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-12 05:35+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-19 13:40+0000\n" +"Last-Translator: Jeff Wang \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: 2012-01-13 05:01+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web_dashboard/static/src/js/dashboard.js:63 msgid "Edit Layout" @@ -53,7 +53,7 @@ msgstr "%" msgid "" "Click on the functionalites listed below to launch them and configure your " "system" -msgstr "" +msgstr "单击以下功能列表打开配置界面" #: addons/web_dashboard/static/src/xml/web_dashboard.xml:0 msgid "Welcome to OpenERP" diff --git a/addons/web_diagram/po/zh_CN.po b/addons/web_diagram/po/zh_CN.po index 63d570efe65..81df135c4c0 100644 --- a/addons/web_diagram/po/zh_CN.po +++ b/addons/web_diagram/po/zh_CN.po @@ -8,18 +8,18 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-12 05:36+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-19 13:42+0000\n" +"Last-Translator: Jeff Wang \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: 2012-01-13 05:01+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web_diagram/static/src/js/diagram.js:11 msgid "Diagram" -msgstr "" +msgstr "图表" #: addons/web_diagram/static/src/js/diagram.js:210 msgid "Cancel" diff --git a/addons/web_graph/po/zh_CN.po b/addons/web_graph/po/zh_CN.po index 6ff1d55c867..6f3e8e5f8ff 100644 --- a/addons/web_graph/po/zh_CN.po +++ b/addons/web_graph/po/zh_CN.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2012-01-07 05:43+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-19 13:43+0000\n" +"Last-Translator: hifly \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: 2012-01-08 05:27+0000\n" -"X-Generator: Launchpad (build 14640)\n" +"X-Launchpad-Export-Date: 2012-01-20 05:05+0000\n" +"X-Generator: Launchpad (build 14700)\n" #: addons/web_graph/static/src/js/graph.js:19 msgid "Graph" -msgstr "" +msgstr "图形" From 9b54bdeb1885dc76a1579e00d584a9b248b7c809 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 11:56:08 +0100 Subject: [PATCH 122/170] [ADD] dynamic view: handle setting domains via onchange lp bug: https://launchpad.net/bugs/911676 fixed bzr revid: xmo@openerp.com-20120120105608-zjbam8ki4uoqer5v --- addons/web/controllers/main.py | 12 ++++++++++++ addons/web/static/src/js/view_form.js | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 261d77caa24..df3163d4e6c 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -837,6 +837,18 @@ class DataSet(openerpweb.Controller): return getattr(req.session.model(model), method)(*args, **kwargs) + @openerpweb.jsonrequest + def onchange(self, req, model, method, args, context_id=None): + result = self.call_common(req, model, method, args, context_id=context_id) + if 'domain' not in result: + return result + + result['domain'] = dict( + (k, parse_domain(v, req.session)) + for k, v in result['domain'].iteritems()) + + return result + @openerpweb.jsonrequest def call(self, req, model, method, args, domain_id=None, context_id=None): return self.call_common(req, model, method, args, domain_id, context_id) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 17e46f6085c..2172ae103b8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -316,7 +316,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# var change_spec = self.parse_on_change(on_change, widget); if (change_spec) { var ajax = { - url: '/web/dataset/call', + url: '/web/dataset/onchange', async: false }; return self.rpc(ajax, { @@ -342,6 +342,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# var result = response; if (result.value) { for (var f in result.value) { + if (!result.value.hasOwnProperty(f)) { continue; } var field = this.fields[f]; // If field is not defined in the view, just ignore it if (field) { @@ -367,7 +368,14 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# }); } if (result.domain) { - // TODO: + function edit_domain(node) { + var new_domain = result.domain[node.attrs.name]; + if (new_domain) { + node.attrs.domain = new_domain; + } + _(node.children).each(edit_domain); + } + edit_domain(this.fields_view.arch); } return $.Deferred().resolve(); } catch(e) { From 217c180fa29514e67e54e13f4eca515e9a649c3b Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 20 Jan 2012 12:06:50 +0100 Subject: [PATCH 123/170] [FIX+REF] account_analytic_analysis: fixed the dependancies and a bug related to wrong computation of is_overdue_quantity that was also counting the sales/purchases made instead of only considering the timesheet entries. Refactoring: 200 lines removed, as they were useless since commit 6305 (removal of consolidation on all fields), and as they were filthy and error prone since they were written -_- bzr revid: qdp-launchpad@openerp.com-20120120110650-zho7p4mem5vqebse --- .../account_analytic_analysis/__openerp__.py | 2 +- .../account_analytic_analysis.py | 200 +----------------- 2 files changed, 4 insertions(+), 198 deletions(-) diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 01ef6a3cb81..2f4d4446ee7 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -36,7 +36,7 @@ user-wise as well as month wise. "author" : "Camptocamp", "website" : "http://www.camptocamp.com/", "images" : ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"], - "depends" : ["hr_timesheet_invoice"], + "depends" : ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application "init_xml" : [], "update_xml": [ "security/ir.model.access.csv", diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index d379ba232fc..20c170cb5c0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -322,7 +322,7 @@ class account_analytic_account(osv.osv): result = dict.fromkeys(ids, 0) for record in self.browse(cr, uid, ids, context=context): if record.quantity_max > 0.0: - result[record.id] = int(record.quantity >= record.quantity_max) + result[record.id] = int(record.hours_quantity >= record.quantity_max) else: result[record.id] = 0 return result @@ -413,8 +413,7 @@ class account_analytic_account_summary_user(osv.osv): _columns = { 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'unit_amount': fields.function(_unit_amount, type='float', - string='Total Time'), + 'unit_amount': fields.float('Total Time'), 'user': fields.many2one('res.users', 'User'), } @@ -454,96 +453,6 @@ class account_analytic_account_summary_user(osv.osv): 'GROUP BY u."user", u.account_id, u.max_user' \ ')') - def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'): - if context is None: - context = {} - if not ids: - return [] - - if fields is None: - fields = self._columns.keys() - res_trans_obj = self.pool.get('ir.translation') - - # construct a clause for the rules: - d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context) - - # all inherited fields + all non inherited fields for which the attribute whose name is in load is True - fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values() - res = [] - cr.execute('SELECT MAX(id) FROM res_users') - max_user = cr.fetchone()[0] - if fields_pre: - fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre) - for i in range(0, len(ids), cr.IN_MAX): - sub_ids = ids[i:i+cr.IN_MAX] - if d1: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND "user" IN (%s) AND %s ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]), - ','.join([str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user)) for x in sub_ids]), d1, - self._order),d2) - if not cr.rowcount == len({}.fromkeys(sub_ids)): - raise except_orm(_('AccessError'), - _('You try to bypass an access rule (Document type: %s).') % self._description) - else: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND "user" IN (%s) ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]), - ','.join([str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user)) for x in sub_ids]), - self._order)) - res.extend(cr.dictfetchall()) - else: - res = map(lambda x: {'id': x}, ids) - for f in fields_pre: - if self._columns[f].translate: - ids = map(lambda x: x['id'], res) - res_trans = res_trans_obj._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids) - for r in res: - r[f] = res_trans.get(r['id'], False) or r[f] - - for table in self._inherits: - col = self._inherits[table] - cols = intersect(self._inherit_fields.keys(), fields) - if not cols: - continue - res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load) - - res3 = {} - for r in res2: - res3[r['id']] = r - del r['id'] - - for record in res: - record.update(res3[record[col]]) - if col not in fields: - del record[col] - - # all fields which need to be post-processed by a simple function (symbol_get) - fields_post = filter(lambda x: x in self._columns and self._columns[x]._symbol_get, fields) - if fields_post: - # maybe it would be faster to iterate on the fields then on res, so that we wouldn't need - # to get the _symbol_get in each occurence - for r in res: - for f in fields_post: - r[f] = self.columns[f]._symbol_get(r[f]) - ids = map(lambda x: x['id'], res) - - # all non inherited fields for which the attribute whose name is in load is False - fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields) - for f in fields_post: - # get the value of that field for all records/ids - res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res) - for record in res: - record[f] = res2[record['id']] - - return res - account_analytic_account_summary_user() class account_analytic_account_summary_month(osv.osv): @@ -552,26 +461,9 @@ class account_analytic_account_summary_month(osv.osv): _auto = False _rec_name = 'month' - def _unit_amount(self, cr, uid, ids, name, arg, context=None): - res = {} - account_obj = self.pool.get('account.analytic.account') - account_ids = [int(str(int(x))[:-6]) for x in ids] - month_ids = [int(str(int(x))[-6:]) for x in ids] - parent_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. - if parent_ids: - cr.execute('SELECT id, unit_amount ' \ - 'FROM account_analytic_analysis_summary_month ' \ - 'WHERE account_id IN %s ' \ - 'AND month_id IN %s ',(parent_ids, tuple(month_ids),)) - for sum_id, unit_amount in cr.fetchall(): - res[sum_id] = unit_amount - for id in ids: - res[id] = round(res.get(id, 0.0), 2) - return res - _columns = { 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'unit_amount': fields.function(_unit_amount, type='float', string='Total Time'), + 'unit_amount': fields.float('Total Time'), 'month': fields.char('Month', size=32, readonly=True), } @@ -622,92 +514,6 @@ class account_analytic_account_summary_month(osv.osv): 'GROUP BY d.month, d.account_id ' \ ')') - def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'): - if context is None: - context = {} - if not ids: - return [] - - if fields is None: - fields = self._columns.keys() - res_trans_obj = self.pool.get('ir.translation') - # construct a clause for the rules: - d1, d2, tables= self.pool.get('ir.rule').domain_get(cr, user, self._name) - - # all inherited fields + all non inherited fields for which the attribute whose name is in load is True - fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values() - res = [] - if fields_pre: - fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre) - for i in range(0, len(ids), cr.IN_MAX): - sub_ids = ids[i:i+cr.IN_MAX] - if d1: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND month_id IN (%s) AND %s ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x)[:-6] for x in sub_ids]), - ','.join([str(x)[-6:] for x in sub_ids]), d1, - self._order),d2) - if not cr.rowcount == len({}.fromkeys(sub_ids)): - raise except_orm(_('AccessError'), - _('You try to bypass an access rule (Document type: %s).') % self._description) - else: - cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \ - 'AND account_id IN (%s) ' \ - 'AND month_id IN (%s) ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join([str(x) for x in sub_ids]), - ','.join([str(x)[:-6] for x in sub_ids]), - ','.join([str(x)[-6:] for x in sub_ids]), - self._order)) - res.extend(cr.dictfetchall()) - else: - res = map(lambda x: {'id': x}, ids) - - for f in fields_pre: - if self._columns[f].translate: - ids = map(lambda x: x['id'], res) - res_trans = res_trans_obj._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids) - for r in res: - r[f] = res_trans.get(r['id'], False) or r[f] - - for table in self._inherits: - col = self._inherits[table] - cols = intersect(self._inherit_fields.keys(), fields) - if not cols: - continue - res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load) - - res3 = {} - for r in res2: - res3[r['id']] = r - del r['id'] - - for record in res: - record.update(res3[record[col]]) - if col not in fields: - del record[col] - - # all fields which need to be post-processed by a simple function (symbol_get) - fields_post = filter(lambda x: x in self._columns and self._columns[x]._symbol_get, fields) - if fields_post: - # maybe it would be faster to iterate on the fields then on res, so that we wouldn't need - # to get the _symbol_get in each occurence - for r in res: - for f in fields_post: - r[f] = self.columns[f]._symbol_get(r[f]) - ids = map(lambda x: x['id'], res) - - # all non inherited fields for which the attribute whose name is in load is False - fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields) - for f in fields_post: - # get the value of that field for all records/ids - res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res) - for record in res: - record[f] = res2[record['id']] - return res account_analytic_account_summary_month() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From ba178be7c0828dc0df33b0d22347cc9e92dbb574 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 12:46:12 +0100 Subject: [PATCH 124/170] [IMP] gunicorn: add CPU and memory limits. bzr revid: vmt@openerp.com-20120120114612-xowu57yy3f5uxi0j --- gunicorn.conf.py | 34 ++++++++++++++- openerp/tests/addons/test_limits/__init__.py | 3 ++ .../tests/addons/test_limits/__openerp__.py | 15 +++++++ openerp/tests/addons/test_limits/models.py | 43 +++++++++++++++++++ openerp/wsgi.py | 1 + 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 openerp/tests/addons/test_limits/__init__.py create mode 100644 openerp/tests/addons/test_limits/__openerp__.py create mode 100644 openerp/tests/addons/test_limits/models.py diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 9962493d549..c575d53875f 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -17,7 +17,7 @@ pidfile = '.gunicorn.pid' # Gunicorn recommends 2-4 x number_of_cpu_cores, but # you'll want to vary this a bit to find the best for your # particular work load. -workers = 4 +workers = 1 # Some application-wide initialization is needed. on_starting = openerp.wsgi.on_starting @@ -27,6 +27,8 @@ when_ready = openerp.wsgi.when_ready # big reports for example timeout = 240 +#max_requests = 150 + # Equivalent of --load command-line option openerp.conf.server_wide_modules = ['web'] @@ -35,7 +37,7 @@ conf = openerp.tools.config # Path to the OpenERP Addons repository (comma-separated for # multiple locations) -conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons' +conf['addons_path'] = '/home/thu/repos/addons/trunk,/home/thu/repos/web/trunk/addons,/home/thu/repos/server/trunk-limits/openerp/tests/addons' # Optional database config if not using local socket #conf['db_name'] = 'mycompany' @@ -52,5 +54,33 @@ conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons # If --static-http-enable is used, path for the static web directory #conf['static_http_document_root'] = '/var/www' +def time_expired(n, stack): + import os + import time + print '>>> [%s] time ran out.' % (os.getpid()) + raise Exception('(time ran out)') + +def pre_request(worker, req): + import os + import psutil + import resource + import signal + # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space + rss, vms = psutil.Process(os.getpid()).get_memory_info() + soft, hard = resource.getrlimit(resource.RLIMIT_AS) + print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) + print ">>>>>> %s" % (req.body,) + # Let's say 512MB is ok, 768 is a hard limit (will raise MemoryError), + # 640 will nicely restart the process. + resource.setrlimit(resource.RLIMIT_AS, (768 * 1024 * 1024, hard)) + if vms > 640 * 1024 * 1024: + print ">>> Worker eating too much memory, reset it after the request." + worker.alive = False # Commit suicide after the request. + + r = resource.getrusage(resource.RUSAGE_SELF) + cpu_time = r.ru_utime + r.ru_stime + signal.signal(signal.SIGXCPU, time_expired) + soft, hard = resource.getrlimit(resource.RLIMIT_CPU) + resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + 15, hard)) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tests/addons/test_limits/__init__.py b/openerp/tests/addons/test_limits/__init__.py new file mode 100644 index 00000000000..fe4487156b1 --- /dev/null +++ b/openerp/tests/addons/test_limits/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +import models +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tests/addons/test_limits/__openerp__.py b/openerp/tests/addons/test_limits/__openerp__.py new file mode 100644 index 00000000000..333f1fe4372 --- /dev/null +++ b/openerp/tests/addons/test_limits/__openerp__.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +{ + 'name': 'test-limits', + 'version': '0.1', + 'category': 'Tests', + 'description': """A module with dummy methods.""", + 'author': 'OpenERP SA', + 'maintainer': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'depends': ['base'], + 'data': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tests/addons/test_limits/models.py b/openerp/tests/addons/test_limits/models.py new file mode 100644 index 00000000000..435e93811fc --- /dev/null +++ b/openerp/tests/addons/test_limits/models.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +import time + +import openerp + +class m(openerp.osv.osv.Model): + """ This model exposes a few methods that will consume between 'almost no + resource' and 'a lot of resource'. + """ + _name = 'test.limits.model' + + def consume_nothing(self, cr, uid, context=None): + return True + + def consume_memory(self, cr, uid, size, context=None): + l = [0] * size + return True + + def leak_memory(self, cr, uid, size, context=None): + if not hasattr(self, 'l'): + self.l = [] + self.l.append([0] * size) + print ">>>", len(self.l) + return True + + def consume_time(self, cr, uid, seconds, context=None): + time.sleep(seconds) + return True + + def consume_cpu_time(self, cr, uid, seconds, context=None): + import os + t0 = time.clock() + t1 = time.clock() +# try: + while t1 - t0 < seconds: + print "[%s] ..." % os.getpid() + for i in xrange(10000000): + x = i * i + t1 = time.clock() +# except Exception, e: +# print "+++", e + return True +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index aeba38dcfbc..b9263b42352 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -460,6 +460,7 @@ def on_starting(server): openerp.service.web_services.start_web_services() openerp.modules.module.initialize_sys_path() openerp.modules.loading.open_openerp_namespace() + openerp.pooler.get_db_and_pool('xx', update_module=False, pooljobs=False) for m in openerp.conf.server_wide_modules: try: __import__(m) From 7b38be73702ad7bf41a7332b64d07ae9aa047672 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 13:49:30 +0100 Subject: [PATCH 125/170] [FIX] DataSetStatic.read_slice called with no options should not blow up lp bug: https://launchpad.net/bugs/919161 fixed bzr revid: xmo@openerp.com-20120120124930-zug80i862x9mwu34 --- addons/web/static/src/js/data.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index bb53fb2175a..a4d9e9e4d71 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -309,7 +309,7 @@ openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet * domain and context. * * @param {Array} [fields] fields to read and return, by default all fields are returned - * @params {Object} options + * @params {Object} [options] * @param {Number} [options.offset=0] The index from which selected records should be returned * @param {Number} [options.limit=null] The maximum number of records to return * @returns {$.Deferred} @@ -504,11 +504,11 @@ openerp.web.DataSetStatic = openerp.web.DataSet.extend({ this.ids = ids || []; }, read_slice: function (fields, options) { + options = options || {}; + fields = fields || {}; // TODO remove fields from options - var self = this, - offset = options.offset || 0, - limit = options.limit || false, - fields = fields || false; + var offset = options.offset || 0, + limit = options.limit || false; var end_pos = limit && limit !== -1 ? offset + limit : this.ids.length; return this.read_ids(this.ids.slice(offset, end_pos), fields); }, @@ -560,8 +560,8 @@ openerp.web.DataSetSearch = openerp.web.DataSet.extend(/** @lends openerp.web.D * @returns {$.Deferred} */ read_slice: function (fields, options) { + options = options || {}; var self = this; - var options = options || {}; var offset = options.offset || 0; return this.rpc('/web/dataset/search_read', { model: this.model, From 6ade58a9d64b3304da488c8139bd56469e13a1d8 Mon Sep 17 00:00:00 2001 From: "tfr@openerp.com" <> Date: Fri, 20 Jan 2012 13:56:20 +0100 Subject: [PATCH 126/170] [FIX] usability issue in base_contact bzr revid: tfr@openerp.com-20120120125620-e91721mb83xhryir --- addons/base_contact/base_contact.py | 1 - addons/base_contact/base_contact_view.xml | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 40653f01ff3..7df5c444ecb 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -120,7 +120,6 @@ class res_partner_location(osv.osv): 'city': fields.char('City', size=128), 'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"), 'country_id': fields.many2one('res.country', 'Country'), - 'partner_id': fields.many2one('res.partner', 'Partner Name', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."), 'company_id': fields.many2one('res.company', 'Company',select=1), 'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'), 'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\ diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 10d8de984c2..a92d015f92d 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -50,7 +50,8 @@ - + + @@ -135,14 +136,14 @@ form - + - + From f5e4a28727fe319963969f293f70e79d45e835b1 Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Fri, 20 Jan 2012 19:11:20 +0530 Subject: [PATCH 127/170] [FIX] replace views instance with new action. lp bug: https://launchpad.net/bugs/919175 fixed bzr revid: vda@tinyerp.com-20120120134120-ugqv7yzer7gp31z8 --- addons/web_process/static/src/js/process.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 601973d4cb5..5bfd1d39587 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -241,14 +241,13 @@ openerp.web_process = function (openerp) { dataset.call('get', ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context], function(res) { - self.$element.empty(); var action = res[0][res[0].length - 1]; self.rpc("/web/action/load", { action_id: action.id, context: dataset.context }, function(result) { var action_manager = new openerp.web.ActionManager(self); - action_manager.appendTo(self.widget_parent.$element); + action_manager.replace(self.$element); action_manager.do_action(result.result); }); }); From 86b15b7e9d850829aff1f1e6a07e0c96299e492b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 15:59:25 +0100 Subject: [PATCH 128/170] [FIX] error reporting in _.sprintf bzr revid: xmo@openerp.com-20120120145925-jko6qqombu3fxpoj --- .../web/static/lib/underscore/underscore.string.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web/static/lib/underscore/underscore.string.js b/addons/web/static/lib/underscore/underscore.string.js index 99966c3f475..d0b6ff1ffb3 100644 --- a/addons/web/static/lib/underscore/underscore.string.js +++ b/addons/web/static/lib/underscore/underscore.string.js @@ -73,7 +73,7 @@ arg = argv[cursor]; for (k = 0; k < match[2].length; k++) { if (!arg.hasOwnProperty(match[2][k])) { - throw(sprintf('[_.sprintf] property "%s" does not exist', match[2][k])); + throw new Error(sprintf('[_.sprintf] property "%s" does not exist', match[2][k])); } arg = arg[match[2][k]]; } @@ -85,7 +85,7 @@ } if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) { - throw(sprintf('[_.sprintf] expecting number but found %s', get_type(arg))); + throw new Error(sprintf('[_.sprintf] expecting number but found %s', get_type(arg))); } switch (match[8]) { case 'b': arg = arg.toString(2); break; @@ -134,12 +134,12 @@ field_list.push(field_match[1]); } else { - throw('[_.sprintf] huh?'); + throw new Error('[_.sprintf] huh?'); } } } else { - throw('[_.sprintf] huh?'); + throw new Error('[_.sprintf] huh?'); } match[2] = field_list; } @@ -147,12 +147,12 @@ arg_names |= 2; } if (arg_names === 3) { - throw('[_.sprintf] mixing positional and named placeholders is not (yet) supported'); + throw new Error('[_.sprintf] mixing positional and named placeholders is not (yet) supported'); } parse_tree.push(match); } else { - throw('[_.sprintf] huh?'); + throw new Error('[_.sprintf] huh?'); } _fmt = _fmt.substring(match[0].length); } From 09347af434e8ebe1ad828c44703ec8d8ab6870d8 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 16:00:50 +0100 Subject: [PATCH 129/170] [IMP] gunicorn: moved gunicorn hook to openerp.wsgi (just like previous hooks), added new command-line options. bzr revid: vmt@openerp.com-20120120150050-3o3hg6k1n17alup0 --- gunicorn.conf.py | 32 ++------------------------------ openerp/tools/config.py | 17 ++++++++++++++++- openerp/wsgi.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index c575d53875f..05feb71ada8 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -22,12 +22,13 @@ workers = 1 # Some application-wide initialization is needed. on_starting = openerp.wsgi.on_starting when_ready = openerp.wsgi.when_ready +pre_request = openerp.wsgi.pre_request # openerp request-response cycle can be quite long for # big reports for example timeout = 240 -#max_requests = 150 +max_requests = 2000 # Equivalent of --load command-line option openerp.conf.server_wide_modules = ['web'] @@ -54,33 +55,4 @@ conf['addons_path'] = '/home/thu/repos/addons/trunk,/home/thu/repos/web/trunk/ad # If --static-http-enable is used, path for the static web directory #conf['static_http_document_root'] = '/var/www' -def time_expired(n, stack): - import os - import time - print '>>> [%s] time ran out.' % (os.getpid()) - raise Exception('(time ran out)') - -def pre_request(worker, req): - import os - import psutil - import resource - import signal - # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space - rss, vms = psutil.Process(os.getpid()).get_memory_info() - soft, hard = resource.getrlimit(resource.RLIMIT_AS) - print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) - print ">>>>>> %s" % (req.body,) - # Let's say 512MB is ok, 768 is a hard limit (will raise MemoryError), - # 640 will nicely restart the process. - resource.setrlimit(resource.RLIMIT_AS, (768 * 1024 * 1024, hard)) - if vms > 640 * 1024 * 1024: - print ">>> Worker eating too much memory, reset it after the request." - worker.alive = False # Commit suicide after the request. - - r = resource.getrusage(resource.RUSAGE_SELF) - cpu_time = r.ru_utime + r.ru_stime - signal.signal(signal.SIGXCPU, time_expired) - soft, hard = resource.getrlimit(resource.RLIMIT_CPU) - resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + 15, hard)) - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 8107e10bf85..4f33c3b79f1 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -266,6 +266,20 @@ class configmanager(object): group.add_option("--max-cron-threads", dest="max_cron_threads", my_default=4, help="Maximum number of threads processing concurrently cron jobs.", type="int") + # TODO sensible default for the three following limits. + group.add_option("--virtual-memory-limit", dest="virtual_memory_limit", my_default=768 * 1024 * 1024, + help="Maximum allowed virtual memory per Gunicorn process. " + "When the limit is reached, any memory allocation will fail.", + type="int") + group.add_option("--virtual-memory-reset", dest="virtual_memory_reset", my_default=640 * 1024 * 1024, + help="Maximum allowed virtual memory per Gunicorn process. " + "When the limit is reached, the worker will be reset after " + "the current request.", + type="int") + group.add_option("--cpu-time-limit", dest="cpu_time_limit", my_default=60, + help="Maximum allowed CPU time per Gunicorn process. " + "When the limit is reached, an exception is raised.", + type="int") group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", help="Use the unaccent function provided by the database when available.") @@ -371,7 +385,8 @@ class configmanager(object): 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'list_db', 'xmlrpcs', 'test_file', 'test_disable', 'test_commit', 'test_report_directory', - 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent', + 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', + 'virtual_memory_limit', 'virtual_memory_reset', 'cpu_time_limit', 'unaccent', ] for arg in keys: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index b9263b42352..88c75539dc2 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -481,12 +481,41 @@ def when_ready(server): # Hijack gunicorn's SIGWINCH handling; we can choose another one. signal.signal(signal.SIGWINCH, make_winch_handler(server)) +# Install limits on virtual memory and CPU time consumption. +def pre_request(worker, req): + import os + import psutil + import resource + import signal + # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space + rss, vms = psutil.Process(os.getpid()).get_memory_info() + soft, hard = resource.getrlimit(resource.RLIMIT_AS) + print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) + print ">>>>>> %s" % (req.body,) + resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard)) + if vms > config['virtual_memory_reset']: + print ">>> Worker eating too much memory, reset it after the request." + worker.alive = False # Commit suicide after the request. + + r = resource.getrusage(resource.RUSAGE_SELF) + cpu_time = r.ru_utime + r.ru_stime + signal.signal(signal.SIGXCPU, time_expired) + soft, hard = resource.getrlimit(resource.RLIMIT_CPU) + resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + config['cpu_time_limit'], hard)) + # Our signal handler will signal a SGIQUIT to all workers. def make_winch_handler(server): def handle_winch(sig, fram): server.kill_workers(signal.SIGQUIT) # This is gunicorn specific. return handle_winch +# SIGXCPU (exceeded CPU time) signal handler will raise an exception. +def time_expired(n, stack): + import os + import time + print '>>> [%s] time ran out.' % (os.getpid()) + raise Exception('(time ran out)') # TODO one of openerp.exception + # Kill gracefuly the workers (e.g. because we want to clear their cache). # This is done by signaling a SIGWINCH to the master process, so it can be # called by the workers themselves. From 48459b568a6a28ce541681d1fa992751f9092db5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 Jan 2012 16:30:46 +0100 Subject: [PATCH 130/170] [FIX] get_value called on readonly reference widget before its name_get has had the time to run lp bug: https://launchpad.net/bugs/919225 fixed bzr revid: xmo@openerp.com-20120120153046-fkq105mmzooo58q5 --- addons/web/static/src/js/view_page.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js index 31190d70f85..7057a454bca 100644 --- a/addons/web/static/src/js/view_page.js +++ b/addons/web/static/src/js/view_page.js @@ -198,7 +198,14 @@ openerp.web.page = function (openerp) { if (!this.value) { return null; } - return _.str.sprintf('%s,%d', this.field.relation, this.value[0]); + var id; + if (typeof this.value === 'number') { + // name_get has not run yet + id = this.value; + } else { + id = this.value[0]; + } + return _.str.sprintf('%s,%d', this.field.relation, id); } }); From 5e2721aaf247a75f8361f1272617b2cf7c27bafd Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 16:43:22 +0100 Subject: [PATCH 131/170] [IMP] gunicorn: commit suicide in the post_request hook instead of the pre_request hook. bzr revid: vmt@openerp.com-20120120154322-f23rxofv0169tbsm --- gunicorn.conf.py | 1 + openerp/wsgi.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 05feb71ada8..4d85fa2b6c0 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -23,6 +23,7 @@ workers = 1 on_starting = openerp.wsgi.on_starting when_ready = openerp.wsgi.when_ready pre_request = openerp.wsgi.pre_request +post_request = openerp.wsgi.post_request # openerp request-response cycle can be quite long for # big reports for example diff --git a/openerp/wsgi.py b/openerp/wsgi.py index 88c75539dc2..ed03ed9bc6c 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -491,11 +491,7 @@ def pre_request(worker, req): rss, vms = psutil.Process(os.getpid()).get_memory_info() soft, hard = resource.getrlimit(resource.RLIMIT_AS) print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) - print ">>>>>> %s" % (req.body,) resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard)) - if vms > config['virtual_memory_reset']: - print ">>> Worker eating too much memory, reset it after the request." - worker.alive = False # Commit suicide after the request. r = resource.getrusage(resource.RUSAGE_SELF) cpu_time = r.ru_utime + r.ru_stime @@ -503,6 +499,15 @@ def pre_request(worker, req): soft, hard = resource.getrlimit(resource.RLIMIT_CPU) resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + config['cpu_time_limit'], hard)) +# Reset the worker if it consumes too much memory (e.g. caused by a memory leak). +def post_request(worker, req, environ): + import os + import psutil + rss, vms = psutil.Process(os.getpid()).get_memory_info() + if vms > config['virtual_memory_reset']: + print ">>> Worker eating too much memory, reset it after the request." + worker.alive = False # Commit suicide after the request. + # Our signal handler will signal a SGIQUIT to all workers. def make_winch_handler(server): def handle_winch(sig, fram): From 30d7253fef235bbb117aeec0a27c7c5e3c436c4a Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 20 Jan 2012 17:04:09 +0100 Subject: [PATCH 132/170] [IMP] gunicorn: changed `print` with `logging.info`. bzr revid: vmt@openerp.com-20120120160409-cu1vcw7cfa3z0zgy --- gunicorn.conf.py | 2 +- openerp/tests/addons/test_limits/models.py | 5 ----- openerp/wsgi.py | 10 ++++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 4d85fa2b6c0..db570401d17 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -17,7 +17,7 @@ pidfile = '.gunicorn.pid' # Gunicorn recommends 2-4 x number_of_cpu_cores, but # you'll want to vary this a bit to find the best for your # particular work load. -workers = 1 +workers = 4 # Some application-wide initialization is needed. on_starting = openerp.wsgi.on_starting diff --git a/openerp/tests/addons/test_limits/models.py b/openerp/tests/addons/test_limits/models.py index 435e93811fc..5240acd23ab 100644 --- a/openerp/tests/addons/test_limits/models.py +++ b/openerp/tests/addons/test_limits/models.py @@ -20,7 +20,6 @@ class m(openerp.osv.osv.Model): if not hasattr(self, 'l'): self.l = [] self.l.append([0] * size) - print ">>>", len(self.l) return True def consume_time(self, cr, uid, seconds, context=None): @@ -31,13 +30,9 @@ class m(openerp.osv.osv.Model): import os t0 = time.clock() t1 = time.clock() -# try: while t1 - t0 < seconds: - print "[%s] ..." % os.getpid() for i in xrange(10000000): x = i * i t1 = time.clock() -# except Exception, e: -# print "+++", e return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index ed03ed9bc6c..7d47cdb7bb6 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -490,7 +490,6 @@ def pre_request(worker, req): # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space rss, vms = psutil.Process(os.getpid()).get_memory_info() soft, hard = resource.getrlimit(resource.RLIMIT_AS) - print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment) resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard)) r = resource.getrusage(resource.RUSAGE_SELF) @@ -505,7 +504,8 @@ def post_request(worker, req, environ): import psutil rss, vms = psutil.Process(os.getpid()).get_memory_info() if vms > config['virtual_memory_reset']: - print ">>> Worker eating too much memory, reset it after the request." + logging.getLogger('wsgi.worker').info('Virtual memory consumption ' + 'too high, rebooting the worker.') worker.alive = False # Commit suicide after the request. # Our signal handler will signal a SGIQUIT to all workers. @@ -516,10 +516,8 @@ def make_winch_handler(server): # SIGXCPU (exceeded CPU time) signal handler will raise an exception. def time_expired(n, stack): - import os - import time - print '>>> [%s] time ran out.' % (os.getpid()) - raise Exception('(time ran out)') # TODO one of openerp.exception + logging.getLogger('wsgi.worker').info('CPU time limit exceeded.') + raise Exception('CPU time limit exceeded.') # TODO one of openerp.exception # Kill gracefuly the workers (e.g. because we want to clear their cache). # This is done by signaling a SIGWINCH to the master process, so it can be From 303db9c49b6888964d460535ea118501a13c3827 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Sat, 21 Jan 2012 13:55:15 +0100 Subject: [PATCH 133/170] [FIX] l10n_nl: Tax name used twice [FIX] incorrect account type for accounts Debtors and Creditors lp bug: https://launchpad.net/bugs/919626 fixed bzr revid: stefan@therp.nl-20120121125515-tnwqnkgjso1fynst --- addons/l10n_nl/account_chart_netherlands.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml index 72b9f92684c..d1326f2dbed 100644 --- a/addons/l10n_nl/account_chart_netherlands.xml +++ b/addons/l10n_nl/account_chart_netherlands.xml @@ -1385,7 +1385,7 @@ Debiteuren 1300 receivable - + @@ -1458,7 +1458,7 @@ Crediteuren 1500 payable - + @@ -4352,7 +4352,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge Inkopen import binnen EU laag - BTW import binnen EU + 6% BTW import binnen EU percent @@ -4387,7 +4387,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge Inkopen import binnen EU hoog - 0% BTW import binnen EU + 19% BTW import binnen EU percent @@ -4421,9 +4421,9 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge - Inkopen import binnen EU hoog + Inkopen import binnen EU overig 0% BTW import binnen EU - + percent @@ -4432,7 +4432,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge - Inkopen import binnen EU hoog(1) + Inkopen import binnen EU overig(1) percent @@ -4444,7 +4444,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge - Inkopen import binnen EU hoog(2) + Inkopen import binnen EU overig(2) percent From 7d22e1eb8cf4058b923300e8e85c0375696460a2 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 23 Jan 2012 00:32:02 +0100 Subject: [PATCH 134/170] [FIX] revert html_template is used by other modules. commit 2012 revid:nicolas.vanhoren@openerp.com-20120118161735-2yuxisndfq92ctoi bzr revid: al@openerp.com-20120122233202-moq81q35qddjtlw8 --- Makefile | 3 +++ addons/web/controllers/main.html | 21 --------------------- addons/web/controllers/main.py | 22 +++++++++++++++++++--- addons/web/static/src/js/chrome.js | 1 + 4 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 addons/web/controllers/main.html diff --git a/Makefile b/Makefile index 9e84e356aaf..4beb20d3eed 100644 --- a/Makefile +++ b/Makefile @@ -29,3 +29,6 @@ doc: cloc: cloc addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/*.js addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml +blamestat: + echo addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml | xargs -t -n 1 bzr blame -v --long --all | awk '{print $2}' | sort | uniq -c | sort -n + diff --git a/addons/web/controllers/main.html b/addons/web/controllers/main.html deleted file mode 100644 index fd0be5ba349..00000000000 --- a/addons/web/controllers/main.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - OpenERP - - %(css)s - %(js)s - - - - - - \ No newline at end of file diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7f5b43ba671..7844897c047 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -84,9 +84,24 @@ def concat_files(file_list, reader=None, intersperse=""): files_concat = intersperse.join(files_content) return files_concat,files_timestamp -html_template = None -with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "main.html")) as html_file: - html_template = html_file.read() +html_template = """ + + + + OpenERP + + %(css)s + %(js)s + + + + +""" class WebClient(openerpweb.Controller): _cp_path = "/web/webclient" @@ -192,6 +207,7 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), + 'init': 'new s.web.WebClient().start();', } return r diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 06fcf518002..b8ee62c3749 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1061,6 +1061,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie }, start: function() { var self = this; + this.$element = $(document.body); if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { From 8ffb0a310fec4935d007b568fb798d57b81c44ae Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 23 Jan 2012 05:20:51 +0000 Subject: [PATCH 135/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120121054148-0jtsy55iwkhewr4r bzr revid: launchpad_translations_on_behalf_of_openerp-20120122053059-j2aa26epvk6o1s3o bzr revid: launchpad_translations_on_behalf_of_openerp-20120123052051-qlxloap8u2xcv0fa --- addons/account/i18n/de.po | 10 +- addons/account/i18n/gl.po | 10 +- addons/auction/i18n/gl.po | 14 +- addons/base_calendar/i18n/nl.po | 44 ++--- addons/base_contact/i18n/nl.po | 36 ++-- addons/base_contact/i18n/sr@latin.po | 54 +++--- addons/base_iban/i18n/sr@latin.po | 19 +- addons/base_module_quality/i18n/nl.po | 24 +-- addons/base_module_quality/i18n/sr@latin.po | 150 ++++++++------- addons/base_setup/i18n/ru.po | 33 ++-- addons/crm/i18n/nl.po | 49 ++--- addons/crm_caldav/i18n/nl.po | 10 +- addons/crm_claim/i18n/nl.po | 11 +- addons/crm_fundraising/i18n/nl.po | 38 ++-- addons/crm_helpdesk/i18n/nl.po | 48 ++--- addons/crm_partner_assign/i18n/nl.po | 95 +++++----- addons/crm_profiling/i18n/nl.po | 17 +- addons/delivery/i18n/nl.po | 65 ++++--- addons/document/i18n/nl.po | 33 ++-- addons/hr_payroll/i18n/nl.po | 87 ++++----- addons/point_of_sale/i18n/de.po | 191 ++++++++++++-------- addons/stock/i18n/de.po | 9 +- 22 files changed, 578 insertions(+), 469 deletions(-) diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index a7814d4d0e1..82d150b5eb2 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2012-01-14 10:39+0000\n" +"PO-Revision-Date: 2012-01-22 10:03+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-15 05:20+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: account #: view:account.invoice.report:0 @@ -4780,7 +4780,7 @@ msgstr "Steuer Anwendung" #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale #, python-format msgid "Journal Items" -msgstr "Buchungsjournale" +msgstr "Journal Zeilen" #. module: account #: code:addons/account/account.py:1087 @@ -6869,7 +6869,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Journal Entries" -msgstr "Buchungssätze" +msgstr "Buchungsbelege" #. module: account #: help:account.partner.ledger,page_split:0 diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index e8f0188b645..189909fddf2 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2011-11-07 12:52+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-22 12:25+0000\n" +"Last-Translator: Xosé \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:45+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: account #: view:account.invoice.report:0 @@ -2040,7 +2040,7 @@ msgstr "Importar dende factura" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "January" -msgstr "Enero" +msgstr "Xaneiro" #. module: account #: view:account.journal:0 diff --git a/addons/auction/i18n/gl.po b/addons/auction/i18n/gl.po index 1592d54d902..54110c2e41b 100644 --- a/addons/auction/i18n/gl.po +++ b/addons/auction/i18n/gl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-09 08:15+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-22 12:23+0000\n" +"Last-Translator: Xosé \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:58+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_menu @@ -1829,17 +1829,17 @@ msgstr "Estimación" #. module: auction #: view:auction.taken:0 msgid "OK" -msgstr "Ok" +msgstr "Aceptar" #. module: auction #: model:ir.actions.report.xml,name:auction.buyer_form_id msgid "Buyer Form" -msgstr "Formulario comprador" +msgstr "Formulario do comprador" #. module: auction #: field:auction.bid,partner_id:0 msgid "Buyer Name" -msgstr "Nome comprador" +msgstr "Nome do comprador" #. module: auction #: view:report.auction:0 diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po index 1a39f693914..c6047765485 100644 --- a/addons/base_calendar/i18n/nl.po +++ b/addons/base_calendar/i18n/nl.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:16+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 18:25+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation Type" -msgstr "" +msgstr "Uitnodiging type" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 @@ -31,7 +31,7 @@ msgstr "De gebeurtenis begint" #. module: base_calendar #: view:calendar.attendee:0 msgid "Declined Invitations" -msgstr "" +msgstr "Geweigerde uitnodigingen" #. module: base_calendar #: help:calendar.event,exdate:0 @@ -63,7 +63,7 @@ msgstr "Maandelijks" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Unknown" -msgstr "" +msgstr "Onbekend" #. module: base_calendar #: view:calendar.attendee:0 @@ -115,7 +115,7 @@ msgstr "vierde" #: code:addons/base_calendar/base_calendar.py:1006 #, python-format msgid "Count cannot be negative" -msgstr "" +msgstr "telling kan niet negatief zijn" #. module: base_calendar #: field:calendar.event,day:0 @@ -238,7 +238,7 @@ msgstr "Zaal" #. module: base_calendar #: view:calendar.attendee:0 msgid "Accepted Invitations" -msgstr "" +msgstr "Geaccepteerde uitnodigingen" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -268,7 +268,7 @@ msgstr "Werkwijze" #: code:addons/base_calendar/base_calendar.py:1004 #, python-format msgid "Interval cannot be negative" -msgstr "" +msgstr "Interval kan niet negatief zijn" #. module: base_calendar #: selection:calendar.event,state:0 @@ -280,7 +280,7 @@ msgstr "Geannuleerd" #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 #, python-format msgid "%s must have an email address to send mail" -msgstr "" +msgstr "%s moet een e-mail adres hebben om e-mail te kunnen verzenden" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -419,6 +419,8 @@ msgstr "Deelnemers" #, python-format msgid "Group by date not supported, use the calendar view instead" msgstr "" +"Groepeer op datum wordt niet ondersteund, gebruik hiervoor de kalender " +"weergave" #. module: base_calendar #: view:calendar.event:0 @@ -468,7 +470,7 @@ msgstr "Plaats" #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Openbaar voor werknemers" #. module: base_calendar #: field:base_calendar.invite.attendee,send_mail:0 @@ -567,7 +569,7 @@ msgstr "Toegewezen aan" #. module: base_calendar #: view:calendar.event:0 msgid "To" -msgstr "" +msgstr "Aan" #. module: base_calendar #: view:calendar.attendee:0 @@ -588,7 +590,7 @@ msgstr "Aangemaakt" #. module: base_calendar #: sql_constraint:ir.model:0 msgid "Each model must be unique!" -msgstr "" +msgstr "Ieder model moet uniek zijn!" #. module: base_calendar #: selection:calendar.event,rrule_type:0 @@ -775,7 +777,7 @@ msgstr "Lid" #. module: base_calendar #: view:calendar.event:0 msgid "From" -msgstr "" +msgstr "Van" #. module: base_calendar #: field:calendar.event,rrule:0 @@ -858,7 +860,7 @@ msgstr "Maandag" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model msgid "Models" -msgstr "" +msgstr "Modellen" #. module: base_calendar #: selection:calendar.event,month_list:0 @@ -877,7 +879,7 @@ msgstr "Datum gebeurtenis" #: selection:calendar.event,end_type:0 #: selection:calendar.todo,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Aantal herhalingen" #. module: base_calendar #: view:calendar.event:0 @@ -921,7 +923,7 @@ msgstr "Data" #: field:calendar.event,end_type:0 #: field:calendar.todo,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Herhaling beëindiging" #. module: base_calendar #: field:calendar.event,mo:0 @@ -932,7 +934,7 @@ msgstr "Maa" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitations To Review" -msgstr "" +msgstr "Te herziene uitnodigingen" #. module: base_calendar #: selection:calendar.event,month_list:0 @@ -966,7 +968,7 @@ msgstr "Januari" #. module: base_calendar #: view:calendar.attendee:0 msgid "Delegated Invitations" -msgstr "" +msgstr "Gedelegeerde uitnodigingen" #. module: base_calendar #: field:calendar.alarm,trigger_interval:0 @@ -1254,7 +1256,7 @@ msgstr "Personen uitnodigen" #. module: base_calendar #: view:calendar.event:0 msgid "Confirmed Events" -msgstr "" +msgstr "Bevestigde evenementen" #. module: base_calendar #: field:calendar.attendee,dir:0 diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po index 30b90f7699d..516c3973b12 100644 --- a/addons/base_contact/i18n/nl.po +++ b/addons/base_contact/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 06:49+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 18:28+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #~ msgid "Categories" #~ msgstr "Categorieën" @@ -22,12 +22,12 @@ msgstr "" #. module: base_contact #: field:res.partner.location,city:0 msgid "City" -msgstr "" +msgstr "Stad" #. module: base_contact #: view:res.partner.contact:0 msgid "First/Lastname" -msgstr "" +msgstr "Voornaam/achternaam" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -41,7 +41,7 @@ msgstr "Contactpersonen" #. module: base_contact #: view:res.partner.contact:0 msgid "Professional Info" -msgstr "" +msgstr "Professionele info" #. module: base_contact #: field:res.partner.contact,first_name:0 @@ -51,7 +51,7 @@ msgstr "Voornaam" #. module: base_contact #: field:res.partner.address,location_id:0 msgid "Location" -msgstr "" +msgstr "Locatie" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 @@ -75,17 +75,17 @@ msgstr "Website" #. module: base_contact #: field:res.partner.location,zip:0 msgid "Zip" -msgstr "" +msgstr "Postcode" #. module: base_contact #: field:res.partner.location,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Provincie" #. module: base_contact #: field:res.partner.location,company_id:0 msgid "Company" -msgstr "" +msgstr "Bedrijf" #. module: base_contact #: field:res.partner.contact,title:0 @@ -95,7 +95,7 @@ msgstr "Titel" #. module: base_contact #: field:res.partner.location,partner_id:0 msgid "Main Partner" -msgstr "" +msgstr "Hoofd relatie" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 @@ -151,7 +151,7 @@ msgstr "Mobiel" #. module: base_contact #: field:res.partner.location,country_id:0 msgid "Country" -msgstr "" +msgstr "Land" #. module: base_contact #: view:res.partner.contact:0 @@ -184,7 +184,7 @@ msgstr "Contactpersoon" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_location msgid "res.partner.location" -msgstr "" +msgstr "res.partner.location" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 @@ -225,7 +225,7 @@ msgstr "Foto" #. module: base_contact #: view:res.partner.location:0 msgid "Locations" -msgstr "" +msgstr "Locaties" #. module: base_contact #: view:res.partner.contact:0 @@ -235,7 +235,7 @@ msgstr "Algemeen" #. module: base_contact #: field:res.partner.location,street:0 msgid "Street" -msgstr "" +msgstr "Adres" #. module: base_contact #: view:res.partner.contact:0 @@ -255,12 +255,12 @@ msgstr "Relatieadressen" #. module: base_contact #: field:res.partner.location,street2:0 msgid "Street2" -msgstr "" +msgstr "Adres 2" #. module: base_contact #: view:res.partner.contact:0 msgid "Personal Information" -msgstr "" +msgstr "Persoonlijke informatie" #. module: base_contact #: field:res.partner.contact,birthdate:0 diff --git a/addons/base_contact/i18n/sr@latin.po b/addons/base_contact/i18n/sr@latin.po index d543cad3747..64808b11a2d 100644 --- a/addons/base_contact/i18n/sr@latin.po +++ b/addons/base_contact/i18n/sr@latin.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-12-23 15:25+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-01-20 15:52+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_contact #: field:res.partner.location,city:0 msgid "City" -msgstr "" +msgstr "Grad" #. module: base_contact #: view:res.partner.contact:0 msgid "First/Lastname" -msgstr "" +msgstr "Ime/prezime" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -39,7 +39,7 @@ msgstr "Kontakti" #. module: base_contact #: view:res.partner.contact:0 msgid "Professional Info" -msgstr "" +msgstr "Profesionlne informacije" #. module: base_contact #: field:res.partner.contact,first_name:0 @@ -49,7 +49,7 @@ msgstr "Ime" #. module: base_contact #: field:res.partner.address,location_id:0 msgid "Location" -msgstr "" +msgstr "Mesto" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 @@ -62,6 +62,8 @@ msgid "" "If the active field is set to False, it will allow you to " "hide the partner contact without removing it." msgstr "" +"Ako je aktivno polje podešeno na ''Lažno'' (false), omogućiće Vam da " +"sakrijete partnera a da ga ne izbrišete." #. module: base_contact #: field:res.partner.contact,website:0 @@ -71,17 +73,17 @@ msgstr "Internet stranica" #. module: base_contact #: field:res.partner.location,zip:0 msgid "Zip" -msgstr "" +msgstr "Poštanski broj" #. module: base_contact #: field:res.partner.location,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Federalna država" #. module: base_contact #: field:res.partner.location,company_id:0 msgid "Company" -msgstr "" +msgstr "Preduzeće" #. module: base_contact #: field:res.partner.contact,title:0 @@ -91,17 +93,17 @@ msgstr "Naslov" #. module: base_contact #: field:res.partner.location,partner_id:0 msgid "Main Partner" -msgstr "" +msgstr "Glavni partner" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 msgid "Base Contact" -msgstr "Osnovni Kontakt" +msgstr "Osnovni kontakt" #. module: base_contact #: field:res.partner.contact,email:0 msgid "E-Mail" -msgstr "E-Mail" +msgstr "E‑pošta:" #. module: base_contact #: field:res.partner.contact,active:0 @@ -122,12 +124,12 @@ msgstr "Postanska adresa" #. module: base_contact #: field:res.partner.contact,function:0 msgid "Main Function" -msgstr "Glavna Funkcija" +msgstr "Glavna funkcija" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 msgid "Define partners and their addresses." -msgstr "Definisi Partnere i njihove Adrese" +msgstr "Definiši partnere i njihove adrese" #. module: base_contact #: field:res.partner.contact,name:0 @@ -147,7 +149,7 @@ msgstr "Mobilni" #. module: base_contact #: field:res.partner.location,country_id:0 msgid "Country" -msgstr "" +msgstr "Država" #. module: base_contact #: view:res.partner.contact:0 @@ -169,7 +171,7 @@ msgstr "Dodatne informacije" #: view:res.partner.contact:0 #: field:res.partner.contact,job_ids:0 msgid "Functions and Addresses" -msgstr "Funkcije i Adrese" +msgstr "Funkcije i adrese" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_contact @@ -180,17 +182,17 @@ msgstr "Kontakt" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_location msgid "res.partner.location" -msgstr "" +msgstr "res.partner.location" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 msgid "Companies you work with." -msgstr "Kompanije s kojima radite." +msgstr "Preduzeća s kojima radite." #. module: base_contact #: field:res.partner.contact,partner_id:0 msgid "Main Employer" -msgstr "Glavni Poslodavac." +msgstr "Glavni poslodavac" #. module: base_contact #: view:res.partner.contact:0 @@ -205,7 +207,7 @@ msgstr "Adrese" #. module: base_contact #: model:process.node,note:base_contact.process_node_addresses0 msgid "Working and private addresses." -msgstr "Rad na Privatnoj adresi" +msgstr "Adrese na radu i privatne adrese." #. module: base_contact #: field:res.partner.contact,last_name:0 @@ -221,7 +223,7 @@ msgstr "Fotografija" #. module: base_contact #: view:res.partner.location:0 msgid "Locations" -msgstr "" +msgstr "Mesta" #. module: base_contact #: view:res.partner.contact:0 @@ -231,7 +233,7 @@ msgstr "Opšte" #. module: base_contact #: field:res.partner.location,street:0 msgid "Street" -msgstr "" +msgstr "Ulica" #. module: base_contact #: view:res.partner.contact:0 @@ -251,12 +253,12 @@ msgstr "Partnerove adrese" #. module: base_contact #: field:res.partner.location,street2:0 msgid "Street2" -msgstr "" +msgstr "Ulica2" #. module: base_contact #: view:res.partner.contact:0 msgid "Personal Information" -msgstr "" +msgstr "Lični podaci" #. module: base_contact #: field:res.partner.contact,birthdate:0 diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po index 9d277f123ad..d0b8b938c0f 100644 --- a/addons/base_iban/i18n/sr@latin.po +++ b/addons/base_iban/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-10-05 13:32+0000\n" +"PO-Revision-Date: 2012-01-20 15:40+0000\n" "Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_iban #: constraint:res.partner.bank:0 @@ -24,21 +24,24 @@ msgid "" "Please define BIC/Swift code on bank for bank type IBAN Account to make " "valid payments" msgstr "" +"\n" +"Molimo definišite BIC/Swift kod banke za tip IBAN račun za izvršenje " +"validnih uplata/isplata." #. module: base_iban #: model:res.partner.bank.type,format_layout:base_iban.bank_iban msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" -msgstr "" +msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field msgid "bank_bic" -msgstr "" +msgstr "bank_bic" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field msgid "zip" -msgstr "Pošt. Broj" +msgstr "poštanski broj" #. module: base_iban #: help:res.partner.bank,iban:0 @@ -61,7 +64,7 @@ msgstr "country_id" msgid "" "The IBAN does not seem to be correct. You should have entered something like " "this %s" -msgstr "" +msgstr "IBAN izgleda nije tačan. Trebalo je uneti nešto kao %s" #. module: base_iban #: field:res.partner.bank,iban:0 @@ -72,7 +75,7 @@ msgstr "IBAN" #: code:addons/base_iban/base_iban.py:131 #, python-format msgid "The IBAN is invalid, it should begin with the country code" -msgstr "" +msgstr "IBAN je neispravan, trebalo bi da počinje sa kodom države" #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po index ae410817030..38d450a5c61 100644 --- a/addons/base_module_quality/i18n/nl.po +++ b/addons/base_module_quality/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 18:47+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-21 18:30+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:187 @@ -29,7 +29,7 @@ msgstr "Suggestie" #: model:ir.actions.act_window,name:base_module_quality.action_view_quality_save_report #: view:save.report:0 msgid "Standard Entries" -msgstr "" +msgstr "Standard Entries" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:100 @@ -57,7 +57,7 @@ msgstr "" #. module: base_module_quality #: view:save.report:0 msgid " " -msgstr "" +msgstr " " #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -79,7 +79,7 @@ msgstr "Snelheid test" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_quality_check msgid "Module Quality Check" -msgstr "" +msgstr "Module kwaliteitscontrole" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:82 @@ -191,7 +191,7 @@ msgstr "Unit test" #. module: base_module_quality #: view:quality.check:0 msgid "Check" -msgstr "" +msgstr "Controleer" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -296,7 +296,7 @@ msgstr "Resultaat in %" #. module: base_module_quality #: view:quality.check:0 msgid "This wizard will check module(s) quality" -msgstr "" +msgstr "Deze wizard zal de module kwaliteit controleren" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:58 @@ -444,7 +444,7 @@ msgstr "Test Is niet geïmplementeerd" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_save_report msgid "Save Report of Quality" -msgstr "" +msgstr "Sla kwaliteitsrapport op" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -485,7 +485,7 @@ msgstr "" #: code:addons/base_module_quality/speed_test/speed_test.py:116 #, python-format msgid "Error in Read method: %s" -msgstr "" +msgstr "Fout in lees methode: %s" #. module: base_module_quality #: code:addons/base_module_quality/workflow_test/workflow_test.py:129 @@ -506,7 +506,7 @@ msgstr "Annuleren" #. module: base_module_quality #: view:save.report:0 msgid "Close" -msgstr "" +msgstr "Afsluiten" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:32 diff --git a/addons/base_module_quality/i18n/sr@latin.po b/addons/base_module_quality/i18n/sr@latin.po index 1c00709d73e..92427d11dc3 100644 --- a/addons/base_module_quality/i18n/sr@latin.po +++ b/addons/base_module_quality/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-12-23 15:34+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-01-20 15:50+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:187 @@ -29,19 +29,19 @@ msgstr "Predlog" #: model:ir.actions.act_window,name:base_module_quality.action_view_quality_save_report #: view:save.report:0 msgid "Standard Entries" -msgstr "" +msgstr "Standardni unosi" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:100 #, python-format msgid "Programming Error" -msgstr "Greska Programiranja" +msgstr "Greška programiranja" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:31 #, python-format msgid "Method Test" -msgstr "Testiraj Metodu" +msgstr "Testiraj metod" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:34 @@ -50,11 +50,13 @@ msgid "" "\n" "Test checks for fields, views, security rules, dependancy level\n" msgstr "" +"\n" +"Test za polja, preglede, pravila sigurnosti, nivo zavisnosti\n" #. module: base_module_quality #: view:save.report:0 msgid " " -msgstr "" +msgstr " " #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -71,12 +73,12 @@ msgstr "Modul nema ni jedan objekat" #: code:addons/base_module_quality/speed_test/speed_test.py:49 #, python-format msgid "Speed Test" -msgstr "Test Brzine" +msgstr "Test brzine" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_quality_check msgid "Module Quality Check" -msgstr "" +msgstr "Provera kvaliteta modula" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:82 @@ -89,7 +91,7 @@ msgstr "" #: code:addons/base_module_quality/workflow_test/workflow_test.py:143 #, python-format msgid "Object Name" -msgstr "Ime Objekta" +msgstr "Ime stavke" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:54 @@ -97,7 +99,7 @@ msgstr "Ime Objekta" #: code:addons/base_module_quality/method_test/method_test.py:68 #, python-format msgid "Ok" -msgstr "U redu" +msgstr "OK" #. module: base_module_quality #: code:addons/base_module_quality/terp_test/terp_test.py:34 @@ -106,14 +108,14 @@ msgid "" "This test checks if the module satisfies the current coding standard used by " "OpenERP." msgstr "" -"Ovo proverava da li modul zadovljava dato kodne standarde koje OpenERP " -"koristi." +"Ovaj test proverava da li modul zadovljava trenutne standarde kodiranja koje " +"OpenERP koristi." #. module: base_module_quality #: code:addons/base_module_quality/wizard/quality_save_report.py:39 #, python-format msgid "No report to save!" -msgstr "Nema Izvestaja za cuvanje!" +msgstr "Nema izveštaja koji bi se sačuvao!" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:177 @@ -140,18 +142,18 @@ msgstr "Rezultat (/10)" #: code:addons/base_module_quality/terp_test/terp_test.py:33 #, python-format msgid "Terp Test" -msgstr "Terp Test" +msgstr "Testiraj Terp" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:33 #, python-format msgid "Object Test" -msgstr "Testiraj objekt" +msgstr "Testiraj stavku" #. module: base_module_quality #: view:module.quality.detail:0 msgid "Save Report" -msgstr "Sacuvaj Izvestaj" +msgstr "Sačuvaj izveštaj" #. module: base_module_quality #: code:addons/base_module_quality/wizard/module_quality_check.py:43 @@ -159,13 +161,13 @@ msgstr "Sacuvaj Izvestaj" #: view:quality.check:0 #, python-format msgid "Quality Check" -msgstr "Provera Kvaliteta" +msgstr "Provera kvaliteta" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:128 #, python-format msgid "Not Efficient" -msgstr "Nije Efikasno" +msgstr "Neefikasno" #. module: base_module_quality #: code:addons/base_module_quality/wizard/quality_save_report.py:39 @@ -183,18 +185,18 @@ msgstr "Povratno o strukturi modula" #: code:addons/base_module_quality/unit_test/unit_test.py:35 #, python-format msgid "Unit Test" -msgstr "Test Jedinice" +msgstr "Test jedinice" #. module: base_module_quality #: view:quality.check:0 msgid "Check" -msgstr "" +msgstr "Proveri" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "Reading Complexity" -msgstr "Citanje Kompleksnosti" +msgstr "Čitanje kompleksnosti" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:267 @@ -211,7 +213,7 @@ msgstr "Stanje" #: code:addons/base_module_quality/unit_test/unit_test.py:50 #, python-format msgid "Module does not have 'unit_test/test.py' file" -msgstr "Modul ne sadrzi 'unit_test/test.py' fajl" +msgstr "Modul nema 'unit_test/test.py' datoteku" #. module: base_module_quality #: field:module.quality.detail,ponderation:0 @@ -222,7 +224,7 @@ msgstr "Ponderacija" #: code:addons/base_module_quality/object_test/object_test.py:177 #, python-format msgid "Result of Security in %" -msgstr "Bezbedonosni rezultat u %" +msgstr "Rezultati bezbednosti u %" #. module: base_module_quality #: help:module.quality.detail,ponderation:0 @@ -260,18 +262,18 @@ msgstr "Nema podataka" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_detail msgid "module.quality.detail" -msgstr "modul.detalj.kvalitet" +msgstr "module.quality.detail" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:127 #, python-format msgid "O(n) or worst" -msgstr "O(n) ili losije" +msgstr "O(n) ili lošije" #. module: base_module_quality #: field:save.report,module_file:0 msgid "Save report" -msgstr "Sacuvaj Izvestaj" +msgstr "Sačubvaj izveštaj" #. module: base_module_quality #: code:addons/base_module_quality/workflow_test/workflow_test.py:34 @@ -293,7 +295,7 @@ msgstr "Rezultat u %" #. module: base_module_quality #: view:quality.check:0 msgid "This wizard will check module(s) quality" -msgstr "" +msgstr "Ovaj čarobnjak će proveriti kvalitet modula" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:58 @@ -319,12 +321,12 @@ msgstr "Poruka" #: code:addons/base_module_quality/terp_test/terp_test.py:54 #, python-format msgid "The module does not contain the __openerp__.py file" -msgstr "Ovaj Modul ne sadrzi __openerp__.py fajl" +msgstr "Ovaj modul nema __openerp__.py datoteku." #. module: base_module_quality #: view:module.quality.detail:0 msgid "Detail" -msgstr "Detalji" +msgstr "Detalj" #. module: base_module_quality #: field:module.quality.detail,note:0 @@ -340,27 +342,27 @@ msgid "" "wished.\n" "" msgstr "" -"O(1) podrazumeva da broj SQL zahteva za citanje objekata ne zavisi od " -"broja broja objekata koje citamo. Ova mogucnost je najtrazenija.\n" -"" +"O(1) podrazumeva da broj SQL zahteva za čitanje objekata ne zavisi od " +"broja stavki koje čitamo. Ova mogućnost je najpoželjnija.\n" +" " #. module: base_module_quality #: code:addons/base_module_quality/terp_test/terp_test.py:120 #, python-format msgid "__openerp__.py file" -msgstr "__openerp__.py fajl" +msgstr "__openerp__.py datoteka" #. module: base_module_quality #: code:addons/base_module_quality/unit_test/unit_test.py:70 #, python-format msgid "Status" -msgstr "Status" +msgstr "Stanje" #. module: base_module_quality #: view:module.quality.check:0 #: field:module.quality.check,check_detail_ids:0 msgid "Tests" -msgstr "Probe" +msgstr "Testiranja" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:50 @@ -371,12 +373,16 @@ msgid "" "needed in order to run it.\n" "\n" msgstr "" +"\n" +"Ovaj test proverava brzinu modula. Zapazite da je potrebno najmanje 5 demo " +"podataka da bi se mogao pokrenuti.\n" +"\n" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:71 #, python-format msgid "Unable to parse the result. Check the details." -msgstr "Rezultat se ne moze uporedjivati. Proveri detalje." +msgstr "Rezultat se ne moze upoređivati. Proverite detalje." #. module: base_module_quality #: code:addons/base_module_quality/structure_test/structure_test.py:33 @@ -385,31 +391,33 @@ msgid "" "\n" "This test checks if the module satisfy tiny structure\n" msgstr "" +"\n" +"Ovaj test proverava da li modul ispunjava strukturu ''najmanje''\n" #. module: base_module_quality #: code:addons/base_module_quality/structure_test/structure_test.py:151 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136 #, python-format msgid "Module Name" -msgstr "Ime Modula" +msgstr "Naziv Modula" #. module: base_module_quality #: code:addons/base_module_quality/unit_test/unit_test.py:56 #, python-format msgid "Error! Module is not properly loaded/installed" -msgstr "Greska ! Modul nije ispravno ucitan/instaliran" +msgstr "Greška ! Modul nije ispravno učitan/instaliran" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:115 #, python-format msgid "Error in Read method" -msgstr "Greska u metodi Citanja" +msgstr "Greška u metodi čitanja" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:138 #, python-format msgid "Score is below than minimal score(%s%%)" -msgstr "Rezultat je ispod minimalnoig rezultata (%s%%)" +msgstr "Rezultat je ispod minimalnog rezultata (%s%%)" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -429,12 +437,12 @@ msgstr "Izuzetak" #: code:addons/base_module_quality/base_module_quality.py:100 #, python-format msgid "Test Is Not Implemented" -msgstr "Tset NIJE Implementiran" +msgstr "Test NIJE Implementiran" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_save_report msgid "Save Report of Quality" -msgstr "" +msgstr "Sačuvaj izveštaj o kvalitetu" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -446,7 +454,7 @@ msgstr "N" #: code:addons/base_module_quality/workflow_test/workflow_test.py:143 #, python-format msgid "Feed back About Workflow of Module" -msgstr "Povratna informacija o prezasicenosti Modula" +msgstr "Povratna informacija o prezasićenosti modula" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:73 @@ -455,8 +463,8 @@ msgid "" "Given module has no objects.Speed test can work only when new objects are " "created in the module along with demo data" msgstr "" -"Dati modul nema objekata. Test brzine moze da radi kada je kreiran novi " -"objekat u modulu zajedno sa demo podacima" +"Dati modul nema stavki. Test brzine može da radi jedino kada se nove stavke " +"naprave u modulu zajedno sa demo podacima" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:32 @@ -466,18 +474,22 @@ msgid "" "of Python. See http://www.logilab.org/project/name/pylint for further info.\n" " " msgstr "" +"Ovaj test koristi Pylint i proverava da li modul zadovoljava standarde " +"kodiranja Python-a. Vidite http://www.logilab.org/project/name/pylint za " +"dodatne informacije.\n" +" " #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:116 #, python-format msgid "Error in Read method: %s" -msgstr "" +msgstr "Greška u metodu čitanja: %s" #. module: base_module_quality #: code:addons/base_module_quality/workflow_test/workflow_test.py:129 #, python-format msgid "No Workflow define" -msgstr "Prezasicenost nije definisana" +msgstr "Prezasićenost nije definisana" #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -492,7 +504,7 @@ msgstr "Otkaži" #. module: base_module_quality #: view:save.report:0 msgid "Close" -msgstr "" +msgstr "Zatvori" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:32 @@ -501,11 +513,14 @@ msgid "" "\n" "PEP-8 Test , copyright of py files check, method can not call from loops\n" msgstr "" +"\n" +"PEP-8 test, provera copyright-a py datoteka, metod se ne može pokrenuti iz " +"petlji (loops)\n" #. module: base_module_quality #: field:module.quality.check,final_score:0 msgid "Final Score (%)" -msgstr "Krajnji Rezultat (%)" +msgstr "Konačni rezultat (%)" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:61 @@ -513,7 +528,7 @@ msgstr "Krajnji Rezultat (%)" msgid "" "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)" msgstr "" -"Greska. Da li je pylint ispravno instaliran? " +"Greška. Da li je pylint ispravno instaliran? " "(http://pypi.python.org/pypi/pylint)" #. module: base_module_quality @@ -531,7 +546,7 @@ msgstr "Ocenjen Modul" #: code:addons/base_module_quality/workflow_test/workflow_test.py:33 #, python-format msgid "Workflow Test" -msgstr "Test Prezasicenosti" +msgstr "Test Prezasićenosti" #. module: base_module_quality #: code:addons/base_module_quality/unit_test/unit_test.py:36 @@ -542,6 +557,10 @@ msgid "" "'unit_test/test.py' is needed in module.\n" "\n" msgstr "" +"\n" +"Ovaj test proverava Pojedinačni test slučajeva (PyUnit) za ovaj modul. " +"Zapazite da je neophodno 'unit_test/test.py' u modulu.\n" +"\n" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:32 @@ -551,6 +570,9 @@ msgid "" "This test checks if the module classes are raising exception when calling " "basic methods or not.\n" msgstr "" +"\n" +"Ovaj test proverava da li klase modula podižu ili ne očekivanja kada se " +"pokreću osnovne metode.\n" #. module: base_module_quality #: field:module.quality.detail,detail:0 @@ -561,7 +583,7 @@ msgstr "Detalji" #: code:addons/base_module_quality/speed_test/speed_test.py:119 #, python-format msgid "Warning! Not enough demo data" -msgstr "" +msgstr "Upozorenje! Nema dovoljno demo podataka!" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:31 @@ -579,7 +601,7 @@ msgstr "PEP-8 Test" #: code:addons/base_module_quality/object_test/object_test.py:187 #, python-format msgid "Field name" -msgstr "Ime Polja" +msgstr "Ime polja" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -602,12 +624,12 @@ msgstr "Ime Tag-a" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_check msgid "module.quality.check" -msgstr "modul.provera.kvaliteta" +msgstr "module.quality.check" #. module: base_module_quality #: field:module.quality.detail,name:0 msgid "Name" -msgstr "Ime" +msgstr "Naziv" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:177 @@ -624,13 +646,13 @@ msgstr "Rezultat (%)" #. module: base_module_quality #: help:save.report,name:0 msgid "Save report as .html format" -msgstr "Sacuvaj Izvestaj kao .html format" +msgstr "Sačuvaj izveštaj kao .html format" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:269 #, python-format msgid "The module has to be installed before running this test." -msgstr "Modul treba biti instaliran pre nego pokrenes ovaj test." +msgstr "Modul treba da je instaliran pre pokretanja ovog testa." #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:123 @@ -650,7 +672,7 @@ msgstr "Rezultat polja u %" #: field:module.quality.detail,summary:0 #, python-format msgid "Summary" -msgstr "Sumarno" +msgstr "Sažetak" #. module: base_module_quality #: code:addons/base_module_quality/pylint_test/pylint_test.py:99 @@ -658,19 +680,19 @@ msgstr "Sumarno" #: field:save.report,name:0 #, python-format msgid "File Name" -msgstr "Ime Fajla" +msgstr "Naziv datoteke" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:274 #, python-format msgid "Line number" -msgstr "Broj Linije" +msgstr "Broj linije" #. module: base_module_quality #: code:addons/base_module_quality/structure_test/structure_test.py:32 #, python-format msgid "Structure Test" -msgstr "Test Strukture" +msgstr "Test strukture" #. module: base_module_quality #: field:module.quality.detail,quality_check_id:0 @@ -681,7 +703,7 @@ msgstr "Kvalitet" #: code:addons/base_module_quality/terp_test/terp_test.py:140 #, python-format msgid "Feed back About terp file of Module" -msgstr "Povratni info o terp fajlu Modula" +msgstr "Povratne informacije o terp datoteci modula" #~ msgid "Base module quality - To check the quality of other modules" #~ msgstr "Kvalitet baze modula - Da proveri kvalitet ostalih modula" diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index 02786282ffb..c0d3274cf86 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -7,44 +7,44 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-11-07 12:52+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-20 19:34+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-21 05:41+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 msgid "Display Tips" -msgstr "" +msgstr "Выводить советы" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Guest" -msgstr "" +msgstr "Гость" #. module: base_setup #: model:ir.model,name:base_setup.model_product_installer msgid "product.installer" -msgstr "" +msgstr "product.installer" #. module: base_setup #: selection:product.installer,customers:0 msgid "Create" -msgstr "" +msgstr "Создать" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Member" -msgstr "" +msgstr "Участник" #. module: base_setup #: field:migrade.application.installer.modules,sync_google_contact:0 msgid "Sync Google Contact" -msgstr "" +msgstr "Синхронизировать конакты Google" #. module: base_setup #: help:user.preferences.config,context_tz:0 @@ -56,7 +56,7 @@ msgstr "" #. module: base_setup #: selection:product.installer,customers:0 msgid "Import" -msgstr "" +msgstr "Импорт" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -126,6 +126,9 @@ msgid "" "simplified interface, which has less features but is easier. You can always " "switch later from the user preferences." msgstr "" +"Если Вы используете OpenERP первый раз, мы настоятельно советуем выбрать " +"упрощенный интерфейс, который имеет меньше функций, но является более " +"легким. Позже Вы всегда сможете сменить интерфейс в настройках пользователя." #. module: base_setup #: view:base.setup.terminology:0 @@ -136,12 +139,12 @@ msgstr "res_config_contents" #. module: base_setup #: field:user.preferences.config,view:0 msgid "Interface" -msgstr "" +msgstr "Интерфейс" #. module: base_setup #: model:ir.model,name:base_setup.model_migrade_application_installer_modules msgid "migrade.application.installer.modules" -msgstr "" +msgstr "migrade.application.installer.modules" #. module: base_setup #: view:base.setup.terminology:0 @@ -158,12 +161,12 @@ msgstr "" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Customer" -msgstr "" +msgstr "Заказчик" #. module: base_setup #: field:user.preferences.config,context_lang:0 msgid "Language" -msgstr "" +msgstr "Язык" #. module: base_setup #: help:user.preferences.config,context_lang:0 diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index da7f4d82d59..eed91b75a74 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2012-01-19 19:14+0000\n" +"PO-Revision-Date: 2012-01-22 19:00+0000\n" "Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-20 04:38+0000\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" "X-Generator: Launchpad (build 14700)\n" #. module: crm @@ -238,7 +238,7 @@ msgstr "Uitschrijven" #. module: crm #: field:crm.meeting,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Herhaling beëindiging" #. module: crm #: code:addons/crm/crm_lead.py:323 @@ -572,7 +572,7 @@ msgstr "E-Mail" #. module: crm #: view:crm.phonecall:0 msgid "Phonecalls during last 7 days" -msgstr "" +msgstr "Telefoongesprekken van de afgelopen 7 dagen" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -633,7 +633,7 @@ msgstr "Einddatum" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule/Log a call" -msgstr "" +msgstr "Plan/Log een gesprek" #. module: crm #: constraint:base.action.rule:0 @@ -1273,7 +1273,7 @@ msgstr "Conditie dossier velden" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in pending state" -msgstr "" +msgstr "Telefoongesprekken in de staat 'lopend'" #. module: crm #: view:crm.case.section:0 @@ -1568,7 +1568,7 @@ msgstr "Onderliggende teams" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in draft and open state" -msgstr "" +msgstr "Telefoongesprekken in de concept en open fase" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead1 @@ -1602,7 +1602,7 @@ msgstr "res.users" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities which are in pending state" -msgstr "" +msgstr "Leads/Prospects dien zich in de lopende fase bevinden" #. module: crm #: model:ir.model,name:crm.model_crm_merge_opportunity @@ -1638,7 +1638,7 @@ msgstr "Telefoongesprek categoriën" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities which are in open state" -msgstr "" +msgstr "Leads/Prospects dien zich in de open fase bevinden" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_categ @@ -2140,7 +2140,7 @@ msgstr "Naam contactpersoon" #. module: crm #: view:crm.lead:0 msgid "Leads creating during last 7 days" -msgstr "" +msgstr "Leads aangemaakt in de afgelopen 7 dagen" #. module: crm #: view:crm.phonecall2partner:0 @@ -2209,7 +2209,7 @@ msgstr "Team" #. module: crm #: view:crm.lead.report:0 msgid "Leads/Opportunities which are in New state" -msgstr "" +msgstr "Leads/Prospects dien zich in de nieuw fase bevinden" #. module: crm #: view:crm.phonecall:0 @@ -2233,7 +2233,7 @@ msgstr "Slagingskans" #. module: crm #: view:crm.lead:0 msgid "Pending Opportunities" -msgstr "" +msgstr "Lopende prospects" #. module: crm #: view:crm.lead.report:0 @@ -3066,7 +3066,7 @@ msgstr "Bevestigd" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_stage_user msgid "Planned Revenue By User and Stage" -msgstr "" +msgstr "Geplande opbrengst per gebrukier en fase" #. module: crm #: view:crm.meeting:0 @@ -3106,7 +3106,7 @@ msgstr "Dag v/d maand" #. module: crm #: model:ir.actions.act_window,name:crm.act_my_oppor_stage msgid "Planned Revenue By Stage" -msgstr "" +msgstr "Geplande opbrengst per fase" #. module: crm #: selection:crm.add.note,state:0 @@ -3242,7 +3242,7 @@ msgstr "Partner contactpersoon e-mail" #: code:addons/crm/wizard/crm_lead_to_partner.py:48 #, python-format msgid "A partner is already defined." -msgstr "" +msgstr "Een relatie is al gedefinieerd" #. module: crm #: selection:crm.meeting,byday:0 @@ -3464,6 +3464,8 @@ msgstr "Normaal" #, python-format msgid "Closed/Cancelled Leads can not be converted into Opportunity" msgstr "" +"Gesloten/Geannuleerde leads kunnen niet naar een prospect worden " +"geconverteerd" #. module: crm #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action @@ -3534,7 +3536,7 @@ msgstr "De prospect '%s' is gewonnen." #. module: crm #: field:crm.case.stage,case_default:0 msgid "Common to All Teams" -msgstr "" +msgstr "Algemeen voor alle teams" #. module: crm #: code:addons/crm/wizard/crm_add_note.py:28 @@ -3637,7 +3639,7 @@ msgstr "Persoonlijk" #. module: crm #: selection:crm.meeting,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Openbaar voor werknemers" #. module: crm #: field:crm.lead,function:0 @@ -3662,7 +3664,7 @@ msgstr "Omschrijving" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in current month" -msgstr "" +msgstr "Telefoongesprekken gemaakt in de huidige maand" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3686,7 +3688,7 @@ msgstr "Nieuwe prospects" #: code:addons/crm/crm_action_rule.py:61 #, python-format msgid "No E-Mail Found for your Company address!" -msgstr "" +msgstr "Geen e-mail gevonden voor uw bedrijfsadres!" #. module: crm #: field:crm.lead.report,email:0 @@ -3706,7 +3708,7 @@ msgstr "Prospects op gebruiker en team" #. module: crm #: view:crm.phonecall:0 msgid "Reset to Todo" -msgstr "" +msgstr "Zet terug naar Te doen" #. module: crm #: field:crm.case.section,working_hours:0 @@ -3835,6 +3837,10 @@ msgid "" "channels that will be maintained at the creation of a document in the " "system. Some examples of channels can be: Website, Phone Call, Reseller, etc." msgstr "" +"Volg hier waar uw leads en verkoopkansen vandaan komen door specifieke " +"kanalen te maken die worden bijgehouden bij het maken van een document in " +"het systeem, Enkele voorbeelden van kanalen kunnen zijn: Website, " +"Telefonisch, Dealer, etc." #. module: crm #: selection:crm.lead2opportunity.partner,name:0 @@ -3866,7 +3872,7 @@ msgstr "Reeks" #. module: crm #: model:ir.model,name:crm.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "E-mail opmaak wizard" #. module: crm #: view:crm.meeting:0 @@ -3905,6 +3911,7 @@ msgstr "Jaar" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead8 diff --git a/addons/crm_caldav/i18n/nl.po b/addons/crm_caldav/i18n/nl.po index b7e4f9f870f..129d5ca515e 100644 --- a/addons/crm_caldav/i18n/nl.po +++ b/addons/crm_caldav/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:51+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:04+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_caldav #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse @@ -25,7 +25,7 @@ msgstr "Caldav Browse" #. module: crm_caldav #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse msgid "Synchronize This Calendar" -msgstr "" +msgstr "Deze agenda synchroniseren" #. module: crm_caldav #: model:ir.model,name:crm_caldav.model_crm_meeting diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po index 56d98318213..b162af86d71 100644 --- a/addons/crm_claim/i18n/nl.po +++ b/addons/crm_claim/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-18 20:27+0000\n" -"Last-Translator: Erwin (Endian Solutions) \n" +"PO-Revision-Date: 2012-01-22 14:40+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-19 04:51+0000\n" -"X-Generator: Launchpad (build 14692)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -475,7 +475,7 @@ msgstr "Juni" #. module: crm_claim #: view:res.partner:0 msgid "Partners Claim" -msgstr "" +msgstr "Relatie claim" #. module: crm_claim #: field:crm.claim,partner_phone:0 @@ -785,6 +785,7 @@ msgstr "ID" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm_claim #: view:crm.claim:0 diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po index 2b3acaece4a..fdf7d7ccd36 100644 --- a/addons/crm_fundraising/i18n/nl.po +++ b/addons/crm_fundraising/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:53+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 18:34+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_fundraising #: field:crm.fundraising,planned_revenue:0 @@ -104,7 +104,7 @@ msgstr "Berichten" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "My company" -msgstr "" +msgstr "Mijn bedrijf" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -126,7 +126,7 @@ msgstr "Gesch. omzet" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Open Funds" -msgstr "" +msgstr "Open fondsen" #. module: crm_fundraising #: field:crm.fundraising,ref:0 @@ -170,7 +170,7 @@ msgstr "Relatie" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Funds raised in current year" -msgstr "" +msgstr "Geworven fondsen dit jaar" #. module: crm_fundraising #: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising @@ -208,7 +208,7 @@ msgstr "" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Pending Funds" -msgstr "" +msgstr "Lopende fondsen" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -221,7 +221,7 @@ msgstr "Betalingsvorm" #: selection:crm.fundraising,state:0 #: view:crm.fundraising.report:0 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: crm_fundraising #: field:crm.fundraising,email_from:0 @@ -237,7 +237,7 @@ msgstr "Laagste" #: view:crm.fundraising:0 #: view:crm.fundraising.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm_fundraising #: field:crm.fundraising,create_date:0 @@ -307,7 +307,7 @@ msgstr "Aantal dagen om werving af te sluiten" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Funds raised in current month" -msgstr "" +msgstr "Geworven fondsen huidige maand" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -384,7 +384,7 @@ msgstr "Referentie 2" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Funds raised in last month" -msgstr "" +msgstr "Geworven fondsen laatste maand" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -540,7 +540,7 @@ msgstr "Deze personen ontvangen email." #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Fund Category" -msgstr "" +msgstr "Fonds categorie" #. module: crm_fundraising #: field:crm.fundraising,date:0 @@ -565,7 +565,7 @@ msgstr "Contactpersoon relatie" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Month of fundraising" -msgstr "" +msgstr "Maand van fondsverwerving" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -583,7 +583,7 @@ msgstr "Status" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "Unassigned" -msgstr "" +msgstr "Niet toegewezen" #. module: crm_fundraising #: view:crm.fundraising:0 @@ -612,7 +612,7 @@ msgstr "Open" #. module: crm_fundraising #: selection:crm.fundraising,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm_fundraising #: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1 @@ -653,7 +653,7 @@ msgstr "Beantwoorden" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Date of fundraising" -msgstr "" +msgstr "Datum van fondsverwerving" #. module: crm_fundraising #: view:crm.fundraising.report:0 @@ -669,7 +669,7 @@ msgstr "Betalingsvorm" #. module: crm_fundraising #: view:crm.fundraising:0 msgid "New Funds" -msgstr "" +msgstr "Nieuwe fondsen" #. module: crm_fundraising #: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act @@ -744,7 +744,7 @@ msgstr "Fondsen op categorie" #. module: crm_fundraising #: view:crm.fundraising.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm_fundraising #: selection:crm.fundraising.report,month:0 diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po index a6256154df0..c011cc7084c 100644 --- a/addons/crm_helpdesk/i18n/nl.po +++ b/addons/crm_helpdesk/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:53+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-22 14:38+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -46,7 +46,7 @@ msgstr "Maart" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current year" -msgstr "" +msgstr "Helpdesk verzoeken dit jaar" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -80,7 +80,7 @@ msgstr "Toevoegen interne notitie" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Date of helpdesk requests" -msgstr "" +msgstr "Datum van helpdesk verzoek" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -95,7 +95,7 @@ msgstr "Berichten" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My company" -msgstr "" +msgstr "Mijn bedrijf" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 @@ -156,7 +156,7 @@ msgstr "Afdeling" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in last month" -msgstr "" +msgstr "Helpdesk verzoeken laatste maand" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -166,14 +166,14 @@ msgstr "Verstuur nieuwe email" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Helpdesk requests during last 7 days" -msgstr "" +msgstr "Helpdesk verzoeken in de afgelopen 7 dagen" #. module: crm_helpdesk #: view:crm.helpdesk:0 #: selection:crm.helpdesk,state:0 #: view:crm.helpdesk.report:0 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: crm_helpdesk #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report @@ -207,7 +207,7 @@ msgstr "# Mails" #: view:crm.helpdesk:0 #: view:crm.helpdesk.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mijn verkoop team(s)" #. module: crm_helpdesk #: field:crm.helpdesk,create_date:0 @@ -252,7 +252,7 @@ msgstr "Categorieën" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "New Helpdesk Request" -msgstr "" +msgstr "Nieuw helpdesk verzoek" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -267,13 +267,13 @@ msgstr "Data" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month of helpdesk requests" -msgstr "" +msgstr "Maand van helpdesk verzoek" #. module: crm_helpdesk #: code:addons/crm_helpdesk/crm_helpdesk.py:101 #, python-format msgid "No Subject" -msgstr "" +msgstr "Geen onderwerp" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -283,12 +283,12 @@ msgstr "#Helpdesk" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "All pending Helpdesk Request" -msgstr "" +msgstr "Alle lopende helpdesk verzoeken" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Year of helpdesk requests" -msgstr "" +msgstr "Jaar van helpdesk verzoek" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -324,7 +324,7 @@ msgstr "Wijzigingsdatum" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current month" -msgstr "" +msgstr "Helpdeskverzoeken van de huidige maand" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -345,7 +345,7 @@ msgstr "Categorie" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Responsible User" -msgstr "" +msgstr "Verantwoordelijke gebruiker" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -361,7 +361,7 @@ msgstr "Verwachte kosten" #. module: crm_helpdesk #: help:crm.helpdesk,channel_id:0 msgid "Communication channel." -msgstr "" +msgstr "Communicatiekanaal" #. module: crm_helpdesk #: help:crm.helpdesk,email_cc:0 @@ -575,7 +575,7 @@ msgstr "Helpdesk aanvragen" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -664,7 +664,7 @@ msgstr "Naam" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month-1" -msgstr "" +msgstr "Maand-1" #. module: crm_helpdesk #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main @@ -703,17 +703,17 @@ msgstr "" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Todays's Helpdesk Requests" -msgstr "" +msgstr "Helpdeskverzoeken van vandaag" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Request Date" -msgstr "" +msgstr "Aanvraagdatum" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Open Helpdesk Request" -msgstr "" +msgstr "Open helpdeskverzoeken" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po index 9e7e981f4c1..88812ba8bd8 100644 --- a/addons/crm_partner_assign/i18n/nl.po +++ b/addons/crm_partner_assign/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 08:55+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:03+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,send_to:0 @@ -25,12 +25,12 @@ msgstr "Versturen naar" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subtype:0 msgid "Message type" -msgstr "" +msgstr "Bericht type" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,auto_delete:0 msgid "Permanently delete emails after sending" -msgstr "" +msgstr "Verwijder e-mails definitief na verzending" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_close:0 @@ -40,7 +40,7 @@ msgstr "Vertraging tot sluiten" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_to:0 msgid "Message recipients" -msgstr "" +msgstr "Ontvangers van het bericht" #. module: crm_partner_assign #: field:crm.lead.report.assign,planned_revenue:0 @@ -61,7 +61,7 @@ msgstr "Groepeer op..." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,template_id:0 msgid "Template" -msgstr "" +msgstr "Sjabloon" #. module: crm_partner_assign #: view:crm.lead:0 @@ -76,12 +76,12 @@ msgstr "Geo lokaliseren" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,body_text:0 msgid "Plain-text version of the message" -msgstr "" +msgstr "Platte tekst verzie van het bericht" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Body" -msgstr "" +msgstr "Inhoud" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -101,7 +101,7 @@ msgstr "Vertraging tot sluiting" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "#Partner" -msgstr "" +msgstr "#Partner" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 @@ -137,7 +137,7 @@ msgstr "Hoogste" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,body_text:0 msgid "Text contents" -msgstr "" +msgstr "Tekst inhoud" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -148,7 +148,7 @@ msgstr "Dag" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,message_id:0 msgid "Message unique identifier" -msgstr "" +msgstr "Bericht unieke identifier" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 @@ -167,6 +167,8 @@ msgid "" "Add here all attachments of the current document you want to include in the " "Email." msgstr "" +"Voeg hier alle bijlagen aan het huidige document toe die u bij de email wilt " +"bijvoegen." #. module: crm_partner_assign #: selection:crm.lead.report.assign,state:0 @@ -195,17 +197,17 @@ msgstr "" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,body_html:0 msgid "Rich-text/HTML version of the message" -msgstr "" +msgstr "Rich-tekst/HTML versie van het bericht" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,auto_delete:0 msgid "Auto Delete" -msgstr "" +msgstr "Auto-verwijder" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_bcc:0 msgid "Blind carbon copy message recipients" -msgstr "" +msgstr "Blind carbon copy ontvangers van het bericht" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,partner_id:0 @@ -254,7 +256,7 @@ msgstr "Afdeling" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Send" -msgstr "" +msgstr "Verzend" #. module: crm_partner_assign #: view:res.partner:0 @@ -286,7 +288,7 @@ msgstr "Soort" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Name" -msgstr "" +msgstr "Naam" #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -299,11 +301,13 @@ msgid "" "Type of message, usually 'html' or 'plain', used to select plaintext or rich " "text contents accordingly" msgstr "" +"Soort bericht, normaliter 'html' of 'tekst', wordt gebruikt om te kiezen " +"voor platte tekst of tekst met opmaak." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Assign Date" -msgstr "" +msgstr "Wijs datum toe" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -318,7 +322,7 @@ msgstr "Datum gemaakt" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,res_id:0 msgid "Related Document ID" -msgstr "" +msgstr "Gerelateerde document ID" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -349,7 +353,7 @@ msgstr "Stadium" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,model:0 msgid "Related Document model" -msgstr "" +msgstr "Gerelateerde Document model" #. module: crm_partner_assign #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192 @@ -392,7 +396,7 @@ msgstr "Sluiten" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,use_template:0 msgid "Use Template" -msgstr "" +msgstr "Gebruik sjabloon" #. module: crm_partner_assign #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign @@ -464,12 +468,12 @@ msgstr "#Verkoopkansen" #. module: crm_partner_assign #: view:crm.lead:0 msgid "Team" -msgstr "" +msgstr "Team" #. module: crm_partner_assign #: view:crm.lead:0 msgid "Referred Partner" -msgstr "" +msgstr "Voorkeur partner" #. module: crm_partner_assign #: selection:crm.lead.report.assign,state:0 @@ -490,7 +494,7 @@ msgstr "Gesloten" #. module: crm_partner_assign #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward msgid "Mass forward to partner" -msgstr "" +msgstr "Als bulk doorsturen naar relatie" #. module: crm_partner_assign #: view:res.partner:0 @@ -570,7 +574,7 @@ msgstr "Geo lengtegraad" #. module: crm_partner_assign #: field:crm.partner.report.assign,opp:0 msgid "# of Opportunity" -msgstr "" +msgstr "# of prospect" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -600,12 +604,12 @@ msgstr "Relatie waaraan dit dossier is toegewezen." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,date:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,body_html:0 msgid "Rich-text contents" -msgstr "" +msgstr "Rich-tekst inhoud" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -620,18 +624,18 @@ msgstr "res.partner.grade" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,message_id:0 msgid "Message-Id" -msgstr "" +msgstr "Bericht-Id" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 #: field:crm.lead.forward.to.partner,attachment_ids:0 msgid "Attachments" -msgstr "" +msgstr "Bijlagen" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,email_cc:0 msgid "Cc" -msgstr "" +msgstr "Cc" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -641,7 +645,7 @@ msgstr "September" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,references:0 msgid "References" -msgstr "" +msgstr "Referenties" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -668,7 +672,7 @@ msgstr "Openen" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_cc:0 msgid "Carbon copy message recipients" -msgstr "" +msgstr "Carbon copy ontvangers van het bericht" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,headers:0 @@ -676,6 +680,8 @@ msgid "" "Full message headers, e.g. SMTP session headers (usually available on " "inbound messages only)" msgstr "" +"Volledige bericht koppen, bijvoorbeeld SMTP sessie koppen (normaliter alleen " +"beschikbaar bij inkomende berichten)" #. module: crm_partner_assign #: field:res.partner,date_localization:0 @@ -702,7 +708,7 @@ msgstr "" #. module: crm_partner_assign #: field:crm.partner.report.assign,nbr:0 msgid "# of Partner" -msgstr "" +msgstr "# Partners" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 @@ -713,7 +719,7 @@ msgstr "Doorsturen aan relatie" #. module: crm_partner_assign #: field:crm.partner.report.assign,name:0 msgid "Partner name" -msgstr "" +msgstr "Relatienaam" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -728,7 +734,7 @@ msgstr "Verwachte omzet" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,reply_to:0 msgid "Reply-To" -msgstr "" +msgstr "Antwoord-aan" #. module: crm_partner_assign #: field:crm.lead,partner_assigned_id:0 @@ -748,7 +754,7 @@ msgstr "Verkoopkans" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Send Mail" -msgstr "" +msgstr "Verstuur bericht" #. module: crm_partner_assign #: field:crm.lead.report.assign,partner_id:0 @@ -776,7 +782,7 @@ msgstr "Land" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,headers:0 msgid "Message headers" -msgstr "" +msgstr "Bericht kop" #. module: crm_partner_assign #: view:res.partner:0 @@ -786,7 +792,7 @@ msgstr "Omzetten naar verkoopkans" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,email_bcc:0 msgid "Bcc" -msgstr "" +msgstr "Bcc" #. module: crm_partner_assign #: view:crm.lead:0 @@ -827,12 +833,13 @@ msgstr "CRM Lead overzicht" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,references:0 msgid "Message references, such as identifiers of previous messages" -msgstr "" +msgstr "Bericht referenties, zoals identifiers van vorige berichten" #. module: crm_partner_assign #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 @@ -847,12 +854,12 @@ msgstr "Volgnummer" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign msgid "CRM Partner Report" -msgstr "" +msgstr "CRM relatierapport" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner msgid "E-mail composition wizard" -msgstr "" +msgstr "E-mail opmaak wizard" #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -873,7 +880,7 @@ msgstr "Datum gemaakt" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,filter_id:0 msgid "Filters" -msgstr "" +msgstr "Filters" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -884,7 +891,7 @@ msgstr "Jaar" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,reply_to:0 msgid "Preferred response address for the message" -msgstr "" +msgstr "Voorkeur antwoordadres voor het bericht" #~ msgid "Reply-to of the Sales team defined on this case" #~ msgstr "Beantwoordt-aan van het voor dit dosseir gedefinieerde verkoopteam" diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po index 6ca25d5ca37..2506327a38d 100644 --- a/addons/crm_profiling/i18n/nl.po +++ b/addons/crm_profiling/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-14 04:22+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:04+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -69,7 +69,7 @@ msgstr "Antwoord" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire_line msgid "open.questionnaire.line" -msgstr "" +msgstr "open.questionnaire.line" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_crm_segmentation @@ -102,7 +102,7 @@ msgstr "Antwoorden" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire msgid "open.questionnaire" -msgstr "" +msgstr "open.questionnaire" #. module: crm_profiling #: field:open.questionnaire,questionnaire_id:0 @@ -117,12 +117,12 @@ msgstr "Gebruik een vragenlijst" #. module: crm_profiling #: view:open.questionnaire:0 msgid "_Cancel" -msgstr "" +msgstr "_Annuleren" #. module: crm_profiling #: field:open.questionnaire,question_ans_ids:0 msgid "Question / Answers" -msgstr "" +msgstr "Vragen / Antwoorden" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -156,6 +156,7 @@ msgstr "Gebruik de profileringsregels" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: crm_profiling #: view:crm_profiling.question:0 diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po index 6fd70c9eece..dc2f97cb613 100644 --- a/addons/delivery/i18n/nl.po +++ b/addons/delivery/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 18:38+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-21 19:15+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: delivery #: report:sale.shipping:0 @@ -69,7 +69,7 @@ msgstr "Planningsregel" #. module: delivery #: help:delivery.carrier,partner_id:0 msgid "The partner that is doing the delivery service." -msgstr "" +msgstr "De relatie die de afleveringsservice doet" #. module: delivery #: model:ir.actions.report.xml,name:delivery.report_shipping @@ -89,7 +89,7 @@ msgstr "Verzameld om te factureren" #. module: delivery #: field:delivery.carrier,pricelist_ids:0 msgid "Advanced Pricing" -msgstr "" +msgstr "Geavanceerd prijsbeheer" #. module: delivery #: help:delivery.grid,sequence:0 @@ -130,7 +130,7 @@ msgstr "" #. module: delivery #: field:delivery.carrier,amount:0 msgid "Amount" -msgstr "" +msgstr "Bedrag" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -208,6 +208,9 @@ msgid "" "Define your delivery methods and their pricing. The delivery costs can be " "added on the sale order form or in the invoice, based on the delivery orders." msgstr "" +"Definieer uw levering methodes en hun prijzen. De leveringkosten kunnen " +"worden toegevoegd op de verkooporder of in de factuur, op basis van de " +"leveringsorders." #. module: delivery #: report:sale.shipping:0 @@ -217,7 +220,7 @@ msgstr "Partij" #. module: delivery #: field:delivery.carrier,partner_id:0 msgid "Transport Company" -msgstr "" +msgstr "Transport bedrijf" #. module: delivery #: model:ir.model,name:delivery.model_delivery_grid @@ -260,6 +263,8 @@ msgid "" "Amount of the order to benefit from a free shipping, expressed in the " "company currency" msgstr "" +"Bedrag van de bestelling wat kan profiteren van een gratis verzending, " +"uitgedrukt in het bedrijf valuta" #. module: delivery #: code:addons/delivery/stock.py:89 @@ -290,17 +295,17 @@ msgstr "Poscode Afleverradres" #: code:addons/delivery/delivery.py:143 #, python-format msgid "Default price" -msgstr "" +msgstr "Standaard prijs" #. module: delivery #: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard msgid "delivery.define.delivery.steps.wizard" -msgstr "" +msgstr "delivery.define.delivery.steps.wizard" #. module: delivery #: field:delivery.carrier,normal_price:0 msgid "Normal Price" -msgstr "" +msgstr "Standaard prijs" #. module: delivery #: report:sale.shipping:0 @@ -337,17 +342,23 @@ msgid "" "Check this box if you want to manage delivery prices that depends on the " "destination, the weight, the total of the order, etc." msgstr "" +"Schakel dit selectievakje in als u wilt dat de levering prijzen afhankelijk " +"zijn van de bestemming, het gewicht, het totaal van de bestelling, enz." #. module: delivery #: help:delivery.carrier,normal_price:0 msgid "" "Keep empty if the pricing depends on the advanced pricing per destination" msgstr "" +"Laat leeg indien de prijs is gebaseerd op de geavanceerde prijs per " +"bestemming" #. module: delivery #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." msgstr "" +"Het is niet mogelijk om producten te verplaatsen naar een locatie van het " +"type 'view'." #. module: delivery #: code:addons/delivery/wizard/delivery_sale_order.py:94 @@ -370,7 +381,7 @@ msgstr "Order niet in status \"Concept\"!" #. module: delivery #: view:delivery.define.delivery.steps.wizard:0 msgid "Choose Your Default Picking Policy" -msgstr "" +msgstr "Kies u standaard verzamelbeleid" #. module: delivery #: constraint:stock.move:0 @@ -407,7 +418,7 @@ msgstr "Kostprijs" #. module: delivery #: field:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Picking Policy" -msgstr "" +msgstr "Verzamelbeleid" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -424,7 +435,7 @@ msgstr "" #. module: delivery #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referentie moet uniek zijn per bedrijf!" #. module: delivery #: field:delivery.grid.line,max_value:0 @@ -440,12 +451,12 @@ msgstr "Aantal" #: view:delivery.define.delivery.steps.wizard:0 #: model:ir.actions.act_window,name:delivery.action_define_delivery_steps msgid "Setup Your Picking Policy" -msgstr "" +msgstr "Stel uw verzamelbeleid in" #. module: delivery #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1 msgid "Define Delivery Methods" -msgstr "" +msgstr "Definieer aflever methodes" #. module: delivery #: help:delivery.carrier,free_if_more_than:0 @@ -453,6 +464,8 @@ msgid "" "If the order is more expensive than a certain amount, the customer can " "benefit from a free shipping" msgstr "" +"Als de bestelling duurder is dan een bepaald bedrag kan de klant profiteren " +"van een gratis verzending" #. module: delivery #: help:sale.order,carrier_id:0 @@ -471,12 +484,12 @@ msgstr "Annuleren" #: code:addons/delivery/delivery.py:131 #, python-format msgid "Free if more than %.2f" -msgstr "" +msgstr "Gratis indien meer dan %.2f" #. module: delivery #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Orderreferentie moet uniek zijn per bedrijf!" #. module: delivery #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form @@ -485,6 +498,9 @@ msgid "" "reinvoice the delivery costs when you are doing invoicing based on delivery " "orders" msgstr "" +"Definieer de levering methodes die u gebruikt en hun prijzen, om de " +"verzendkosten te her-factureren wanneer facturatie baseert op leverings " +"orders" #. module: delivery #: view:res.partner:0 @@ -504,7 +520,7 @@ msgstr "U moet een productie partij toewijzen voor dit product" #. module: delivery #: field:delivery.carrier,free_if_more_than:0 msgid "Free If More Than" -msgstr "" +msgstr "Gratis indien meer dan" #. module: delivery #: view:delivery.sale.order:0 @@ -576,17 +592,17 @@ msgstr "De vervoerder %s (id: %d) heeft geen leveringsmatrix!" #. module: delivery #: view:delivery.carrier:0 msgid "Pricing Information" -msgstr "" +msgstr "Prijsbeleid informatie" #. module: delivery #: selection:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Deliver all products at once" -msgstr "" +msgstr "Lever alle producten in 1 keer" #. module: delivery #: field:delivery.carrier,use_detailed_pricelist:0 msgid "Advanced Pricing per Destination" -msgstr "" +msgstr "Geavanceerd prijsbeleid per bestemming" #. module: delivery #: view:delivery.carrier:0 @@ -619,6 +635,7 @@ msgstr "" #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." msgstr "" +"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken" #. module: delivery #: field:delivery.grid,sequence:0 @@ -639,12 +656,12 @@ msgstr "Afleveringskosten" #. module: delivery #: selection:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Deliver each product when available" -msgstr "" +msgstr "Lever ieder product wanneer beschikbaar" #. module: delivery #: view:delivery.define.delivery.steps.wizard:0 msgid "Apply" -msgstr "" +msgstr "Toepassen" #. module: delivery #: field:delivery.grid.line,price_type:0 diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po index 7e8f819b636..30278689f45 100644 --- a/addons/document/i18n/nl.po +++ b/addons/document/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 15:28+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-22 19:04+0000\n" +"Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:11+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: document #: field:document.directory,parent_id:0 @@ -151,7 +151,7 @@ msgstr "Mapnaam moet uniek zijn" #. module: document #: view:ir.attachment:0 msgid "Filter on my documents" -msgstr "" +msgstr "Filter op mijn documenten" #. module: document #: field:ir.attachment,index_content:0 @@ -170,7 +170,7 @@ msgstr "" #. module: document #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config msgid "Knowledge Management" -msgstr "" +msgstr "Kennisbeheer" #. module: document #: view:document.directory:0 @@ -204,7 +204,7 @@ msgstr "Mappen per resource" #. module: document #: view:ir.attachment:0 msgid "Indexed Content - experimental" -msgstr "" +msgstr "Geïndexeerde inhoud - Experimenteel" #. module: document #: field:document.directory.content,suffix:0 @@ -390,6 +390,8 @@ msgid "" "When executing this wizard, it will configure your directories automatically " "according to modules installed." msgstr "" +"Bij het uitvoeren van deze wizard, zal het automatisch de mappen " +"configureren op basis van de geïnstalleerde modules." #. module: document #: field:document.directory.content,directory_id:0 @@ -525,7 +527,7 @@ msgstr "" #. module: document #: model:ir.actions.act_window,name:document.action_config_auto_directory msgid "Configure Directories" -msgstr "" +msgstr "Geconfigureerde mappen" #. module: document #: field:document.directory.content,include_name:0 @@ -679,7 +681,7 @@ msgstr "Alleen lezen" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_form msgid "Document Directory" -msgstr "" +msgstr "Document mappen" #. module: document #: sql_constraint:document.directory:0 @@ -705,6 +707,11 @@ msgid "" "attached to the document, or to print and download any report. This tool " "will create directories automatically according to modules installed." msgstr "" +"OpenERP's Document Management System ondersteunt het mappen van virtuele " +"mappen met documenten. De virtuele map van een document kan worden gebruikt " +"om de bestanden die bij het document behoren te beheren, of om af te drukken " +"en te downloaden. Deze tool maakt automatisch mappen op basis van " +"geïnstalleerde modules." #. module: document #: view:board.board:0 @@ -798,7 +805,7 @@ msgstr "Maand" #. module: document #: view:report.document.user:0 msgid "This Months Files" -msgstr "" +msgstr "Deze maand bestanden" #. module: document #: model:ir.ui.menu,name:document.menu_reporting @@ -864,7 +871,7 @@ msgstr "Bestanden per relatie" #. module: document #: view:document.configuration:0 msgid "Configure Direcories" -msgstr "" +msgstr "Geconfigureerde mappen" #. module: document #: view:report.document.user:0 @@ -879,7 +886,7 @@ msgstr "Notities" #. module: document #: model:ir.model,name:document.model_document_configuration msgid "Directory Configuration" -msgstr "" +msgstr "Mappen configuratie" #. module: document #: help:document.directory,type:0 @@ -982,7 +989,7 @@ msgstr "Mime Type" #. module: document #: view:report.document.user:0 msgid "All Months Files" -msgstr "" +msgstr "Alle maanden bestanden" #. module: document #: field:document.directory.content,name:0 diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po index 13892fa769d..ae60e101f46 100644 --- a/addons/hr_payroll/i18n/nl.po +++ b/addons/hr_payroll/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-01-10 16:37+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-22 19:09+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: hr_payroll #: field:hr.payslip.line,condition_select:0 @@ -26,7 +26,7 @@ msgstr "" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Monthly" -msgstr "" +msgstr "Maandelijks" #. module: hr_payroll #: view:hr.payslip:0 @@ -54,19 +54,19 @@ msgstr "" #: view:hr.payslip.line:0 #: view:hr.salary.rule:0 msgid "Group By..." -msgstr "" +msgstr "Groepeer op..." #. module: hr_payroll #: view:hr.payslip:0 msgid "States" -msgstr "" +msgstr "Statussen" #. module: hr_payroll #: field:hr.payslip.line,input_ids:0 #: view:hr.salary.rule:0 #: field:hr.salary.rule,input_ids:0 msgid "Inputs" -msgstr "" +msgstr "Invoer" #. module: hr_payroll #: field:hr.payslip.line,parent_rule_id:0 @@ -87,7 +87,7 @@ msgstr "Salarisstrook" #: field:hr.payroll.structure,parent_id:0 #: field:hr.salary.rule.category,parent_id:0 msgid "Parent" -msgstr "" +msgstr "Bovenliggend" #. module: hr_payroll #: report:paylip.details:0 @@ -125,13 +125,13 @@ msgstr "Zet op concept" #. module: hr_payroll #: model:ir.model,name:hr_payroll.model_hr_salary_rule msgid "hr.salary.rule" -msgstr "" +msgstr "hr.salary.rule" #. module: hr_payroll #: field:hr.payslip,payslip_run_id:0 #: model:ir.model,name:hr_payroll.model_hr_payslip_run msgid "Payslip Batches" -msgstr "" +msgstr "Loonafschrift batces" #. module: hr_payroll #: view:hr.payslip.employees:0 @@ -161,7 +161,7 @@ msgstr "Loonafschrift" #. module: hr_payroll #: view:hr.payslip.employees:0 msgid "Generate" -msgstr "" +msgstr "Genereren" #. module: hr_payroll #: help:hr.payslip.line,amount_percentage_base:0 @@ -172,7 +172,7 @@ msgstr "" #. module: hr_payroll #: report:contribution.register.lines:0 msgid "Total:" -msgstr "" +msgstr "Totaal:" #. module: hr_payroll #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules @@ -183,18 +183,18 @@ msgstr "" #: view:hr.payslip:0 #: view:hr.salary.rule:0 msgid "Input Data" -msgstr "" +msgstr "Invoergegevens" #. module: hr_payroll #: constraint:hr.payslip:0 msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" +msgstr "Loonafschrift \"Datum van' moet voor 'Datum t/m' liggen" #. module: hr_payroll #: view:hr.payslip:0 #: view:hr.salary.rule.category:0 msgid "Notes" -msgstr "" +msgstr "Notities" #. module: hr_payroll #: view:hr.payslip:0 @@ -208,14 +208,14 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Amount" -msgstr "" +msgstr "Bedrag" #. module: hr_payroll #: view:hr.payslip:0 #: view:hr.payslip.line:0 #: model:ir.model,name:hr_payroll.model_hr_payslip_line msgid "Payslip Line" -msgstr "" +msgstr "Loonafschrift regel" #. module: hr_payroll #: view:hr.payslip:0 @@ -237,7 +237,7 @@ msgstr "" #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52 #, python-format msgid "Warning !" -msgstr "" +msgstr "Waarschuwing !" #. module: hr_payroll #: report:paylip.details:0 @@ -248,7 +248,7 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Note" -msgstr "" +msgstr "Opmerking" #. module: hr_payroll #: field:hr.payroll.structure,code:0 @@ -256,7 +256,7 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Reference" -msgstr "" +msgstr "Referentie" #. module: hr_payroll #: view:hr.payslip:0 @@ -279,12 +279,12 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Identification No" -msgstr "" +msgstr "Identificatienr." #. module: hr_payroll #: field:hr.payslip,struct_id:0 msgid "Structure" -msgstr "" +msgstr "Structuur" #. module: hr_payroll #: help:hr.employee,total_wage:0 @@ -294,7 +294,7 @@ msgstr "" #. module: hr_payroll #: view:hr.payslip:0 msgid "Total Working Days" -msgstr "" +msgstr "Totaal aantal werkdagen" #. module: hr_payroll #: help:hr.payslip.line,code:0 @@ -307,12 +307,12 @@ msgstr "" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Weekly" -msgstr "" +msgstr "Wekelijks" #. module: hr_payroll #: view:hr.payslip:0 msgid "Confirm" -msgstr "" +msgstr "Bevestigen" #. module: hr_payroll #: model:ir.actions.report.xml,name:hr_payroll.payslip_report @@ -350,7 +350,7 @@ msgstr "" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Quarterly" -msgstr "" +msgstr "Driemaandelijks" #. module: hr_payroll #: field:hr.payslip,state:0 @@ -376,7 +376,7 @@ msgstr "" #: field:hr.payslip.line,employee_id:0 #: model:ir.model,name:hr_payroll.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Werknemer" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 @@ -392,7 +392,7 @@ msgstr "" #: report:paylip.details:0 #: report:payslip:0 msgid "Email" -msgstr "" +msgstr "E-mail" #. module: hr_payroll #: view:hr.payslip.run:0 @@ -434,12 +434,12 @@ msgstr "" #. module: hr_payroll #: field:hr.payslip.worked_days,number_of_days:0 msgid "Number of Days" -msgstr "" +msgstr "Aantal dagen" #. module: hr_payroll #: selection:hr.payslip,state:0 msgid "Rejected" -msgstr "" +msgstr "Afgewezen" #. module: hr_payroll #: view:hr.payroll.structure:0 @@ -466,7 +466,7 @@ msgstr "" #: selection:hr.payslip,state:0 #: view:hr.payslip.run:0 msgid "Done" -msgstr "" +msgstr "Gereed" #. module: hr_payroll #: field:hr.payslip.line,appears_on_payslip:0 @@ -480,7 +480,7 @@ msgstr "" #: field:hr.salary.rule,amount_fix:0 #: selection:hr.salary.rule,amount_select:0 msgid "Fixed Amount" -msgstr "" +msgstr "Vast Bedrag" #. module: hr_payroll #: help:hr.payslip.line,active:0 @@ -514,7 +514,7 @@ msgstr "" #. module: hr_payroll #: field:hr.payslip.worked_days,number_of_hours:0 msgid "Number of Hours" -msgstr "" +msgstr "Aantal uren" #. module: hr_payroll #: view:hr.payslip:0 @@ -547,7 +547,7 @@ msgstr "" #: selection:hr.payslip.line,condition_select:0 #: selection:hr.salary.rule,condition_select:0 msgid "Range" -msgstr "" +msgstr "Bereik" #. module: hr_payroll #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree @@ -558,12 +558,12 @@ msgstr "" #. module: hr_payroll #: view:hr.payslip:0 msgid "Payslip" -msgstr "" +msgstr "Loonafschrift" #. module: hr_payroll #: constraint:hr.contract:0 msgid "Error! contract start-date must be lower then contract end-date." -msgstr "" +msgstr "Fout! startdatum contract moet vóór einddatum contract liggen." #. module: hr_payroll #: view:hr.contract:0 @@ -602,7 +602,7 @@ msgstr "" #. module: hr_payroll #: view:hr.salary.rule:0 msgid "Computation" -msgstr "" +msgstr "Berekening" #. module: hr_payroll #: help:hr.payslip.input,amount:0 @@ -624,7 +624,7 @@ msgstr "" #: view:hr.salary.rule:0 #: field:hr.salary.rule,category_id:0 msgid "Category" -msgstr "" +msgstr "Categorie" #. module: hr_payroll #: help:hr.payslip.run,credit_note:0 @@ -650,7 +650,7 @@ msgstr "" #: view:hr.payslip.run:0 #: selection:hr.payslip.run,state:0 msgid "Draft" -msgstr "" +msgstr "Concept" #. module: hr_payroll #: report:contribution.register.lines:0 @@ -660,7 +660,7 @@ msgstr "" #: report:payslip:0 #: field:payslip.lines.contribution.register,date_from:0 msgid "Date From" -msgstr "" +msgstr "Vanaf datum" #. module: hr_payroll #: view:hr.payslip.run:0 @@ -675,7 +675,7 @@ msgstr "" #. module: hr_payroll #: view:hr.salary.rule:0 msgid "Conditions" -msgstr "" +msgstr "Voorwaarden" #. module: hr_payroll #: field:hr.payslip.line,amount_percentage:0 @@ -1322,3 +1322,6 @@ msgstr "" #~ msgid "Expire" #~ msgstr "Verlooptijd" + +#~ msgid "Human Resource Payroll" +#~ msgstr "HR loonlijst" diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po index c04ad96a436..8c20b9e3200 100644 --- a/addons/point_of_sale/i18n/de.po +++ b/addons/point_of_sale/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-07-23 02:59+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-01-22 21:13+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: point_of_sale #: field:report.transaction.pos,product_nb:0 @@ -35,7 +35,7 @@ msgstr "Heute" #. module: point_of_sale #: view:pos.confirm:0 msgid "Post All Orders" -msgstr "" +msgstr "Verbuche alle Aufträge" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_box_out @@ -71,7 +71,7 @@ msgstr "Erfasse Zahlung:" #. module: point_of_sale #: field:pos.box.out,name:0 msgid "Description / Reason" -msgstr "" +msgstr "Beschreibung / Grund" #. module: point_of_sale #: view:report.cash.register:0 @@ -82,7 +82,7 @@ msgstr "Meine Verkäufe" #. module: point_of_sale #: view:report.cash.register:0 msgid "Month from Creation date of cash register" -msgstr "" +msgstr "Monat der Erstellung der Kassa" #. module: point_of_sale #: report:account.statement:0 @@ -101,13 +101,15 @@ msgid "" "Configuration error! The currency chosen should be shared by the default " "accounts too." msgstr "" +"Konfigurationsfehler! Die gewählte Währung muss auch bei den Standardkonten " +"verwendet werden" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.pos_category_action #: model:ir.ui.menu,name:point_of_sale.menu_pos_category #: view:pos.category:0 msgid "PoS Categories" -msgstr "" +msgstr "POS Kategorien" #. module: point_of_sale #: report:pos.lines:0 @@ -136,6 +138,8 @@ msgid "" "You do not have any open cash register. You must create a payment method or " "open a cash register." msgstr "" +"Sie haben keine offenen Registierkassen. Sie müssen einen Zahlungsweg " +"festelgen oder ein Registerkasse öffnen." #. module: point_of_sale #: report:account.statement:0 @@ -179,7 +183,7 @@ msgstr "Status" #. module: point_of_sale #: view:pos.order:0 msgid "Accounting Information" -msgstr "" +msgstr "Finanzbuchhaltung Info" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month @@ -226,11 +230,13 @@ msgid "" "This is a product you can use to put cash into a statement for the point of " "sale backend." msgstr "" +"Dies ist ein Produkt mit dem Sie Geld in einen Buchungsbeleg der " +"Kassenverwaltung geben können." #. module: point_of_sale #: field:pos.category,parent_id:0 msgid "Parent Category" -msgstr "" +msgstr "Übergeordnete Kategorie" #. module: point_of_sale #: report:pos.details:0 @@ -265,12 +271,12 @@ msgstr "Verkäufe des Monats nach Benutzer" #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created during this year" -msgstr "" +msgstr "Kassa Analyse des laufenden Jahres" #. module: point_of_sale #: view:report.cash.register:0 msgid "Day from Creation date of cash register" -msgstr "" +msgstr "Tag der Erzeugung einer Registrierkasse" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale @@ -281,12 +287,13 @@ msgstr "Tagesvorfälle" #: code:addons/point_of_sale/point_of_sale.py:273 #, python-format msgid "Configuration Error !" -msgstr "" +msgstr "Fehler Konfiguration !" #. module: point_of_sale #: view:pos.box.entries:0 msgid "Fill in this form if you put money in the cash register:" msgstr "" +"Füllen Sie dieses Formular aus, wenn Sie Geld in die Regstrierkasse geben" #. module: point_of_sale #: view:account.bank.statement:0 @@ -313,7 +320,7 @@ msgstr "Verkäufe nach Benutzer je Monat" #. module: point_of_sale #: field:pos.category,child_id:0 msgid "Children Categories" -msgstr "" +msgstr "Unterkategorien" #. module: point_of_sale #: field:pos.make.payment,payment_date:0 @@ -326,6 +333,8 @@ msgid "" "If you want to sell this product through the point of sale, select the " "category it belongs to." msgstr "" +"Wenn Sie diese Produkt in der Kasse verkaufen wollen, dann wählen Sie eine " +"Kategorie dafür aus." #. module: point_of_sale #: report:account.statement:0 @@ -357,7 +366,7 @@ msgstr "Menge" #. module: point_of_sale #: field:pos.order.line,name:0 msgid "Line No" -msgstr "" +msgstr "Zeile Nr." #. module: point_of_sale #: view:account.bank.statement:0 @@ -372,7 +381,7 @@ msgstr "Summe Netto:" #. module: point_of_sale #: field:pos.make.payment,payment_name:0 msgid "Payment Reference" -msgstr "" +msgstr "Zahlung Refrenz" #. module: point_of_sale #: report:pos.details_summary:0 @@ -382,13 +391,13 @@ msgstr "Zahlungsmodus" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_confirm msgid "Post POS Journal Entries" -msgstr "" +msgstr "Verbuche POS Buchungen" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:396 #, python-format msgid "Customer Invoice" -msgstr "" +msgstr "Ausgangsrechnung" #. module: point_of_sale #: view:pos.box.out:0 @@ -450,7 +459,7 @@ msgstr "Tel.:" #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm #: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm msgid "Create Sale Entries" -msgstr "" +msgstr "Erzeuge Verkauf Buchungen" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment @@ -462,7 +471,7 @@ msgstr "Zahlung" #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created in current month" -msgstr "" +msgstr "Geld Analyse des laufenden Monats" #. module: point_of_sale #: report:account.statement:0 @@ -473,7 +482,7 @@ msgstr "Endsaldo" #. module: point_of_sale #: view:pos.order:0 msgid "Post Entries" -msgstr "" +msgstr "Verbuche Buchungen" #. module: point_of_sale #: report:pos.details_summary:0 @@ -500,14 +509,14 @@ msgstr "Offene Kassenbücher" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created during current year" -msgstr "" +msgstr "Kassa Aufträge des aktuellen Jahres" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale #: view:pos.order:0 msgid "PoS Orders" -msgstr "" +msgstr "POS Aufträge" #. module: point_of_sale #: report:pos.details:0 @@ -523,7 +532,7 @@ msgstr "Summe bezahlt" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register msgid "List of Cash Registers" -msgstr "" +msgstr "Liste der Kassabücher" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_transaction_pos @@ -533,7 +542,7 @@ msgstr "Transaktion" #. module: point_of_sale #: view:report.pos.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Nicht in Rechnung gestellt" #. module: point_of_sale #: selection:report.cash.register,month:0 @@ -558,7 +567,7 @@ msgstr "Sie müssen noch eine Preisliste beim Verkaufsauftrag wählen !" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_discount msgid "Add a Global Discount" -msgstr "" +msgstr "Füge allg. Rabatt hinzu" #. module: point_of_sale #: field:pos.order.line,price_subtotal_incl:0 @@ -581,7 +590,7 @@ msgstr "Anfangssaldo" #: model:ir.model,name:point_of_sale.model_pos_category #: field:product.product,pos_categ_id:0 msgid "PoS Category" -msgstr "" +msgstr "POS Kategorie" #. module: point_of_sale #: report:pos.payment.report.user:0 @@ -598,7 +607,7 @@ msgstr "# Positionen" #: view:pos.order:0 #: selection:pos.order,state:0 msgid "Posted" -msgstr "" +msgstr "Gebucht" #. module: point_of_sale #: report:all.closed.cashbox.of.the.day:0 @@ -671,7 +680,7 @@ msgstr "# Menge" #: model:ir.actions.act_window,name:point_of_sale.action_box_out #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2 msgid "Take Money Out" -msgstr "" +msgstr "Geld entnehmen" #. module: point_of_sale #: view:pos.order:0 @@ -734,6 +743,8 @@ msgid "" "This field authorize Validation of Cashbox without controlling the closing " "balance." msgstr "" +"Dieses Feld ermöglicht die Validierung der Registrierkasse ohne den Saldo zu " +"überprüfen." #. module: point_of_sale #: report:pos.invoice:0 @@ -840,7 +851,7 @@ msgstr "Preis" #. module: point_of_sale #: field:account.journal,journal_user:0 msgid "PoS Payment Method" -msgstr "" +msgstr "POS Zahlungsmethode" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user @@ -852,7 +863,7 @@ msgstr "Verkäufe nach Benutzer" #. module: point_of_sale #: help:product.product,img:0 msgid "Use an image size of 50x50." -msgstr "" +msgstr "Verwende ein Bild 50x50" #. module: point_of_sale #: field:report.cash.register,date:0 @@ -863,7 +874,7 @@ msgstr "Erzeugt am" #: code:addons/point_of_sale/point_of_sale.py:53 #, python-format msgid "Unable to Delete !" -msgstr "" +msgstr "Nicht löschbar!" #. module: point_of_sale #: report:pos.details:0 @@ -887,6 +898,8 @@ msgid "" "There is no receivable account defined to make payment for the partner: " "\"%s\" (id:%d)" msgstr "" +"Um Zahlungen durchzuführen muss ein Forderungskonto für den Partner " +"definiert sein, : \"%s\" (id:%d)" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:281 @@ -929,23 +942,23 @@ msgstr "Druckdatum" #: code:addons/point_of_sale/point_of_sale.py:270 #, python-format msgid "There is no receivable account defined to make payment" -msgstr "" +msgstr "Für Zahlungen muss ein Forderungskonto definiert sein." #. module: point_of_sale #: view:pos.open.statement:0 msgid "Do you want to open cash registers ?" -msgstr "" +msgstr "Wollen Sie eine Registrierkasse öffnen" #. module: point_of_sale #: help:pos.category,sequence:0 msgid "" "Gives the sequence order when displaying a list of product categories." -msgstr "" +msgstr "Reihenfolge bei Anzeige einer Liste für Produktkategorien" #. module: point_of_sale #: field:product.product,expense_pdt:0 msgid "PoS Cash Output" -msgstr "" +msgstr "Kassa Geld Ausgang" #. module: point_of_sale #: view:account.bank.statement:0 @@ -958,7 +971,7 @@ msgstr "Gruppierung..." #. module: point_of_sale #: field:product.product,img:0 msgid "Product Image, must be 50x50" -msgstr "" +msgstr "Produkt Bild, muss 50x50 sein" #. module: point_of_sale #: view:pos.order:0 @@ -979,7 +992,7 @@ msgstr "Keine Preisliste!" #. module: point_of_sale #: view:pos.order:0 msgid "Update" -msgstr "" +msgstr "Aktualisieren" #. module: point_of_sale #: report:pos.invoice:0 @@ -989,7 +1002,7 @@ msgstr "Basis" #. module: point_of_sale #: view:product.product:0 msgid "Point-of-Sale" -msgstr "" +msgstr "Kassa" #. module: point_of_sale #: report:pos.details:0 @@ -1036,7 +1049,7 @@ msgstr "Produkte" #: model:ir.actions.act_window,name:point_of_sale.action_product_output #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations msgid "Products 'Put Money In'" -msgstr "" +msgstr "Produkt 'Geld Einzahlen'" #. module: point_of_sale #: view:pos.order:0 @@ -1061,7 +1074,7 @@ msgstr "Drucke Quittung für Barverkauf" #. module: point_of_sale #: field:pos.make.payment,journal:0 msgid "Payment Mode" -msgstr "" +msgstr "Zahlungsmethode" #. module: point_of_sale #: report:pos.details:0 @@ -1084,6 +1097,9 @@ msgid "" "This is a product you can use to take cash from a statement for the point of " "sale backend, exemple: money lost, transfer to bank, etc." msgstr "" +"Dies ist ein Produkt mit dem Sie Geld aus einen Buchungsbeleg der " +"Kassenverwaltung nehmen können. Beispiel: Verlust, Überweisung auf die Bank " +"etc" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_open_statement @@ -1130,7 +1146,7 @@ msgstr "Automatische Eröffnung" #. module: point_of_sale #: selection:report.pos.order,state:0 msgid "Synchronized" -msgstr "" +msgstr "Synchronisiert" #. module: point_of_sale #: view:report.cash.register:0 @@ -1148,7 +1164,7 @@ msgstr "Kassenbuch" #. module: point_of_sale #: view:report.pos.order:0 msgid "Year of order date" -msgstr "" +msgstr "Jahr des Bestelldatums" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree @@ -1176,7 +1192,7 @@ msgstr "Tägl. Marge nach Benutzer" #: model:ir.actions.act_window,name:point_of_sale.action_box_entries #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl msgid "Put Money In" -msgstr "" +msgstr "Zahle Geld ein" #. module: point_of_sale #: field:report.cash.register,balance_start:0 @@ -1187,12 +1203,12 @@ msgstr "Startsaldo" #: view:account.bank.statement:0 #: selection:report.pos.order,state:0 msgid "Closed" -msgstr "" +msgstr "Abgeschlossen" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created by today" -msgstr "" +msgstr "Kassaaufträge bis heute" #. module: point_of_sale #: field:pos.order,amount_paid:0 @@ -1213,7 +1229,7 @@ msgstr "Rabatt (%)" #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created in last month" -msgstr "" +msgstr "Geldanlyse des letzten Monats" #. module: point_of_sale #: view:pos.close.statement:0 @@ -1222,11 +1238,14 @@ msgid "" "validation. He will also open all cash registers for which you have to " "control the ending belance before closing manually." msgstr "" +"OpenERP wird alle Registerkassen schließen, die ohne Validierung geschlossen " +"werden können und alle Registerkassen öffnen, die Sie vor manueller " +"Schließung validieren müssen." #. module: point_of_sale #: view:report.cash.register:0 msgid "Cash Analysis created by today" -msgstr "" +msgstr "Cash Analyse inkl. heute" #. module: point_of_sale #: selection:report.cash.register,state:0 @@ -1259,7 +1278,7 @@ msgstr "Kassenblatt" #. module: point_of_sale #: view:report.cash.register:0 msgid "Year from Creation date of cash register" -msgstr "" +msgstr "Jahr der Erstellung der Registrierkasse" #. module: point_of_sale #: view:pos.order:0 @@ -1292,11 +1311,14 @@ msgid "" "payments. We suggest you to control the opening balance of each register, " "using their CashBox tab." msgstr "" +"Das System wird alle Registrierkassen öffnen, damit Sie Zahlungen erfassen " +"können. Es ist empfehlenswert die Eröffnungsbilanzen aller Registerkassen " +"mit dem Reiter Kassenlade zu überprüfen." #. module: point_of_sale #: field:account.journal,check_dtls:0 msgid "Control Balance Before Closing" -msgstr "" +msgstr "Saldo vor Abschluß" #. module: point_of_sale #: view:pos.order:0 @@ -1339,7 +1361,7 @@ msgstr "Verkaufsmargen nach Benutzer" #: code:addons/point_of_sale/wizard/pos_payment.py:59 #, python-format msgid "Paiement" -msgstr "" +msgstr "Zahlung" #. module: point_of_sale #: report:pos.invoice:0 @@ -1376,12 +1398,12 @@ msgstr "Closing Balance" #: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all msgid "All Sales Orders" -msgstr "" +msgstr "Alle Verkaufs Aufträge" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_root msgid "PoS Backend" -msgstr "" +msgstr "POS Verwaltung" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details @@ -1403,7 +1425,7 @@ msgstr "Verkäufe nach Benutzer" #. module: point_of_sale #: report:pos.details:0 msgid "Order" -msgstr "" +msgstr "Auftrag" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:460 @@ -1426,7 +1448,7 @@ msgstr "Nettobetrag:" #. module: point_of_sale #: model:res.groups,name:point_of_sale.group_pos_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: point_of_sale #: field:pos.details,date_start:0 @@ -1477,7 +1499,7 @@ msgstr "Auswertungen Aus-/Einzahlungen" #. module: point_of_sale #: view:pos.confirm:0 msgid "Generate Journal Entries" -msgstr "" +msgstr "Erzeuge Buchungen" #. module: point_of_sale #: report:account.statement:0 @@ -1503,19 +1525,19 @@ msgstr "Rechnungsdatum" #. module: point_of_sale #: field:pos.box.entries,name:0 msgid "Reason" -msgstr "" +msgstr "Begründung" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_product_input #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations msgid "Products 'Take Money Out'" -msgstr "" +msgstr "Produkte 'Nimm Geld heraus'" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form #: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open msgid "Payment Methods" -msgstr "" +msgstr "Zahlungswege" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:281 @@ -1533,7 +1555,7 @@ msgstr "Heutige Zahlungen nach Benutzer" #. module: point_of_sale #: view:pos.open.statement:0 msgid "Open Registers" -msgstr "" +msgstr "Öffne Registerkassen" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:226 @@ -1551,7 +1573,7 @@ msgstr "Anz. der Artikel" #: selection:pos.order,state:0 #: selection:report.pos.order,state:0 msgid "Cancelled" -msgstr "" +msgstr "Storniert" #. module: point_of_sale #: field:pos.order,picking_id:0 @@ -1595,12 +1617,12 @@ msgstr "Beende Kasse" #: code:addons/point_of_sale/point_of_sale.py:53 #, python-format msgid "In order to delete a sale, it must be new or cancelled." -msgstr "" +msgstr "Um einen Verkauf zu löschen muss diese neu oder storniert sein." #. module: point_of_sale #: view:pos.confirm:0 msgid "Generate Entries" -msgstr "" +msgstr "Erzeuge Buchungen" #. module: point_of_sale #: field:pos.box.entries,product_id:0 @@ -1634,6 +1656,8 @@ msgid "" "This field authorize the automatic creation of the cashbox, without control " "of the initial balance." msgstr "" +"Dieses Feld erlaubt das Erstellen von Kassenladen ohne Prüfung der " +"Eröffnungsbilanz." #. module: point_of_sale #: report:pos.invoice:0 @@ -1645,18 +1669,19 @@ msgstr "Lieferantenrechnung" #: selection:pos.order,state:0 #: selection:report.pos.order,state:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:226 #, python-format msgid "In order to set to draft a sale, it must be cancelled." msgstr "" +"Um einen Verkauf auf Entwurf zu setzen muss dieser vorher storniert werden." #. module: point_of_sale #: view:report.pos.order:0 msgid "Day of order date" -msgstr "" +msgstr "Tag der Bestellung" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_rep @@ -1689,17 +1714,17 @@ msgstr "Startdatum" #: code:addons/point_of_sale/point_of_sale.py:241 #, python-format msgid "Unable to cancel the picking." -msgstr "" +msgstr "Lieferung nicht löschbar!" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created during current month" -msgstr "" +msgstr "Kassaaufträge des laufenden Monats" #. module: point_of_sale #: view:report.pos.order:0 msgid "POS ordered created last month" -msgstr "" +msgstr "Kassaaufträge des letzen Monats" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice @@ -1717,7 +1742,7 @@ msgstr "Dezember" #: view:pos.order:0 #, python-format msgid "Return Products" -msgstr "" +msgstr "Retourelieferung für Produkte" #. module: point_of_sale #: view:pos.box.out:0 @@ -1775,7 +1800,7 @@ msgstr "Rabatthinweis" #. module: point_of_sale #: view:pos.order:0 msgid "Re-Print" -msgstr "" +msgstr "Wiederhole Ausdruck" #. module: point_of_sale #: view:report.cash.register:0 @@ -1821,6 +1846,8 @@ msgid "" "Payment methods are defined by accounting journals having the field Payment " "Method checked." msgstr "" +"Zahlungswege werden in jenen Buchungsjournalen definiert, die das Feld " +"Zahlungsweg markiert haben." #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree @@ -1856,6 +1883,8 @@ msgid "" "Generate all sale journal entries for non invoiced orders linked to a closed " "cash register or statement." msgstr "" +"Erzeuge Einträge des Verkaufsjournals für alle nicht fakturierten " +"Bestellungen, die zu einer abgeschlossen Registrierkasse oder Belege gehören." #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:346 @@ -1871,7 +1900,7 @@ msgstr "Verkauf Journal" #. module: point_of_sale #: view:pos.close.statement:0 msgid "Do you want to close your cash registers ?" -msgstr "" +msgstr "Wollen Sie die Registrierkassen schließen?" #. module: point_of_sale #: report:pos.invoice:0 @@ -1908,7 +1937,7 @@ msgstr "Rabatt(%)" #. module: point_of_sale #: view:pos.order:0 msgid "General Information" -msgstr "" +msgstr "Allgemeine Informationen" #. module: point_of_sale #: view:pos.details:0 @@ -1927,7 +1956,7 @@ msgstr "Auftragszeilen" #. module: point_of_sale #: view:account.journal:0 msgid "Extended Configuration" -msgstr "" +msgstr "Erweiterte Konfiguration" #. module: point_of_sale #: field:pos.order.line,price_subtotal:0 @@ -1957,7 +1986,7 @@ msgstr "Heutige Verkäufe nach Benutzer" #. module: point_of_sale #: report:pos.invoice:0 msgid "Customer Code" -msgstr "" +msgstr "Kundennummer" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_box_out.py:87 @@ -1986,7 +2015,7 @@ msgstr "Zahlungspositionen" #. module: point_of_sale #: view:pos.order:0 msgid "Yesterday" -msgstr "" +msgstr "Gestern" #. module: point_of_sale #: field:pos.order,note:0 @@ -1996,7 +2025,7 @@ msgstr "Interner Hinweis" #. module: point_of_sale #: view:pos.box.out:0 msgid "Describe why you take money from the cash register:" -msgstr "" +msgstr "Nennen Sie den Grund für die Geldentnahme" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all @@ -2055,11 +2084,13 @@ msgid "" "Check this box if this journal define a payment method that can be used in " "point of sales." msgstr "" +"Markieren Sie dieses Feld, wenn dieses Journal als Zahlungsweg im " +"Kassensystem verwendet wird." #. module: point_of_sale #: field:pos.category,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sequenz" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_return.py:316 @@ -2071,7 +2102,7 @@ msgstr "Erfasse Zahlung" #. module: point_of_sale #: constraint:pos.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Fehler! Rekursive Kategorien sind nicht zulässig" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_sales_user_today @@ -2081,12 +2112,12 @@ msgstr "Verkäufer Heute" #. module: point_of_sale #: view:report.pos.order:0 msgid "Month of order date" -msgstr "" +msgstr "Monat der Bestellung" #. module: point_of_sale #: field:product.product,income_pdt:0 msgid "PoS Cash Input" -msgstr "" +msgstr "Kassa Geld Einzahlung" #. module: point_of_sale #: view:report.cash.register:0 diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po index fef6bc55b4e..e8c02025718 100644 --- a/addons/stock/i18n/de.po +++ b/addons/stock/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2012-01-15 09:16+0000\n" +"PO-Revision-Date: 2012-01-22 21:26+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-16 05:18+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-23 05:20+0000\n" +"X-Generator: Launchpad (build 14700)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -706,6 +706,9 @@ msgid "" "according to the original purchase order. You can validate the shipment " "totally or partially." msgstr "" +"Die eingehenden Lieferungen besteht aus allen Bestellaufträgen an Ihre " +"Lieferanten. Sie bestehen aus einer Liste von Produkten basierende auf der " +"Originalbestellung. Sie können diese ganz oder teilweise validieren." #. module: stock #: field:stock.move.split.lines,wizard_exist_id:0 From 017a353c833da0e0943a66574e3bc1a75b5798e3 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Mon, 23 Jan 2012 11:06:02 +0100 Subject: [PATCH 136/170] use real 'progress' attribute value bzr revid: simone.orsi@domsense.com-20120123100602-yvpg5m5kmg9h0pel --- addons/web_gantt/static/src/js/gantt.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 77bb6df4397..7cfd0312e2c 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -35,6 +35,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ this.date_start = this.fields_view.arch.attrs.date_start, this.date_delay = this.fields_view.arch.attrs.date_delay, this.date_stop = this.fields_view.arch.attrs.date_stop, + this.progress = this.fields_view.arch.attrs.progress, this.day_length = this.fields_view.arch.attrs.day_length || 8; this.color_field = this.fields_view.arch.attrs.color, @@ -144,6 +145,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ var id = res['id']; var text = res[this.text]; var start_date = res[this.date_start]; + var progress = res[this.progress]; if (this.date_stop != undefined){ if (res[this.date_stop] != false){ @@ -179,7 +181,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ var mod_id = i+ "_" +j; parents[grp_key] = mod_id; child_event[mod_id] = {}; - all_events[mod_id] = {'parent': "", 'evt':[mod_id , grp_key, start_date, start_date, 100, ""]}; + all_events[mod_id] = {'parent': "", 'evt':[mod_id , grp_key, start_date, start_date, progress, ""]}; } else{ mod_id = parents[grp_key]; @@ -191,7 +193,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ child_event[mod_id][grp_key] = ch_mod_id; child_event[ch_mod_id] = {}; temp_id = ch_mod_id; - all_events[ch_mod_id] = {'parent': mod_id, 'evt':[ch_mod_id , grp_key, start_date, start_date, 100, ""]}; + all_events[ch_mod_id] = {'parent': mod_id, 'evt':[ch_mod_id , grp_key, start_date, start_date, progress, ""]}; mod_id = ch_mod_id; } else{ @@ -200,15 +202,15 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ } } } - all_events[id] = {'parent': temp_id, 'evt':[id , text, start_date, duration, 100, ""]}; + all_events[id] = {'parent': temp_id, 'evt':[id , text, start_date, duration, progress, ""]}; final_events.push(id); } else { if (i == 0) { var mod_id = "_" + i; - all_events[mod_id] = {'parent': "", 'evt': [mod_id, this.name, start_date, start_date, 100, ""]}; + all_events[mod_id] = {'parent': "", 'evt': [mod_id, this.name, start_date, start_date, progress, ""]}; } - all_events[id] = {'parent': mod_id, 'evt':[id , text, start_date, duration, 100, ""]}; + all_events[id] = {'parent': mod_id, 'evt':[id , text, start_date, duration, progress, ""]}; final_events.push(id); } } From 2e856ca443dcd965b920284dc49ea2787df78094 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Jan 2012 11:07:44 +0100 Subject: [PATCH 137/170] [IMP] add ~ISO timestamps to db dump filenames bzr revid: xmo@openerp.com-20120123100744-k8qatd18p18hd8y5 --- addons/web/controllers/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7844897c047..35705a267df 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -6,6 +6,7 @@ import csv import glob import itertools import operator +import datetime import os import re import simplejson @@ -339,9 +340,14 @@ class Database(openerpweb.Controller): def backup(self, req, backup_db, backup_pwd, token): db_dump = base64.b64decode( req.session.proxy("db").dump(backup_pwd, backup_db)) + filename = "%(db)s_%(timestamp)s.dump" % { + 'db': backup_db, + 'timestamp': datetime.datetime.utcnow().strftime( + "%Y-%m-%d_%H-%M-%SZ") + } return req.make_response(db_dump, [('Content-Type', 'application/octet-stream; charset=binary'), - ('Content-Disposition', 'attachment; filename="' + backup_db + '.dump"')], + ('Content-Disposition', 'attachment; filename="' + filename + '"')], {'fileToken': int(token)} ) From e624e8b9b4d5b517041f458f930cac604220d7c4 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 23 Jan 2012 14:05:10 +0100 Subject: [PATCH 138/170] =?UTF-8?q?[FIX]=C2=A0typo=20in=20js=20property=5F?= =?UTF-8?q?widget.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: florent.xicluna@gmail.com-20120123130510-k1udncnop5t9d661 --- addons/web/static/src/js/view_editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 6e58886fadd..6ae15a5fdb8 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -806,7 +806,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'}, 'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'}, 'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]}, - 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'} + 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'selection_multi'} }; var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); this.edit_node_dialog.$element.append('
'); @@ -1131,7 +1131,7 @@ var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', ]; openerp.web.ViewEditor.property_widget = new openerp.web.Registry({ 'boolean' : 'openerp.web.ViewEditor.FieldBoolean', - 'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', + 'selection_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', 'selection' : 'openerp.web.ViewEditor.FieldSelect', 'char' : 'openerp.web.ViewEditor.FieldChar', 'float' : 'openerp.web.ViewEditor.FieldFloat' From 4aea2b3f8c54a8ab030bed52d7332e463982c47a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 23 Jan 2012 14:39:28 +0100 Subject: [PATCH 139/170] [IMP] product required in PO line bzr revid: fp@tinyerp.com-20120123133928-h1l6x9l32dme54ws --- addons/plugin_outlook/__openerp__.py | 1 - addons/purchase/purchase_view.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py index 9bc79433dfc..8da0d318e48 100644 --- a/addons/plugin_outlook/__openerp__.py +++ b/addons/plugin_outlook/__openerp__.py @@ -40,7 +40,6 @@ mail into mail.message with attachments. 'update_xml' : ['plugin_outlook.xml'], 'active': False, 'installable': True, - 'certificate' : '001278773815818292125', 'images': ['images/config_outlook.jpeg','images/outlook_config_openerp.jpeg','images/outlook_push.jpeg'], } diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 1516ea729c0..736d1cf87d7 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -359,7 +359,7 @@ - + From b09507fd991bd1668fb810bdae7c853bb2866140 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 23 Jan 2012 14:53:25 +0100 Subject: [PATCH 140/170] [REF] removed_sessions: use a set() instead of a list(), because it's more efficient. bzr revid: florent.xicluna@gmail.com-20120123135325-m23bgckb948rskal --- addons/web/common/http.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 6d4bf1536a2..016aff3754e 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -355,7 +355,7 @@ def session_context(request, storage_path, session_cookie='sessionid'): # Remove all OpenERPSession instances with no uid, they're generated # either by login process or by HTTP requests without an OpenERP # session id, and are generally noise - removed_sessions = [] + removed_sessions = set() for key, value in request.session.items(): if (isinstance(value, session.OpenERPSession) and not value._uid @@ -363,7 +363,7 @@ def session_context(request, storage_path, session_cookie='sessionid'): and value._creation_time + (60*5) < time.time() # FIXME do not use a fixed value ): _logger.debug('remove session %s', key) - removed_sessions.append(key) + removed_sessions.add(key) del request.session[key] with session_lock: From ac8532f801fed592f64e2a4692e242964f0a0e54 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Jan 2012 15:36:14 +0100 Subject: [PATCH 141/170] [FIX] pressing [ESC] while in an editable listview in a dialog should not close the dialog bzr revid: xmo@openerp.com-20120123143614-c2cw93asd6n5qfqs --- addons/web/static/src/js/view_list_editable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index a26626d8630..4f6a1531c7a 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -212,7 +212,8 @@ openerp.web.list_editable = function (openerp) { e.stopImmediatePropagation(); }) .keyup(function () { - return self.on_row_keyup.apply(self, arguments); }); + return self.on_row_keyup.apply(self, arguments); }) + .keydown(function (e) { e.stopPropagation(); }); if (row) { $new_row.replaceAll(row); } else if (self.options.editable) { From ad461e18b4ddda6c7c362faeecd0f8b6d8cd2b45 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Jan 2012 15:46:05 +0100 Subject: [PATCH 142/170] [FIX] onchange: handlers can return 'False' instead of en empty dict when they don't want to return anything, don't blow up lp bug: https://launchpad.net/bugs/920443 fixed bzr revid: xmo@openerp.com-20120123144605-j2jqvaelro0dv28f --- addons/web/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 35705a267df..26e7d6baba6 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -880,7 +880,7 @@ class DataSet(openerpweb.Controller): :return: result of the onchange call with all domains parsed """ result = self.call_common(req, model, method, args, context_id=context_id) - if 'domain' not in result: + if not result or 'domain' not in result: return result result['domain'] = dict( From 7a894c67f0acf65aa04fbfcd2df53ef197df8ca9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Jan 2012 16:07:49 +0100 Subject: [PATCH 143/170] [FIX] if no @progress defined (most common case since @progress does not actually exist), default to 100 bzr revid: xmo@openerp.com-20120123150749-ufo2mp9ntkz7tvy7 --- addons/web_gantt/static/src/js/gantt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 7cfd0312e2c..80b29fe4368 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -145,7 +145,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ var id = res['id']; var text = res[this.text]; var start_date = res[this.date_start]; - var progress = res[this.progress]; + var progress = res[this.progress] || 100; if (this.date_stop != undefined){ if (res[this.date_stop] != false){ From 8310fc0122f8c127bc12edd9905c254d93c567d4 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 23 Jan 2012 16:11:40 +0100 Subject: [PATCH 144/170] [REV] plugin_outlook: partial revert of accidental certificate removal in previous revision bzr revid: odo@openerp.com-20120123151140-8aznfzi0byhxtms8 --- addons/plugin_outlook/__openerp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py index 8da0d318e48..9bc79433dfc 100644 --- a/addons/plugin_outlook/__openerp__.py +++ b/addons/plugin_outlook/__openerp__.py @@ -40,6 +40,7 @@ mail into mail.message with attachments. 'update_xml' : ['plugin_outlook.xml'], 'active': False, 'installable': True, + 'certificate' : '001278773815818292125', 'images': ['images/config_outlook.jpeg','images/outlook_config_openerp.jpeg','images/outlook_push.jpeg'], } From e3a8b1e8bf84ce8b5096379b36f7015bac70e2ab Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 24 Jan 2012 05:30:28 +0000 Subject: [PATCH 145/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120124053028-aaihr6tr1hcxf7jk --- addons/account/i18n/tr.po | 12 +- .../account_analytic_analysis/i18n/en_GB.po | 467 +++++++++++ addons/account_analytic_plans/i18n/tr.po | 16 +- addons/account_anglo_saxon/i18n/en_GB.po | 18 +- addons/account_budget/i18n/en_GB.po | 488 +++++++++++ addons/account_cancel/i18n/en_GB.po | 10 +- addons/account_coda/i18n/en_GB.po | 265 ++++++ addons/account_invoice_layout/i18n/en_GB.po | 396 +++++++++ addons/account_invoice_layout/i18n/tr.po | 16 +- addons/analytic/i18n/ar.po | 12 +- .../i18n/en_GB.po | 14 +- .../analytic_journal_billing_rate/i18n/tr.po | 11 +- addons/analytic_user_function/i18n/en_GB.po | 10 +- addons/audittrail/i18n/zh_CN.po | 12 +- addons/base_calendar/i18n/tr.po | 45 +- addons/base_contact/i18n/tr.po | 36 +- addons/base_iban/i18n/en_GB.po | 19 +- addons/base_module_quality/i18n/tr.po | 22 +- addons/base_setup/i18n/en_GB.po | 299 +++++++ addons/base_setup/i18n/tr.po | 103 ++- addons/base_vat/i18n/en_GB.po | 22 +- addons/base_vat/i18n/tr.po | 22 +- addons/board/i18n/tr.po | 20 +- addons/board/i18n/zh_CN.po | 20 +- addons/crm_caldav/i18n/en_GB.po | 10 +- addons/crm_caldav/i18n/tr.po | 10 +- addons/crm_profiling/i18n/en_GB.po | 252 ++++++ addons/document_ics/i18n/en_GB.po | 378 +++++++++ addons/document_webdav/i18n/en_GB.po | 206 +++++ addons/hr/i18n/hr.po | 67 +- addons/hr/i18n/zh_CN.po | 34 +- addons/hr_contract/i18n/zh_CN.po | 22 +- addons/hr_payroll_account/i18n/en_GB.po | 296 +++++++ addons/hr_recruitment/i18n/hr.po | 406 +++++----- addons/idea/i18n/en_GB.po | 755 ++++++++++++++++++ addons/l10n_be/i18n/en_GB.po | 639 +++++++++++++++ addons/l10n_br/i18n/en_GB.po | 50 +- addons/l10n_ca/i18n/en_GB.po | 129 +++ addons/l10n_th/i18n/tr.po | 14 +- addons/mail_gateway/i18n/tr.po | 359 +++++++++ addons/marketing/i18n/tr.po | 12 +- addons/mrp_repair/i18n/tr.po | 10 +- addons/mrp_subproduct/i18n/tr.po | 16 +- addons/multi_company/i18n/tr.po | 12 +- addons/outlook/i18n/tr.po | 156 ++++ addons/procurement/i18n/zh_CN.po | 14 +- addons/product/i18n/zh_CN.po | 14 +- addons/project/i18n/zh_CN.po | 120 +-- addons/project_retro_planning/i18n/tr.po | 12 +- addons/purchase/i18n/en_GB.po | 517 ++++++------ addons/purchase_analytic_plans/i18n/tr.po | 10 +- addons/sale_layout/i18n/tr.po | 12 +- addons/sale_margin/i18n/tr.po | 10 +- addons/sale_mrp/i18n/tr.po | 12 +- addons/sale_order_dates/i18n/tr.po | 10 +- addons/stock_invoice_directly/i18n/tr.po | 10 +- addons/stock_location/i18n/tr.po | 10 +- addons/stock_no_autopicking/i18n/tr.po | 12 +- 58 files changed, 6092 insertions(+), 859 deletions(-) create mode 100644 addons/account_analytic_analysis/i18n/en_GB.po create mode 100644 addons/account_budget/i18n/en_GB.po create mode 100644 addons/account_coda/i18n/en_GB.po create mode 100644 addons/account_invoice_layout/i18n/en_GB.po create mode 100644 addons/base_setup/i18n/en_GB.po create mode 100644 addons/crm_profiling/i18n/en_GB.po create mode 100644 addons/document_ics/i18n/en_GB.po create mode 100644 addons/document_webdav/i18n/en_GB.po create mode 100644 addons/hr_payroll_account/i18n/en_GB.po create mode 100644 addons/idea/i18n/en_GB.po create mode 100644 addons/l10n_be/i18n/en_GB.po create mode 100644 addons/l10n_ca/i18n/en_GB.po create mode 100644 addons/mail_gateway/i18n/tr.po create mode 100644 addons/outlook/i18n/tr.po diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index df284ac0231..85f6ab44208 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2012-01-09 20:41+0000\n" -"Last-Translator: Erdem U \n" +"PO-Revision-Date: 2012-01-23 23:30+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-10 05:21+0000\n" -"X-Generator: Launchpad (build 14640)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: account #: view:account.invoice.report:0 @@ -738,7 +738,7 @@ msgstr "Kalemlere göre Analitik Girişler" #. module: account #: field:account.invoice.refund,filter_refund:0 msgid "Refund Method" -msgstr "" +msgstr "İade Yöntemi" #. module: account #: code:addons/account/wizard/account_change_currency.py:38 @@ -779,7 +779,7 @@ msgstr "Bu faturaya ait paydaş kaynağı" #. module: account #: view:account.invoice.report:0 msgid "Supplier Invoices And Refunds" -msgstr "" +msgstr "Tedarikçi Faturaları ve İadeler" #. module: account #: view:account.move.line.unreconcile.select:0 diff --git a/addons/account_analytic_analysis/i18n/en_GB.po b/addons/account_analytic_analysis/i18n/en_GB.po new file mode 100644 index 00000000000..e1129145dc4 --- /dev/null +++ b/addons/account_analytic_analysis/i18n/en_GB.po @@ -0,0 +1,467 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:49+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "No Account Manager" +msgstr "No Account Manager" + +#. module: account_analytic_analysis +#: field:account.analytic.account,revenue_per_hour:0 +msgid "Revenue per Time (real)" +msgstr "Revenue per Time (real)" + +#. module: account_analytic_analysis +#: help:account.analytic.account,remaining_ca:0 +msgid "Computed using the formula: Max Invoice Price - Invoiced Amount." +msgstr "Computed using the formula: Max Invoice Price - Invoiced Amount." + +#. module: account_analytic_analysis +#: help:account.analytic.account,last_worked_date:0 +msgid "Date of the latest work done on this account." +msgstr "Date of the latest work done on this account." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "" +"The contracts to be renewed because the deadline is passed or the working " +"hours are higher than the allocated hours" +msgstr "" +"The contracts to be renewed because the deadline is passed or the working " +"hours are higher than the allocated hours" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Pending contracts to renew with your customer" +msgstr "Pending contracts to renew with your customer" + +#. module: account_analytic_analysis +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:551 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:722 +#, python-format +msgid "AccessError" +msgstr "AccessError" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Analytic Accounts with a past deadline in one month." +msgstr "Analytic Accounts with a past deadline in one month." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Group By..." +msgstr "Group By..." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "End Date" +msgstr "End Date" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Create Invoice" +msgstr "Create Invoice" + +#. module: account_analytic_analysis +#: field:account.analytic.account,last_invoice_date:0 +msgid "Last Invoice Date" +msgstr "Last Invoice Date" + +#. module: account_analytic_analysis +#: help:account.analytic.account,theorical_margin:0 +msgid "Computed using the formula: Theorial Revenue - Total Costs" +msgstr "Computed using the formula: Theorial Revenue - Total Costs" + +#. module: account_analytic_analysis +#: help:account.analytic.account,hours_quantity:0 +msgid "" +"Number of time you spent on the analytic account (from timesheet). It " +"computes quantities on all journal of type 'general'." +msgstr "" +"Number of time you spent on the analytic account (from timesheet). It " +"computes quantities on all journal of type 'general'." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Contracts in progress" +msgstr "Contracts in progress" + +#. module: account_analytic_analysis +#: field:account.analytic.account,is_overdue_quantity:0 +msgid "Overdue Quantity" +msgstr "Overdue Quantity" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue +msgid "" +"You will find here the contracts to be renewed because the deadline is " +"passed or the working hours are higher than the allocated hours. OpenERP " +"automatically sets these analytic accounts to the pending state, in order to " +"raise a warning during the timesheets recording. Salesmen should review all " +"pending accounts and reopen or close the according to the negotiation with " +"the customer." +msgstr "" + +#. module: account_analytic_analysis +#: field:account.analytic.account,ca_theorical:0 +msgid "Theoretical Revenue" +msgstr "Theoretical Revenue" + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_qtt_non_invoiced:0 +msgid "Uninvoiced Time" +msgstr "Uninvoiced Time" + +#. module: account_analytic_analysis +#: help:account.analytic.account,last_worked_invoiced_date:0 +msgid "" +"If invoice from the costs, this is the date of the latest work or cost that " +"have been invoiced." +msgstr "" +"If invoice from the costs, this is the date of the latest work or cost that " +"have been invoiced." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "To Renew" +msgstr "To Renew" + +#. module: account_analytic_analysis +#: field:account.analytic.account,last_worked_date:0 +msgid "Date of Last Cost/Work" +msgstr "Date of Last Cost/Work" + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_qtt_invoiced:0 +msgid "Invoiced Time" +msgstr "Invoiced Time" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "" +"A contract in OpenERP is an analytic account having a partner set on it." +msgstr "" +"A contract in OpenERP is an analytic account having a partner set on it." + +#. module: account_analytic_analysis +#: field:account.analytic.account,remaining_hours:0 +msgid "Remaining Time" +msgstr "Remaining Time" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue +#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue +msgid "Contracts to Renew" +msgstr "Contracts to Renew" + +#. module: account_analytic_analysis +#: help:account.analytic.account,hours_qtt_non_invoiced:0 +msgid "" +"Number of time (hours/days) (from journal of type 'general') that can be " +"invoiced if you invoice based on analytic account." +msgstr "" +"Number of time (hours/days) (from journal of type 'general') that can be " +"invoiced if you invoice based on analytic account." + +#. module: account_analytic_analysis +#: field:account.analytic.account,theorical_margin:0 +msgid "Theoretical Margin" +msgstr "Theoretical Margin" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid " +1 Month" +msgstr " +1 Month" + +#. module: account_analytic_analysis +#: help:account.analytic.account,ca_theorical:0 +msgid "" +"Based on the costs you had on the project, what would have been the revenue " +"if all these costs have been invoiced at the normal sale price provided by " +"the pricelist." +msgstr "" +"Based on the costs you had on the project, what would have been the revenue " +"if all these costs have been invoiced at the normal sale price provided by " +"the pricelist." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Pending" +msgstr "Pending" + +#. module: account_analytic_analysis +#: field:account.analytic.account,ca_to_invoice:0 +msgid "Uninvoiced Amount" +msgstr "Uninvoiced Amount" + +#. module: account_analytic_analysis +#: help:account.analytic.account,real_margin:0 +msgid "Computed using the formula: Invoiced Amount - Total Costs." +msgstr "Computed using the formula: Invoiced Amount - Total Costs." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Parent" +msgstr "Parent" + +#. module: account_analytic_analysis +#: field:account.analytic.account,user_ids:0 +#: field:account_analytic_analysis.summary.user,user:0 +msgid "User" +msgstr "User" + +#. module: account_analytic_analysis +#: help:account.analytic.account,real_margin_rate:0 +msgid "Computes using the formula: (Real Margin / Total Costs) * 100." +msgstr "Computes using the formula: (Real Margin / Total Costs) * 100." + +#. module: account_analytic_analysis +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user +msgid "Hours Summary by User" +msgstr "Hours Summary by User" + +#. module: account_analytic_analysis +#: field:account.analytic.account,ca_invoiced:0 +msgid "Invoiced Amount" +msgstr "Invoiced Amount" + +#. module: account_analytic_analysis +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:552 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:723 +#, python-format +msgid "You try to bypass an access rule (Document type: %s)." +msgstr "You try to bypass an access rule (Document type: %s)." + +#. module: account_analytic_analysis +#: field:account.analytic.account,last_worked_invoiced_date:0 +msgid "Date of Last Invoiced Cost" +msgstr "Date of Last Invoiced Cost" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Contract" +msgstr "Contract" + +#. module: account_analytic_analysis +#: field:account.analytic.account,real_margin_rate:0 +msgid "Real Margin Rate (%)" +msgstr "Real Margin Rate (%)" + +#. module: account_analytic_analysis +#: field:account.analytic.account,real_margin:0 +msgid "Real Margin" +msgstr "Real Margin" + +#. module: account_analytic_analysis +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "" +"Error! The currency has to be the same as the currency of the selected " +"company" + +#. module: account_analytic_analysis +#: help:account.analytic.account,ca_invoiced:0 +msgid "Total customer invoiced amount for this account." +msgstr "Total customer invoiced amount for this account." + +#. module: account_analytic_analysis +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month +msgid "Hours summary by month" +msgstr "Hours summary by month" + +#. module: account_analytic_analysis +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Error! You can not create recursive analytic accounts." + +#. module: account_analytic_analysis +#: field:account.analytic.account,remaining_ca:0 +msgid "Remaining Revenue" +msgstr "Remaining Revenue" + +#. module: account_analytic_analysis +#: help:account.analytic.account,remaining_hours:0 +msgid "Computed using the formula: Maximum Time - Total Time" +msgstr "Computed using the formula: Maximum Time - Total Time" + +#. module: account_analytic_analysis +#: help:account.analytic.account,hours_qtt_invoiced:0 +msgid "" +"Number of time (hours/days) that can be invoiced plus those that already " +"have been invoiced." +msgstr "" +"Number of time (hours/days) that can be invoiced plus those that already " +"have been invoiced." + +#. module: account_analytic_analysis +#: help:account.analytic.account,ca_to_invoice:0 +msgid "" +"If invoice from analytic account, the remaining amount you can invoice to " +"the customer based on the total costs." +msgstr "" +"If invoice from analytic account, the remaining amount you can invoice to " +"the customer based on the total costs." + +#. module: account_analytic_analysis +#: help:account.analytic.account,revenue_per_hour:0 +msgid "Computed using the formula: Invoiced Amount / Total Time" +msgstr "Computed using the formula: Invoiced Amount / Total Time" + +#. module: account_analytic_analysis +#: field:account.analytic.account,total_cost:0 +msgid "Total Costs" +msgstr "Total Costs" + +#. module: account_analytic_analysis +#: field:account.analytic.account,month_ids:0 +#: field:account_analytic_analysis.summary.month,month:0 +msgid "Month" +msgstr "Month" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +#: field:account_analytic_analysis.summary.month,account_id:0 +#: field:account_analytic_analysis.summary.user,account_id:0 +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analytic Account" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all +#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all +msgid "Contracts" +msgstr "Contracts" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Manager" +msgstr "Manager" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all +#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all +msgid "All Uninvoiced Entries" +msgstr "All Uninvoiced Entries" + +#. module: account_analytic_analysis +#: help:account.analytic.account,last_invoice_date:0 +msgid "If invoice from the costs, this is the date of the latest invoiced." +msgstr "If invoice from the costs, this is the date of the latest invoiced." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Associated Partner" +msgstr "Associated Partner" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Open" +msgstr "Open" + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_quantity:0 +#: field:account_analytic_analysis.summary.month,unit_amount:0 +#: field:account_analytic_analysis.summary.user,unit_amount:0 +msgid "Total Time" +msgstr "Total Time" + +#. module: account_analytic_analysis +#: help:account.analytic.account,total_cost:0 +msgid "" +"Total of costs for this account. It includes real costs (from invoices) and " +"indirect costs, like time spent on timesheets." +msgstr "" +"Total of costs for this account. It includes real costs (from invoices) and " +"indirect costs, like time spent on timesheets." + +#~ msgid "Billing" +#~ msgstr "Billing" + +#~ msgid "" +#~ "Number of hours that can be invoiced plus those that already have been " +#~ "invoiced." +#~ msgstr "" +#~ "Number of hours that can be invoiced plus those that already have been " +#~ "invoiced." + +#~ msgid "Uninvoiced Hours" +#~ msgstr "Uninvoiced Hours" + +#~ msgid "Date of the last invoice created for this analytic account." +#~ msgstr "Date of the last invoice created for this analytic account." + +#~ msgid "Computed using the formula: Maximum Quantity - Hours Tot." +#~ msgstr "Computed using the formula: Maximum Quantity - Hours Tot." + +#~ msgid "report_account_analytic" +#~ msgstr "report_account_analytic" + +#~ msgid "" +#~ "Number of hours you spent on the analytic account (from timesheet). It " +#~ "computes on all journal of type 'general'." +#~ msgstr "" +#~ "Number of hours you spent on the analytic account (from timesheet). It " +#~ "computes on all journal of type 'general'." + +#~ msgid "Remaining Hours" +#~ msgstr "Remaining Hours" + +#~ msgid "Invoiced Hours" +#~ msgstr "Invoiced Hours" + +#~ msgid "" +#~ "\n" +#~ "This module is for modifying account analytic view to show\n" +#~ "important data to project manager of services companies.\n" +#~ "Adds menu to show relevant information to each manager..\n" +#~ "\n" +#~ "You can also view the report of account analytic summary\n" +#~ "user-wise as well as month wise.\n" +#~ msgstr "" +#~ "\n" +#~ "This module is for modifying account analytic view to show\n" +#~ "important data to project manager of services companies.\n" +#~ "Adds menu to show relevant information to each manager..\n" +#~ "\n" +#~ "You can also view the report of account analytic summary\n" +#~ "user-wise as well as month wise.\n" + +#~ msgid "Hours Tot" +#~ msgstr "Hours Tot" + +#~ msgid "Revenue per Hours (real)" +#~ msgstr "Revenue per Hours (real)" + +#~ msgid "Overpassed Accounts" +#~ msgstr "Overpassed Accounts" + +#~ msgid "Analytic accounts" +#~ msgstr "Analytic accounts" + +#~ msgid "" +#~ "Number of hours (from journal of type 'general') that can be invoiced if you " +#~ "invoice based on analytic account." +#~ msgstr "" +#~ "Number of hours (from journal of type 'general') that can be invoiced if you " +#~ "invoice based on analytic account." + +#~ msgid "Computed using the formula: Invoiced Amount / Hours Tot." +#~ msgstr "Computed using the formula: Invoiced Amount / Hours Tot." diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po index f815f932ff3..3dd6f8b775c 100644 --- a/addons/account_analytic_plans/i18n/tr.po +++ b/addons/account_analytic_plans/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-22 16:29+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:33+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:51+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: account_analytic_plans #: view:analytic.plan.create.model:0 @@ -97,7 +97,7 @@ msgstr "Hesap2 No" #. module: account_analytic_plans #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -134,7 +134,7 @@ msgstr "Banka Ekstresi Kalemi" #. module: account_analytic_plans #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer msgid "Define your Analytic Plans" -msgstr "" +msgstr "Analitik Planınızı Tanımlayın" #. module: account_analytic_plans #: constraint:account.invoice:0 @@ -302,7 +302,7 @@ msgstr "analiz.plan.oluştur.model.eylem" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_line msgid "Analytic Line" -msgstr "" +msgstr "Analiz Satırı" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -342,7 +342,7 @@ msgstr "Firma bağlı olduğu hesap ve dönemle aynı olmalıdır." #. module: account_analytic_plans #: constraint:account.move.line:0 msgid "The date of your Journal Entry is not in the defined period!" -msgstr "" +msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!" #. module: account_analytic_plans #: field:account.analytic.plan.line,min_required:0 diff --git a/addons/account_anglo_saxon/i18n/en_GB.po b/addons/account_anglo_saxon/i18n/en_GB.po index 5b83be953f1..b985a05a410 100644 --- a/addons/account_anglo_saxon/i18n/en_GB.po +++ b/addons/account_anglo_saxon/i18n/en_GB.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-08-25 11:47+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:21+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: account_anglo_saxon #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Order Reference must be unique per Company!" #. module: account_anglo_saxon #: view:product.category:0 @@ -35,17 +35,17 @@ msgstr "Product Category" #. module: account_anglo_saxon #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Reference must be unique per Company!" #. module: account_anglo_saxon #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Error ! You cannot create recursive categories." #. module: account_anglo_saxon #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Invalid BBA Structured Communication !" #. module: account_anglo_saxon #: constraint:product.template:0 @@ -88,7 +88,7 @@ msgstr "Picking List" #. module: account_anglo_saxon #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Invoice Number must be unique per Company!" #. module: account_anglo_saxon #: help:product.category,property_account_creditor_price_difference_categ:0 diff --git a/addons/account_budget/i18n/en_GB.po b/addons/account_budget/i18n/en_GB.po new file mode 100644 index 00000000000..604d941afb9 --- /dev/null +++ b/addons/account_budget/i18n/en_GB.po @@ -0,0 +1,488 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:32+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: account_budget +#: field:crossovered.budget,creating_user_id:0 +msgid "Responsible User" +msgstr "Responsible User" + +#. module: account_budget +#: selection:crossovered.budget,state:0 +msgid "Confirmed" +msgstr "Confirmed" + +#. module: account_budget +#: model:ir.actions.act_window,name:account_budget.open_budget_post_form +#: model:ir.ui.menu,name:account_budget.menu_budget_post_form +msgid "Budgetary Positions" +msgstr "Budgetary Positions" + +#. module: account_budget +#: code:addons/account_budget/account_budget.py:119 +#, python-format +msgid "The General Budget '%s' has no Accounts!" +msgstr "The General Budget '%s' has no Accounts!" + +#. module: account_budget +#: report:account.budget:0 +msgid "Printed at:" +msgstr "Printed at:" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "Confirm" +msgstr "Confirm" + +#. module: account_budget +#: field:crossovered.budget,validating_user_id:0 +msgid "Validate User" +msgstr "Validate User" + +#. module: account_budget +#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report +msgid "Print Summary" +msgstr "Print Summary" + +#. module: account_budget +#: field:crossovered.budget.lines,paid_date:0 +msgid "Paid Date" +msgstr "Paid Date" + +#. module: account_budget +#: field:account.budget.analytic,date_to:0 +#: field:account.budget.crossvered.report,date_to:0 +#: field:account.budget.crossvered.summary.report,date_to:0 +#: field:account.budget.report,date_to:0 +msgid "End of period" +msgstr "End of period" + +#. module: account_budget +#: view:crossovered.budget:0 +#: selection:crossovered.budget,state:0 +msgid "Draft" +msgstr "Draft" + +#. module: account_budget +#: report:account.budget:0 +msgid "at" +msgstr "at" + +#. module: account_budget +#: view:account.budget.report:0 +#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic +#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report +msgid "Print Budgets" +msgstr "Print Budgets" + +#. module: account_budget +#: report:account.budget:0 +msgid "Currency:" +msgstr "Currency:" + +#. module: account_budget +#: model:ir.model,name:account_budget.model_account_budget_crossvered_report +msgid "Account Budget crossvered report" +msgstr "Account Budget crossvered report" + +#. module: account_budget +#: selection:crossovered.budget,state:0 +msgid "Validated" +msgstr "Validated" + +#. module: account_budget +#: field:crossovered.budget.lines,percentage:0 +msgid "Percentage" +msgstr "Percentage" + +#. module: account_budget +#: report:crossovered.budget.report:0 +msgid "to" +msgstr "to" + +#. module: account_budget +#: field:crossovered.budget,state:0 +msgid "Status" +msgstr "Status" + +#. module: account_budget +#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view +msgid "" +"A budget is a forecast of your company's income and expenses expected for a " +"period in the future. With a budget, a company is able to carefully look at " +"how much money they are taking in during a given period, and figure out the " +"best way to divide it among various categories. By keeping track of where " +"your money goes, you may be less likely to overspend, and more likely to " +"meet your financial goals. Forecast a budget by detailing the expected " +"revenue per analytic account and monitor its evolution based on the actuals " +"realised during that period." +msgstr "" +"A budget is a forecast of your company's income and expenses expected for a " +"period in the future. With a budget, a company is able to carefully look at " +"how much money they are taking in during a given period, and figure out the " +"best way to divide it among various categories. By keeping track of where " +"your money goes, you may be less likely to overspend, and more likely to " +"meet your financial goals. Forecast a budget by detailing the expected " +"revenue per analytic account and monitor its evolution based on the actuals " +"realised during that period." + +#. module: account_budget +#: view:account.budget.crossvered.summary.report:0 +msgid "This wizard is used to print summary of budgets" +msgstr "This wizard is used to print summary of budgets" + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "%" +msgstr "%" + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Description" +msgstr "Description" + +#. module: account_budget +#: report:crossovered.budget.report:0 +msgid "Currency" +msgstr "Currency" + +#. module: account_budget +#: report:crossovered.budget.report:0 +msgid "Total :" +msgstr "Total :" + +#. module: account_budget +#: field:account.budget.post,company_id:0 +#: field:crossovered.budget,company_id:0 +#: field:crossovered.budget.lines,company_id:0 +msgid "Company" +msgstr "Company" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "To Approve" +msgstr "To Approve" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "Reset to Draft" +msgstr "Reset to Draft" + +#. module: account_budget +#: view:account.budget.post:0 +#: view:crossovered.budget:0 +#: field:crossovered.budget.lines,planned_amount:0 +msgid "Planned Amount" +msgstr "Planned Amount" + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Perc(%)" +msgstr "Perc(%)" + +#. module: account_budget +#: view:crossovered.budget:0 +#: selection:crossovered.budget,state:0 +msgid "Done" +msgstr "Done" + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Practical Amt" +msgstr "Practical Amt" + +#. module: account_budget +#: view:account.analytic.account:0 +#: view:account.budget.post:0 +#: view:crossovered.budget:0 +#: field:crossovered.budget.lines,practical_amount:0 +msgid "Practical Amount" +msgstr "Practical Amount" + +#. module: account_budget +#: field:crossovered.budget,date_to:0 +#: field:crossovered.budget.lines,date_to:0 +msgid "End Date" +msgstr "End Date" + +#. module: account_budget +#: model:ir.model,name:account_budget.model_account_budget_analytic +#: model:ir.model,name:account_budget.model_account_budget_report +msgid "Account Budget report for analytic account" +msgstr "Account Budget report for analytic account" + +#. module: account_budget +#: view:account.analytic.account:0 +msgid "Theoritical Amount" +msgstr "Theoretical Amount" + +#. module: account_budget +#: field:account.budget.post,name:0 +#: field:crossovered.budget,name:0 +msgid "Name" +msgstr "Name" + +#. module: account_budget +#: model:ir.model,name:account_budget.model_crossovered_budget_lines +msgid "Budget Line" +msgstr "Budget Line" + +#. module: account_budget +#: view:account.analytic.account:0 +#: view:account.budget.post:0 +msgid "Lines" +msgstr "Lines" + +#. module: account_budget +#: report:account.budget:0 +#: view:crossovered.budget:0 +#: field:crossovered.budget.lines,crossovered_budget_id:0 +#: report:crossovered.budget.report:0 +#: model:ir.actions.report.xml,name:account_budget.account_budget +#: model:ir.model,name:account_budget.model_crossovered_budget +msgid "Budget" +msgstr "Budget" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "To Approve Budgets" +msgstr "To Approve Budgets" + +#. module: account_budget +#: code:addons/account_budget/account_budget.py:119 +#, python-format +msgid "Error!" +msgstr "Error!" + +#. module: account_budget +#: field:account.budget.post,code:0 +#: field:crossovered.budget,code:0 +msgid "Code" +msgstr "Code" + +#. module: account_budget +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +msgid "This wizard is used to print budget" +msgstr "This wizard is used to print budget" + +#. module: account_budget +#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view +#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree +#: model:ir.actions.act_window,name:account_budget.action_account_budget_report +#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget +#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view +#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree +#: model:ir.ui.menu,name:account_budget.next_id_31 +#: model:ir.ui.menu,name:account_budget.next_id_pos +msgid "Budgets" +msgstr "Budgets" + +#. module: account_budget +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "" +"Error! The currency has to be the same as the currency of the selected " +"company" + +#. module: account_budget +#: selection:crossovered.budget,state:0 +msgid "Cancelled" +msgstr "Cancelled" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "Approve" +msgstr "Approve" + +#. module: account_budget +#: field:crossovered.budget,date_from:0 +#: field:crossovered.budget.lines,date_from:0 +msgid "Start Date" +msgstr "Start Date" + +#. module: account_budget +#: view:account.budget.post:0 +#: field:crossovered.budget.lines,general_budget_id:0 +#: model:ir.model,name:account_budget.model_account_budget_post +msgid "Budgetary Position" +msgstr "Budgetary Position" + +#. module: account_budget +#: field:account.budget.analytic,date_from:0 +#: field:account.budget.crossvered.report,date_from:0 +#: field:account.budget.crossvered.summary.report,date_from:0 +#: field:account.budget.report,date_from:0 +msgid "Start of period" +msgstr "Start of period" + +#. module: account_budget +#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report +msgid "Account Budget crossvered summary report" +msgstr "Account Budget crossvered summary report" + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Theoretical Amt" +msgstr "Theoretical Amt" + +#. module: account_budget +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +#: view:account.budget.crossvered.summary.report:0 +#: view:account.budget.report:0 +msgid "Select Dates Period" +msgstr "Select Dates Period" + +#. module: account_budget +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +#: view:account.budget.crossvered.summary.report:0 +#: view:account.budget.report:0 +msgid "Print" +msgstr "Print" + +#. module: account_budget +#: view:account.budget.post:0 +#: view:crossovered.budget:0 +#: field:crossovered.budget.lines,theoritical_amount:0 +msgid "Theoretical Amount" +msgstr "Theoretical Amount" + +#. module: account_budget +#: field:crossovered.budget.lines,analytic_account_id:0 +#: model:ir.model,name:account_budget.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analytic Account" + +#. module: account_budget +#: report:account.budget:0 +msgid "Budget :" +msgstr "Budget :" + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Planned Amt" +msgstr "Planned Amt" + +#. module: account_budget +#: view:account.budget.post:0 +#: field:account.budget.post,account_ids:0 +msgid "Accounts" +msgstr "Accounts" + +#. module: account_budget +#: view:account.analytic.account:0 +#: field:account.analytic.account,crossovered_budget_line:0 +#: view:account.budget.post:0 +#: field:account.budget.post,crossovered_budget_line:0 +#: view:crossovered.budget:0 +#: field:crossovered.budget,crossovered_budget_line:0 +#: view:crossovered.budget.lines:0 +#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines +#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view +#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view +msgid "Budget Lines" +msgstr "Budget Lines" + +#. module: account_budget +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +#: view:account.budget.crossvered.summary.report:0 +#: view:account.budget.report:0 +#: view:crossovered.budget:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: account_budget +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Error! You can not create recursive analytic accounts." + +#. module: account_budget +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Analysis from" +msgstr "Analysis from" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "Draft Budgets" +msgstr "Draft Budgets" + +#~ msgid "" +#~ "This module allows accountants to manage analytic and crossovered budgets.\n" +#~ "\n" +#~ "Once the Master Budgets and the Budgets are defined (in " +#~ "Accounting/Budgets/),\n" +#~ "the Project Managers can set the planned amount on each Analytic Account.\n" +#~ "\n" +#~ "The accountant has the possibility to see the total of amount planned for " +#~ "each\n" +#~ "Budget and Master Budget in order to ensure the total planned is not\n" +#~ "greater/lower than what he planned for this Budget/Master Budget. Each list " +#~ "of\n" +#~ "record can also be switched to a graphical view of it.\n" +#~ "\n" +#~ "Three reports are available:\n" +#~ " 1. The first is available from a list of Budgets. It gives the " +#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n" +#~ "\n" +#~ " 2. The second is a summary of the previous one, it only gives the " +#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n" +#~ "\n" +#~ " 3. The last one is available from the Analytic Chart of Accounts. It " +#~ "gives the spreading, for the selected Analytic Accounts, of the Master " +#~ "Budgets per Budgets.\n" +#~ "\n" +#~ msgstr "" +#~ "This module allows accountants to manage analytic and crossovered budgets.\n" +#~ "\n" +#~ "Once the Master Budgets and the Budgets are defined (in " +#~ "Accounting/Budgets/),\n" +#~ "the Project Managers can set the planned amount on each Analytic Account.\n" +#~ "\n" +#~ "The accountant has the possibility to see the total of amount planned for " +#~ "each\n" +#~ "Budget and Master Budget in order to ensure the total planned is not\n" +#~ "greater/lower than what he planned for this Budget/Master Budget. Each list " +#~ "of\n" +#~ "record can also be switched to a graphical view of it.\n" +#~ "\n" +#~ "Three reports are available:\n" +#~ " 1. The first is available from a list of Budgets. It gives the " +#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n" +#~ "\n" +#~ " 2. The second is a summary of the previous one, it only gives the " +#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n" +#~ "\n" +#~ " 3. The last one is available from the Analytic Chart of Accounts. It " +#~ "gives the spreading, for the selected Analytic Accounts, of the Master " +#~ "Budgets per Budgets.\n" +#~ "\n" + +#~ msgid "Budget Management" +#~ msgstr "Budget Management" diff --git a/addons/account_cancel/i18n/en_GB.po b/addons/account_cancel/i18n/en_GB.po index b272507a4f1..68c44296c9b 100644 --- a/addons/account_cancel/i18n/en_GB.po +++ b/addons/account_cancel/i18n/en_GB.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-08-25 11:46+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:21+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: account_cancel #: view:account.invoice:0 msgid "Cancel" -msgstr "" +msgstr "Cancel" #~ msgid "Account Cancel" #~ msgstr "Account Cancel" diff --git a/addons/account_coda/i18n/en_GB.po b/addons/account_coda/i18n/en_GB.po new file mode 100644 index 00000000000..a5fb702bed0 --- /dev/null +++ b/addons/account_coda/i18n/en_GB.po @@ -0,0 +1,265 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:23+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: account_coda +#: help:account.coda,journal_id:0 +#: field:account.coda.import,journal_id:0 +msgid "Bank Journal" +msgstr "Bank Journal" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda.import,note:0 +msgid "Log" +msgstr "Log" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda_import +msgid "Account Coda Import" +msgstr "Account Coda Import" + +#. module: account_coda +#: field:account.coda,name:0 +msgid "Coda file" +msgstr "Coda file" + +#. module: account_coda +#: view:account.coda:0 +msgid "Group By..." +msgstr "Group By..." + +#. module: account_coda +#: field:account.coda.import,awaiting_account:0 +msgid "Default Account for Unrecognized Movement" +msgstr "Default Account for Unrecognized Movement" + +#. module: account_coda +#: help:account.coda,date:0 +msgid "Import Date" +msgstr "Import Date" + +#. module: account_coda +#: field:account.coda,note:0 +msgid "Import log" +msgstr "Import log" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Import" +msgstr "Import" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda import" +msgstr "Coda import" + +#. module: account_coda +#: code:addons/account_coda/account_coda.py:51 +#, python-format +msgid "Coda file not found for bank statement !!" +msgstr "Coda file not found for bank statement !!" + +#. module: account_coda +#: help:account.coda.import,awaiting_account:0 +msgid "" +"Set here the default account that will be used, if the partner is found but " +"does not have the bank account, or if he is domiciled" +msgstr "" +"Set here the default account that will be used, if the partner is found but " +"does not have the bank account, or if he is domiciled" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,company_id:0 +msgid "Company" +msgstr "Company" + +#. module: account_coda +#: help:account.coda.import,def_payable:0 +msgid "" +"Set here the payable account that will be used, by default, if the partner " +"is not found" +msgstr "" +"Set here the payable account that will be used, by default, if the partner " +"is not found" + +#. module: account_coda +#: view:account.coda:0 +msgid "Search Coda" +msgstr "Search Coda" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,user_id:0 +msgid "User" +msgstr "User" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,date:0 +msgid "Date" +msgstr "Date" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement +msgid "Coda Import Logs" +msgstr "Coda Import Logs" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda +msgid "coda for an Account" +msgstr "coda for an Account" + +#. module: account_coda +#: field:account.coda.import,def_payable:0 +msgid "Default Payable Account" +msgstr "Default Payable Account" + +#. module: account_coda +#: help:account.coda,name:0 +msgid "Store the detail of bank statements" +msgstr "Store the detail of bank statements" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Open Statements" +msgstr "Open Statements" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:167 +#, python-format +msgid "The bank account %s is not defined for the partner %s.\n" +msgstr "The bank account %s is not defined for the partner %s.\n" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_import +msgid "Import Coda Statements" +msgstr "Import Coda Statements" + +#. module: account_coda +#: view:account.coda.import:0 +#: model:ir.actions.act_window,name:account_coda.action_account_coda_import +msgid "Import Coda Statement" +msgstr "Import Coda Statement" + +#. module: account_coda +#: view:account.coda:0 +msgid "Statements" +msgstr "Statements" + +#. module: account_coda +#: field:account.bank.statement,coda_id:0 +msgid "Coda" +msgstr "Coda" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Results :" +msgstr "Results :" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Result of Imported Coda Statements" +msgstr "Result of Imported Coda Statements" + +#. module: account_coda +#: help:account.coda.import,def_receivable:0 +msgid "" +"Set here the receivable account that will be used, by default, if the " +"partner is not found" +msgstr "" +"Set here the receivable account that will be used, by default, if the " +"partner is not found" + +#. module: account_coda +#: field:account.coda.import,coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement +msgid "Coda File" +msgstr "Coda File" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_bank_statement +msgid "Bank Statement" +msgstr "Bank Statement" + +#. module: account_coda +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda Logs" +msgstr "Coda Logs" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:311 +#, python-format +msgid "Result" +msgstr "Result" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Click on 'New' to select your file :" +msgstr "Click on 'New' to select your file :" + +#. module: account_coda +#: field:account.coda.import,def_receivable:0 +msgid "Default Receivable Account" +msgstr "Default Receivable Account" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Close" +msgstr "Close" + +#. module: account_coda +#: field:account.coda,statement_ids:0 +msgid "Generated Bank Statements" +msgstr "Generated Bank Statements" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Configure Your Journal and Account :" +msgstr "Configure Your Journal and Account :" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda Import" +msgstr "Coda Import" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,journal_id:0 +msgid "Journal" +msgstr "Journal" + +#~ msgid "Account CODA - import bank statements from coda file" +#~ msgstr "Account CODA - import bank statements from coda file" + +#~ msgid "" +#~ "\n" +#~ " Module provides functionality to import\n" +#~ " bank statements from coda files.\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ " Module provides functionality to import\n" +#~ " bank statements from coda files.\n" +#~ " " diff --git a/addons/account_invoice_layout/i18n/en_GB.po b/addons/account_invoice_layout/i18n/en_GB.po new file mode 100644 index 00000000000..52565a133c0 --- /dev/null +++ b/addons/account_invoice_layout/i18n/en_GB.po @@ -0,0 +1,396 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:53+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Sub Total" +msgstr "Sub Total" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Note:" +msgstr "Note:" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Cancelled Invoice" +msgstr "Cancelled Invoice" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +#: field:notify.message,name:0 +msgid "Title" +msgstr "Title" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Disc. (%)" +msgstr "Disc. (%)" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Note" +msgstr "Note" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 +msgid "Print" +msgstr "Print" + +#. module: account_invoice_layout +#: help:notify.message,msg:0 +msgid "" +"This notification will appear at the bottom of the Invoices when printed." +msgstr "" +"This notification will appear at the bottom of the Invoices when printed." + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Unit Price" +msgstr "Unit Price" + +#. module: account_invoice_layout +#: model:ir.model,name:account_invoice_layout.model_notify_message +msgid "Notify By Messages" +msgstr "Notify By Messages" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "VAT :" +msgstr "VAT :" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Tel. :" +msgstr "Tel. :" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "PRO-FORMA" +msgstr "PRO-FORMA" + +#. module: account_invoice_layout +#: field:account.invoice,abstract_line_ids:0 +msgid "Invoice Lines" +msgstr "Invoice Lines" + +#. module: account_invoice_layout +#: view:account.invoice.line:0 +msgid "Seq." +msgstr "Seq." + +#. module: account_invoice_layout +#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message +msgid "Notification Message" +msgstr "Notification Message" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Customer Code" +msgstr "Customer Code" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Description" +msgstr "Description" + +#. module: account_invoice_layout +#: help:account.invoice.line,sequence:0 +msgid "Gives the sequence order when displaying a list of invoice lines." +msgstr "Gives the sequence order when displaying a list of invoice lines." + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Price" +msgstr "Price" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Invoice Date" +msgstr "Invoice Date" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Taxes:" +msgstr "Taxes:" + +#. module: account_invoice_layout +#: field:account.invoice.line,functional_field:0 +msgid "Source Account" +msgstr "Source Account" + +#. module: account_invoice_layout +#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form +msgid "Write Messages" +msgstr "Write Messages" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Base" +msgstr "Base" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Page Break" +msgstr "Page Break" + +#. module: account_invoice_layout +#: view:notify.message:0 +#: field:notify.message,msg:0 +msgid "Special Message" +msgstr "Special Message" + +#. module: account_invoice_layout +#: help:account.invoice.special.msg,message:0 +msgid "Message to Print at the bottom of report" +msgstr "Message to Print at the bottom of report" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Quantity" +msgstr "Quantity" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Refund" +msgstr "Refund" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Fax :" +msgstr "Fax :" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Total:" +msgstr "Total:" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 +msgid "Select Message" +msgstr "Select Message" + +#. module: account_invoice_layout +#: view:notify.message:0 +msgid "Messages" +msgstr "Messages" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Product" +msgstr "Product" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Description / Taxes" +msgstr "Description / Taxes" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Amount" +msgstr "Amount" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Net Total :" +msgstr "Net Total :" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Total :" +msgstr "Total :" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Draft Invoice" +msgstr "Draft Invoice" + +#. module: account_invoice_layout +#: field:account.invoice.line,sequence:0 +msgid "Sequence Number" +msgstr "Sequence Number" + +#. module: account_invoice_layout +#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg +msgid "Account Invoice Special Message" +msgstr "Account Invoice Special Message" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Origin" +msgstr "Origin" + +#. module: account_invoice_layout +#: sql_constraint:account.invoice:0 +msgid "Invoice Number must be unique per Company!" +msgstr "Invoice Number must be unique per Company!" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Separator Line" +msgstr "Separator Line" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Your Reference" +msgstr "Your Reference" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Supplier Invoice" +msgstr "Supplier Invoice" + +#. module: account_invoice_layout +#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1 +msgid "Invoices" +msgstr "Invoices" + +#. module: account_invoice_layout +#: constraint:account.invoice:0 +msgid "Invalid BBA Structured Communication !" +msgstr "Invalid BBA Structured Communication !" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Tax" +msgstr "Tax" + +#. module: account_invoice_layout +#: model:ir.model,name:account_invoice_layout.model_account_invoice_line +msgid "Invoice Line" +msgstr "Invoice Line" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Net Total:" +msgstr "Net Total:" + +#. module: account_invoice_layout +#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg +#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message +msgid "Invoices and Message" +msgstr "Invoices and Message" + +#. module: account_invoice_layout +#: field:account.invoice.line,state:0 +msgid "Type" +msgstr "Type" + +#. module: account_invoice_layout +#: view:notify.message:0 +msgid "Write a notification or a wishful message." +msgstr "Write a notification or a wishful message." + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: model:ir.model,name:account_invoice_layout.model_account_invoice +#: report:notify_account.invoice:0 +msgid "Invoice" +msgstr "Invoice" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Supplier Refund" +msgstr "Supplier Refund" + +#. module: account_invoice_layout +#: field:account.invoice.special.msg,message:0 +msgid "Message" +msgstr "Message" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Taxes :" +msgstr "Taxes :" + +#. module: account_invoice_layout +#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form +msgid "All Notification Messages" +msgstr "All Notification Messages" + +#~ msgid "Invoices Layout Improvement" +#~ msgstr "Invoices Layout Improvement" + +#~ msgid "ERP & CRM Solutions..." +#~ msgstr "ERP & CRM Solutions..." + +#~ msgid "Invoices with Layout and Message" +#~ msgstr "Invoices with Layout and Message" + +#~ msgid "Invoices with Layout" +#~ msgstr "Invoices with Layout" + +#~ msgid "" +#~ "\n" +#~ " This module provides some features to improve the layout of the " +#~ "invoices.\n" +#~ "\n" +#~ " It gives you the possibility to\n" +#~ " * order all the lines of an invoice\n" +#~ " * add titles, comment lines, sub total lines\n" +#~ " * draw horizontal lines and put page breaks\n" +#~ "\n" +#~ " Moreover, there is one option which allows you to print all the selected " +#~ "invoices with a given special message at the bottom of it. This feature can " +#~ "be very useful for printing your invoices with end-of-year wishes, special " +#~ "punctual conditions...\n" +#~ "\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ " This module provides some features to improve the layout of the " +#~ "invoices.\n" +#~ "\n" +#~ " It gives you the possibility to\n" +#~ " * order all the lines of an invoice\n" +#~ " * add titles, comment lines, sub total lines\n" +#~ " * draw horizontal lines and put page breaks\n" +#~ "\n" +#~ " Moreover, there is one option which allows you to print all the selected " +#~ "invoices with a given special message at the bottom of it. This feature can " +#~ "be very useful for printing your invoices with end-of-year wishes, special " +#~ "punctual conditions...\n" +#~ "\n" +#~ " " diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po index 0ea90da7415..653a5b8ca0d 100644 --- a/addons/account_invoice_layout/i18n/tr.po +++ b/addons/account_invoice_layout/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-23 19:35+0000\n" +"PO-Revision-Date: 2012-01-23 23:34+0000\n" "Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 @@ -108,7 +108,7 @@ msgstr "Bilgilendirme Mesajı" #. module: account_invoice_layout #: report:account.invoice.layout:0 msgid "Customer Code" -msgstr "" +msgstr "Müşteri Kodu" #. module: account_invoice_layout #: report:account.invoice.layout:0 @@ -255,7 +255,7 @@ msgstr "Menşei" #. module: account_invoice_layout #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 @@ -276,12 +276,12 @@ msgstr "Tedarikçi Faturası" #. module: account_invoice_layout #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1 msgid "Invoices" -msgstr "" +msgstr "Faturalar" #. module: account_invoice_layout #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Geçersiz BBA Yapılı İletişim !" #. module: account_invoice_layout #: report:account.invoice.layout:0 @@ -303,7 +303,7 @@ msgstr "Net Toplam:" #: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message msgid "Invoices and Message" -msgstr "" +msgstr "Faturalar ve Mesajlar" #. module: account_invoice_layout #: field:account.invoice.line,state:0 diff --git a/addons/analytic/i18n/ar.po b/addons/analytic/i18n/ar.po index d337112fe31..f8850a0c75c 100644 --- a/addons/analytic/i18n/ar.po +++ b/addons/analytic/i18n/ar.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-07 22:04+0000\n" -"Last-Translator: kifcaliph \n" +"PO-Revision-Date: 2012-01-23 14:39+0000\n" +"Last-Translator: kifcaliph \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-08 05:03+0000\n" -"X-Generator: Launchpad (build 14640)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: analytic #: field:account.analytic.account,child_ids:0 @@ -128,7 +128,7 @@ msgstr "مستخدِم" #. module: analytic #: field:account.analytic.account,parent_id:0 msgid "Parent Analytic Account" -msgstr "حساب التحليل الأعلى" +msgstr "الحساب التحليلي الرئيسي" #. module: analytic #: field:account.analytic.line,date:0 @@ -152,6 +152,8 @@ msgid "" "Calculated by multiplying the quantity and the price given in the Product's " "cost price. Always expressed in the company main currency." msgstr "" +"محسوبة بواسطة ضرب الكمية و السعر المعطى في سعر تكلفة المنتج. و يعبر عنه " +"دائما بالعملة الرئيسية للشركة." #. module: analytic #: field:account.analytic.account,child_complete_ids:0 diff --git a/addons/analytic_journal_billing_rate/i18n/en_GB.po b/addons/analytic_journal_billing_rate/i18n/en_GB.po index 4632f2ac6b3..95193b7b3cc 100644 --- a/addons/analytic_journal_billing_rate/i18n/en_GB.po +++ b/addons/analytic_journal_billing_rate/i18n/en_GB.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-08-25 11:50+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:36+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: analytic_journal_billing_rate #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Invoice Number must be unique per Company!" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 @@ -35,7 +35,7 @@ msgstr "Invoice" #. module: analytic_journal_billing_rate #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Invalid BBA Structured Communication !" #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 @@ -69,7 +69,7 @@ msgstr "" #. module: analytic_journal_billing_rate #: constraint:hr.analytic.timesheet:0 msgid "You cannot modify an entry in a Confirmed/Done timesheet !." -msgstr "" +msgstr "You cannot modify an entry in a Confirmed/Done timesheet !." #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,rate_id:0 diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po index 6030efd92fc..f65da009ac9 100644 --- a/addons/analytic_journal_billing_rate/i18n/tr.po +++ b/addons/analytic_journal_billing_rate/i18n/tr.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-09-09 07:16+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2012-01-23 23:27+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: analytic_journal_billing_rate #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 @@ -68,6 +68,7 @@ msgstr "Hata! Para birimi seçilen firmanın para birimiyle aynı olmalı" #: constraint:hr.analytic.timesheet:0 msgid "You cannot modify an entry in a Confirmed/Done timesheet !." msgstr "" +"Onaylandı/Tamanlandı durumundaki zaman çizelgesini değiştiremezsiniz !." #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,rate_id:0 diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po index a6aebc896e1..5912cd3c1fb 100644 --- a/addons/analytic_user_function/i18n/en_GB.po +++ b/addons/analytic_user_function/i18n/en_GB.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-08-25 17:43+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:22+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:09+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 @@ -30,7 +30,7 @@ msgstr "Relation table between users and products on a analytic account" #. module: analytic_user_function #: constraint:hr.analytic.timesheet:0 msgid "You cannot modify an entry in a Confirmed/Done timesheet !." -msgstr "" +msgstr "You cannot modify an entry in a Confirmed/Done timesheet !." #. module: analytic_user_function #: field:analytic.user.funct.grid,account_id:0 diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po index 31365bdec4e..ff93a817f0b 100644 --- a/addons/audittrail/i18n/zh_CN.po +++ b/addons/audittrail/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-10-30 13:31+0000\n" -"Last-Translator: openerp-china.black-jack \n" +"PO-Revision-Date: 2012-01-23 10:09+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:05+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: audittrail #: code:addons/audittrail/audittrail.py:75 @@ -43,7 +43,7 @@ msgstr "" #. module: audittrail #: view:audittrail.rule:0 msgid "Subscribed Rule" -msgstr "" +msgstr "订阅规则" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_rule @@ -317,7 +317,7 @@ msgstr "审计跟踪日志" #. module: audittrail #: view:audittrail.rule:0 msgid "Draft Rule" -msgstr "" +msgstr "草稿规则" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po index b797d65248e..364e03baf5d 100644 --- a/addons/base_calendar/i18n/tr.po +++ b/addons/base_calendar/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-06-23 19:26+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 21:54+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation Type" -msgstr "" +msgstr "Davetiye Tipi" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 @@ -31,7 +31,7 @@ msgstr "Etkinlik Başlar" #. module: base_calendar #: view:calendar.attendee:0 msgid "Declined Invitations" -msgstr "" +msgstr "Reddedilmiş Davetler" #. module: base_calendar #: help:calendar.event,exdate:0 @@ -63,7 +63,7 @@ msgstr "Aylık" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Unknown" -msgstr "" +msgstr "Bilinmeyen" #. module: base_calendar #: view:calendar.attendee:0 @@ -115,7 +115,7 @@ msgstr "Dördüncü" #: code:addons/base_calendar/base_calendar.py:1006 #, python-format msgid "Count cannot be negative" -msgstr "" +msgstr "Sayı negatif olamaz" #. module: base_calendar #: field:calendar.event,day:0 @@ -238,7 +238,7 @@ msgstr "Oda" #. module: base_calendar #: view:calendar.attendee:0 msgid "Accepted Invitations" -msgstr "" +msgstr "Kabul edilmiş davetler" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -268,7 +268,7 @@ msgstr "Yöntem" #: code:addons/base_calendar/base_calendar.py:1004 #, python-format msgid "Interval cannot be negative" -msgstr "" +msgstr "Aralık negatif olamaz" #. module: base_calendar #: selection:calendar.event,state:0 @@ -280,7 +280,7 @@ msgstr "Vazgeçildi" #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 #, python-format msgid "%s must have an email address to send mail" -msgstr "" +msgstr "%s nin e-posta gönderebilmesi için e-posta adresi olmalı" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -419,6 +419,7 @@ msgstr "Katılımcılar" #, python-format msgid "Group by date not supported, use the calendar view instead" msgstr "" +"Tarihe göre gruplama desteklenmiyor, Bunun yerine takvim görünümü kullanın" #. module: base_calendar #: view:calendar.event:0 @@ -468,7 +469,7 @@ msgstr "Konum" #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Çalışanlara açık" #. module: base_calendar #: field:base_calendar.invite.attendee,send_mail:0 @@ -567,7 +568,7 @@ msgstr "Şuna Yetkilendirildi" #. module: base_calendar #: view:calendar.event:0 msgid "To" -msgstr "" +msgstr "Kime" #. module: base_calendar #: view:calendar.attendee:0 @@ -588,7 +589,7 @@ msgstr "Oluşturuldu" #. module: base_calendar #: sql_constraint:ir.model:0 msgid "Each model must be unique!" -msgstr "" +msgstr "Her model eşşiz olmalı!" #. module: base_calendar #: selection:calendar.event,rrule_type:0 @@ -775,7 +776,7 @@ msgstr "Üye" #. module: base_calendar #: view:calendar.event:0 msgid "From" -msgstr "" +msgstr "Kimden" #. module: base_calendar #: field:calendar.event,rrule:0 @@ -856,7 +857,7 @@ msgstr "Pazartesi" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model msgid "Models" -msgstr "" +msgstr "Modeller" #. module: base_calendar #: selection:calendar.event,month_list:0 @@ -875,7 +876,7 @@ msgstr "Etkinlik Tarihi" #: selection:calendar.event,end_type:0 #: selection:calendar.todo,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Tekrar Sayısı" #. module: base_calendar #: view:calendar.event:0 @@ -919,7 +920,7 @@ msgstr "Veri" #: field:calendar.event,end_type:0 #: field:calendar.todo,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Tekrarları sonlandırma" #. module: base_calendar #: field:calendar.event,mo:0 @@ -930,7 +931,7 @@ msgstr "Pzt" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitations To Review" -msgstr "" +msgstr "İncelenecek Davetler" #. module: base_calendar #: selection:calendar.event,month_list:0 @@ -964,7 +965,7 @@ msgstr "Ocak" #. module: base_calendar #: view:calendar.attendee:0 msgid "Delegated Invitations" -msgstr "" +msgstr "Yetkilendirilmiş Davetiyeler" #. module: base_calendar #: field:calendar.alarm,trigger_interval:0 @@ -996,7 +997,7 @@ msgstr "Etkin" #: code:addons/base_calendar/base_calendar.py:389 #, python-format msgid "You cannot duplicate a calendar attendee." -msgstr "" +msgstr "Takvim katılımcısını çoğaltamazsınız." #. module: base_calendar #: view:calendar.event:0 @@ -1251,7 +1252,7 @@ msgstr "Kişi Davet Et" #. module: base_calendar #: view:calendar.event:0 msgid "Confirmed Events" -msgstr "" +msgstr "Onaylanmış Etkinlikler" #. module: base_calendar #: field:calendar.attendee,dir:0 diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po index eb4d2317152..23ee4f778bc 100644 --- a/addons/base_contact/i18n/tr.po +++ b/addons/base_contact/i18n/tr.po @@ -7,24 +7,24 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-28 13:39+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 21:56+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_contact #: field:res.partner.location,city:0 msgid "City" -msgstr "" +msgstr "Şehir" #. module: base_contact #: view:res.partner.contact:0 msgid "First/Lastname" -msgstr "" +msgstr "Ad/Soyad" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -38,7 +38,7 @@ msgstr "İlgililer" #. module: base_contact #: view:res.partner.contact:0 msgid "Professional Info" -msgstr "" +msgstr "Profesyonel Bilgiler" #. module: base_contact #: field:res.partner.contact,first_name:0 @@ -48,7 +48,7 @@ msgstr "Ad" #. module: base_contact #: field:res.partner.address,location_id:0 msgid "Location" -msgstr "" +msgstr "Yer" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 @@ -72,17 +72,17 @@ msgstr "Web Sitesi" #. module: base_contact #: field:res.partner.location,zip:0 msgid "Zip" -msgstr "" +msgstr "Posta Kodu" #. module: base_contact #: field:res.partner.location,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Fed. Eyalet" #. module: base_contact #: field:res.partner.location,company_id:0 msgid "Company" -msgstr "" +msgstr "Şirket" #. module: base_contact #: field:res.partner.contact,title:0 @@ -92,7 +92,7 @@ msgstr "Unvan" #. module: base_contact #: field:res.partner.location,partner_id:0 msgid "Main Partner" -msgstr "" +msgstr "Ana Cari" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 @@ -148,7 +148,7 @@ msgstr "Gsm No" #. module: base_contact #: field:res.partner.location,country_id:0 msgid "Country" -msgstr "" +msgstr "Ülke" #. module: base_contact #: view:res.partner.contact:0 @@ -181,7 +181,7 @@ msgstr "İlgili" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_location msgid "res.partner.location" -msgstr "" +msgstr "res.partner.location" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 @@ -222,7 +222,7 @@ msgstr "Foto" #. module: base_contact #: view:res.partner.location:0 msgid "Locations" -msgstr "" +msgstr "Lokasyonlar" #. module: base_contact #: view:res.partner.contact:0 @@ -232,7 +232,7 @@ msgstr "Genel" #. module: base_contact #: field:res.partner.location,street:0 msgid "Street" -msgstr "" +msgstr "Sokak" #. module: base_contact #: view:res.partner.contact:0 @@ -252,12 +252,12 @@ msgstr "Paydaş Adresleri" #. module: base_contact #: field:res.partner.location,street2:0 msgid "Street2" -msgstr "" +msgstr "Sokak2" #. module: base_contact #: view:res.partner.contact:0 msgid "Personal Information" -msgstr "" +msgstr "Kişisel Bilgiler" #. module: base_contact #: field:res.partner.contact,birthdate:0 diff --git a/addons/base_iban/i18n/en_GB.po b/addons/base_iban/i18n/en_GB.po index 556c3f9fc23..da11b776d09 100644 --- a/addons/base_iban/i18n/en_GB.po +++ b/addons/base_iban/i18n/en_GB.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-08-25 17:41+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 15:23+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_iban #: constraint:res.partner.bank:0 @@ -24,16 +24,19 @@ msgid "" "Please define BIC/Swift code on bank for bank type IBAN Account to make " "valid payments" msgstr "" +"\n" +"Please define BIC/Swift code on bank for bank type IBAN Account to make " +"valid payments" #. module: base_iban #: model:res.partner.bank.type,format_layout:base_iban.bank_iban msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" -msgstr "" +msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field msgid "bank_bic" -msgstr "" +msgstr "bank_bic" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field @@ -62,6 +65,8 @@ msgid "" "The IBAN does not seem to be correct. You should have entered something like " "this %s" msgstr "" +"The IBAN does not seem to be correct. You should have entered something like " +"this %s" #. module: base_iban #: field:res.partner.bank,iban:0 @@ -72,7 +77,7 @@ msgstr "IBAN" #: code:addons/base_iban/base_iban.py:131 #, python-format msgid "The IBAN is invalid, it should begin with the country code" -msgstr "" +msgstr "The IBAN is invalid, it should begin with the country code" #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po index 3d2f05e76fe..01b5842386a 100644 --- a/addons/base_module_quality/i18n/tr.po +++ b/addons/base_module_quality/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-10 18:32+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 22:06+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_module_quality #: code:addons/base_module_quality/object_test/object_test.py:187 @@ -28,7 +28,7 @@ msgstr "Öneri" #: model:ir.actions.act_window,name:base_module_quality.action_view_quality_save_report #: view:save.report:0 msgid "Standard Entries" -msgstr "" +msgstr "Standart Girdiler" #. module: base_module_quality #: code:addons/base_module_quality/base_module_quality.py:100 @@ -56,7 +56,7 @@ msgstr "" #. module: base_module_quality #: view:save.report:0 msgid " " -msgstr "" +msgstr " " #. module: base_module_quality #: selection:module.quality.detail,state:0 @@ -78,7 +78,7 @@ msgstr "Hız denemesi" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_quality_check msgid "Module Quality Check" -msgstr "" +msgstr "Modül Kalite Kontrolü" #. module: base_module_quality #: code:addons/base_module_quality/method_test/method_test.py:82 @@ -190,7 +190,7 @@ msgstr "Birim Testi" #. module: base_module_quality #: view:quality.check:0 msgid "Check" -msgstr "" +msgstr "Denetle" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -294,7 +294,7 @@ msgstr "Sonuç %" #. module: base_module_quality #: view:quality.check:0 msgid "This wizard will check module(s) quality" -msgstr "" +msgstr "Bu sihirbaz modüllerin kalitesini denetler" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:58 @@ -441,7 +441,7 @@ msgstr "Test uygulanmamış" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_save_report msgid "Save Report of Quality" -msgstr "" +msgstr "Kalite Raporunu Kaydet" #. module: base_module_quality #: code:addons/base_module_quality/speed_test/speed_test.py:151 @@ -503,7 +503,7 @@ msgstr "Vazgeç" #. module: base_module_quality #: view:save.report:0 msgid "Close" -msgstr "" +msgstr "Kapat" #. module: base_module_quality #: code:addons/base_module_quality/pep8_test/pep8_test.py:32 diff --git a/addons/base_setup/i18n/en_GB.po b/addons/base_setup/i18n/en_GB.po new file mode 100644 index 00000000000..4494de8c257 --- /dev/null +++ b/addons/base_setup/i18n/en_GB.po @@ -0,0 +1,299 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:44+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: base_setup +#: field:user.preferences.config,menu_tips:0 +msgid "Display Tips" +msgstr "Display Tips" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Guest" +msgstr "Guest" + +#. module: base_setup +#: model:ir.model,name:base_setup.model_product_installer +msgid "product.installer" +msgstr "product.installer" + +#. module: base_setup +#: selection:product.installer,customers:0 +msgid "Create" +msgstr "Create" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Member" +msgstr "Member" + +#. module: base_setup +#: field:migrade.application.installer.modules,sync_google_contact:0 +msgid "Sync Google Contact" +msgstr "Sync Google Contact" + +#. module: base_setup +#: help:user.preferences.config,context_tz:0 +msgid "" +"Set default for new user's timezone, used to perform timezone conversions " +"between the server and the client." +msgstr "" +"Set default for new user's timezone, used to perform timezone conversions " +"between the server and the client." + +#. module: base_setup +#: selection:product.installer,customers:0 +msgid "Import" +msgstr "Import" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Donor" +msgstr "Donor" + +#. module: base_setup +#: model:ir.actions.act_window,name:base_setup.action_base_setup_company +msgid "Set Company Header and Footer" +msgstr "Set Company Header and Footer" + +#. module: base_setup +#: model:ir.actions.act_window,help:base_setup.action_base_setup_company +msgid "" +"Fill in your company data (address, logo, bank accounts) so that it's " +"printed on your reports. You can click on the button 'Preview Header' in " +"order to check the header/footer of PDF documents." +msgstr "" +"Fill in your company data (address, logo, bank accounts) so that it's " +"printed on your reports. You can click on the button 'Preview Header' in " +"order to check the header/footer of PDF documents." + +#. module: base_setup +#: field:product.installer,customers:0 +msgid "Customers" +msgstr "Customers" + +#. module: base_setup +#: selection:user.preferences.config,view:0 +msgid "Extended" +msgstr "Extended" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Patient" +msgstr "Patient" + +#. module: base_setup +#: model:ir.actions.act_window,help:base_setup.action_import_create_installer +msgid "" +"Create or Import Customers and their contacts manually from this form or " +"you can import your existing partners by CSV spreadsheet from \"Import " +"Data\" wizard" +msgstr "" +"Create or Import Customers and their contacts manually from this form or " +"you can import your existing partners by CSV spreadsheet from \"Import " +"Data\" wizard" + +#. module: base_setup +#: view:user.preferences.config:0 +msgid "Define Users's Preferences" +msgstr "Define Users's Preferences" + +#. module: base_setup +#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form +msgid "Define default users preferences" +msgstr "Define default users preferences" + +#. module: base_setup +#: help:migrade.application.installer.modules,import_saleforce:0 +msgid "For Import Saleforce" +msgstr "For Import Saleforce" + +#. module: base_setup +#: help:migrade.application.installer.modules,quickbooks_ippids:0 +msgid "For Quickbooks Ippids" +msgstr "For Quickbooks Ippids" + +#. module: base_setup +#: help:user.preferences.config,view:0 +msgid "" +"If you use OpenERP for the first time we strongly advise you to select the " +"simplified interface, which has less features but is easier. You can always " +"switch later from the user preferences." +msgstr "" +"If you use OpenERP for the first time we strongly advise you to select the " +"simplified interface, which has less features but is easier. You can always " +"switch later from the user preferences." + +#. module: base_setup +#: view:base.setup.terminology:0 +#: view:user.preferences.config:0 +msgid "res_config_contents" +msgstr "res_config_contents" + +#. module: base_setup +#: field:user.preferences.config,view:0 +msgid "Interface" +msgstr "Interface" + +#. module: base_setup +#: model:ir.model,name:base_setup.model_migrade_application_installer_modules +msgid "migrade.application.installer.modules" +msgstr "" + +#. module: base_setup +#: view:base.setup.terminology:0 +msgid "" +"You can use this wizard to change the terminologies for customers in the " +"whole application." +msgstr "" +"You can use this wizard to change the terminologies for customers in the " +"whole application." + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Tenant" +msgstr "" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Customer" +msgstr "Customer" + +#. module: base_setup +#: field:user.preferences.config,context_lang:0 +msgid "Language" +msgstr "Language" + +#. module: base_setup +#: help:user.preferences.config,context_lang:0 +msgid "" +"Sets default language for the all user interface, when UI translations are " +"available. If you want to Add new Language, you can add it from 'Load an " +"Official Translation' wizard from 'Administration' menu." +msgstr "" + +#. module: base_setup +#: view:user.preferences.config:0 +msgid "" +"This will set the default preferences for new users and update all existing " +"ones. Afterwards, users are free to change those values on their own user " +"preference form." +msgstr "" +"This will set the default preferences for new users and update all existing " +"ones. Afterwards, users are free to change those values on their own user " +"preference form." + +#. module: base_setup +#: field:base.setup.terminology,partner:0 +msgid "How do you call a Customer" +msgstr "How do you call a Customer" + +#. module: base_setup +#: field:migrade.application.installer.modules,quickbooks_ippids:0 +msgid "Quickbooks Ippids" +msgstr "" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Client" +msgstr "Client" + +#. module: base_setup +#: field:migrade.application.installer.modules,import_saleforce:0 +msgid "Import Saleforce" +msgstr "Import Saleforce" + +#. module: base_setup +#: field:user.preferences.config,context_tz:0 +msgid "Timezone" +msgstr "Timezone" + +#. module: base_setup +#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form +msgid "Use another word to say \"Customer\"" +msgstr "Use another word to say \"Customer\"" + +#. module: base_setup +#: model:ir.model,name:base_setup.model_base_setup_terminology +msgid "base.setup.terminology" +msgstr "base.setup.terminology" + +#. module: base_setup +#: help:user.preferences.config,menu_tips:0 +msgid "" +"Check out this box if you want to always display tips on each menu action" +msgstr "" +"Check out this box if you want to always display tips on each menu action" + +#. module: base_setup +#: field:base.setup.terminology,config_logo:0 +#: field:migrade.application.installer.modules,config_logo:0 +#: field:product.installer,config_logo:0 +#: field:user.preferences.config,config_logo:0 +msgid "Image" +msgstr "Image" + +#. module: base_setup +#: model:ir.model,name:base_setup.model_user_preferences_config +msgid "user.preferences.config" +msgstr "user.preferences.config" + +#. module: base_setup +#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user +msgid "Create Additional Users" +msgstr "Create Additional Users" + +#. module: base_setup +#: model:ir.actions.act_window,name:base_setup.action_import_create_installer +msgid "Create or Import Customers" +msgstr "Create or Import Customers" + +#. module: base_setup +#: field:migrade.application.installer.modules,import_sugarcrm:0 +msgid "Import Sugarcrm" +msgstr "Import Sugarcrm" + +#. module: base_setup +#: help:product.installer,customers:0 +msgid "Import or create customers" +msgstr "Import or create customers" + +#. module: base_setup +#: selection:user.preferences.config,view:0 +msgid "Simplified" +msgstr "Simplified" + +#. module: base_setup +#: help:migrade.application.installer.modules,import_sugarcrm:0 +msgid "For Import Sugarcrm" +msgstr "For Import Sugarcrm" + +#. module: base_setup +#: selection:base.setup.terminology,partner:0 +msgid "Partner" +msgstr "Partner" + +#. module: base_setup +#: view:base.setup.terminology:0 +msgid "Specify Your Terminology" +msgstr "Specify Your Terminology" + +#. module: base_setup +#: help:migrade.application.installer.modules,sync_google_contact:0 +msgid "For Sync Google Contact" +msgstr "For Sync Google Contact" diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po index 0cc157f9757..a3292c669b4 100644 --- a/addons/base_setup/i18n/tr.po +++ b/addons/base_setup/i18n/tr.po @@ -7,44 +7,44 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-11-07 12:47+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-23 21:47+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 msgid "Display Tips" -msgstr "" +msgstr "İpuçlarını Göster" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Guest" -msgstr "" +msgstr "Misafir" #. module: base_setup #: model:ir.model,name:base_setup.model_product_installer msgid "product.installer" -msgstr "" +msgstr "product.installer" #. module: base_setup #: selection:product.installer,customers:0 msgid "Create" -msgstr "" +msgstr "Oluştur" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Member" -msgstr "" +msgstr "Üye" #. module: base_setup #: field:migrade.application.installer.modules,sync_google_contact:0 msgid "Sync Google Contact" -msgstr "" +msgstr "Google Kişilerle Senkronize Et" #. module: base_setup #: help:user.preferences.config,context_tz:0 @@ -52,21 +52,23 @@ msgid "" "Set default for new user's timezone, used to perform timezone conversions " "between the server and the client." msgstr "" +"Yeni kullanıcıların öntanımlı saat dilimini belirleyin. Sunucu ve istemci " +"arasında saat çevirimleri için kullanılır." #. module: base_setup #: selection:product.installer,customers:0 msgid "Import" -msgstr "" +msgstr "İçe Aktar" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Donor" -msgstr "" +msgstr "Verici" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_base_setup_company msgid "Set Company Header and Footer" -msgstr "" +msgstr "Şirket Başlık ve Altbilgilerini Ayarla" #. module: base_setup #: model:ir.actions.act_window,help:base_setup.action_base_setup_company @@ -75,21 +77,24 @@ msgid "" "printed on your reports. You can click on the button 'Preview Header' in " "order to check the header/footer of PDF documents." msgstr "" +"Raporlarınızda gösterilmesi için şirket bilgilerinizi doldurun (adres, logo, " +"banka hesapları). 'Anteti Görüntüle' butonuna tıklayarak antet bilgilerinizi " +"PDF olarak görüntüleyebilirsiniz." #. module: base_setup #: field:product.installer,customers:0 msgid "Customers" -msgstr "" +msgstr "Müşteriler" #. module: base_setup #: selection:user.preferences.config,view:0 msgid "Extended" -msgstr "" +msgstr "Detaylı" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Patient" -msgstr "" +msgstr "Hasta" #. module: base_setup #: model:ir.actions.act_window,help:base_setup.action_import_create_installer @@ -98,26 +103,28 @@ msgid "" "you can import your existing partners by CSV spreadsheet from \"Import " "Data\" wizard" msgstr "" +"Bu formu kullanarak müşterileri ve ilgili kişileri oluşturabilir ya da içeri " +"aktarabilirsiniz." #. module: base_setup #: view:user.preferences.config:0 msgid "Define Users's Preferences" -msgstr "" +msgstr "Kullanıcı Seçeneklerini Tanımlayın" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form msgid "Define default users preferences" -msgstr "" +msgstr "Öntanımlı Kullanıcı Seçeneklerini Tanımlayın" #. module: base_setup #: help:migrade.application.installer.modules,import_saleforce:0 msgid "For Import Saleforce" -msgstr "" +msgstr "Saleforce'dan aktarım için" #. module: base_setup #: help:migrade.application.installer.modules,quickbooks_ippids:0 msgid "For Quickbooks Ippids" -msgstr "" +msgstr "Quickbooks lppidleri için" #. module: base_setup #: help:user.preferences.config,view:0 @@ -126,6 +133,9 @@ msgid "" "simplified interface, which has less features but is easier. You can always " "switch later from the user preferences." msgstr "" +"OpenERP yi ilk defa kullanıyorsanız basit arayüzü kullanmanızı öneririz. " +"Daha az seçenek sunar ama daha basittir. Dilediğiniz her zaman kullanıcı " +"seçeneklerinden detaylı arayüze geçebilirsiniz." #. module: base_setup #: view:base.setup.terminology:0 @@ -136,12 +146,12 @@ msgstr "res_config_contents" #. module: base_setup #: field:user.preferences.config,view:0 msgid "Interface" -msgstr "" +msgstr "Arayüz" #. module: base_setup #: model:ir.model,name:base_setup.model_migrade_application_installer_modules msgid "migrade.application.installer.modules" -msgstr "" +msgstr "migrade.application.installer.modules" #. module: base_setup #: view:base.setup.terminology:0 @@ -149,21 +159,23 @@ msgid "" "You can use this wizard to change the terminologies for customers in the " "whole application." msgstr "" +"Bu sihirbazı kullanarak uygulamanın içinde müşterileriniz için farklı " +"terimler atayabilirsiniz. (Hasta, cari, müşteri,iş ortağı gibi)" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Tenant" -msgstr "" +msgstr "Kiracı" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Customer" -msgstr "" +msgstr "Müşteri" #. module: base_setup #: field:user.preferences.config,context_lang:0 msgid "Language" -msgstr "" +msgstr "Dil" #. module: base_setup #: help:user.preferences.config,context_lang:0 @@ -172,6 +184,8 @@ msgid "" "available. If you want to Add new Language, you can add it from 'Load an " "Official Translation' wizard from 'Administration' menu." msgstr "" +"Tüm kullanıcı arayüzü için öntanımlı dil seçilir. Eğer yeni bir dil eklemek " +"isterseniz 'Ayarlar' menüsünden ekleyebilirsiniz." #. module: base_setup #: view:user.preferences.config:0 @@ -180,47 +194,52 @@ msgid "" "ones. Afterwards, users are free to change those values on their own user " "preference form." msgstr "" +"Bu form kayıtlı ve yeni kullanıcılar için öntanımlı seçenekleri " +"belirlemenizi sağlar. Kullanıcılar daha sonra bu değerleri kendi istekleri " +"doğrultusunda değiştirebilirler." #. module: base_setup #: field:base.setup.terminology,partner:0 msgid "How do you call a Customer" -msgstr "" +msgstr "Müşterilerinize ne isim veriyorsunuz ?" #. module: base_setup #: field:migrade.application.installer.modules,quickbooks_ippids:0 msgid "Quickbooks Ippids" -msgstr "" +msgstr "Quickbooks Ippidleri" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Client" -msgstr "" +msgstr "Müşteri" #. module: base_setup #: field:migrade.application.installer.modules,import_saleforce:0 msgid "Import Saleforce" -msgstr "" +msgstr "Saleforce'dan Aktar" #. module: base_setup #: field:user.preferences.config,context_tz:0 msgid "Timezone" -msgstr "" +msgstr "Saat Dilimi" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form msgid "Use another word to say \"Customer\"" -msgstr "" +msgstr "\"Müşteri\" yerine başka bir söz seçin" #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_terminology msgid "base.setup.terminology" -msgstr "" +msgstr "base.setup.terminology" #. module: base_setup #: help:user.preferences.config,menu_tips:0 msgid "" "Check out this box if you want to always display tips on each menu action" msgstr "" +"Eğer her menü eyleminde ipuçlarını göstermek istiyorsanız bu kutucuğu " +"işaretleyin." #. module: base_setup #: field:base.setup.terminology,config_logo:0 @@ -233,52 +252,52 @@ msgstr "Resim" #. module: base_setup #: model:ir.model,name:base_setup.model_user_preferences_config msgid "user.preferences.config" -msgstr "" +msgstr "user.preferences.config" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user msgid "Create Additional Users" -msgstr "" +msgstr "Ek kullanıcılar Oluştur" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_import_create_installer msgid "Create or Import Customers" -msgstr "" +msgstr "Müşterileri Oluştur ya da İçeri Aktar" #. module: base_setup #: field:migrade.application.installer.modules,import_sugarcrm:0 msgid "Import Sugarcrm" -msgstr "" +msgstr "SugarCRM'den Aktar" #. module: base_setup #: help:product.installer,customers:0 msgid "Import or create customers" -msgstr "" +msgstr "Müşterileri oluştur ya da içeri aktar" #. module: base_setup #: selection:user.preferences.config,view:0 msgid "Simplified" -msgstr "" +msgstr "Sadeleşmiş" #. module: base_setup #: help:migrade.application.installer.modules,import_sugarcrm:0 msgid "For Import Sugarcrm" -msgstr "" +msgstr "SugarCRM'den almak için" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Partner" -msgstr "" +msgstr "Cari" #. module: base_setup #: view:base.setup.terminology:0 msgid "Specify Your Terminology" -msgstr "" +msgstr "Terminolojinizi Belirleyin" #. module: base_setup #: help:migrade.application.installer.modules,sync_google_contact:0 msgid "For Sync Google Contact" -msgstr "" +msgstr "Google Kişilerden Senkronize et" #~ msgid "State" #~ msgstr "Eyalet" diff --git a/addons/base_vat/i18n/en_GB.po b/addons/base_vat/i18n/en_GB.po index 40428f37c32..11925fe18e6 100644 --- a/addons/base_vat/i18n/en_GB.po +++ b/addons/base_vat/i18n/en_GB.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-08-25 17:34+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:23+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_vat #: code:addons/base_vat/base_vat.py:125 @@ -24,31 +24,33 @@ msgid "" "This VAT number does not seem to be valid.\n" "Note: the expected format is %s" msgstr "" +"This VAT number does not seem to be valid.\n" +"Note: the expected format is %s" #. module: base_vat #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "The company name must be unique !" #. module: base_vat #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Error ! You cannot create recursive associated members." #. module: base_vat #: field:res.company,vat_check_vies:0 msgid "VIES VAT Check" -msgstr "" +msgstr "VIES VAT Check" #. module: base_vat #: model:ir.model,name:base_vat.model_res_company msgid "Companies" -msgstr "" +msgstr "Companies" #. module: base_vat #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "Error! You can not create recursive companies." #. module: base_vat #: help:res.partner,vat_subjected:0 @@ -70,6 +72,8 @@ msgid "" "If checked, Partners VAT numbers will be fully validated against EU's VIES " "service rather than via a simple format validation (checksum)." msgstr "" +"If checked, Partners VAT numbers will be fully validated against EU's VIES " +"service rather than via a simple format validation (checksum)." #. module: base_vat #: field:res.partner,vat_subjected:0 diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po index 9219566f5b3..4b62b247011 100644 --- a/addons/base_vat/i18n/tr.po +++ b/addons/base_vat/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-12 11:09+0000\n" -"Last-Translator: Arif Aydogmus \n" +"PO-Revision-Date: 2012-01-23 22:01+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: base_vat #: code:addons/base_vat/base_vat.py:125 @@ -23,31 +23,33 @@ msgid "" "This VAT number does not seem to be valid.\n" "Note: the expected format is %s" msgstr "" +"Bu VAT numarası geçerli değil gibi gözüküyor.\n" +"Not: Beklenen biçim %s" #. module: base_vat #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Şirket adı tekil olmalı !" #. module: base_vat #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız." #. module: base_vat #: field:res.company,vat_check_vies:0 msgid "VIES VAT Check" -msgstr "" +msgstr "VIES VAT Kontrolü" #. module: base_vat #: model:ir.model,name:base_vat.model_res_company msgid "Companies" -msgstr "" +msgstr "Şirketler" #. module: base_vat #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "Hata! özyinelemeli şirketler oluşturamazsınız." #. module: base_vat #: help:res.partner,vat_subjected:0 @@ -68,6 +70,8 @@ msgid "" "If checked, Partners VAT numbers will be fully validated against EU's VIES " "service rather than via a simple format validation (checksum)." msgstr "" +"Eğer seçilirse, Carinin VAT numarası basit biçim onayı yerine Avrupa Birliği " +"VIES servisinden kontrol edilecek." #. module: base_vat #: field:res.partner,vat_subjected:0 diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po index 6f903cf968c..6a89b783805 100644 --- a/addons/board/i18n/tr.po +++ b/addons/board/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-15 10:13+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:39+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: board #: view:res.log.report:0 @@ -39,7 +39,7 @@ msgstr "Son Bağlantılar" #. module: board #: view:res.log.report:0 msgid "Log created in last month" -msgstr "" +msgstr "Geçen Ay oluşturulan günlükler" #. module: board #: view:board.board:0 @@ -55,7 +55,7 @@ msgstr "Grupla..." #. module: board #: view:res.log.report:0 msgid "Log created in current year" -msgstr "" +msgstr "Bu yıl oluşturulan günlükler" #. module: board #: model:ir.model,name:board.model_board_board @@ -92,7 +92,7 @@ msgstr "Ay" #. module: board #: view:res.log.report:0 msgid "Log created in current month" -msgstr "" +msgstr "Bu ay oluşturulan günlükler" #. module: board #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action @@ -103,7 +103,7 @@ msgstr "Belge Başına aylık faaliyet" #. module: board #: view:board.board:0 msgid "Configuration Overview" -msgstr "" +msgstr "Yapılandırma Genel Bakışı" #. module: board #: model:ir.actions.act_window,name:board.action_view_board_list_form @@ -211,7 +211,7 @@ msgstr "Ocak" #. module: board #: view:board.board:0 msgid "Users" -msgstr "" +msgstr "Kullanıcılar" #. module: board #: selection:res.log.report,month:0 @@ -262,7 +262,7 @@ msgstr "Model" #. module: board #: model:ir.actions.act_window,name:board.board_homepage_action msgid "Home Page" -msgstr "" +msgstr "Ana Sayfa" #. module: board #: model:ir.actions.act_window,name:board.action_latest_activities_tree diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po index 7e8a45ac019..b8821094508 100644 --- a/addons/board/i18n/zh_CN.po +++ b/addons/board/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-04-11 14:24+0000\n" -"Last-Translator: openerp-china.black-jack \n" +"PO-Revision-Date: 2012-01-23 10:14+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: board #: view:res.log.report:0 @@ -39,7 +39,7 @@ msgstr "最后一次连接" #. module: board #: view:res.log.report:0 msgid "Log created in last month" -msgstr "" +msgstr "上月创建的日志" #. module: board #: view:board.board:0 @@ -55,7 +55,7 @@ msgstr "分组..." #. module: board #: view:res.log.report:0 msgid "Log created in current year" -msgstr "" +msgstr "本年创建的日志" #. module: board #: model:ir.model,name:board.model_board_board @@ -92,7 +92,7 @@ msgstr "月" #. module: board #: view:res.log.report:0 msgid "Log created in current month" -msgstr "" +msgstr "本月创建的日志" #. module: board #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action @@ -103,7 +103,7 @@ msgstr "每种单据的月活动次数" #. module: board #: view:board.board:0 msgid "Configuration Overview" -msgstr "" +msgstr "配置总揽" #. module: board #: model:ir.actions.act_window,name:board.action_view_board_list_form @@ -211,7 +211,7 @@ msgstr "1月" #. module: board #: view:board.board:0 msgid "Users" -msgstr "" +msgstr "用户" #. module: board #: selection:res.log.report,month:0 @@ -262,7 +262,7 @@ msgstr "模型" #. module: board #: model:ir.actions.act_window,name:board.board_homepage_action msgid "Home Page" -msgstr "" +msgstr "首页" #. module: board #: model:ir.actions.act_window,name:board.action_latest_activities_tree diff --git a/addons/crm_caldav/i18n/en_GB.po b/addons/crm_caldav/i18n/en_GB.po index 0d375467b10..a7a1bd01563 100644 --- a/addons/crm_caldav/i18n/en_GB.po +++ b/addons/crm_caldav/i18n/en_GB.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-04-02 15:52+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 15:24+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: crm_caldav #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse @@ -25,7 +25,7 @@ msgstr "Caldav Browse" #. module: crm_caldav #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse msgid "Synchronize This Calendar" -msgstr "" +msgstr "Synchronize This Calendar" #. module: crm_caldav #: model:ir.model,name:crm_caldav.model_crm_meeting diff --git a/addons/crm_caldav/i18n/tr.po b/addons/crm_caldav/i18n/tr.po index ddcb0cb5a9b..52fab70a060 100644 --- a/addons/crm_caldav/i18n/tr.po +++ b/addons/crm_caldav/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-10 17:51+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:20+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: crm_caldav #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse @@ -25,7 +25,7 @@ msgstr "Caldav Tarama" #. module: crm_caldav #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse msgid "Synchronize This Calendar" -msgstr "" +msgstr "Bu Takvimi Senkronize Et" #. module: crm_caldav #: model:ir.model,name:crm_caldav.model_crm_meeting diff --git a/addons/crm_profiling/i18n/en_GB.po b/addons/crm_profiling/i18n/en_GB.po new file mode 100644 index 00000000000..3553fc0a0cd --- /dev/null +++ b/addons/crm_profiling/i18n/en_GB.po @@ -0,0 +1,252 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:48+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +msgid "Questions List" +msgstr "Questions List" + +#. module: crm_profiling +#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires +msgid "" +"You can create specific topic-related questionnaires to guide your team(s) " +"in the sales cycle by helping them to ask the right questions. The " +"segmentation tool allows you to automatically assign a partner to a category " +"according to his answers to the different questionnaires." +msgstr "" +"You can create specific topic-related questionnaires to guide your team(s) " +"in the sales cycle by helping them to ask the right questions. The " +"segmentation tool allows you to automatically assign a partner to a category " +"according to his answers to the different questionnaires." + +#. module: crm_profiling +#: field:crm_profiling.answer,question_id:0 +#: field:crm_profiling.question,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_question +#: field:open.questionnaire.line,question_id:0 +msgid "Question" +msgstr "Question" + +#. module: crm_profiling +#: model:ir.actions.act_window,name:crm_profiling.action_open_questionnaire +#: view:open.questionnaire:0 +msgid "Open Questionnaire" +msgstr "Open Questionnaire" + +#. module: crm_profiling +#: field:crm.segmentation,child_ids:0 +msgid "Child Profiles" +msgstr "Child Profiles" + +#. module: crm_profiling +#: view:crm.segmentation:0 +msgid "Partner Segmentations" +msgstr "Partner Segmentations" + +#. module: crm_profiling +#: field:crm_profiling.answer,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_answer +#: field:open.questionnaire.line,answer_id:0 +msgid "Answer" +msgstr "Answer" + +#. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_open_questionnaire_line +msgid "open.questionnaire.line" +msgstr "open.questionnaire.line" + +#. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_crm_segmentation +msgid "Partner Segmentation" +msgstr "Partner Segmentation" + +#. module: crm_profiling +#: view:res.partner:0 +msgid "Profiling" +msgstr "Profiling" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +#: field:crm_profiling.questionnaire,description:0 +msgid "Description" +msgstr "Description" + +#. module: crm_profiling +#: field:crm.segmentation,answer_no:0 +msgid "Excluded Answers" +msgstr "Excluded Answers" + +#. module: crm_profiling +#: view:crm_profiling.answer:0 +#: view:crm_profiling.question:0 +#: field:res.partner,answers_ids:0 +msgid "Answers" +msgstr "Answers" + +#. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_open_questionnaire +msgid "open.questionnaire" +msgstr "open.questionnaire" + +#. module: crm_profiling +#: field:open.questionnaire,questionnaire_id:0 +msgid "Questionnaire name" +msgstr "Questionnaire name" + +#. module: crm_profiling +#: view:res.partner:0 +msgid "Use a questionnaire" +msgstr "Use a questionnaire" + +#. module: crm_profiling +#: view:open.questionnaire:0 +msgid "_Cancel" +msgstr "_Cancel" + +#. module: crm_profiling +#: field:open.questionnaire,question_ans_ids:0 +msgid "Question / Answers" +msgstr "Question / Answers" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires +#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire +#: view:open.questionnaire:0 +msgid "Questionnaires" +msgstr "Questionnaires" + +#. module: crm_profiling +#: help:crm.segmentation,profiling_active:0 +msgid "" +"Check this box if you want to use this tab as " +"part of the segmentation rule. If not checked, " +"the criteria beneath will be ignored" +msgstr "" +"Check this box if you want to use this tab as part of the segmentation rule. " +"If not checked, the criteria beneath will be ignored" + +#. module: crm_profiling +#: constraint:crm.segmentation:0 +msgid "Error ! You can not create recursive profiles." +msgstr "Error ! You can not create recursive profiles." + +#. module: crm_profiling +#: field:crm.segmentation,profiling_active:0 +msgid "Use The Profiling Rules" +msgstr "Use The Profiling Rules" + +#. module: crm_profiling +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." +msgstr "Error ! You cannot create recursive associated members." + +#. module: crm_profiling +#: view:crm_profiling.question:0 +#: field:crm_profiling.question,answers_ids:0 +msgid "Avalaible answers" +msgstr "Avalaible answers" + +#. module: crm_profiling +#: field:crm.segmentation,answer_yes:0 +msgid "Included Answers" +msgstr "Included Answers" + +#. module: crm_profiling +#: view:crm_profiling.question:0 +#: field:crm_profiling.questionnaire,questions_ids:0 +#: model:ir.actions.act_window,name:crm_profiling.open_questions +#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer +msgid "Questions" +msgstr "Questions" + +#. module: crm_profiling +#: field:crm.segmentation,parent_id:0 +msgid "Parent Profile" +msgstr "Parent Profile" + +#. module: crm_profiling +#: view:open.questionnaire:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: crm_profiling +#: code:addons/crm_profiling/wizard/open_questionnaire.py:77 +#: field:crm_profiling.questionnaire,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire +#: view:open.questionnaire:0 +#: view:open.questionnaire.line:0 +#: field:open.questionnaire.line,wizard_id:0 +#, python-format +msgid "Questionnaire" +msgstr "Questionnaire" + +#. module: crm_profiling +#: view:open.questionnaire:0 +msgid "Save Data" +msgstr "Save Data" + +#~ msgid "Using a questionnaire" +#~ msgstr "Using a questionnaire" + +#~ msgid "Error ! You can not create recursive associated members." +#~ msgstr "Error ! You can not create recursive associated members." + +#~ msgid "Crm Profiling management - To Perform Segmentation within Partners" +#~ msgstr "Crm Profiling management - To Perform Segmentation within Partners" + +#~ msgid "" +#~ "\n" +#~ " This module allows users to perform segmentation within partners.\n" +#~ " It uses the profiles criteria from the earlier segmentation module and " +#~ "improve it. Thanks to the new concept of questionnaire. You can now regroup " +#~ "questions into a questionnaire and directly use it on a partner.\n" +#~ "\n" +#~ " It also has been merged with the earlier CRM & SRM segmentation tool " +#~ "because they were overlapping.\n" +#~ "\n" +#~ " The menu items related are in \"CRM & SRM\\Configuration\\" +#~ "Segmentations\"\n" +#~ "\n" +#~ "\n" +#~ " * Note: this module is not compatible with the module segmentation, " +#~ "since it's the same which has been renamed.\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ " This module allows users to perform segmentation within partners.\n" +#~ " It uses the profiles criteria from the earlier segmentation module and " +#~ "improve it. Thanks to the new concept of questionnaire. You can now regroup " +#~ "questions into a questionnaire and directly use it on a partner.\n" +#~ "\n" +#~ " It also has been merged with the earlier CRM & SRM segmentation tool " +#~ "because they were overlapping.\n" +#~ "\n" +#~ " The menu items related are in \"CRM & SRM\\Configuration\\" +#~ "Segmentations\"\n" +#~ "\n" +#~ "\n" +#~ " * Note: this module is not compatible with the module segmentation, " +#~ "since it's the same which has been renamed.\n" +#~ " " diff --git a/addons/document_ics/i18n/en_GB.po b/addons/document_ics/i18n/en_GB.po new file mode 100644 index 00000000000..6ef9431e188 --- /dev/null +++ b/addons/document_ics/i18n/en_GB.po @@ -0,0 +1,378 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:59+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: document_ics +#: help:document.ics.crm.wizard,claims:0 +msgid "" +"Manages the supplier and customers claims,including your corrective or " +"preventive actions." +msgstr "" +"Manages the supplier and customers claims,including your corrective or " +"preventive actions." + +#. module: document_ics +#: field:document.directory.content,object_id:0 +msgid "Object" +msgstr "Object" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "uid" +msgstr "uid" + +#. module: document_ics +#: help:document.ics.crm.wizard,fund:0 +msgid "" +"This may help associations in their fund raising process and tracking." +msgstr "" +"This may help associations in their fund raising process and tracking." + +#. module: document_ics +#: field:document.ics.crm.wizard,jobs:0 +msgid "Jobs Hiring Process" +msgstr "Jobs Hiring Process" + +#. module: document_ics +#: view:document.ics.crm.wizard:0 +msgid "Configure Calendars for CRM Sections" +msgstr "Configure Calendars for CRM Sections" + +#. module: document_ics +#: field:document.ics.crm.wizard,helpdesk:0 +msgid "Helpdesk" +msgstr "Helpdesk" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "dtstamp" +msgstr "dtstamp" + +#. module: document_ics +#: help:document.directory.content,fname_field:0 +msgid "" +"The field of the object used in the filename. Has to " +"be a unique identifier." +msgstr "" +"The field of the object used in the filename. Has to be a unique identifier." + +#. module: document_ics +#: field:document.directory.ics.fields,content_id:0 +msgid "Content" +msgstr "Content" + +#. module: document_ics +#: field:document.ics.crm.wizard,meeting:0 +msgid "Calendar of Meetings" +msgstr "Calendar of Meetings" + +#. module: document_ics +#: view:document.ics.crm.wizard:0 +msgid "" +"OpenERP can create and pre-configure a series of integrated calendar for you." +msgstr "" +"OpenERP can create and pre-configure a series of integrated calendar for you." + +#. module: document_ics +#: help:document.ics.crm.wizard,helpdesk:0 +msgid "Manages an Helpdesk service." +msgstr "Manages an Helpdesk service." + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "dtend" +msgstr "dtend" + +#. module: document_ics +#: model:ir.model,name:document_ics.model_crm_meeting +msgid "Meeting" +msgstr "Meeting" + +#. module: document_ics +#: help:document.ics.crm.wizard,lead:0 +msgid "" +"Allows you to track and manage leads which are pre-sales requests or " +"contacts, the very first contact with a customer request." +msgstr "" +"Allows you to track and manage leads which are pre-sales requests or " +"contacts, the very first contact with a customer request." + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "description" +msgstr "description" + +#. module: document_ics +#: field:document.directory.ics.fields,fn:0 +msgid "Function" +msgstr "Function" + +#. module: document_ics +#: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories +msgid "Configure Calendars for Sections " +msgstr "Configure Calendars for Sections " + +#. module: document_ics +#: help:document.ics.crm.wizard,opportunity:0 +msgid "Tracks identified business opportunities for your sales pipeline." +msgstr "Tracks identified business opportunities for your sales pipeline." + +#. module: document_ics +#: help:document.ics.crm.wizard,jobs:0 +msgid "" +"Helps you to organise the jobs hiring process: evaluation, meetings, email " +"integration..." +msgstr "" +"Helps you to organise the jobs hiring process: evaluation, meetings, email " +"integration..." + +#. module: document_ics +#: view:document.ics.crm.wizard:0 +msgid "title" +msgstr "title" + +#. module: document_ics +#: field:document.ics.crm.wizard,fund:0 +msgid "Fund Raising Operations" +msgstr "Fund Raising Operations" + +#. module: document_ics +#: model:ir.model,name:document_ics.model_document_directory_content +msgid "Directory Content" +msgstr "Directory Content" + +#. module: document_ics +#: model:ir.model,name:document_ics.model_document_directory_ics_fields +msgid "Document Directory ICS Fields" +msgstr "Document Directory ICS Fields" + +#. module: document_ics +#: help:document.ics.crm.wizard,phonecall:0 +msgid "" +"Helps you to encode the result of a phone call or to plan a list of phone " +"calls to process." +msgstr "" +"Helps you to encode the result of a phone call or to plan a list of phone " +"calls to process." + +#. module: document_ics +#: help:document.ics.crm.wizard,document_ics:0 +msgid "" +" Will allow you to synchronise your Open ERP calendars with your phone, " +"outlook, Sunbird, ical, ..." +msgstr "" +" Will allow you to synchronise your Open ERP calendars with your phone, " +"outlook, Sunbird, ical, ..." + +#. module: document_ics +#: field:document.directory.ics.fields,field_id:0 +msgid "OpenERP Field" +msgstr "OpenERP Field" + +#. module: document_ics +#: view:document.directory:0 +msgid "ICS Calendar" +msgstr "ICS Calendar" + +#. module: document_ics +#: field:document.directory.ics.fields,name:0 +msgid "ICS Value" +msgstr "ICS Value" + +#. module: document_ics +#: selection:document.directory.ics.fields,fn:0 +msgid "Expression as constant" +msgstr "Expression as constant" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "location" +msgstr "location" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "attendee" +msgstr "attendee" + +#. module: document_ics +#: field:document.ics.crm.wizard,name:0 +msgid "Name" +msgstr "Name" + +#. module: document_ics +#: help:document.directory.ics.fields,fn:0 +msgid "Alternate method of calculating the value" +msgstr "Alternate method of calculating the value" + +#. module: document_ics +#: help:document.ics.crm.wizard,meeting:0 +msgid "Manages the calendar of meetings of the users." +msgstr "Manages the calendar of meetings of the users." + +#. module: document_ics +#: field:document.directory.content,ics_domain:0 +msgid "Domain" +msgstr "Domain" + +#. module: document_ics +#: help:document.ics.crm.wizard,bugs:0 +msgid "Used by companies to track bugs and support requests on software" +msgstr "Used by companies to track bugs and support requests on software" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "last-modified" +msgstr "last-modified" + +#. module: document_ics +#: view:document.directory:0 +msgid "ICS Mapping" +msgstr "ICS Mapping" + +#. module: document_ics +#: field:document.ics.crm.wizard,document_ics:0 +msgid "Shared Calendar" +msgstr "Shared Calendar" + +#. module: document_ics +#: field:document.ics.crm.wizard,claims:0 +msgid "Claims" +msgstr "Claims" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "dtstart" +msgstr "dtstart" + +#. module: document_ics +#: field:document.directory.ics.fields,expr:0 +msgid "Expression" +msgstr "Expression" + +#. module: document_ics +#: field:document.ics.crm.wizard,bugs:0 +msgid "Bug Tracking" +msgstr "Bug Tracking" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "categories" +msgstr "categories" + +#. module: document_ics +#: selection:document.directory.ics.fields,fn:0 +msgid "Use the field" +msgstr "Use the field" + +#. module: document_ics +#: view:document.ics.crm.wizard:0 +msgid "Create Pre-Configured Calendars" +msgstr "Create Pre-Configured Calendars" + +#. module: document_ics +#: field:document.directory.content,fname_field:0 +msgid "Filename field" +msgstr "Filename field" + +#. module: document_ics +#: field:document.directory.content,obj_iterate:0 +msgid "Iterate object" +msgstr "Iterate object" + +#. module: document_ics +#: field:crm.meeting,code:0 +msgid "Calendar Code" +msgstr "Calendar Code" + +#. module: document_ics +#: selection:document.directory.ics.fields,fn:0 +msgid "Interval in hours" +msgstr "Interval in hours" + +#. module: document_ics +#: field:document.ics.crm.wizard,config_logo:0 +msgid "Image" +msgstr "Image" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "created" +msgstr "created" + +#. module: document_ics +#: help:document.directory.content,obj_iterate:0 +msgid "" +"If set, a separate instance will be created for each " +"record of Object" +msgstr "" +"If set, a separate instance will be created for each record of Object" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "summary" +msgstr "summary" + +#. module: document_ics +#: field:document.ics.crm.wizard,lead:0 +msgid "Leads" +msgstr "Leads" + +#. module: document_ics +#: model:ir.model,name:document_ics.model_document_ics_crm_wizard +msgid "document.ics.crm.wizard" +msgstr "document.ics.crm.wizard" + +#. module: document_ics +#: view:document.ics.crm.wizard:0 +msgid "res_config_contents" +msgstr "res_config_contents" + +#. module: document_ics +#: field:document.ics.crm.wizard,phonecall:0 +msgid "Phone Calls" +msgstr "Phone Calls" + +#. module: document_ics +#: field:document.directory.content,ics_field_ids:0 +msgid "Fields Mapping" +msgstr "Fields Mapping" + +#. module: document_ics +#: selection:document.directory.ics.fields,name:0 +msgid "url" +msgstr "url" + +#. module: document_ics +#: field:document.ics.crm.wizard,opportunity:0 +msgid "Business Opportunities" +msgstr "Business Opportunities" + +#~ msgid "Allows to synchronise calendars with others applications." +#~ msgstr "Allows to synchronise calendars with others applications." + +#~ msgid "Shared Calendar Meetings" +#~ msgstr "Shared Calendar Meetings" + +#~ msgid "Support for iCal based on Document Management System" +#~ msgstr "Support for iCal based on Document Management System" + +#~ msgid "Configure" +#~ msgstr "Configure" + +#~ msgid "Configuration Progress" +#~ msgstr "Configuration Progress" diff --git a/addons/document_webdav/i18n/en_GB.po b/addons/document_webdav/i18n/en_GB.po new file mode 100644 index 00000000000..c2f31a61c8b --- /dev/null +++ b/addons/document_webdav/i18n/en_GB.po @@ -0,0 +1,206 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:26+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: document_webdav +#: field:document.webdav.dir.property,create_date:0 +#: field:document.webdav.file.property,create_date:0 +msgid "Date Created" +msgstr "Date Created" + +#. module: document_webdav +#: model:ir.ui.menu,name:document_webdav.menu_document_props +msgid "Documents" +msgstr "Documents" + +#. module: document_webdav +#: constraint:document.directory:0 +msgid "Error! You can not create recursive Directories." +msgstr "Error! You can not create recursive Directories." + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +#: view:document.webdav.file.property:0 +msgid "Search Document properties" +msgstr "Search Document properties" + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +#: field:document.webdav.dir.property,namespace:0 +#: view:document.webdav.file.property:0 +#: field:document.webdav.file.property,namespace:0 +msgid "Namespace" +msgstr "Namespace" + +#. module: document_webdav +#: field:document.directory,dav_prop_ids:0 +msgid "DAV properties" +msgstr "DAV properties" + +#. module: document_webdav +#: model:ir.model,name:document_webdav.model_document_webdav_file_property +msgid "document.webdav.file.property" +msgstr "document.webdav.file.property" + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +#: view:document.webdav.file.property:0 +msgid "Group By..." +msgstr "Group By..." + +#. module: document_webdav +#: view:document.directory:0 +msgid "These properties will be added to WebDAV requests" +msgstr "These properties will be added to WebDAV requests" + +#. module: document_webdav +#: model:ir.actions.act_window,name:document_webdav.action_file_props_form +msgid "DAV Properties for Documents" +msgstr "DAV Properties for Documents" + +#. module: document_webdav +#: code:addons/document_webdav/webdav.py:37 +#, python-format +msgid "PyWebDAV Import Error!" +msgstr "PyWebDAV Import Error!" + +#. module: document_webdav +#: view:document.webdav.file.property:0 +#: field:document.webdav.file.property,file_id:0 +msgid "Document" +msgstr "Document" + +#. module: document_webdav +#: model:ir.ui.menu,name:document_webdav.menu_folder_props +msgid "Folders" +msgstr "Folders" + +#. module: document_webdav +#: sql_constraint:document.directory:0 +msgid "Directory cannot be parent of itself!" +msgstr "Directory cannot be parent of itself!" + +#. module: document_webdav +#: view:document.directory:0 +msgid "Dynamic context" +msgstr "Dynamic context" + +#. module: document_webdav +#: view:document.directory:0 +msgid "WebDAV properties" +msgstr "WebDAV properties" + +#. module: document_webdav +#: sql_constraint:document.directory:0 +msgid "The directory name must be unique !" +msgstr "The directory name must be unique !" + +#. module: document_webdav +#: code:addons/document_webdav/webdav.py:37 +#, python-format +msgid "" +"Please install PyWebDAV from " +"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-" +"0.9.4.tar.gz&can=2&q=/" +msgstr "" +"Please install PyWebDAV from " +"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-" +"0.9.4.tar.gz&can=2&q=/" + +#. module: document_webdav +#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form +msgid "DAV Properties for Folders" +msgstr "DAV Properties for Folders" + +#. module: document_webdav +#: view:document.directory:0 +#: view:document.webdav.dir.property:0 +#: view:document.webdav.file.property:0 +msgid "Properties" +msgstr "Properties" + +#. module: document_webdav +#: field:document.webdav.dir.property,name:0 +#: field:document.webdav.file.property,name:0 +msgid "Name" +msgstr "Name" + +#. module: document_webdav +#: model:ir.model,name:document_webdav.model_document_webdav_dir_property +msgid "document.webdav.dir.property" +msgstr "document.webdav.dir.property" + +#. module: document_webdav +#: field:document.webdav.dir.property,value:0 +#: field:document.webdav.file.property,value:0 +msgid "Value" +msgstr "Value" + +#. module: document_webdav +#: field:document.webdav.dir.property,dir_id:0 +#: model:ir.model,name:document_webdav.model_document_directory +msgid "Directory" +msgstr "Directory" + +#. module: document_webdav +#: field:document.webdav.dir.property,write_uid:0 +#: field:document.webdav.file.property,write_uid:0 +msgid "Last Modification User" +msgstr "Last Modification User" + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +msgid "Dir" +msgstr "Dir" + +#. module: document_webdav +#: field:document.webdav.dir.property,write_date:0 +#: field:document.webdav.file.property,write_date:0 +msgid "Date Modified" +msgstr "Date Modified" + +#. module: document_webdav +#: field:document.webdav.dir.property,create_uid:0 +#: field:document.webdav.file.property,create_uid:0 +msgid "Creator" +msgstr "Creator" + +#. module: document_webdav +#: model:ir.ui.menu,name:document_webdav.menu_properties +msgid "DAV Properties" +msgstr "DAV Properties" + +#. module: document_webdav +#: sql_constraint:document.directory:0 +msgid "Directory must have a parent or a storage" +msgstr "Directory must have a parent or a storage" + +#. module: document_webdav +#: field:document.webdav.dir.property,do_subst:0 +#: field:document.webdav.file.property,do_subst:0 +msgid "Substitute" +msgstr "Substitute" + +#~ msgid "WebDAV server for Document Management" +#~ msgstr "WebDAV server for Document Management" + +#~ msgid "DAV properties for folders" +#~ msgstr "DAV properties for folders" + +#~ msgid "DAV properties for documents" +#~ msgstr "DAV properties for documents" diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po index babf6b46413..70b86b4c053 100644 --- a/addons/hr/i18n/hr.po +++ b/addons/hr/i18n/hr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2012-01-17 09:55+0000\n" -"Last-Translator: Milan Tribuson \n" +"PO-Revision-Date: 2012-01-23 10:38+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-18 04:44+0000\n" -"X-Generator: Launchpad (build 14681)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" "Language: hr\n" #. module: hr @@ -59,7 +59,7 @@ msgstr "Grupiraj po..." #. module: hr #: model:ir.actions.act_window,name:hr.view_department_form_installer msgid "Create Your Departments" -msgstr "" +msgstr "Kreirajte vaše odjele" #. module: hr #: model:ir.actions.act_window,help:hr.action_hr_job @@ -70,6 +70,11 @@ msgid "" "will be used in the recruitment process to evaluate the applicants for this " "job position." msgstr "" +"Radna mjesta koriste se za definiranje poslova i preduvjeta za nj. " +"obavljanje. Možete pratiti broj zaposlenih po radnom mjestu i koliko možete " +"očekivati ​​u budućnosti. Također, radnom mjestu možete priložiti anketu " +"koje će se koristiti u procesu zapošljavanja za procjenu kompetencije " +"kandidata za to radno mjesto." #. module: hr #: view:hr.employee:0 @@ -111,7 +116,7 @@ msgstr "Očekivano u regrutiranju" #. module: hr #: model:ir.actions.todo.category,name:hr.category_hr_management_config msgid "HR Management" -msgstr "" +msgstr "Upravljanje ljudskim resursima" #. module: hr #: help:hr.employee,partner_id:0 @@ -151,6 +156,10 @@ msgid "" "operations on all the employees of the same category, i.e. allocating " "holidays." msgstr "" +"Kreiraj obrazac djelatnika i povežite ih na OpenERP korisnika ako želite da " +"imaju pristup ovoj instanci . Kategorije se mogu postaviti na zaposlenika za " +"obavljanje velikih operacija nad svim zaposlenicima iste kategorije, npr. " +"alokacije godišnjih odmora." #. module: hr #: model:ir.actions.act_window,help:hr.open_module_tree_department @@ -159,11 +168,14 @@ msgid "" "to employees by departments: expenses and timesheet validation, leaves " "management, recruitments, etc." msgstr "" +"Struktura odjela vaše tvrtke se koristi za upravljanje svim dokumentima u " +"vezi s zaposlenicim po odjelima: troškovi, evidencija o radnom vremenu, " +"upravljanje dopustima, upravljanje zapošljavanjem itd." #. module: hr #: field:hr.employee,color:0 msgid "Color Index" -msgstr "" +msgstr "Indeks boja" #. module: hr #: model:process.transition,note:hr.process_transition_employeeuser0 @@ -193,12 +205,12 @@ msgstr "Žensko" #. module: hr #: help:hr.job,expected_employees:0 msgid "Required number of employees in total for that job." -msgstr "" +msgstr "Ukupan broj potrebnih zaposlenika za taj posao" #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config msgid "Attendance" -msgstr "" +msgstr "Prisutnost" #. module: hr #: view:hr.employee:0 @@ -296,7 +308,7 @@ msgstr "Očekivano djelatnika" #. module: hr #: selection:hr.employee,marital:0 msgid "Divorced" -msgstr "Razveden-a" +msgstr "Razveden(a)" #. module: hr #: field:hr.employee.category,parent_id:0 @@ -356,7 +368,7 @@ msgstr "hr.department" #. module: hr #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer msgid "Create your Employees" -msgstr "" +msgstr "Kreiraj zaposlenike" #. module: hr #: field:hr.employee.category,name:0 @@ -391,7 +403,7 @@ msgstr "" #. module: hr #: help:hr.employee,bank_account_id:0 msgid "Employee bank salary account" -msgstr "Konto za plaću djelatnika" +msgstr "Broj tekućeg računa za isplatu plaće" #. module: hr #: field:hr.department,note:0 @@ -443,7 +455,7 @@ msgstr "nepoznato" #. module: hr #: help:hr.job,no_of_employee:0 msgid "Number of employees with that job." -msgstr "" +msgstr "Broj djelatnika sa tim poslom" #. module: hr #: field:hr.employee,ssnid:0 @@ -463,7 +475,7 @@ msgstr "Pogreška ! Ne možete kreirati rekurzivnu hijerarhiju djelatnika." #. module: hr #: model:ir.actions.act_window,name:hr.action2 msgid "Subordonate Hierarchy" -msgstr "" +msgstr "Podređena hijerarhija" #. module: hr #: model:ir.actions.act_window,help:hr.view_department_form_installer @@ -472,11 +484,14 @@ msgid "" "employees by departments: expenses and timesheet validation, leaves " "management, recruitments, etc." msgstr "" +"Struktura vaših odjela se koristi za upravljanje svim dokumentima u vezi s " +"zaposlenicim po odjelima: troškovi, evidencija o radnom vremenu, upravljanje " +"dopustima, upravljanje zapošljavanjem itd." #. module: hr #: field:hr.employee,bank_account_id:0 msgid "Bank Account Number" -msgstr "" +msgstr "Broj bankovnog računa" #. module: hr #: view:hr.department:0 @@ -495,7 +510,7 @@ msgstr "" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_dashboard msgid "Dashboard" -msgstr "" +msgstr "Nadzorna ploča" #. module: hr #: selection:hr.job,state:0 @@ -511,7 +526,7 @@ msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !" #: view:hr.job:0 #: field:hr.job,state:0 msgid "State" -msgstr "Stanje" +msgstr "Status" #. module: hr #: field:hr.employee,marital:0 @@ -546,7 +561,7 @@ msgstr "Osobni podaci" #. module: hr #: field:hr.employee,city:0 msgid "City" -msgstr "" +msgstr "Mjesto" #. module: hr #: field:hr.employee,passport_id:0 @@ -597,12 +612,12 @@ msgstr "Odjel" #. module: hr #: field:hr.employee,country_id:0 msgid "Nationality" -msgstr "Narodnost" +msgstr "Nacionalnost" #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config msgid "Leaves" -msgstr "" +msgstr "Dopusti" #. module: hr #: view:board.board:0 @@ -612,7 +627,7 @@ msgstr "Ploča upravitelja HR" #. module: hr #: field:hr.employee,resource_id:0 msgid "Resource" -msgstr "Sredstva" +msgstr "Resurs" #. module: hr #: field:hr.department,complete_name:0 @@ -678,7 +693,7 @@ msgstr "Poslovne pozicije" #. module: hr #: field:hr.employee,otherid:0 msgid "Other Id" -msgstr "" +msgstr "Drugi id" #. module: hr #: view:hr.employee:0 @@ -689,12 +704,12 @@ msgstr "Trener" #. module: hr #: sql_constraint:hr.job:0 msgid "The name of the job position must be unique per company!" -msgstr "" +msgstr "Naziv radnog mjesta mora biti jedinstven po tvrtki" #. module: hr #: view:hr.job:0 msgid "My Departments Jobs" -msgstr "" +msgstr "Poslovi u mom odjelu" #. module: hr #: field:hr.department,manager_id:0 @@ -706,7 +721,7 @@ msgstr "Voditelj" #. module: hr #: selection:hr.employee,marital:0 msgid "Widower" -msgstr "Udovac-ica" +msgstr "Udovac(ica)" #. module: hr #: field:hr.employee,child_ids:0 @@ -716,7 +731,7 @@ msgstr "Podređeni djelatnici" #. module: hr #: field:hr.job,no_of_employee:0 msgid "Number of Employees" -msgstr "" +msgstr "Broj djelatnika" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po index 691a6b8ac2e..863ae3875e6 100644 --- a/addons/hr/i18n/zh_CN.po +++ b/addons/hr/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2011-01-13 13:22+0000\n" +"PO-Revision-Date: 2012-01-23 10:08+0000\n" "Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:54+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 @@ -58,7 +58,7 @@ msgstr "分组..." #. module: hr #: model:ir.actions.act_window,name:hr.view_department_form_installer msgid "Create Your Departments" -msgstr "" +msgstr "创建您的部门" #. module: hr #: model:ir.actions.act_window,help:hr.action_hr_job @@ -110,7 +110,7 @@ msgstr "招聘人数" #. module: hr #: model:ir.actions.todo.category,name:hr.category_hr_management_config msgid "HR Management" -msgstr "" +msgstr "人力资源管理" #. module: hr #: help:hr.employee,partner_id:0 @@ -160,7 +160,7 @@ msgstr "您公司的部门结构用于管理所有需要按部门分类的员工 #. module: hr #: field:hr.employee,color:0 msgid "Color Index" -msgstr "" +msgstr "颜色索引" #. module: hr #: model:process.transition,note:hr.process_transition_employeeuser0 @@ -188,12 +188,12 @@ msgstr "女性" #. module: hr #: help:hr.job,expected_employees:0 msgid "Required number of employees in total for that job." -msgstr "" +msgstr "该职位所需的总员工数" #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config msgid "Attendance" -msgstr "" +msgstr "考勤" #. module: hr #: view:hr.employee:0 @@ -351,7 +351,7 @@ msgstr "hr.department" #. module: hr #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer msgid "Create your Employees" -msgstr "" +msgstr "创建您的员工信息" #. module: hr #: field:hr.employee.category,name:0 @@ -433,7 +433,7 @@ msgstr "未知的" #. module: hr #: help:hr.job,no_of_employee:0 msgid "Number of employees with that job." -msgstr "" +msgstr "该职位员工数" #. module: hr #: field:hr.employee,ssnid:0 @@ -483,7 +483,7 @@ msgstr "员工信息表单里有多种不同的信息如联系信息。" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_dashboard msgid "Dashboard" -msgstr "" +msgstr "仪表盘" #. module: hr #: selection:hr.job,state:0 @@ -534,7 +534,7 @@ msgstr "个人信息" #. module: hr #: field:hr.employee,city:0 msgid "City" -msgstr "" +msgstr "城市" #. module: hr #: field:hr.employee,passport_id:0 @@ -544,7 +544,7 @@ msgstr "护照号" #. module: hr #: field:hr.employee,mobile_phone:0 msgid "Work Mobile" -msgstr "" +msgstr "办公手机" #. module: hr #: view:hr.employee.category:0 @@ -666,7 +666,7 @@ msgstr "职位" #. module: hr #: field:hr.employee,otherid:0 msgid "Other Id" -msgstr "" +msgstr "其它证件号" #. module: hr #: view:hr.employee:0 @@ -677,12 +677,12 @@ msgstr "师傅" #. module: hr #: sql_constraint:hr.job:0 msgid "The name of the job position must be unique per company!" -msgstr "" +msgstr "每个公司里的任一职位名称都必须唯一" #. module: hr #: view:hr.job:0 msgid "My Departments Jobs" -msgstr "" +msgstr "我的部门职位" #. module: hr #: field:hr.department,manager_id:0 @@ -704,7 +704,7 @@ msgstr "下属" #. module: hr #: field:hr.job,no_of_employee:0 msgid "Number of Employees" -msgstr "" +msgstr "员工数" #~ msgid "Group name" #~ msgstr "组名" diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po index d630db57fdb..058856dae6c 100644 --- a/addons/hr_contract/i18n/zh_CN.po +++ b/addons/hr_contract/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 07:07+0000\n" -"Last-Translator: ryanlin \n" +"PO-Revision-Date: 2012-01-23 10:05+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:59+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: hr_contract #: field:hr.contract,wage:0 @@ -24,7 +24,7 @@ msgstr "工资" #. module: hr_contract #: view:hr.contract:0 msgid "Information" -msgstr "" +msgstr "信息" #. module: hr_contract #: view:hr.contract:0 @@ -86,7 +86,7 @@ msgstr "搜索合同" #. module: hr_contract #: view:hr.contract:0 msgid "Contracts in progress" -msgstr "" +msgstr "合同执行情况" #. module: hr_contract #: field:hr.employee,vehicle_distance:0 @@ -110,7 +110,7 @@ msgstr "个人信息" #. module: hr_contract #: view:hr.contract:0 msgid "Contracts whose end date already passed" -msgstr "" +msgstr "已过期合同" #. module: hr_contract #: help:hr.employee,contract_id:0 @@ -162,7 +162,7 @@ msgstr "结束日期" #. module: hr_contract #: help:hr.contract,wage:0 msgid "Basic Salary of the employee" -msgstr "" +msgstr "该员工基本工资" #. module: hr_contract #: field:hr.contract,name:0 @@ -183,7 +183,7 @@ msgstr "备注" #. module: hr_contract #: field:hr.contract,permit_no:0 msgid "Work Permit No" -msgstr "" +msgstr "工作证编号" #. module: hr_contract #: view:hr.contract:0 @@ -216,7 +216,7 @@ msgstr "职务信息" #. module: hr_contract #: field:hr.contract,visa_expire:0 msgid "Visa Expire Date" -msgstr "" +msgstr "签证到期日期" #. module: hr_contract #: field:hr.contract,job_id:0 @@ -241,7 +241,7 @@ msgstr "错误！合同开始日期必须小于结束日期。" #. module: hr_contract #: field:hr.contract,visa_no:0 msgid "Visa No" -msgstr "" +msgstr "签证号" #. module: hr_contract #: field:hr.employee,place_of_birth:0 diff --git a/addons/hr_payroll_account/i18n/en_GB.po b/addons/hr_payroll_account/i18n/en_GB.po new file mode 100644 index 00000000000..05d297c6915 --- /dev/null +++ b/addons/hr_payroll_account/i18n/en_GB.po @@ -0,0 +1,296 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 13:36+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: hr_payroll_account +#: field:hr.payslip,move_id:0 +msgid "Accounting Entry" +msgstr "Accounting Entry" + +#. module: hr_payroll_account +#: field:hr.salary.rule,account_tax_id:0 +msgid "Tax Code" +msgstr "Tax Code" + +#. module: hr_payroll_account +#: field:hr.payslip,journal_id:0 +#: field:hr.payslip.run,journal_id:0 +msgid "Expense Journal" +msgstr "Expense Journal" + +#. module: hr_payroll_account +#: code:addons/hr_payroll_account/hr_payroll_account.py:157 +#: code:addons/hr_payroll_account/hr_payroll_account.py:173 +#, python-format +msgid "Adjustment Entry" +msgstr "Adjustment Entry" + +#. module: hr_payroll_account +#: field:hr.contract,analytic_account_id:0 +#: field:hr.salary.rule,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Analytic Account" + +#. module: hr_payroll_account +#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule +msgid "hr.salary.rule" +msgstr "hr.salary.rule" + +#. module: hr_payroll_account +#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run +msgid "Payslip Batches" +msgstr "Payslip Batches" + +#. module: hr_payroll_account +#: field:hr.contract,journal_id:0 +msgid "Salary Journal" +msgstr "Salary Journal" + +#. module: hr_payroll_account +#: model:ir.model,name:hr_payroll_account.model_hr_payslip +msgid "Pay Slip" +msgstr "Pay Slip" + +#. module: hr_payroll_account +#: constraint:hr.payslip:0 +msgid "Payslip 'Date From' must be before 'Date To'." +msgstr "Payslip 'Date From' must be before 'Date To'." + +#. module: hr_payroll_account +#: help:hr.payslip,period_id:0 +msgid "Keep empty to use the period of the validation(Payslip) date." +msgstr "Keep empty to use the period of the validation(Payslip) date." + +#. module: hr_payroll_account +#: code:addons/hr_payroll_account/hr_payroll_account.py:171 +#, python-format +msgid "" +"The Expense Journal \"%s\" has not properly configured the Debit Account!" +msgstr "" +"The Expense Journal \"%s\" has not properly configured the Debit Account!" + +#. module: hr_payroll_account +#: code:addons/hr_payroll_account/hr_payroll_account.py:155 +#, python-format +msgid "" +"The Expense Journal \"%s\" has not properly configured the Credit Account!" +msgstr "" +"The Expense Journal \"%s\" has not properly configured the Credit Account!" + +#. module: hr_payroll_account +#: field:hr.salary.rule,account_debit:0 +msgid "Debit Account" +msgstr "Debit Account" + +#. module: hr_payroll_account +#: code:addons/hr_payroll_account/hr_payroll_account.py:102 +#, python-format +msgid "Payslip of %s" +msgstr "Payslip of %s" + +#. module: hr_payroll_account +#: model:ir.model,name:hr_payroll_account.model_hr_contract +msgid "Contract" +msgstr "Contract" + +#. module: hr_payroll_account +#: constraint:hr.contract:0 +msgid "Error! contract start-date must be lower then contract end-date." +msgstr "Error! contract start-date must be lower then contract end-date." + +#. module: hr_payroll_account +#: field:hr.payslip,period_id:0 +msgid "Force Period" +msgstr "Force Period" + +#. module: hr_payroll_account +#: field:hr.salary.rule,account_credit:0 +msgid "Credit Account" +msgstr "Credit Account" + +#. module: hr_payroll_account +#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees +msgid "Generate payslips for all selected employees" +msgstr "Generate payslips for all selected employees" + +#. module: hr_payroll_account +#: code:addons/hr_payroll_account/hr_payroll_account.py:155 +#: code:addons/hr_payroll_account/hr_payroll_account.py:171 +#, python-format +msgid "Configuration Error!" +msgstr "Configuration Error!" + +#. module: hr_payroll_account +#: view:hr.contract:0 +#: view:hr.salary.rule:0 +msgid "Accounting" +msgstr "Accounting" + +#~ msgid "Other Informations" +#~ msgstr "Other Informations" + +#~ msgid "Analytic Account for Salary Analysis" +#~ msgstr "Analytic Account for Salary Analysis" + +#~ msgid "Period" +#~ msgstr "Period" + +#~ msgid "Employee" +#~ msgstr "Employee" + +#~ msgid "Bank Journal" +#~ msgstr "Bank Journal" + +#~ msgid "Contribution Register Line" +#~ msgstr "Contribution Register Line" + +#~ msgid "Contribution Register" +#~ msgstr "Contribution Register" + +#~ msgid "Accounting Lines" +#~ msgstr "Accounting Lines" + +#~ msgid "Expense account when Salary Expense will be recorded" +#~ msgstr "Expense account when Salary Expense will be recorded" + +#~ msgid "Accounting Informations" +#~ msgstr "Accounting Informations" + +#~ msgid "Description" +#~ msgstr "Description" + +#~ msgid "Account Move Link to Pay Slip" +#~ msgstr "Account Move Link to Pay Slip" + +#~ msgid "Salary Account" +#~ msgstr "Salary Account" + +#~ msgid "Payroll Register" +#~ msgstr "Payroll Register" + +#~ msgid "Human Resource Payroll Accounting" +#~ msgstr "Human Resource Payroll Accounting" + +#, python-format +#~ msgid "Please Confirm all Expense Invoice appear for Reimbursement" +#~ msgstr "Please Confirm all Expense Invoice appear for Reimbursement" + +#~ msgid "Bank Account" +#~ msgstr "Bank Account" + +#~ msgid "Payment Lines" +#~ msgstr "Payment Lines" + +#, python-format +#~ msgid "Please define fiscal year for perticular contract" +#~ msgstr "Please define fiscal year for perticular contract" + +#~ msgid "Account Lines" +#~ msgstr "Account Lines" + +#~ msgid "Name" +#~ msgstr "Name" + +#~ msgid "Payslip Line" +#~ msgstr "Payslip Line" + +#~ msgid "Error ! You cannot create recursive Hierarchy of Employees." +#~ msgstr "Error ! You cannot create recursive Hierarchy of Employees." + +#~ msgid "" +#~ "Generic Payroll system Integrated with Accountings\n" +#~ " * Expense Encoding\n" +#~ " * Payment Encoding\n" +#~ " * Company Contribution Management\n" +#~ " " +#~ msgstr "" +#~ "Generic Payroll system Integrated with Accountings\n" +#~ " * Expense Encoding\n" +#~ " * Payment Encoding\n" +#~ " * Company Contribution Management\n" +#~ " " + +#~ msgid "Account" +#~ msgstr "Account" + +#, python-format +#~ msgid "Warning !" +#~ msgstr "Warning !" + +#~ msgid "Accounting vouchers" +#~ msgstr "Accounting vouchers" + +#~ msgid "Accounting Vouchers" +#~ msgstr "Accounting Vouchers" + +#~ msgid "General Account" +#~ msgstr "General Account" + +#~ msgid "Expense Entries" +#~ msgstr "Expense Entries" + +#~ msgid "Employee Account" +#~ msgstr "Employee Account" + +#~ msgid "Total By Employee" +#~ msgstr "Total By Employee" + +#~ msgid "Bank Advice Note" +#~ msgstr "Bank Advice Note" + +#~ msgid "" +#~ "Error ! You cannot select a department for which the employee is the manager." +#~ msgstr "" +#~ "Error ! You cannot select a department for which the employee is the manager." + +#, python-format +#~ msgid "Please Configure Partners Receivable Account!!" +#~ msgstr "Please Configure Partners Receivable Account!!" + +#~ msgid "Employee Payable Account" +#~ msgstr "Employee Payable Account" + +#~ msgid "Sequence" +#~ msgstr "Sequence" + +#~ msgid "Leave Type" +#~ msgstr "Leave Type" + +#~ msgid "Total By Company" +#~ msgstr "Total By Company" + +#~ msgid "Salary Structure" +#~ msgstr "Salary Structure" + +#~ msgid "Year" +#~ msgstr "Year" + +#, python-format +#~ msgid "Period is not defined for slip date %s" +#~ msgstr "Period is not defined for slip date %s" + +#, python-format +#~ msgid "Fiscal Year is not defined for slip date %s" +#~ msgstr "Fiscal Year is not defined for slip date %s" + +#~ msgid "Accounting Details" +#~ msgstr "Accounting Details" + +#, python-format +#~ msgid "Please Configure Partners Payable Account!!" +#~ msgstr "Please Configure Partners Payable Account!!" diff --git a/addons/hr_recruitment/i18n/hr.po b/addons/hr_recruitment/i18n/hr.po index 1e7b9c11686..454c57bb47d 100644 --- a/addons/hr_recruitment/i18n/hr.po +++ b/addons/hr_recruitment/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-12-19 17:21+0000\n" -"Last-Translator: Goran Kliska \n" +"PO-Revision-Date: 2012-01-23 13:20+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: hr_recruitment #: help:hr.applicant,active:0 @@ -23,6 +23,7 @@ msgid "" "If the active field is set to false, it will allow you to hide the case " "without removing it." msgstr "" +"Ako je aktivno polje odznačeno, slučaj će biti skriven umjesto uklonjen." #. module: hr_recruitment #: view:hr.recruitment.stage:0 @@ -35,12 +36,12 @@ msgstr "Preduvjeti" #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_source_action #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_source msgid "Sources of Applicants" -msgstr "" +msgstr "Izvori kandidata za posao" #. module: hr_recruitment #: field:hr.recruitment.report,delay_open:0 msgid "Avg. Delay to Open" -msgstr "" +msgstr "Prosječno kašnjenje za otvaranje" #. module: hr_recruitment #: field:hr.recruitment.report,nbr:0 @@ -55,12 +56,12 @@ msgstr "Grupiraj po..." #. module: hr_recruitment #: field:hr.applicant,user_email:0 msgid "User Email" -msgstr "" +msgstr "Korisnikov email" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Filter and view on next actions and date" -msgstr "" +msgstr "Filtriraj pogled na sljedeće akcije i datume" #. module: hr_recruitment #: view:hr.applicant:0 @@ -78,7 +79,7 @@ msgstr "Datum slijedeće akcije" #. module: hr_recruitment #: field:hr.applicant,salary_expected_extra:0 msgid "Expected Salary Extra" -msgstr "" +msgstr "Očekivani bonus" #. module: hr_recruitment #: view:hr.recruitment.report:0 @@ -88,29 +89,29 @@ msgstr "Poslovi" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Pending Jobs" -msgstr "" +msgstr "Poslovi na čekanju" #. module: hr_recruitment #: field:hr.applicant,company_id:0 #: view:hr.recruitment.report:0 #: field:hr.recruitment.report,company_id:0 msgid "Company" -msgstr "Organizacija" +msgstr "Tvrtka" #. module: hr_recruitment #: view:hired.employee:0 msgid "No" -msgstr "" +msgstr "Ne" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Job" -msgstr "" +msgstr "Radno mjesto" #. module: hr_recruitment #: field:hr.recruitment.partner.create,close:0 msgid "Close job request" -msgstr "" +msgstr "Zatvori zahtjev za radnim mjestom" #. module: hr_recruitment #: field:hr.applicant,day_open:0 @@ -125,7 +126,7 @@ msgstr "Ciljevi" #. module: hr_recruitment #: field:hr.recruitment.report,partner_address_id:0 msgid "Partner Contact Name" -msgstr "" +msgstr "Naziv kontakta partnera" #. module: hr_recruitment #: view:hr.applicant:0 @@ -143,7 +144,7 @@ msgstr "Dan" #. module: hr_recruitment #: field:hr.applicant,reference:0 msgid "Refered By" -msgstr "" +msgstr "Preporučuje" #. module: hr_recruitment #: view:hr.applicant:0 @@ -158,12 +159,12 @@ msgstr "Dodaj internu bilješku" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Refuse" -msgstr "" +msgstr "Odbiti" #. module: hr_recruitment #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced msgid "Master Degree" -msgstr "" +msgstr "Magistar" #. module: hr_recruitment #: field:hr.applicant,partner_mobile:0 @@ -183,46 +184,46 @@ msgstr "Poruke" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Next Actions" -msgstr "" +msgstr "Sljedeća akcija" #. module: hr_recruitment #: field:hr.applicant,salary_expected:0 #: view:hr.recruitment.report:0 msgid "Expected Salary" -msgstr "" +msgstr "Očekivana plaća" #. module: hr_recruitment #: field:hr.applicant,job_id:0 #: field:hr.recruitment.report,job_id:0 msgid "Applied Job" -msgstr "" +msgstr "Prijava za posao" #. module: hr_recruitment #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate msgid "Graduate" -msgstr "" +msgstr "Apsolvent" #. module: hr_recruitment #: field:hr.applicant,color:0 msgid "Color Index" -msgstr "" +msgstr "Indeks boja" #. module: hr_recruitment #: view:board.board:0 #: view:hr.applicant:0 #: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status msgid "Applicants Status" -msgstr "" +msgstr "Status kandidata" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "My Recruitment" -msgstr "" +msgstr "Moja regrutacija" #. module: hr_recruitment #: field:hr.job,survey_id:0 msgid "Interview Form" -msgstr "" +msgstr "obrazac razgovora za posao" #. module: hr_recruitment #: help:hr.job,survey_id:0 @@ -230,38 +231,41 @@ msgid "" "Choose an interview form for this job position and you will be able to " "print/answer this interview from all applicants who apply for this job" msgstr "" +"Odaberite obrazac razgovora za posao za ovo radno mjesto i moći ćete biti u " +"mogućnosti ispisati / odgovoriti razgovor sa svim kandidatima koji se " +"prijavljuju za ovaj posao" #. module: hr_recruitment #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment msgid "Recruitment" -msgstr "" +msgstr "Zapošljavanje" #. module: hr_recruitment #: code:addons/hr_recruitment/hr_recruitment.py:436 #, python-format msgid "Warning!" -msgstr "" +msgstr "Upozorenje!" #. module: hr_recruitment #: field:hr.recruitment.report,salary_prop:0 msgid "Salary Proposed" -msgstr "" +msgstr "Predložena plaća" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Change Color" -msgstr "" +msgstr "Promijeni boju" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Avg Proposed Salary" -msgstr "" +msgstr "Prosječna predložena plaća" #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.recruitment.report,available:0 msgid "Availability" -msgstr "" +msgstr "Raspoloživost" #. module: hr_recruitment #: help:hr.recruitment.stage,department_id:0 @@ -269,75 +273,77 @@ msgid "" "Stages of the recruitment process may be different per department. If this " "stage is common to all departments, keep tempy this field." msgstr "" +"Faze postupka zapošljavanja mogu se razlikovati od odjela do odjela. " +"Ostavite ovo polje prazno ako je ova faza zajednička svim odjelima." #. module: hr_recruitment #: view:hr.applicant:0 msgid "Previous" -msgstr "" +msgstr "Prethodni" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_recruitment_source msgid "Source of Applicants" -msgstr "" +msgstr "Izvor kandidata" #. module: hr_recruitment #: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:115 #, python-format msgid "Phone Call" -msgstr "" +msgstr "Telefonski poziv" #. module: hr_recruitment #: view:hr.recruitment.partner.create:0 msgid "Convert To Partner" -msgstr "" +msgstr "Pretvori u partnera" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_recruitment_report msgid "Recruitments Statistics" -msgstr "" +msgstr "Statistika zapošljavanja" #. module: hr_recruitment #: code:addons/hr_recruitment/hr_recruitment.py:477 #, python-format msgid "Changed Stage to: %s" -msgstr "" +msgstr "Promijeni fazu u: %s" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Hire" -msgstr "" +msgstr "Zaposli" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Hired employees" -msgstr "" +msgstr "Djelatnici" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Next" -msgstr "" +msgstr "Sljedeće" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_job msgid "Job Description" -msgstr "" +msgstr "Opis posla" #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.applicant,source_id:0 msgid "Source" -msgstr "" +msgstr "Izvor" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Send New Email" -msgstr "" +msgstr "Pošalji novi e-mail" #. module: hr_recruitment #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39 #, python-format msgid "A partner is already defined on this job request." -msgstr "" +msgstr "Partner je već definiran na ovom zahtjevu." #. module: hr_recruitment #: view:hr.applicant:0 @@ -345,40 +351,40 @@ msgstr "" #: view:hr.recruitment.report:0 #: selection:hr.recruitment.report,state:0 msgid "New" -msgstr "" +msgstr "Novi" #. module: hr_recruitment #: field:hr.applicant,email_from:0 msgid "Email" -msgstr "" +msgstr "E-mail" #. module: hr_recruitment #: field:hr.applicant,availability:0 msgid "Availability (Days)" -msgstr "" +msgstr "Dostupnost (dani)" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Available" -msgstr "" +msgstr "Dostupno" #. module: hr_recruitment #: field:hr.applicant,title_action:0 msgid "Next Action" -msgstr "" +msgstr "Sljedeća akcija" #. module: hr_recruitment #: selection:hr.applicant,priority:0 #: selection:hr.recruitment.report,priority:0 msgid "Good" -msgstr "" +msgstr "Dobro" #. module: hr_recruitment #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57 #, python-format msgid "Error !" -msgstr "" +msgstr "Greška !" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act @@ -386,41 +392,43 @@ msgid "" "Define here your stages of the recruitment process, for example: " "qualification call, first interview, second interview, refused, hired." msgstr "" +"Ovdje definirate faze procesa zapošljavanja, na primjer: inicijalni poziv, " +"prvi razgovor, drugi razgovor, odbijen, zaposlen." #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.applicant,create_date:0 #: view:hr.recruitment.report:0 msgid "Creation Date" -msgstr "" +msgstr "Datum kreiranja" #. module: hr_recruitment #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_hired_employee #: model:ir.model,name:hr_recruitment.model_hired_employee msgid "Create Employee" -msgstr "" +msgstr "Kreiraj djelatnika" #. module: hr_recruitment #: field:hr.recruitment.job2phonecall,deadline:0 msgid "Planned Date" -msgstr "" +msgstr "Planiran datum" #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.applicant,priority:0 #: field:hr.recruitment.report,priority:0 msgid "Appreciation" -msgstr "" +msgstr "Aprecijacija" #. module: hr_recruitment #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1 msgid "Initial Qualification" -msgstr "" +msgstr "Inicijalna kvalifikacija" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Print Interview" -msgstr "" +msgstr "Ispiši razgovor" #. module: hr_recruitment #: view:hr.applicant:0 @@ -429,7 +437,7 @@ msgstr "" #: field:hr.recruitment.report,stage_id:0 #: view:hr.recruitment.stage:0 msgid "Stage" -msgstr "" +msgstr "Faza" #. module: hr_recruitment #: view:hr.applicant:0 @@ -437,49 +445,49 @@ msgstr "" #: view:hr.recruitment.report:0 #: selection:hr.recruitment.report,state:0 msgid "Pending" -msgstr "" +msgstr "Na čekanju" #. module: hr_recruitment #: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act msgid "Recruitment / Applicants Stages" -msgstr "" +msgstr "Faze zapošljavanja / kandidata" #. module: hr_recruitment #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5 msgid "Doctoral Degree" -msgstr "" +msgstr "Doktorat" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "July" -msgstr "" +msgstr "Srpanj" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Subject" -msgstr "" +msgstr "Naslov" #. module: hr_recruitment #: field:hr.applicant,email_cc:0 msgid "Watchers Emails" -msgstr "Emailovi posmatrača" +msgstr "Elektronska pošta posmatrača" #. module: hr_recruitment #: view:hr.applicant:0 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job msgid "Applicants" -msgstr "" +msgstr "Kandidati" #. module: hr_recruitment #: view:hr.applicant:0 msgid "History Information" -msgstr "" +msgstr "Povijest" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Dates" -msgstr "" +msgstr "Datumi" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act @@ -488,214 +496,217 @@ msgid "" "forget to specify the department if your recruitment process is different " "according to the job position." msgstr "" +" Provjerite da li sljedeće faze odgovaraju vašem procesu zapošljavanja. Ne " +"zaboravite navesti odjel ako se vaš proces zapošljavanja razlikuje ovisno o " +"radnom mjestu." #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid " Month-1 " -msgstr "" +msgstr " Mjesec-1 " #. module: hr_recruitment #: field:hr.recruitment.report,salary_exp:0 msgid "Salary Expected" -msgstr "" +msgstr "Očekivana plaća" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_applicant msgid "Applicant" -msgstr "" +msgstr "Kandidat" #. module: hr_recruitment #: help:hr.recruitment.stage,sequence:0 msgid "Gives the sequence order when displaying a list of stages." -msgstr "" +msgstr "Daje redosljed kod listanja faza" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: hr_recruitment #: help:hr.applicant,salary_expected_extra:0 msgid "Salary Expected by Applicant, extra advantages" -msgstr "" +msgstr "Plaća koju očekuje kandidat, plus dodaci" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Qualification" -msgstr "" +msgstr "Kvalifikacija" #. module: hr_recruitment #: field:hr.applicant,partner_id:0 #: view:hr.recruitment.report:0 #: field:hr.recruitment.report,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "March" -msgstr "" +msgstr "Ožujak" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage msgid "Stage of Recruitment" -msgstr "" +msgstr "Faza zapošljavanja" #. module: hr_recruitment #: view:hr.recruitment.stage:0 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage msgid "Stages" -msgstr "" +msgstr "Faze" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Draft recruitment" -msgstr "" +msgstr "Nacrt zapošljavanja" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Delete" -msgstr "" +msgstr "Izbriši" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "In progress" -msgstr "" +msgstr "U toku" #. module: hr_recruitment #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer msgid "Review Recruitment Stages" -msgstr "" +msgstr "Recenzija faza zapošljavanja" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Jobs - Recruitment Form" -msgstr "" +msgstr "Poslovi - obrazac za zapošljavanje" #. module: hr_recruitment #: field:hr.applicant,probability:0 msgid "Probability" -msgstr "" +msgstr "Vjerojatnost" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "September" -msgstr "" +msgstr "Rujan" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "December" -msgstr "" +msgstr "Prosinac" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Recruitment performed in current year" -msgstr "" +msgstr "Obavljena zapošljavanja u toku godine" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Recruitment during last month" -msgstr "" +msgstr "Zapošljavanja tokom prošlog mjeseca" #. module: hr_recruitment #: view:hr.recruitment.report:0 #: field:hr.recruitment.report,month:0 msgid "Month" -msgstr "" +msgstr "Mjesec" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Unassigned Recruitments" -msgstr "" +msgstr "Nerazvrstana zapošljavanja" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Job Info" -msgstr "" +msgstr "Informacije o poslu" #. module: hr_recruitment #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2 msgid "First Interview" -msgstr "" +msgstr "Prvi razgovor" #. module: hr_recruitment #: field:hr.applicant,write_date:0 msgid "Update Date" -msgstr "" +msgstr "Datum ažuriranja" #. module: hr_recruitment #: view:hired.employee:0 msgid "Yes" -msgstr "" +msgstr "Da" #. module: hr_recruitment #: field:hr.applicant,salary_proposed:0 #: view:hr.recruitment.report:0 msgid "Proposed Salary" -msgstr "" +msgstr "Predložena plaća" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Schedule Meeting" -msgstr "" +msgstr "Dogovori sastanak" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Search Jobs" -msgstr "" +msgstr "Traži poslove" #. module: hr_recruitment #: field:hr.recruitment.job2phonecall,category_id:0 msgid "Category" -msgstr "" +msgstr "Grupa" #. module: hr_recruitment #: field:hr.applicant,partner_name:0 msgid "Applicant's Name" -msgstr "" +msgstr "Ime kandidata" #. module: hr_recruitment #: selection:hr.applicant,priority:0 #: selection:hr.recruitment.report,priority:0 msgid "Very Good" -msgstr "" +msgstr "Vrlo dobro" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "# Cases" -msgstr "" +msgstr "# slučajeva" #. module: hr_recruitment #: field:hr.applicant,date_open:0 msgid "Opened" -msgstr "" +msgstr "Otvoren" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Group By ..." -msgstr "" +msgstr "Grupiraj po ..." #. module: hr_recruitment #: view:hr.applicant:0 #: selection:hr.applicant,state:0 msgid "In Progress" -msgstr "" +msgstr "U toku" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Reset to New" -msgstr "" +msgstr "Postavi na novi" #. module: hr_recruitment #: help:hr.applicant,salary_expected:0 msgid "Salary Expected by Applicant" -msgstr "" +msgstr "Plaća koju kandidat očekuje" #. module: hr_recruitment #: view:hr.applicant:0 msgid "All Initial Jobs" -msgstr "" +msgstr "Svi inicijalni poslovi" #. module: hr_recruitment #: help:hr.applicant,email_cc:0 @@ -704,63 +715,65 @@ msgid "" "outbound emails for this record before being sent. Separate multiple email " "addresses with a comma" msgstr "" +"Ove adrese e-pošte će biti dodane u CC polja svih ulaznih i izlaznih e-" +"poruka ovog zapisa prije slanja. Više adresa odvojite zarezom." #. module: hr_recruitment #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_degree msgid "Degrees" -msgstr "" +msgstr "Stupnjevi" #. module: hr_recruitment #: field:hr.applicant,date_closed:0 #: field:hr.recruitment.report,date_closed:0 msgid "Closed" -msgstr "" +msgstr "Zatvoren" #. module: hr_recruitment #: view:hr.recruitment.stage:0 msgid "Stage Definition" -msgstr "" +msgstr "Definicija faze" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Answer" -msgstr "" +msgstr "Odgovor" #. module: hr_recruitment #: field:hr.recruitment.report,delay_close:0 msgid "Avg. Delay to Close" -msgstr "" +msgstr "Prosječno kašnjenje do zatvaranja" #. module: hr_recruitment #: help:hr.applicant,salary_proposed:0 msgid "Salary Proposed by the Organisation" -msgstr "" +msgstr "Plaća koju predlaže firma" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Meeting" -msgstr "" +msgstr "Sastanak" #. module: hr_recruitment #: code:addons/hr_recruitment/hr_recruitment.py:347 #, python-format msgid "No Subject" -msgstr "" +msgstr "Nema naslova" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Communication & History" -msgstr "" +msgstr "Komunikacija i povijest" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "August" -msgstr "" +msgstr "Kolovoz" #. module: hr_recruitment #: view:hr.applicant:0 @@ -770,117 +783,118 @@ msgstr "" #: field:hr.recruitment.report,type_id:0 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action msgid "Degree" -msgstr "" +msgstr "Stupanj" #. module: hr_recruitment #: field:hr.applicant,partner_phone:0 msgid "Phone" -msgstr "" +msgstr "Telefon" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Global CC" -msgstr "" +msgstr "Globalni CC" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "June" -msgstr "" +msgstr "Lipanj" #. module: hr_recruitment #: field:hr.applicant,day_close:0 msgid "Days to Close" -msgstr "" +msgstr "Dana za zatvaranje" #. module: hr_recruitment #: field:hr.recruitment.report,user_id:0 msgid "User" -msgstr "" +msgstr "Korisnik" #. module: hr_recruitment #: selection:hr.applicant,priority:0 #: selection:hr.recruitment.report,priority:0 msgid "Excellent" -msgstr "" +msgstr "Odlično" #. module: hr_recruitment #: field:hr.applicant,active:0 msgid "Active" -msgstr "" +msgstr "Aktivan" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "November" -msgstr "" +msgstr "Studeni" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Extended Filters..." -msgstr "" +msgstr "Prošireni filteri..." #. module: hr_recruitment #: field:hr.applicant,response:0 msgid "Response" -msgstr "" +msgstr "Odgovor" #. module: hr_recruitment #: field:hr.recruitment.stage,department_id:0 msgid "Specific to a Department" -msgstr "" +msgstr "Specifično za odjel" #. module: hr_recruitment #: field:hr.recruitment.report,salary_prop_avg:0 msgid "Avg Salary Proposed" -msgstr "" +msgstr "Prosječna predložena plaća" #. module: hr_recruitment #: view:hr.recruitment.job2phonecall:0 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall #: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall msgid "Schedule Phone Call" -msgstr "" +msgstr "Dogovori telefonski poziv" #. module: hr_recruitment #: field:hr.applicant,salary_proposed_extra:0 msgid "Proposed Salary Extra" -msgstr "" +msgstr "Predložen bonus" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "January" -msgstr "" +msgstr "Siječanj" #. module: hr_recruitment #: help:hr.applicant,email_from:0 msgid "These people will receive email." -msgstr "" +msgstr "Ove će osobe primiti e-poštu." #. module: hr_recruitment #: selection:hr.applicant,priority:0 #: selection:hr.recruitment.report,priority:0 msgid "Not Good" -msgstr "" +msgstr "Nije dobar" #. module: hr_recruitment #: field:hr.applicant,date:0 #: field:hr.recruitment.report,date:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: hr_recruitment #: view:hr.recruitment.job2phonecall:0 msgid "Phone Call Description" -msgstr "" +msgstr "Opis telefonskog poziva" #. module: hr_recruitment #: view:hr.recruitment.partner.create:0 msgid "Are you sure you want to create a partner based on this job request ?" msgstr "" +"Jeste li sigurni da želite kreirati partnera na temelju ovog zahtjeva?" #. module: hr_recruitment #: view:hired.employee:0 msgid "Would you like to create an employee ?" -msgstr "" +msgstr "Želite li kreirati djelatnika?" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job @@ -893,16 +907,23 @@ msgid "" "are indexed automatically, so that you can easily search through their " "content." msgstr "" +"Iz ovog izbornika možete pratiti kandidate u procesu zapošljavanja i " +"upravljati svim operacijama: sastanci, razgovori, telefonski pozivi, itd. " +"Ako postavite e-mail gateway, kandidati i njigovi priloženi životopisi će se " +"kreirati automatski kada je e-pošta poslana na posao@vašatvrtka. com. Ako " +"instalirate module za upravljanje dokumentima, svi dokumenti (CV i molbe) su " +"indeksirane automatski, tako da jednostavno možete pretraživati ​​kroz " +"njihov sadržaj." #. module: hr_recruitment #: view:hr.applicant:0 msgid "History" -msgstr "" +msgstr "Povijest" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Recruitment performed in current month" -msgstr "" +msgstr "Zapošljavanja u ovom mjesecu" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer @@ -911,6 +932,9 @@ msgid "" "forget to specify the department if your recruitment process is different " "according to the job position." msgstr "" +"Provjerite da li sljedeće faze odgovaraju vašem procesu zapošljavanja. Ne " +"zaboravite navesti odjel ako se vaš proces zapošljavanja razlikuje ovisno o " +"radnom mjestu." #. module: hr_recruitment #: field:hr.applicant,partner_address_id:0 @@ -921,12 +945,12 @@ msgstr "Osoba kod partnera" #: code:addons/hr_recruitment/hr_recruitment.py:436 #, python-format msgid "You must define Applied Job for Applicant !" -msgstr "" +msgstr "Morate definirati posao za koji se kandidat prijavljuje!" #. module: hr_recruitment #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4 msgid "Contract Proposed" -msgstr "" +msgstr "Predloženi ugovor" #. module: hr_recruitment #: view:hr.applicant:0 @@ -934,256 +958,256 @@ msgstr "" #: view:hr.recruitment.report:0 #: field:hr.recruitment.report,state:0 msgid "State" -msgstr "" +msgstr "Stanje" #. module: hr_recruitment #: model:hr.recruitment.source,name:hr_recruitment.source_website_company msgid "Company Website" -msgstr "" +msgstr "Web adresa tvrtke" #. module: hr_recruitment #: sql_constraint:hr.recruitment.degree:0 msgid "The name of the Degree of Recruitment must be unique!" -msgstr "" +msgstr "Naziv stupnja zapošljavanja mora biti jedinstven!" #. module: hr_recruitment #: view:hr.recruitment.report:0 #: field:hr.recruitment.report,year:0 msgid "Year" -msgstr "" +msgstr "Godina" #. module: hr_recruitment #: view:hired.employee:0 #: view:hr.recruitment.job2phonecall:0 #: view:hr.recruitment.partner.create:0 msgid "Cancel" -msgstr "" +msgstr "Odustani" #. module: hr_recruitment #: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action msgid "Applicant Categories" -msgstr "" +msgstr "Grupe kandidata" #. module: hr_recruitment #: selection:hr.recruitment.report,state:0 msgid "Open" -msgstr "" +msgstr "Otvori" #. module: hr_recruitment #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57 #, python-format msgid "A partner is already existing with the same name." -msgstr "" +msgstr "Već postoji partner sa tim nazivom." #. module: hr_recruitment #: view:hr.applicant:0 msgid "Subject / Applicant" -msgstr "" +msgstr "Subjekt / kandidat" #. module: hr_recruitment #: help:hr.recruitment.degree,sequence:0 msgid "Gives the sequence order when displaying a list of degrees." -msgstr "" +msgstr "Daje redosljed kod listanja stupnjeva" #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.applicant,user_id:0 #: view:hr.recruitment.report:0 msgid "Responsible" -msgstr "" +msgstr "Odgovoran" #. module: hr_recruitment #: view:hr.recruitment.report:0 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all msgid "Recruitment Analysis" -msgstr "" +msgstr "Analiza zapošljavanja" #. module: hr_recruitment #: view:hired.employee:0 msgid "Create New Employee" -msgstr "" +msgstr "Kreiraj novog djelatnika" #. module: hr_recruitment #: model:hr.recruitment.source,name:hr_recruitment.source_linkedin msgid "LinkedIn" -msgstr "" +msgstr "LinkedIn" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "October" -msgstr "" +msgstr "Listopad" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Cases By Stage and Estimates" -msgstr "" +msgstr "Slučajevi po fazi i procjenama" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Reply" -msgstr "" +msgstr "Odgovori" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Interview" -msgstr "" +msgstr "Razgovor za posao" #. module: hr_recruitment #: field:hr.recruitment.source,name:0 msgid "Source Name" -msgstr "" +msgstr "Naziv izvora" #. module: hr_recruitment #: field:hr.applicant,description:0 msgid "Description" -msgstr "" +msgstr "Opis" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "May" -msgstr "" +msgstr "Svibanj" #. module: hr_recruitment #: model:hr.recruitment.stage,name:hr_recruitment.stage_job5 msgid "Contract Signed" -msgstr "" +msgstr "Ugovor potpisan" #. module: hr_recruitment #: model:hr.recruitment.source,name:hr_recruitment.source_word msgid "Word of Mouth" -msgstr "" +msgstr "Usmena primopredaja" #. module: hr_recruitment #: selection:hr.applicant,state:0 #: selection:hr.recruitment.report,state:0 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job6 msgid "Refused" -msgstr "" +msgstr "Odbijen" #. module: hr_recruitment #: code:addons/hr_recruitment/hr_recruitment.py:414 #, python-format msgid "Applicant '%s' is being hired." -msgstr "" +msgstr "Kandidat '%s' se zapošljava." #. module: hr_recruitment #: selection:hr.applicant,state:0 #: view:hr.recruitment.report:0 #: selection:hr.recruitment.report,state:0 msgid "Hired" -msgstr "" +msgstr "Zaposlen" #. module: hr_recruitment #: selection:hr.applicant,priority:0 #: selection:hr.recruitment.report,priority:0 msgid "On Average" -msgstr "" +msgstr "U prosjeku" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree msgid "Degree of Recruitment" -msgstr "" +msgstr "Stupanj zapošljavanja" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Open Jobs" -msgstr "" +msgstr "Otvoreni poslovi" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "February" -msgstr "" +msgstr "Veljača" #. module: hr_recruitment #: field:hr.applicant,name:0 #: field:hr.recruitment.degree,name:0 #: field:hr.recruitment.stage,name:0 msgid "Name" -msgstr "" +msgstr "Naziv" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Edit" -msgstr "" +msgstr "Uredi" #. module: hr_recruitment #: model:hr.recruitment.stage,name:hr_recruitment.stage_job3 msgid "Second Interview" -msgstr "" +msgstr "Drugi razgovor" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create msgid "Create Partner from job application" -msgstr "" +msgstr "Kreiraj partnera iz prijave za posao" #. module: hr_recruitment #: selection:hr.recruitment.report,month:0 msgid "April" -msgstr "" +msgstr "Travanj" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Pending recruitment" -msgstr "" +msgstr "Zapošljavanje na čekanju" #. module: hr_recruitment #: model:hr.recruitment.source,name:hr_recruitment.source_monster msgid "Monster" -msgstr "" +msgstr "Čudovište" #. module: hr_recruitment #: model:ir.ui.menu,name:hr_recruitment.menu_hr_job msgid "Job Positions" -msgstr "" +msgstr "Radna mjesta" #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "In progress recruitment" -msgstr "" +msgstr "Zapošljavanje u toku" #. module: hr_recruitment #: sql_constraint:hr.job:0 msgid "The name of the job position must be unique per company!" -msgstr "" +msgstr "Naziv radnog mjesta mora biti jedinstven po tvrtki" #. module: hr_recruitment #: field:hr.recruitment.degree,sequence:0 #: field:hr.recruitment.stage,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sekvenca" #. module: hr_recruitment #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor msgid "Bachelor Degree" -msgstr "" +msgstr "Prvostupnik" #. module: hr_recruitment #: field:hr.recruitment.job2phonecall,user_id:0 msgid "Assign To" -msgstr "" +msgstr "Dodjeljen" #. module: hr_recruitment #: code:addons/hr_recruitment/hr_recruitment.py:407 #, python-format msgid "The job request '%s' has been set 'in progress'." -msgstr "" +msgstr "Zahtjev za poslom '%s' je postavljen na 'u toku'." #. module: hr_recruitment #: help:hr.applicant,salary_proposed_extra:0 msgid "Salary Proposed by the Organisation, extra advantages" -msgstr "" +msgstr "Plaća koju predlaže tvrtka, plus dodaci" #. module: hr_recruitment #: help:hr.recruitment.report,delay_close:0 #: help:hr.recruitment.report,delay_open:0 msgid "Number of Days to close the project issue" -msgstr "" +msgstr "Broj dana za zatvaranje spornih točaka projekta" #. module: hr_recruitment #: field:hr.applicant,survey:0 msgid "Survey" -msgstr "" +msgstr "Upitnik" #~ msgid "Junior Developer" #~ msgstr "Mlađi razvojni programer" diff --git a/addons/idea/i18n/en_GB.po b/addons/idea/i18n/en_GB.po new file mode 100644 index 00000000000..309e3ba10df --- /dev/null +++ b/addons/idea/i18n/en_GB.po @@ -0,0 +1,755 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-23 15:27+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: idea +#: help:idea.category,visibility:0 +msgid "If True creator of the idea will be visible to others" +msgstr "If True creator of the idea will be visible to others" + +#. module: idea +#: view:idea.idea:0 +msgid "By States" +msgstr "By States" + +#. module: idea +#: model:ir.actions.act_window,name:idea.action_idea_select +msgid "Idea select" +msgstr "Idea select" + +#. module: idea +#: view:idea.idea:0 +#: view:idea.vote:0 +#: model:ir.ui.menu,name:idea.menu_idea_vote +msgid "Votes" +msgstr "Votes" + +#. module: idea +#: view:idea.idea:0 +#: field:idea.idea,comment_ids:0 +msgid "Comments" +msgstr "Comments" + +#. module: idea +#: view:idea.idea:0 +msgid "Submit Vote" +msgstr "Submit Vote" + +#. module: idea +#: model:ir.actions.act_window,name:idea.action_report_vote_all +#: model:ir.ui.menu,name:idea.menu_report_vote_all +msgid "Ideas Analysis" +msgstr "Ideas Analysis" + +#. module: idea +#: view:idea.category:0 +#: view:idea.idea:0 +#: view:idea.vote:0 +#: view:report.vote:0 +msgid "Group By..." +msgstr "Group By..." + +#. module: idea +#: selection:report.vote,month:0 +msgid "March" +msgstr "March" + +#. module: idea +#: view:idea.idea:0 +msgid "Accepted Ideas" +msgstr "Accepted Ideas" + +#. module: idea +#: code:addons/idea/wizard/idea_post_vote.py:94 +#, python-format +msgid "Idea must be in 'Open' state before vote for that idea." +msgstr "Idea must be in 'Open' state before vote for that idea." + +#. module: idea +#: view:report.vote:0 +msgid "Open Date" +msgstr "Open Date" + +#. module: idea +#: view:report.vote:0 +msgid "Idea Vote created in curren year" +msgstr "Idea Vote created in current year" + +#. module: idea +#: view:report.vote:0 +#: field:report.vote,day:0 +msgid "Day" +msgstr "Day" + +#. module: idea +#: view:idea.idea:0 +msgid "Refuse" +msgstr "Refuse" + +#. module: idea +#: field:idea.idea,count_votes:0 +msgid "Count of votes" +msgstr "Count of votes" + +#. module: idea +#: model:ir.model,name:idea.model_report_vote +msgid "Idea Vote Statistics" +msgstr "Idea Vote Statistics" + +#. module: idea +#: selection:idea.idea,my_vote:0 +#: selection:idea.post.vote,vote:0 +#: selection:idea.vote,score:0 +#: selection:idea.vote.stat,score:0 +msgid "Bad" +msgstr "Bad" + +#. module: idea +#: selection:report.vote,idea_state:0 +msgid "Cancelled" +msgstr "Cancelled" + +#. module: idea +#: view:idea.category:0 +msgid "Category of ideas" +msgstr "Category of ideas" + +#. module: idea +#: code:addons/idea/idea.py:274 +#: code:addons/idea/wizard/idea_post_vote.py:91 +#: code:addons/idea/wizard/idea_post_vote.py:94 +#, python-format +msgid "Warning !" +msgstr "Warning !" + +#. module: idea +#: view:idea.idea:0 +msgid "Your comment" +msgstr "Your comment" + +#. module: idea +#: model:ir.model,name:idea.model_idea_vote +msgid "Idea Vote" +msgstr "Idea Vote" + +#. module: idea +#: field:idea.category,parent_id:0 +msgid "Parent Categories" +msgstr "Parent Categories" + +#. module: idea +#: selection:idea.idea,my_vote:0 +#: selection:idea.post.vote,vote:0 +#: selection:idea.vote,score:0 +#: selection:idea.vote.stat,score:0 +msgid "Very Bad" +msgstr "Very Bad" + +#. module: idea +#: view:idea.vote:0 +msgid "Ideas vote" +msgstr "Ideas vote" + +#. module: idea +#: view:report.vote:0 +#: field:report.vote,nbr:0 +msgid "# of Lines" +msgstr "# of Lines" + +#. module: idea +#: code:addons/idea/wizard/idea_post_vote.py:91 +#, python-format +msgid "You can not give Vote for this idea more than %s times" +msgstr "You can not give Vote for this idea more than %s times" + +#. module: idea +#: view:idea.category:0 +msgid "Ideas Categories" +msgstr "Ideas Categories" + +#. module: idea +#: help:idea.idea,description:0 +msgid "Content of the idea" +msgstr "Content of the idea" + +#. module: idea +#: model:ir.model,name:idea.model_idea_category +msgid "Idea Category" +msgstr "Idea Category" + +#. module: idea +#: view:idea.idea:0 +#: field:idea.idea,stat_vote_ids:0 +msgid "Statistics" +msgstr "Statistics" + +#. module: idea +#: selection:idea.idea,my_vote:0 +#: selection:idea.post.vote,vote:0 +#: selection:idea.vote,score:0 +#: selection:idea.vote.stat,score:0 +msgid "Not Voted" +msgstr "Not Voted" + +#. module: idea +#: sql_constraint:idea.category:0 +msgid "The name of the category must be unique" +msgstr "The name of the category must be unique" + +#. module: idea +#: model:ir.model,name:idea.model_idea_select +msgid "select idea" +msgstr "select idea" + +#. module: idea +#: view:idea.stat:0 +msgid "stat" +msgstr "stat" + +#. module: idea +#: field:idea.category,child_ids:0 +msgid "Child Categories" +msgstr "Child Categories" + +#. module: idea +#: view:idea.select:0 +msgid "Next" +msgstr "Next" + +#. module: idea +#: view:idea.idea:0 +#: field:idea.idea,state:0 +#: view:report.vote:0 +#: field:report.vote,idea_state:0 +msgid "State" +msgstr "State" + +#. module: idea +#: view:idea.idea:0 +#: selection:idea.idea,state:0 +msgid "New" +msgstr "New" + +#. module: idea +#: selection:idea.idea,my_vote:0 +#: selection:idea.post.vote,vote:0 +#: selection:idea.vote,score:0 +#: selection:idea.vote.stat,score:0 +msgid "Good" +msgstr "Good" + +#. module: idea +#: help:idea.idea,open_date:0 +msgid "Date when an idea opened" +msgstr "Date when an idea opened" + +#. module: idea +#: view:idea.idea:0 +msgid "Idea Detail" +msgstr "Idea Detail" + +#. module: idea +#: help:idea.idea,state:0 +msgid "" +"When the Idea is created the state is 'Draft'.\n" +" It is opened by the user, the state is 'Opened'. \n" +"If the idea is accepted, the state is 'Accepted'." +msgstr "" +"When the Idea is created the state is 'Draft'.\n" +" It is opened by the user, the state is 'Opened'. \n" +"If the idea is accepted, the state is 'Accepted'." + +#. module: idea +#: view:idea.idea:0 +msgid "New Ideas" +msgstr "New Ideas" + +#. module: idea +#: view:report.vote:0 +msgid "Idea Vote created last month" +msgstr "Idea Vote created last month" + +#. module: idea +#: field:idea.category,visibility:0 +#: field:idea.idea,visibility:0 +msgid "Open Idea?" +msgstr "Open Idea?" + +#. module: idea +#: view:report.vote:0 +msgid "Idea Vote created in current month" +msgstr "Idea Vote created in current month" + +#. module: idea +#: selection:report.vote,month:0 +msgid "July" +msgstr "July" + +#. module: idea +#: view:idea.idea:0 +#: selection:idea.idea,state:0 +#: view:report.vote:0 +#: selection:report.vote,idea_state:0 +msgid "Accepted" +msgstr "Accepted" + +#. module: idea +#: model:ir.actions.act_window,name:idea.action_idea_category +#: model:ir.ui.menu,name:idea.menu_idea_category +msgid "Categories" +msgstr "Categories" + +#. module: idea +#: view:idea.category:0 +msgid "Parent Category" +msgstr "Parent Category" + +#. module: idea +#: field:idea.idea,open_date:0 +msgid "Open date" +msgstr "Open date" + +#. module: idea +#: field:idea.idea,vote_ids:0 +#: model:ir.actions.act_window,name:idea.action_idea_post_vote +msgid "Vote" +msgstr "Vote" + +#. module: idea +#: model:ir.actions.act_window,name:idea.action_idea_vote_stat +#: model:ir.ui.menu,name:idea.menu_idea_vote_stat +msgid "Vote Statistics" +msgstr "Vote Statistics" + +#. module: idea +#: field:idea.idea,vote_limit:0 +msgid "Maximum Vote per User" +msgstr "Maximum Vote per User" + +#. module: idea +#: view:idea.vote.stat:0 +msgid "vote_stat of ideas" +msgstr "vote_stat of ideas" + +#. module: idea +#: field:idea.comment,content:0 +#: view:idea.idea:0 +#: view:idea.post.vote:0 +#: field:idea.vote,comment:0 +#: model:ir.model,name:idea.model_idea_comment +msgid "Comment" +msgstr "Comment" + +#. module: idea +#: selection:report.vote,month:0 +msgid "September" +msgstr "September" + +#. module: idea +#: selection:report.vote,month:0 +msgid "December" +msgstr "December" + +#. module: idea +#: view:report.vote:0 +#: field:report.vote,month:0 +msgid "Month" +msgstr "Month" + +#. module: idea +#: view:idea.idea:0 +#: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open +#: model:ir.actions.act_window,name:idea.action_idea_idea_open +msgid "Open Ideas" +msgstr "Open Ideas" + +#. module: idea +#: view:idea.category:0 +#: field:idea.category,name:0 +#: view:idea.idea:0 +#: field:idea.idea,category_id:0 +#: view:report.vote:0 +#: field:report.vote,category_id:0 +msgid "Category" +msgstr "Category" + +#. module: idea +#: selection:idea.idea,my_vote:0 +#: selection:idea.post.vote,vote:0 +#: selection:idea.vote,score:0 +#: selection:idea.vote.stat,score:0 +msgid "Very Good" +msgstr "Very Good" + +#. module: idea +#: selection:idea.idea,state:0 +#: selection:report.vote,idea_state:0 +msgid "Opened" +msgstr "Opened" + +#. module: idea +#: model:ir.actions.act_window,name:idea.action_idea_vote +msgid "Idea's Votes" +msgstr "Idea's Votes" + +#. module: idea +#: view:idea.idea:0 +msgid "By Idea Category" +msgstr "By Idea Category" + +#. module: idea +#: view:idea.idea:0 +msgid "New Idea" +msgstr "New Idea" + +#. module: idea +#: model:ir.actions.act_window,name:idea.action_idea_category_tree +#: model:ir.ui.menu,name:idea.menu_idea_category_tree +msgid "Ideas by Categories" +msgstr "Ideas by Categories" + +#. module: idea +#: selection:report.vote,idea_state:0 +msgid "Draft" +msgstr "Draft" + +#. module: idea +#: selection:report.vote,month:0 +msgid "August" +msgstr "August" + +#. module: idea +#: selection:idea.idea,my_vote:0 +#: selection:idea.post.vote,vote:0 +#: selection:idea.vote,score:0 +#: selection:idea.vote.stat,score:0 +msgid "Normal" +msgstr "Normal" + +#. module: idea +#: selection:report.vote,month:0 +msgid "June" +msgstr "June" + +#. module: idea +#: field:report.vote,creater_id:0 +#: field:report.vote,user_id:0 +msgid "User Name" +msgstr "User Name" + +#. module: idea +#: model:ir.model,name:idea.model_idea_vote_stat +msgid "Idea Votes Statistics" +msgstr "Idea Votes Statistics" + +#. module: idea +#: field:idea.comment,user_id:0 +#: view:idea.vote:0 +#: field:idea.vote,user_id:0 +#: view:report.vote:0 +msgid "User" +msgstr "User" + +#. module: idea +#: field:idea.vote,date:0 +msgid "Date" +msgstr "Date" + +#. module: idea +#: selection:report.vote,month:0 +msgid "November" +msgstr "November" + +#. module: idea +#: field:idea.idea,my_vote:0 +msgid "My Vote" +msgstr "My Vote" + +#. module: idea +#: selection:report.vote,month:0 +msgid "October" +msgstr "October" + +#. module: idea +#: field:idea.comment,create_date:0 +#: field:idea.idea,created_date:0 +msgid "Creation date" +msgstr "Creation date" + +#. module: idea +#: selection:report.vote,month:0 +msgid "January" +msgstr "January" + +#. module: idea +#: model:ir.model,name:idea.model_idea_idea +msgid "idea.idea" +msgstr "idea.idea" + +#. module: idea +#: field:idea.category,summary:0 +msgid "Summary" +msgstr "Summary" + +#. module: idea +#: field:idea.idea,name:0 +msgid "Idea Summary" +msgstr "Idea Summary" + +#. module: idea +#: view:idea.post.vote:0 +msgid "Post" +msgstr "Post" + +#. module: idea +#: view:idea.idea:0 +msgid "History" +msgstr "History" + +#. module: idea +#: field:report.vote,date:0 +msgid "Date Order" +msgstr "Date Order" + +#. module: idea +#: view:idea.idea:0 +#: field:idea.idea,user_id:0 +#: view:report.vote:0 +msgid "Creator" +msgstr "Creator" + +#. module: idea +#: view:idea.post.vote:0 +#: model:ir.ui.menu,name:idea.menu_give_vote +msgid "Give Vote" +msgstr "Give Vote" + +#. module: idea +#: help:idea.idea,vote_limit:0 +msgid "Set to one if you require only one Vote per user" +msgstr "Set to one if you require only one Vote per user" + +#. module: idea +#: view:idea.idea:0 +msgid "By Creators" +msgstr "By Creators" + +#. module: idea +#: view:idea.post.vote:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: idea +#: view:idea.select:0 +msgid "Close" +msgstr "Close" + +#. module: idea +#: view:idea.idea:0 +msgid "Open" +msgstr "Open" + +#. module: idea +#: view:idea.idea:0 +#: view:report.vote:0 +msgid "In Progress" +msgstr "In Progress" + +#. module: idea +#: view:report.vote:0 +msgid "Idea Vote Analysis" +msgstr "Idea Vote Analysis" + +#. module: idea +#: view:idea.idea:0 +#: model:ir.actions.act_window,name:idea.action_idea_idea +#: model:ir.ui.menu,name:idea.menu_idea_idea +#: model:ir.ui.menu,name:idea.menu_ideas +#: model:ir.ui.menu,name:idea.menu_ideas1 +msgid "Ideas" +msgstr "Ideas" + +#. module: idea +#: model:ir.model,name:idea.model_idea_post_vote +msgid "Post vote" +msgstr "Post vote" + +#. module: idea +#: field:idea.vote.stat,score:0 +#: field:report.vote,score:0 +msgid "Score" +msgstr "Score" + +#. module: idea +#: view:idea.idea:0 +msgid "Votes Statistics" +msgstr "Votes Statistics" + +#. module: idea +#: view:idea.vote:0 +msgid "Comments:" +msgstr "Comments:" + +#. module: idea +#: view:idea.category:0 +#: field:idea.idea,description:0 +#: field:idea.post.vote,note:0 +msgid "Description" +msgstr "Description" + +#. module: idea +#: selection:report.vote,month:0 +msgid "May" +msgstr "May" + +#. module: idea +#: selection:idea.idea,state:0 +#: view:report.vote:0 +msgid "Refused" +msgstr "Refused" + +#. module: idea +#: code:addons/idea/idea.py:274 +#, python-format +msgid "Draft/Accepted/Cancelled ideas Could not be voted" +msgstr "Draft/Accepted/Cancelled ideas Could not be voted" + +#. module: idea +#: view:idea.vote:0 +msgid "Vote date" +msgstr "Vote date" + +#. module: idea +#: selection:report.vote,month:0 +msgid "February" +msgstr "February" + +#. module: idea +#: field:idea.category,complete_name:0 +msgid "Name" +msgstr "Name" + +#. module: idea +#: field:idea.vote.stat,nbr:0 +msgid "Number of Votes" +msgstr "Number of Votes" + +#. module: idea +#: view:report.vote:0 +msgid "Month-1" +msgstr "Month-1" + +#. module: idea +#: selection:report.vote,month:0 +msgid "April" +msgstr "April" + +#. module: idea +#: field:idea.idea,count_comments:0 +msgid "Count of comments" +msgstr "Count of comments" + +#. module: idea +#: field:idea.vote,score:0 +msgid "Vote Status" +msgstr "Vote Status" + +#. module: idea +#: field:idea.idea,vote_avg:0 +msgid "Average Score" +msgstr "Average Score" + +#. module: idea +#: constraint:idea.category:0 +msgid "Error ! You cannot create recursive categories." +msgstr "Error ! You cannot create recursive categories." + +#. module: idea +#: field:idea.comment,idea_id:0 +#: field:idea.select,idea_id:0 +#: view:idea.vote:0 +#: field:idea.vote,idea_id:0 +#: field:idea.vote.stat,idea_id:0 +#: model:ir.ui.menu,name:idea.menu_idea_reporting +#: view:report.vote:0 +#: field:report.vote,idea_id:0 +msgid "Idea" +msgstr "Idea" + +#. module: idea +#: view:idea.idea:0 +msgid "Accept" +msgstr "Accept" + +#. module: idea +#: field:idea.post.vote,vote:0 +msgid "Post Vote" +msgstr "Post Vote" + +#. module: idea +#: view:report.vote:0 +#: field:report.vote,year:0 +msgid "Year" +msgstr "Year" + +#. module: idea +#: view:idea.select:0 +msgid "Select Idea for Vote" +msgstr "Select Idea for Vote" + +#~ msgid " Month-1 " +#~ msgstr " Month-1 " + +#~ msgid "Current" +#~ msgstr "Current" + +#~ msgid "Idea Manager" +#~ msgstr "Idea Manager" + +#~ msgid " Today " +#~ msgstr " Today " + +#~ msgid " Year " +#~ msgstr " Year " + +#~ msgid "" +#~ "\n" +#~ " This module allows your user to easily and efficiently participate in " +#~ "the innovation of the enterprise.\n" +#~ " It allows everybody to express ideas about different subjects.\n" +#~ " Then, other users can comment on these ideas and vote for particular " +#~ "ideas.\n" +#~ " Each idea has a score based on the different votes.\n" +#~ " The managers can obtain an easy view on best ideas from all the users.\n" +#~ " Once installed, check the menu 'Ideas' in the 'Tools' main menu." +#~ msgstr "" +#~ "\n" +#~ " This module allows your user to easily and efficiently participate in " +#~ "the innovation of the enterprise.\n" +#~ " It allows everybody to express ideas about different subjects.\n" +#~ " Then, other users can comment on these ideas and vote for particular " +#~ "ideas.\n" +#~ " Each idea has a score based on the different votes.\n" +#~ " The managers can obtain an easy view on best ideas from all the users.\n" +#~ " Once installed, check the menu 'Ideas' in the 'Tools' main menu." + +#~ msgid "Vots Statistics" +#~ msgstr "Vots Statistics" + +#~ msgid " Month " +#~ msgstr " Month " diff --git a/addons/l10n_be/i18n/en_GB.po b/addons/l10n_be/i18n/en_GB.po new file mode 100644 index 00000000000..787c656a56d --- /dev/null +++ b/addons/l10n_be/i18n/en_GB.po @@ -0,0 +1,639 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-23 09:56+0000\n" +"PO-Revision-Date: 2012-01-23 17:51+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: l10n_be +#: field:partner.vat.intra,test_xml:0 +msgid "Test XML file" +msgstr "Test XML file" + +#. module: l10n_be +#: view:partner.vat.list_13:0 +msgid "You can remove customers which you do not want in exported xml file" +msgstr "" + +#. module: l10n_be +#: view:partner.vat_13:0 +msgid "" +"This wizard will create an XML file for VAT details and total invoiced " +"amounts per partner." +msgstr "" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_tiers_receiv +msgid "Tiers - Recevable" +msgstr "" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102 +#, python-format +msgid "Wrong Period Code" +msgstr "Wrong Period Code" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52 +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109 +#, python-format +msgid "No partner has a VAT Number asociated with him." +msgstr "No partner has a VAT Number asociated with him." + +#. module: l10n_be +#: constraint:res.company:0 +msgid "Error! You can not create recursive companies." +msgstr "Error! You can not create recursive companies." + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_tiers +msgid "Tiers" +msgstr "" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,period_id:0 +msgid "Period" +msgstr "Period" + +#. module: l10n_be +#: field:partner.vat.intra,period_ids:0 +msgid "Period (s)" +msgstr "Period (s)" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +#: view:partner.vat.intra:0 +msgid "Save the File with '.xml' extension." +msgstr "Save the File with '.xml' extension." + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_charge +msgid "Charge" +msgstr "" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47 +#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52 +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105 +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109 +#, python-format +msgid "Data Insufficient!" +msgstr "Data Insufficient!" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +#: view:partner.vat.list_13:0 +msgid "Create XML" +msgstr "Create XML" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_capitaux +msgid "Capital" +msgstr "" + +#. module: l10n_be +#: view:partner.vat.list_13:0 +msgid "Print" +msgstr "" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "Save XML" +msgstr "Save XML" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:219 +#, python-format +msgid "Save" +msgstr "Save" + +#. module: l10n_be +#: sql_constraint:res.company:0 +msgid "The company name must be unique !" +msgstr "" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,msg:0 +#: field:partner.vat.intra,msg:0 +#: field:partner.vat.list_13,msg:0 +msgid "File created" +msgstr "File created" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "_Close" +msgstr "" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:131 +#, python-format +msgid "Save XML For Vat declaration" +msgstr "Save XML For Vat declaration" + +#. module: l10n_be +#: view:partner.vat.list_13:0 +msgid "Customers" +msgstr "" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_tax_in +msgid "Taxes à l'entrée" +msgstr "" + +#. module: l10n_be +#: help:l1on_be.vat.declaration,ask_restitution:0 +msgid "It indicates whether a resitution is to made or not?" +msgstr "It indicates whether a resitution is to made or not?" + +#. module: l10n_be +#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration +msgid "Vat Declaraion" +msgstr "Vat Declaration" + +#. module: l10n_be +#: view:partner.vat.intra:0 +#: field:partner.vat.intra,no_vat:0 +msgid "Partner With No VAT" +msgstr "Partner With No VAT" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_immo +msgid "Immobilisation" +msgstr "" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +#: view:partner.vat.intra:0 +msgid "Company" +msgstr "Company" + +#. module: l10n_be +#: model:ir.model,name:l10n_be.model_partner_vat_13 +msgid "partner.vat_13" +msgstr "" + +#. module: l10n_be +#: model:ir.ui.menu,name:l10n_be.partner_vat_listing +msgid "Annual Listing Of VAT-Subjected Customers" +msgstr "Annual Listing Of VAT-Subjected Customers" + +#. module: l10n_be +#: view:partner.vat.list_13:0 +msgid "XML File has been Created." +msgstr "XML File has been Created." + +#. module: l10n_be +#: help:l1on_be.vat.declaration,client_nihil:0 +msgid "" +"Tick this case only if it concerns only the last statement on the civil or " +"cessation of activity" +msgstr "" +"Tick this case only if it concerns only the last statement on the civil or " +"cessation of activity" + +#. module: l10n_be +#: view:partner.vat.list_13:0 +msgid "Select Fiscal Year" +msgstr "Select Fiscal Year" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,ask_restitution:0 +msgid "Ask Restitution" +msgstr "Ask Restitution" + +#. module: l10n_be +#: model:ir.model,name:l10n_be.model_partner_vat_intra +#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra +msgid "Partner VAT Intra" +msgstr "Partner VAT Intra" + +#. module: l10n_be +#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration +#: view:l1on_be.vat.declaration:0 +msgid "Periodical VAT Declaration" +msgstr "Periodical VAT Declaration" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "Note: " +msgstr "Note: " + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "_Preview" +msgstr "" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_tiers_payable +msgid "Tiers - Payable" +msgstr "" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,tax_code_id:0 +#: field:partner.vat.intra,tax_code_id:0 +msgid "Tax Code" +msgstr "Tax Code" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "Periods" +msgstr "Periods" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_produit +msgid "Produit" +msgstr "" + +#. module: l10n_be +#: help:partner.vat.intra,test_xml:0 +msgid "Sets the XML output as test file" +msgstr "Sets the XML output as test file" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_view +msgid "Vue" +msgstr "" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +msgid "Ok" +msgstr "Ok" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,ask_payment:0 +msgid "Ask Payment" +msgstr "Ask Payment" + +#. module: l10n_be +#: help:partner.vat.intra,no_vat:0 +msgid "" +"The Partner whose VAT number is not defined they doesn't include in XML File." +msgstr "" +"The Partner whose VAT number is not defined they doesn't include in XML File." + +#. module: l10n_be +#: field:partner.vat_13,limit_amount:0 +msgid "Limit Amount" +msgstr "Limit Amount" + +#. module: l10n_be +#: model:ir.model,name:l10n_be.model_res_company +msgid "Companies" +msgstr "Companies" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "Create _XML" +msgstr "" + +#. module: l10n_be +#: help:partner.vat.intra,period_ids:0 +msgid "" +"Select here the period(s) you want to include in your intracom declaration" +msgstr "" +"Select here the period(s) you want to include in your intracom declaration" + +#. module: l10n_be +#: view:partner.vat_13:0 +msgid "View Customers" +msgstr "" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102 +#, python-format +msgid "The period code you entered is not valid." +msgstr "The period code you entered is not valid." + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +msgid "Is Last Declaration" +msgstr "Is Last Declaration" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_stock +msgid "Stock et Encours" +msgstr "" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,client_nihil:0 +msgid "Last Declaration of Enterprise" +msgstr "Last Declaration of Enterprise" + +#. module: l10n_be +#: help:partner.vat.intra,mand_id:0 +msgid "" +"This identifies the representative of the sending company. This is a string " +"of 14 characters" +msgstr "" +"This identifies the representative of the sending company. This is a string " +"of 14 characters" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75 +#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:150 +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98 +#, python-format +msgid "Data Insufficient" +msgstr "Data Insufficient" + +#. module: l10n_be +#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement +msgid "Belgium Statements" +msgstr "Belgium Statements" + +#. module: l10n_be +#: model:ir.actions.act_window,name:l10n_be.action_vat_intra +msgid "Partner Vat Intra" +msgstr "Partner Vat Intra" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +msgid "Declare Periodical VAT" +msgstr "Declare Periodical VAT" + +#. module: l10n_be +#: model:ir.model,name:l10n_be.model_partner_vat_list_13 +msgid "partner.vat.list_13" +msgstr "" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +msgid "Save xml" +msgstr "Save xml" + +#. module: l10n_be +#: field:partner.vat.intra,mand_id:0 +msgid "MandataireId" +msgstr "MandataireId" + +#. module: l10n_be +#: field:l1on_be.vat.declaration,file_save:0 +#: field:partner.vat.intra,file_save:0 +#: field:partner.vat.list_13,file_save:0 +msgid "Save File" +msgstr "Save File" + +#. module: l10n_be +#: help:partner.vat.intra,period_code:0 +msgid "" +"This is where you have to set the period code for the intracom declaration " +"using the format: ppyyyy\n" +" PP can stand for a month: from '01' to '12'.\n" +" PP can stand for a trimester: '31','32','33','34'\n" +" The first figure means that it is a trimester,\n" +" The second figure identify the trimester.\n" +" PP can stand for a complete fiscal year: '00'.\n" +" YYYY stands for the year (4 positions).\n" +" " +msgstr "" +"This is where you have to set the period code for the intracom declaration " +"using the format: ppyyyy\n" +" PP can stand for a month: from '01' to '12'.\n" +" PP can stand for a trimester: '31','32','33','34'\n" +" The first figure means that it is a trimester,\n" +" The second figure identify the trimester.\n" +" PP can stand for a complete fiscal year: '00'.\n" +" YYYY stands for the year (4 positions).\n" +" " + +#. module: l10n_be +#: field:l1on_be.vat.declaration,name:0 +#: field:partner.vat.intra,name:0 +#: field:partner.vat.list_13,name:0 +msgid "File Name" +msgstr "File Name" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_tax_out +msgid "Taxes à la sortie" +msgstr "" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_tax +msgid "Tax" +msgstr "" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75 +#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:150 +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98 +#, python-format +msgid "No VAT Number Associated with Main Company!" +msgstr "No VAT Number Associated with Main Company!" + +#. module: l10n_be +#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration +msgid "Vat Declaration" +msgstr "Vat Declaration" + +#. module: l10n_be +#: view:partner.vat.intra:0 +#: field:partner.vat.intra,country_ids:0 +msgid "European Countries" +msgstr "European Countries" + +#. module: l10n_be +#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing_13 +#: view:partner.vat_13:0 +msgid "Partner VAT Listing" +msgstr "Partner VAT Listing" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "General Information" +msgstr "General Information" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "Create an XML file for Vat Intra" +msgstr "Create an XML file for Vat Intra" + +#. module: l10n_be +#: field:partner.vat.intra,period_code:0 +msgid "Period Code" +msgstr "Period Code" + +#. module: l10n_be +#: model:account.account.type,name:l10n_be.user_type_financiers +msgid "Financier" +msgstr "" + +#. module: l10n_be +#: field:partner.vat_13,year:0 +msgid "Year" +msgstr "" + +#. module: l10n_be +#: view:partner.vat_13:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: l10n_be +#: view:l1on_be.vat.declaration:0 +#: view:partner.vat.intra:0 +#: view:partner.vat.list_13:0 +msgid "Close" +msgstr "Close" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105 +#, python-format +msgid "Please select at least one Period." +msgstr "Please select at least one Period." + +#. module: l10n_be +#: help:l1on_be.vat.declaration,ask_payment:0 +msgid "It indicates whether a payment is to made or not?" +msgstr "It indicates whether a payment is to made or not?" + +#. module: l10n_be +#: view:partner.vat.intra:0 +msgid "Partner VAT intra" +msgstr "Partner VAT intra" + +#. module: l10n_be +#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47 +#, python-format +msgid "No data for the selected Year." +msgstr "" + +#~ msgid "Client Name" +#~ msgstr "Client Name" + +#~ msgid "vat.listing.clients" +#~ msgstr "vat.listing.clients" + +#~ msgid "partner.vat.list" +#~ msgstr "partner.vat.list" + +#~ msgid "VAT listing" +#~ msgstr "VAT listing" + +#~ msgid "" +#~ "This wizard will create an XML file for Vat details and total invoiced " +#~ "amounts per partner." +#~ msgstr "" +#~ "This wizard will create an XML file for Vat details and total invoiced " +#~ "amounts per partner." + +#~ msgid "Clients" +#~ msgstr "Clients" + +#~ msgid "Country" +#~ msgstr "Country" + +#~ msgid "VAT" +#~ msgstr "VAT" + +#~ msgid "partner.vat" +#~ msgstr "partner.vat" + +#~ msgid "Amount" +#~ msgstr "Amount" + +#~ msgid "Fiscal Year" +#~ msgstr "Fiscal Year" + +#~ msgid "Turnover" +#~ msgstr "Turnover" + +#~ msgid "" +#~ "You can remove clients/partners which you do not want in exported xml file" +#~ msgstr "" +#~ "You can remove clients/partners which you do not want in exported xml file" + +#~ msgid "" +#~ "You can remove clients/partners which you do not want to show in xml file" +#~ msgstr "" +#~ "You can remove clients/partners which you do not want to show in xml file" + +#~ msgid "View Client" +#~ msgstr "View Client" + +#~ msgid "Belgium - Plan Comptable Minimum Normalise" +#~ msgstr "Belgium - Plan Comptable Minimum Normalise" + +#~ msgid "" +#~ "\n" +#~ " This is the base module to manage the accounting chart for Belgium in " +#~ "OpenERP.\n" +#~ "\n" +#~ " After Installing this module,The Configuration wizard for accounting is " +#~ "launched.\n" +#~ " * We have the account templates which can be helpful to generate Charts " +#~ "of Accounts.\n" +#~ " * On that particular wizard,You will be asked to pass the name of the " +#~ "company,the chart template to follow,the no. of digits to generate the code " +#~ "for your account and Bank account,currency to create Journals.\n" +#~ " Thus,the pure copy of Chart Template is generated.\n" +#~ " * This is the same wizard that runs from Financial " +#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate " +#~ "Chart of Accounts from a Chart Template.\n" +#~ "\n" +#~ " Wizards provided by this module:\n" +#~ " * Partner VAT Intra: Enlist the partners with their related VAT and " +#~ "invoiced amounts.Prepares an XML file format.\n" +#~ " Path to access : Financial " +#~ "Management/Reporting//Legal Statements/Belgium Statements/Partner VAT " +#~ "Listing\n" +#~ " * Periodical VAT Declaration: Prepares an XML file for Vat Declaration " +#~ "of the Main company of the User currently Logged in.\n" +#~ " Path to access : Financial " +#~ "Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT " +#~ "Declaration\n" +#~ " * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for " +#~ "Vat Declaration of the Main company of the User currently Logged in.Based on " +#~ "Fiscal year\n" +#~ " Path to access : Financial " +#~ "Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of " +#~ "VAT-Subjected Customers\n" +#~ "\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ " This is the base module to manage the accounting chart for Belgium in " +#~ "OpenERP.\n" +#~ "\n" +#~ " After Installing this module,The Configuration wizard for accounting is " +#~ "launched.\n" +#~ " * We have the account templates which can be helpful to generate Charts " +#~ "of Accounts.\n" +#~ " * On that particular wizard,You will be asked to pass the name of the " +#~ "company,the chart template to follow,the no. of digits to generate the code " +#~ "for your account and Bank account,currency to create Journals.\n" +#~ " Thus,the pure copy of Chart Template is generated.\n" +#~ " * This is the same wizard that runs from Financial " +#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate " +#~ "Chart of Accounts from a Chart Template.\n" +#~ "\n" +#~ " Wizards provided by this module:\n" +#~ " * Partner VAT Intra: Enlist the partners with their related VAT and " +#~ "invoiced amounts.Prepares an XML file format.\n" +#~ " Path to access : Financial " +#~ "Management/Reporting//Legal Statements/Belgium Statements/Partner VAT " +#~ "Listing\n" +#~ " * Periodical VAT Declaration: Prepares an XML file for Vat Declaration " +#~ "of the Main company of the User currently Logged in.\n" +#~ " Path to access : Financial " +#~ "Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT " +#~ "Declaration\n" +#~ " * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for " +#~ "Vat Declaration of the Main company of the User currently Logged in.Based on " +#~ "Fiscal year\n" +#~ " Path to access : Financial " +#~ "Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of " +#~ "VAT-Subjected Customers\n" +#~ "\n" +#~ " " diff --git a/addons/l10n_br/i18n/en_GB.po b/addons/l10n_br/i18n/en_GB.po index a8d5cef2b5d..175cab5711c 100644 --- a/addons/l10n_br/i18n/en_GB.po +++ b/addons/l10n_br/i18n/en_GB.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-23 09:56+0000\n" -"PO-Revision-Date: 2011-08-25 11:59+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:43+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:55+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: l10n_br #: field:account.tax,tax_discount:0 @@ -23,7 +23,7 @@ msgstr "" #: field:account.tax.code.template,tax_discount:0 #: field:account.tax.template,tax_discount:0 msgid "Discount this Tax in Prince" -msgstr "" +msgstr "Discount this Tax in Prince" #. module: l10n_br #: model:ir.actions.act_window,name:l10n_br.action_l10n_br_cst_form @@ -31,13 +31,13 @@ msgstr "" #: model:ir.ui.menu,name:l10n_br.menu_action_l10n_br_cst #: view:l10n_br_account.cst:0 msgid "Tax Situation Code" -msgstr "" +msgstr "Tax Situation Code" #. module: l10n_br #: model:ir.model,name:l10n_br.model_account_tax_code #: field:l10n_br_account.cst,tax_code_id:0 msgid "Tax Code" -msgstr "" +msgstr "Tax Code" #. module: l10n_br #: help:account.tax.code,domain:0 @@ -46,27 +46,29 @@ msgid "" "This field is only used if you develop your own module allowing developers " "to create specific taxes in a custom domain." msgstr "" +"This field is only used if you develop your own module allowing developers " +"to create specific taxes in a custom domain." #. module: l10n_br #: model:account.account.type,name:l10n_br.resultado msgid "Resultado" -msgstr "" +msgstr "Result" #. module: l10n_br #: model:ir.model,name:l10n_br.model_account_tax_template msgid "account.tax.template" -msgstr "" +msgstr "account.tax.template" #. module: l10n_br #: model:account.account.type,name:l10n_br.passivo msgid "Passivo" -msgstr "" +msgstr "Passive" #. module: l10n_br #: field:l10n_br_account.cst,name:0 #: field:l10n_br_account.cst.template,name:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: l10n_br #: model:account.account.type,name:l10n_br.despesa @@ -77,13 +79,13 @@ msgstr "" #: field:account.tax,amount_mva:0 #: field:account.tax.template,amount_mva:0 msgid "MVA Percent" -msgstr "" +msgstr "MVA Percent" #. module: l10n_br #: help:account.tax.template,amount_mva:0 #: help:account.tax.template,base_reduction:0 msgid "For taxes of type percentage, enter % ratio between 0-1." -msgstr "" +msgstr "For taxes of type percentage, enter % ratio between 0-1." #. module: l10n_br #: field:account.tax,base_reduction:0 @@ -94,17 +96,17 @@ msgstr "" #. module: l10n_br #: constraint:account.tax.code.template:0 msgid "Error ! You can not create recursive Tax Codes." -msgstr "" +msgstr "Error ! You can not create recursive Tax Codes." #. module: l10n_br #: sql_constraint:account.tax:0 msgid "Tax Name must be unique per company!" -msgstr "" +msgstr "Tax Name must be unique per company!" #. module: l10n_br #: model:ir.model,name:l10n_br.model_account_tax msgid "account.tax" -msgstr "" +msgstr "account.tax" #. module: l10n_br #: model:account.account.type,name:l10n_br.receita @@ -117,12 +119,12 @@ msgstr "" #: model:ir.ui.menu,name:l10n_br.menu_action_l10n_br_cst_template #: view:l10n_br_account.cst.template:0 msgid "Tax Situation Code Template" -msgstr "" +msgstr "Tax Situation Code Template" #. module: l10n_br #: model:ir.model,name:l10n_br.model_wizard_multi_charts_accounts msgid "wizard.multi.charts.accounts" -msgstr "" +msgstr "wizard.multi.charts.accounts" #. module: l10n_br #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization @@ -149,29 +151,29 @@ msgstr "" #: help:account.tax.code.template,tax_discount:0 #: help:account.tax.template,tax_discount:0 msgid "Mark it for (ICMS, PIS e etc.)." -msgstr "" +msgstr "Mark it for (ICMS, PIS e etc.)." #. module: l10n_br #: model:account.account.type,name:l10n_br.ativo msgid "Ativo" -msgstr "" +msgstr "Active" #. module: l10n_br #: field:account.tax.code,domain:0 #: field:account.tax.code.template,domain:0 msgid "Domain" -msgstr "" +msgstr "Domain" #. module: l10n_br #: field:l10n_br_account.cst,code:0 #: field:l10n_br_account.cst.template,code:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: l10n_br #: constraint:account.tax.code:0 msgid "Error ! You can not create recursive accounts." -msgstr "" +msgstr "Error ! You can not create recursive accounts." #. module: l10n_br #: help:account.tax,amount_mva:0 @@ -183,7 +185,7 @@ msgstr "" #: model:ir.model,name:l10n_br.model_account_tax_code_template #: field:l10n_br_account.cst.template,tax_code_template_id:0 msgid "Tax Code Template" -msgstr "" +msgstr "Tax Code Template" #~ msgid "Brazilian Localization" #~ msgstr "Brazilian Localisation" diff --git a/addons/l10n_ca/i18n/en_GB.po b/addons/l10n_ca/i18n/en_GB.po new file mode 100644 index 00000000000..690c4c42e79 --- /dev/null +++ b/addons/l10n_ca/i18n/en_GB.po @@ -0,0 +1,129 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-08-02 21:08+0000\n" +"PO-Revision-Date: 2012-01-23 13:38+0000\n" +"Last-Translator: mrx5682 \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_receivable +msgid "Receivable" +msgstr "Receivable" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.acct_type_asset_view +msgid "Asset View" +msgstr "Asset View" + +#. module: l10n_ca +#: model:ir.module.module,description:l10n_ca.module_meta_information +msgid "" +"This is the module to manage the canadian accounting chart in OpenERP." +msgstr "" +"This is the module to manage the canadian accounting chart in OpenERP." + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.acct_type_expense_view +msgid "Expense View" +msgstr "Expense View" + +#. module: l10n_ca +#: constraint:account.account.template:0 +msgid "Error ! You can not create recursive account templates." +msgstr "Error ! You can not create recursive account templates." + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.acct_type_income_view +msgid "Income View" +msgstr "Income View" + +#. module: l10n_ca +#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information +msgid "Canada - Chart of Accounts" +msgstr "Canada - Chart of Accounts" + +#. module: l10n_ca +#: constraint:account.account.type:0 +msgid "Error ! You can not create recursive types." +msgstr "Error ! You can not create recursive types." + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_tax +msgid "Tax" +msgstr "Tax" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_cash +msgid "Cash" +msgstr "Cash" + +#. module: l10n_ca +#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_payable +msgid "Payable" +msgstr "Payable" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_asset +msgid "Asset" +msgstr "Asset" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_equity +msgid "Equity" +msgstr "Equity" + +#. module: l10n_ca +#: constraint:account.tax.code.template:0 +msgid "Error ! You can not create recursive Tax Codes." +msgstr "Error ! You can not create recursive Tax Codes." + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.acct_type_liability_view +msgid "Liability View" +msgstr "Liability View" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_expense +msgid "Expense" +msgstr "Expense" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_income +msgid "Income" +msgstr "Income" + +#. module: l10n_ca +#: model:account.account.type,name:l10n_ca.account_type_view +msgid "View" +msgstr "View" diff --git a/addons/l10n_th/i18n/tr.po b/addons/l10n_th/i18n/tr.po index 0c1e0111644..580318d8c3b 100644 --- a/addons/l10n_th/i18n/tr.po +++ b/addons/l10n_th/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-23 09:56+0000\n" -"PO-Revision-Date: 2011-06-08 10:23+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 23:26+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:55+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: l10n_th #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th @@ -39,17 +39,17 @@ msgstr "" #. module: l10n_th #: model:account.account.type,name:l10n_th.acc_type_other msgid "Other" -msgstr "" +msgstr "Diğer" #. module: l10n_th #: model:account.account.type,name:l10n_th.acc_type_reconciled msgid "Reconciled" -msgstr "" +msgstr "Uzlaşılmış" #. module: l10n_th #: model:account.account.type,name:l10n_th.acc_type_view msgid "View" -msgstr "" +msgstr "Görünüm" #~ msgid "" #~ "\n" diff --git a/addons/mail_gateway/i18n/tr.po b/addons/mail_gateway/i18n/tr.po new file mode 100644 index 00000000000..cf4e9513e1b --- /dev/null +++ b/addons/mail_gateway/i18n/tr.po @@ -0,0 +1,359 @@ +# Turkish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2012-01-23 23:14+0000\n" +"Last-Translator: Ahmet Altınışık \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: mail_gateway +#: field:mailgate.message,res_id:0 +msgid "Resource ID" +msgstr "Kaynak ID" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:68 +#: code:addons/mail_gateway/mail_gateway.py:71 +#: code:addons/mail_gateway/mail_gateway.py:89 +#, python-format +msgid "Method is not implemented" +msgstr "Method uygulanmamış" + +#. module: mail_gateway +#: view:mailgate.message:0 +#: field:mailgate.message,email_from:0 +msgid "From" +msgstr "Kimden" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Open Attachments" +msgstr "Ekleri Aç" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Message Details" +msgstr "Mesaj Detayları" + +#. module: mail_gateway +#: field:mailgate.message,message_id:0 +msgid "Message Id" +msgstr "Mesaj Id" + +#. module: mail_gateway +#: field:mailgate.message,ref_id:0 +msgid "Reference Id" +msgstr "Referans Id" + +#. module: mail_gateway +#: view:mailgate.thread:0 +msgid "Mailgateway History" +msgstr "Epostageçidi Geçmişi" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:249 +#, python-format +msgid "Note" +msgstr "Not" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Group By..." +msgstr "Grupla..." + +#. module: mail_gateway +#: constraint:res.partner:0 +msgid "Error ! You can not create recursive associated members." +msgstr "Hata! Kendini Çağıran üyeler oluşturamazsınız." + +#. module: mail_gateway +#: help:mailgate.message,message_id:0 +msgid "Message Id on Email." +msgstr "Epostadaki Mesaj Idsi" + +#. module: mail_gateway +#: help:mailgate.message,email_to:0 +msgid "Email Recipients" +msgstr "Eposta Alıcıları" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Details" +msgstr "Detaylar" + +#. module: mail_gateway +#: view:mailgate.thread:0 +msgid "Mailgate History" +msgstr "Postageçidi Geçmişi" + +#. module: mail_gateway +#: model:ir.model,name:mail_gateway.model_email_server_tools +msgid "Email Server Tools" +msgstr "Eposta Sunucusu Araçları" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Email Followers" +msgstr "Eposta Takipçileri" + +#. module: mail_gateway +#: model:ir.model,name:mail_gateway.model_res_partner +#: view:mailgate.message:0 +#: field:mailgate.message,partner_id:0 +msgid "Partner" +msgstr "Cari" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:250 +#, python-format +msgid " wrote on %s:\n" +msgstr " Demiş ki %s:\n" + +#. module: mail_gateway +#: view:mailgate.message:0 +#: field:mailgate.message,description:0 +#: field:mailgate.message,message:0 +msgid "Description" +msgstr "Açıklama" + +#. module: mail_gateway +#: field:mailgate.message,email_to:0 +msgid "To" +msgstr "Kime" + +#. module: mail_gateway +#: help:mailgate.message,references:0 +msgid "References emails." +msgstr "Referans e-postalar." + +#. module: mail_gateway +#: help:mailgate.message,email_cc:0 +msgid "Carbon Copy Email Recipients" +msgstr "CC Karbon Kopya E-posta Alıcıları" + +#. module: mail_gateway +#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information +msgid "Email Gateway System" +msgstr "E-posta Geçidi Sistemi" + +#. module: mail_gateway +#: field:mailgate.message,date:0 +msgid "Date" +msgstr "Tarih" + +#. module: mail_gateway +#: field:mailgate.message,model:0 +msgid "Object Name" +msgstr "Nesne Adı" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Partner Name" +msgstr "Cari Adı" + +#. module: mail_gateway +#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread +msgid "Mailgateway Threads" +msgstr "Postageçidi Konuları" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:247 +#, python-format +msgid "Opportunity" +msgstr "Fırsat" + +#. module: mail_gateway +#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails +#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message +#: view:mailgate.message:0 +#: field:res.partner,emails:0 +msgid "Emails" +msgstr "E-postalar" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:252 +#, python-format +msgid "Stage" +msgstr "Aşama" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:250 +#, python-format +msgid " added note on " +msgstr " not eklemiş " + +#. module: mail_gateway +#: help:mailgate.message,email_from:0 +msgid "Email From" +msgstr "E-posta Gönderen" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Thread" +msgstr "Konu" + +#. module: mail_gateway +#: model:ir.model,name:mail_gateway.model_mailgate_message +msgid "Mailgateway Message" +msgstr "Mailgeçidi Mesajı" + +#. module: mail_gateway +#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message +#: field:mailgate.thread,message_ids:0 +msgid "Messages" +msgstr "Mesajlar" + +#. module: mail_gateway +#: field:mailgate.message,user_id:0 +msgid "User Responsible" +msgstr "Sorumlu Kullanıcı" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:248 +#, python-format +msgid "Converted to Opportunity" +msgstr "Fırsata Dönüştürülmüş" + +#. module: mail_gateway +#: field:mailgate.message,email_bcc:0 +msgid "Bcc" +msgstr "Gizli Kopya" + +#. module: mail_gateway +#: field:mailgate.message,history:0 +msgid "Is History?" +msgstr "Geçmiş mi?" + +#. module: mail_gateway +#: help:mailgate.message,email_bcc:0 +msgid "Blind Carbon Copy Email Recipients" +msgstr "Gizli Eposta Alıcıları (BCC)" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "mailgate message" +msgstr "postageçidi mesajı" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:148 +#: view:mailgate.thread:0 +#: view:res.partner:0 +#, python-format +msgid "History" +msgstr "Geçmiş" + +#. module: mail_gateway +#: field:mailgate.message,references:0 +msgid "References" +msgstr "Referanslar" + +#. module: mail_gateway +#: model:ir.model,name:mail_gateway.model_mailgate_thread +#: view:mailgate.thread:0 +msgid "Mailgateway Thread" +msgstr "Postageçidi Konusu" + +#. module: mail_gateway +#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email +#: view:mailgate.message:0 +#: field:mailgate.message,attachment_ids:0 +#: view:mailgate.thread:0 +msgid "Attachments" +msgstr "Ekler" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Open Document" +msgstr "Belge Aç" + +#. module: mail_gateway +#: view:mailgate.thread:0 +msgid "Email Details" +msgstr "Eposta Detayları" + +#. module: mail_gateway +#: field:mailgate.message,email_cc:0 +msgid "Cc" +msgstr "İlgili Kopyası (CC)" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:254 +#, python-format +msgid " on %s:\n" +msgstr " on %s:\n" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Month" +msgstr "Ay" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Email Search" +msgstr "E-posta Ara" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:561 +#, python-format +msgid "receive" +msgstr "Al" + +#. module: mail_gateway +#: model:ir.module.module,description:mail_gateway.module_meta_information +msgid "" +"The generic email gateway system allows to send and receive emails\n" +" * History for Emails\n" +" * Easy Integration with any Module" +msgstr "" +"Genel e-posta geçidi sistemi, OpenERP nin e-posta gönderip almasını sağlar\n" +" * E-posta tarihçesi\n" +" * Diğer Modüllerle kolay entegrasyon" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:255 +#, python-format +msgid "Changed Status to: " +msgstr "Durumu değiştirildi: " + +#. module: mail_gateway +#: field:mailgate.message,display_text:0 +msgid "Display Text" +msgstr "Metin Göster" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Owner" +msgstr "Sahibi" + +#. module: mail_gateway +#: code:addons/mail_gateway/mail_gateway.py:253 +#, python-format +msgid "Changed Stage to: " +msgstr "" + +#. module: mail_gateway +#: view:mailgate.message:0 +msgid "Message" +msgstr "Mesaj" + +#. module: mail_gateway +#: view:mailgate.message:0 +#: field:mailgate.message,name:0 +msgid "Subject" +msgstr "Konu" + +#. module: mail_gateway +#: help:mailgate.message,ref_id:0 +msgid "Message Id in Email Server." +msgstr "E-posta sunucusundaki mesaj IDsi" diff --git a/addons/marketing/i18n/tr.po b/addons/marketing/i18n/tr.po index f358cdefbb2..36516ca7225 100644 --- a/addons/marketing/i18n/tr.po +++ b/addons/marketing/i18n/tr.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:45+0000\n" -"PO-Revision-Date: 2011-06-09 18:18+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:19+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:20+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: marketing #: model:res.groups,name:marketing.group_marketing_manager msgid "Manager" -msgstr "" +msgstr "Yönetici" #. module: marketing #: model:res.groups,name:marketing.group_marketing_user msgid "User" -msgstr "" +msgstr "Kullanıcı" #~ msgid "Configure Your Marketing Application" #~ msgstr "Pazarlama Uygulamalarınızı Yapılandırın" diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po index f48bf0efcf0..f8f1236d009 100644 --- a/addons/mrp_repair/i18n/tr.po +++ b/addons/mrp_repair/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:45+0000\n" -"PO-Revision-Date: 2011-06-23 20:16+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:23+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: mrp_repair #: view:mrp.repair:0 @@ -121,7 +121,7 @@ msgstr "Ücretlerde tanımlanmış ürün yok!" #: view:mrp.repair:0 #: field:mrp.repair,company_id:0 msgid "Company" -msgstr "" +msgstr "Şirket" #. module: mrp_repair #: view:mrp.repair:0 diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po index 41b2630e6fb..56987c78296 100644 --- a/addons/mrp_subproduct/i18n/tr.po +++ b/addons/mrp_subproduct/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:45+0000\n" -"PO-Revision-Date: 2010-09-09 07:20+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2012-01-23 22:32+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: mrp_subproduct #: field:mrp.subproduct,product_id:0 @@ -50,7 +50,7 @@ msgstr "Üretim Emri" #. module: mrp_subproduct #: constraint:mrp.bom:0 msgid "BoM line product should not be same as BoM product." -msgstr "" +msgstr "BoM satırındaki ürün BoM ürünü ile aynı olamaz." #. module: mrp_subproduct #: view:mrp.bom:0 @@ -85,7 +85,7 @@ msgstr "BoM (Malzeme Faturası)" #. module: mrp_subproduct #: sql_constraint:mrp.production:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referans her şirket için tekil olmalı!" #. module: mrp_subproduct #: field:mrp.bom,sub_products:0 @@ -105,7 +105,7 @@ msgstr "Alt Ürün" #. module: mrp_subproduct #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero!" -msgstr "" +msgstr "Sipariş adedi negatif ya da sıfır olamaz!" #. module: mrp_subproduct #: help:mrp.subproduct,subproduct_type:0 @@ -122,7 +122,7 @@ msgstr "" #. module: mrp_subproduct #: constraint:mrp.bom:0 msgid "Error ! You cannot create recursive BoM." -msgstr "" +msgstr "Hata ! Kendini İçeren BoM oluşturamazsınız." #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Görüntüleme mimarisi için Geçersiz XML" diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po index d692c2d4d64..e9dd74809a8 100644 --- a/addons/multi_company/i18n/tr.po +++ b/addons/multi_company/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2010-01-26 11:01+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 23:25+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: multi_company #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany @@ -36,12 +36,12 @@ msgstr "Çoklu Firma" #: model:ir.actions.act_window,name:multi_company.action_inventory_form #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form msgid "Default Company per Object" -msgstr "" +msgstr "Nesne başına Öntanımlı Şirket" #. module: multi_company #: view:multi_company.default:0 msgid "Matching" -msgstr "" +msgstr "Eşleme" #. module: multi_company #: view:multi_company.default:0 diff --git a/addons/outlook/i18n/tr.po b/addons/outlook/i18n/tr.po new file mode 100644 index 00000000000..213d9596319 --- /dev/null +++ b/addons/outlook/i18n/tr.po @@ -0,0 +1,156 @@ +# Turkish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:46+0000\n" +"PO-Revision-Date: 2012-01-23 23:25+0000\n" +"Last-Translator: Ahmet Altınışık \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" + +#. module: outlook +#: field:outlook.installer,doc_file:0 +msgid "Installation Manual" +msgstr "Kurulum Kılavuzu" + +#. module: outlook +#: field:outlook.installer,description:0 +msgid "Description" +msgstr "Açıklama" + +#. module: outlook +#: field:outlook.installer,plugin_file:0 +msgid "Outlook Plug-in" +msgstr "Outlook Eklentisi" + +#. module: outlook +#: model:ir.actions.act_window,name:outlook.action_outlook_installer +#: model:ir.actions.act_window,name:outlook.action_outlook_wizard +#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook +#: view:outlook.installer:0 +msgid "Install Outlook Plug-In" +msgstr "Outlook Eklentisini Kur" + +#. module: outlook +#: view:outlook.installer:0 +msgid "" +"This plug-in allows you to create new contact or link contact to an existing " +"partner. \n" +"Also allows to link your e-mail to OpenERP's documents. \n" +"You can attach it to any existing one in OpenERP or create a new one." +msgstr "" + +#. module: outlook +#: field:outlook.installer,config_logo:0 +msgid "Image" +msgstr "Resim" + +#. module: outlook +#: field:outlook.installer,outlook:0 +msgid "Outlook Plug-in " +msgstr "Outlook Eklentisi " + +#. module: outlook +#: model:ir.model,name:outlook.model_outlook_installer +msgid "outlook.installer" +msgstr "outlook.yükleyicisi" + +#. module: outlook +#: help:outlook.installer,doc_file:0 +msgid "The documentation file :- how to install Outlook Plug-in." +msgstr "Belgeleme dosyası :- how to install Outlook Plug-in." + +#. module: outlook +#: help:outlook.installer,outlook:0 +msgid "" +"Allows you to select an object that you would like to add to your email and " +"its attachments." +msgstr "İstediğiniz bir nesneyi e-postanıza ve ekine eklemenizi sağlar." + +#. module: outlook +#: view:outlook.installer:0 +msgid "title" +msgstr "başlık" + +#. module: outlook +#: view:outlook.installer:0 +msgid "Installation and Configuration Steps" +msgstr "Yükleme ve Yapılandırma Adımları" + +#. module: outlook +#: field:outlook.installer,doc_name:0 +#: field:outlook.installer,name:0 +msgid "File name" +msgstr "Dosya ismi" + +#. module: outlook +#: help:outlook.installer,plugin_file:0 +msgid "" +"outlook plug-in file. Save as this file and install this plug-in in outlook." +msgstr "" +"Outlook eklenti-içe dosyası. Bu dosyayı kayıt edin ve bu eklenti-içe'yi " +"outlook'a yükleyin" + +#. module: outlook +#: view:outlook.installer:0 +msgid "_Close" +msgstr "_Kapat" + +#~ msgid "Skip" +#~ msgstr "Atla" + +#~ msgid "" +#~ "\n" +#~ " This module provide the Outlook plug-in. \n" +#~ "\n" +#~ " Outlook plug-in allows you to select an object that you’d like to add\n" +#~ " to your email and its attachments from MS Outlook. You can select a " +#~ "partner, a task,\n" +#~ " a project, an analytical account, or any other object and Archived " +#~ "selected\n" +#~ " mail in mailgate.messages with attachments.\n" +#~ "\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ " Bu modül Outlook eklentisini kullanıma sunar. \n" +#~ "\n" +#~ " Outlook eklentisi istediğiniz bir nesneyi MS Outllok'ta e-posta eki " +#~ "olarak kullanmanızı sağlar. Bir cari kartı, bir görev kaydını,\n" +#~ " bir projeyi, bir analiz hesabını, ileti arşivinde saklanmış bir e-" +#~ "posta ve ekini ya da herhangi bir nesneyi bu işlem için\n" +#~ " kullanabilirsiniz.\n" +#~ "\n" +#~ " " + +#~ msgid "Outlook Interface" +#~ msgstr "Outlook Arayüzü" + +#~ msgid "Outlook Plug-In" +#~ msgstr "Outlook Eklentisi" + +#~ msgid "" +#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can " +#~ "attach it to any existing one in OpenERP or create a new one." +#~ msgstr "" +#~ "Bu eklenti e-posta adresinizi OpenERP dökümanlarına eklemenizi sağlar. " +#~ "Varolan bir belgeye iliştirebileceğiniz gibi yaratacağınız yeni bir belgede " +#~ "de kullanabilirsiniz." + +#~ msgid "Configure" +#~ msgstr "Yapılandır" + +#~ msgid "Outlook Plug-In Configuration" +#~ msgstr "Outlook Eklenti Ayarları" + +#~ msgid "Configuration Progress" +#~ msgstr "Yapılandırma gidişatı" diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po index b6c1b38a2be..396f622680e 100644 --- a/addons/procurement/i18n/zh_CN.po +++ b/addons/procurement/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-28 09:25+0000\n" +"PO-Revision-Date: 2012-01-23 10:12+0000\n" "Last-Translator: Wei \"oldrev\" Li \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: 2011-12-23 07:20+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: procurement #: view:make.procurement:0 @@ -80,7 +80,7 @@ msgstr "仅计算最少库存规则" #. module: procurement #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." -msgstr "" +msgstr "您不能将产品移动到该类型的视图中。" #. module: procurement #: field:procurement.order,company_id:0 @@ -150,7 +150,7 @@ msgstr "新建的需求单状态是草稿" #. module: procurement #: view:procurement.order:0 msgid "Permanent Procurement Exceptions" -msgstr "" +msgstr "永久性生产需求异常" #. module: procurement #: view:stock.warehouse.orderpoint:0 @@ -861,12 +861,12 @@ msgstr "MRP和物流计划" #. module: procurement #: view:procurement.order:0 msgid "Temporary Procurement Exceptions" -msgstr "" +msgstr "临时产品需求异常" #. module: procurement #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "公司名称必须唯一！" #. module: procurement #: field:mrp.property,name:0 diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po index f21d3dff53d..c33ccd5688b 100644 --- a/addons/product/i18n/zh_CN.po +++ b/addons/product/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2012-01-13 09:38+0000\n" +"PO-Revision-Date: 2012-01-23 10:14+0000\n" "Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: product #: view:product.pricelist.item:0 @@ -141,7 +141,7 @@ msgstr "供应商" #. module: product #: model:product.template,name:product.product_consultant_product_template msgid "Service on Timesheet" -msgstr "" +msgstr "计工单服务" #. module: product #: help:product.price.type,field:0 @@ -1054,7 +1054,7 @@ msgstr "采购单默认使用的计量单位。必须与默认计量单位位于 #. module: product #: help:product.supplierinfo,product_uom:0 msgid "This comes from the product form." -msgstr "" +msgstr "此处源自该产品表单。" #. module: product #: model:ir.actions.act_window,help:product.product_normal_action @@ -1643,7 +1643,7 @@ msgstr "此处是从确认客户订单到完整产品送货的平均延迟时间 #: code:addons/product/product.py:175 #, python-format msgid "Cannot change the category of existing UoM '%s'." -msgstr "" +msgstr "不能修改已存在计量单位的分类“%s”" #. module: product #: field:product.packaging,ean:0 @@ -1905,7 +1905,7 @@ msgstr "需求与货位" #. module: product #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "错误！您不能创建循环分类。" #. module: product #: field:product.category,type:0 diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po index b11e612b03e..10878c90d81 100644 --- a/addons/project/i18n/zh_CN.po +++ b/addons/project/i18n/zh_CN.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2011-01-13 13:36+0000\n" +"PO-Revision-Date: 2012-01-23 14:40+0000\n" "Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: project #: view:report.project.task.user:0 msgid "New tasks" -msgstr "" +msgstr "新任务" #. module: project #: help:project.task.delegate,new_task_description:0 @@ -50,12 +50,12 @@ msgstr "用户无权操作所选择公司数据" #. module: project #: view:report.project.task.user:0 msgid "Previous Month" -msgstr "" +msgstr "上月" #. module: project #: view:report.project.task.user:0 msgid "My tasks" -msgstr "" +msgstr "我的任务" #. module: project #: field:project.project,warn_customer:0 @@ -91,7 +91,7 @@ msgstr "CHECK: " #: code:addons/project/project.py:315 #, python-format msgid "You must assign members on the project '%s' !" -msgstr "" +msgstr "您必须为项目“%s”指定成员！" #. module: project #: field:project.task,work_ids:0 @@ -104,7 +104,7 @@ msgstr "工作完成" #: code:addons/project/project.py:1113 #, python-format msgid "Warning !" -msgstr "" +msgstr "警告！" #. module: project #: model:ir.model,name:project.model_project_task_delegate @@ -119,7 +119,7 @@ msgstr "确认小时数" #. module: project #: view:project.project:0 msgid "Pending Projects" -msgstr "" +msgstr "未决项目" #. module: project #: help:project.task,remaining_hours:0 @@ -197,7 +197,7 @@ msgstr "公司" #. module: project #: view:report.project.task.user:0 msgid "Pending tasks" -msgstr "" +msgstr "未决任务" #. module: project #: field:project.task.delegate,prefix:0 @@ -217,7 +217,7 @@ msgstr "设为未决" #. module: project #: selection:project.task,priority:0 msgid "Important" -msgstr "" +msgstr "重要" #. module: project #: model:process.node,note:project.process_node_drafttask0 @@ -265,7 +265,7 @@ msgstr "天数" #. module: project #: model:ir.ui.menu,name:project.menu_project_config_project msgid "Projects and Stages" -msgstr "" +msgstr "项目与阶段" #. module: project #: view:project.project:0 @@ -302,7 +302,7 @@ msgstr "我的未结任务" #, python-format msgid "" "Please specify the Project Manager or email address of Project Manager." -msgstr "" +msgstr "请指定项目经理或项目经理的电子邮件地址。" #. module: project #: view:project.task:0 @@ -371,7 +371,7 @@ msgstr "用于页眉和和页脚的内置变量。请注意使用正确的符号 #. module: project #: view:project.task:0 msgid "Show only tasks having a deadline" -msgstr "" +msgstr "只显示有截止日期的项目" #. module: project #: selection:project.task,state:0 @@ -398,7 +398,7 @@ msgstr "邮件头" #. module: project #: view:project.task:0 msgid "Change to Next Stage" -msgstr "" +msgstr "更改为下一个阶段" #. module: project #: model:process.node,name:project.process_node_donetask0 @@ -408,7 +408,7 @@ msgstr "完成任务" #. module: project #: field:project.task,color:0 msgid "Color Index" -msgstr "" +msgstr "颜色索引" #. module: project #: model:ir.ui.menu,name:project.menu_definitions @@ -419,7 +419,7 @@ msgstr "设置" #. module: project #: view:report.project.task.user:0 msgid "Current Month" -msgstr "" +msgstr "本月" #. module: project #: model:process.transition,note:project.process_transition_delegate0 @@ -488,12 +488,12 @@ msgstr "取消" #. module: project #: view:project.task.history.cumulative:0 msgid "Ready" -msgstr "" +msgstr "就绪" #. module: project #: view:project.task:0 msgid "Change Color" -msgstr "" +msgstr "更改颜色" #. module: project #: constraint:account.analytic.account:0 @@ -510,7 +510,7 @@ msgstr " (copy)" #. module: project #: view:project.task:0 msgid "New Tasks" -msgstr "" +msgstr "新任务" #. module: project #: view:report.project.task.user:0 @@ -579,12 +579,12 @@ msgstr "天数" #. module: project #: view:project.project:0 msgid "Open Projects" -msgstr "" +msgstr "打开的项目" #. module: project #: view:report.project.task.user:0 msgid "In progress tasks" -msgstr "" +msgstr "进行中任务" #. module: project #: help:project.project,progress_rate:0 @@ -608,7 +608,7 @@ msgstr "项目任务" #: selection:project.task.history.cumulative,state:0 #: view:report.project.task.user:0 msgid "New" -msgstr "" +msgstr "新建" #. module: project #: help:project.task,total_hours:0 @@ -658,7 +658,7 @@ msgstr "普通" #: view:project.task:0 #: view:project.task.history.cumulative:0 msgid "Pending Tasks" -msgstr "" +msgstr "未决任务" #. module: project #: view:project.task:0 @@ -673,19 +673,19 @@ msgstr "剩余的小时数" #. module: project #: model:ir.model,name:project.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "邮件合并向导" #. module: project #: view:report.project.task.user:0 msgid "Creation Date" -msgstr "" +msgstr "创建日期" #. module: project #: view:project.task:0 #: field:project.task.history,remaining_hours:0 #: field:project.task.history.cumulative,remaining_hours:0 msgid "Remaining Time" -msgstr "" +msgstr "剩余时间" #. module: project #: field:project.project,planned_hours:0 @@ -757,7 +757,7 @@ msgstr "七月" #. module: project #: view:project.task.history.burndown:0 msgid "Burndown Chart of Tasks" -msgstr "" +msgstr "任务燃尽图" #. module: project #: field:project.task,date_start:0 @@ -815,7 +815,7 @@ msgstr "分派给这个用户的任务标题" msgid "" "You cannot delete a project containing tasks. I suggest you to desactivate " "it." -msgstr "" +msgstr "您不能删除包含任务的项目。建议您将其禁用。" #. module: project #: view:project.vs.hours:0 @@ -840,7 +840,7 @@ msgstr "延迟的小时数" #. module: project #: selection:project.task,priority:0 msgid "Very important" -msgstr "" +msgstr "非常重要" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_user_tree @@ -900,7 +900,7 @@ msgstr "阶段" #. module: project #: view:project.task:0 msgid "Change to Previous Stage" -msgstr "" +msgstr "更改为上一阶段" #. module: project #: model:ir.actions.todo.category,name:project.category_project_config @@ -916,7 +916,7 @@ msgstr "项目时间单位" #. module: project #: view:report.project.task.user:0 msgid "In progress" -msgstr "" +msgstr "进行中" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_delegate @@ -945,7 +945,7 @@ msgstr "上一级" #. module: project #: view:project.task:0 msgid "Mark as Blocked" -msgstr "" +msgstr "标记为受阻" #. module: project #: model:ir.actions.act_window,help:project.action_view_task @@ -1018,7 +1018,7 @@ msgstr "任务阶段" #. module: project #: model:project.task.type,name:project.project_tt_specification msgid "Design" -msgstr "" +msgstr "设计" #. module: project #: field:project.task,planned_hours:0 @@ -1042,7 +1042,7 @@ msgstr "状态: %(state)s" #. module: project #: help:project.task,sequence:0 msgid "Gives the sequence order when displaying a list of tasks." -msgstr "" +msgstr "指定显示任务列表的顺序号" #. module: project #: view:project.project:0 @@ -1074,19 +1074,19 @@ msgstr "上级任务" #: view:project.task.history.cumulative:0 #: selection:project.task.history.cumulative,kanban_state:0 msgid "Blocked" -msgstr "" +msgstr "受阻" #. module: project #: help:project.task,progress:0 msgid "" "If the task has a progress of 99.99% you should close the task if it's " "finished or reevaluate the time" -msgstr "" +msgstr "如果该任务的进度为 99.99%且该任务已经完成，那么您可以关闭该任务或重新评估时间。" #. module: project #: field:project.task,user_email:0 msgid "User Email" -msgstr "" +msgstr "用户电子邮件" #. module: project #: help:project.task,kanban_state:0 @@ -1175,7 +1175,7 @@ msgstr "发票地址" #: field:project.task.history,kanban_state:0 #: field:project.task.history.cumulative,kanban_state:0 msgid "Kanban State" -msgstr "" +msgstr "看板状态" #. module: project #: view:project.project:0 @@ -1193,7 +1193,7 @@ msgstr "这个报表用于分析你项目和成员的效率。可以分析任务 #. module: project #: view:project.task:0 msgid "Change Type" -msgstr "" +msgstr "更改类型" #. module: project #: help:project.project,members:0 @@ -1230,7 +1230,7 @@ msgstr "八月" #: selection:project.task.history,kanban_state:0 #: selection:project.task.history.cumulative,kanban_state:0 msgid "Normal" -msgstr "" +msgstr "正常" #. module: project #: view:project.project:0 @@ -1242,7 +1242,7 @@ msgstr "项目名称" #: model:ir.model,name:project.model_project_task_history #: model:ir.model,name:project.model_project_task_history_cumulative msgid "History of Tasks" -msgstr "" +msgstr "任务历史" #. module: project #: help:project.task.delegate,state:0 @@ -1255,7 +1255,7 @@ msgstr "你的任务进入了新的阶段。等待状态将在分派的任务结 #: code:addons/project/wizard/mail_compose_message.py:45 #, python-format msgid "Please specify the Customer or email address of Customer." -msgstr "" +msgstr "请指定客户或客户的电子邮件。" #. module: project #: selection:report.project.task.user,month:0 @@ -1287,7 +1287,7 @@ msgstr "恢复" #. module: project #: model:res.groups,name:project.group_project_user msgid "User" -msgstr "" +msgstr "用户" #. module: project #: field:project.project,active:0 @@ -1308,7 +1308,7 @@ msgstr "十一月" #. module: project #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer msgid "Create your Firsts Projects" -msgstr "" +msgstr "创建您的第一个项目" #. module: project #: code:addons/project/project.py:186 @@ -1334,7 +1334,7 @@ msgstr "十月" #. module: project #: view:project.task:0 msgid "Validate planned time and open task" -msgstr "" +msgstr "验证计划时间并打开任务" #. module: project #: model:process.node,name:project.process_node_opentask0 @@ -1344,7 +1344,7 @@ msgstr "待处理任务" #. module: project #: view:project.task:0 msgid "Delegations History" -msgstr "" +msgstr "委派历史" #. module: project #: model:ir.model,name:project.model_res_users @@ -1371,7 +1371,7 @@ msgstr "公司" #. module: project #: view:project.project:0 msgid "Projects in which I am a member." -msgstr "" +msgstr "我是成员的项目" #. module: project #: view:project.project:0 @@ -1493,7 +1493,7 @@ msgstr "状态" #: code:addons/project/project.py:890 #, python-format msgid "Delegated User should be specified" -msgstr "" +msgstr "应该制定委派用户" #. module: project #: code:addons/project/project.py:827 @@ -1568,12 +1568,12 @@ msgstr "标识符：%(task_id)s" #: selection:report.project.task.user,state:0 #: selection:task.by.days,state:0 msgid "In Progress" -msgstr "进展" +msgstr "进行中" #. module: project #: view:project.task.history.cumulative:0 msgid "Task's Analysis" -msgstr "" +msgstr "任务分析" #. module: project #: code:addons/project/project.py:754 @@ -1582,11 +1582,13 @@ msgid "" "Child task still open.\n" "Please cancel or complete child task first." msgstr "" +"子任务仍然开启。\n" +"请先取消或完成子任务。" #. module: project #: view:project.task.type:0 msgid "Stages common to all projects" -msgstr "" +msgstr "适用于所有项目的公共阶段" #. module: project #: constraint:project.task:0 @@ -1607,7 +1609,7 @@ msgstr "工作时间" #. module: project #: view:project.project:0 msgid "Projects in which I am a manager" -msgstr "" +msgstr "我是项目经理的项目" #. module: project #: code:addons/project/project.py:924 @@ -1752,7 +1754,7 @@ msgstr "我的发票科目" #. module: project #: model:project.task.type,name:project.project_tt_merge msgid "Deployment" -msgstr "" +msgstr "部署" #. module: project #: field:project.project,tasks:0 @@ -1811,7 +1813,7 @@ msgstr "任务日程" #. module: project #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "公司名称必须唯一！" #. module: project #: view:project.task:0 @@ -1832,7 +1834,7 @@ msgstr "年" #. module: project #: view:project.task.history.cumulative:0 msgid "Month-2" -msgstr "" +msgstr "前月" #. module: project #: help:report.project.task.user,closing_days:0 @@ -1843,7 +1845,7 @@ msgstr "距结束日期" #: view:project.task.history.cumulative:0 #: view:report.project.task.user:0 msgid "Month-1" -msgstr "" +msgstr "上月" #. module: project #: selection:report.project.task.user,month:0 @@ -1869,7 +1871,7 @@ msgstr "打开完成任务" #. module: project #: view:project.task.type:0 msgid "Common" -msgstr "" +msgstr "公共" #. module: project #: view:project.task:0 @@ -1903,7 +1905,7 @@ msgstr "ID" #: model:ir.actions.act_window,name:project.action_view_task_history_burndown #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown msgid "Burndown Chart" -msgstr "" +msgstr "燃尽图" #. module: project #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po index d63989e95bb..49ca1b8db58 100644 --- a/addons/project_retro_planning/i18n/tr.po +++ b/addons/project_retro_planning/i18n/tr.po @@ -7,24 +7,24 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2010-09-09 07:19+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-23 23:28+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: project_retro_planning #: model:ir.model,name:project_retro_planning.model_project_project msgid "Project" -msgstr "" +msgstr "Proje" #. module: project_retro_planning #: constraint:project.project:0 msgid "Error! project start-date must be lower then project end-date." -msgstr "" +msgstr "Hata! Proje başlangıç tarihi bitiş tarihinden sonra olamaz." #. module: project_retro_planning #: constraint:project.project:0 diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po index 6fb5aa3a9df..1a0483c1302 100644 --- a/addons/purchase/i18n/en_GB.po +++ b/addons/purchase/i18n/en_GB.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-04-11 07:41+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 13:19+0000\n" +"Last-Translator: mrx5682 \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:54+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -23,29 +23,31 @@ msgid "" "The buyer has to approve the RFQ before being sent to the supplier. The RFQ " "becomes a confirmed Purchase Order." msgstr "" +"The buyer has to approve the RFQ before being sent to the supplier. The RFQ " +"becomes a confirmed Purchase Order." #. module: purchase #: model:process.node,note:purchase.process_node_productrecept0 msgid "Incoming products to control" -msgstr "" +msgstr "Incoming products to control" #. module: purchase #: field:purchase.order,invoiced:0 msgid "Invoiced & Paid" -msgstr "" +msgstr "Invoiced & Paid" #. module: purchase #: field:purchase.order,location_id:0 #: view:purchase.report:0 #: field:purchase.report,location_id:0 msgid "Destination" -msgstr "" +msgstr "Destination" #. module: purchase #: code:addons/purchase/purchase.py:235 #, python-format msgid "In order to delete a purchase order, it must be cancelled first!" -msgstr "" +msgstr "In order to delete a purchase order, it must be cancelled first!" #. module: purchase #: code:addons/purchase/purchase.py:772 @@ -54,11 +56,13 @@ msgid "" "You have to select a product UOM in the same category than the purchase UOM " "of the product" msgstr "" +"You have to select a product UOM in the same category than the purchase UOM " +"of the product" #. module: purchase #: help:purchase.report,date:0 msgid "Date on which this document has been created" -msgstr "" +msgstr "Date on which this document has been created" #. module: purchase #: view:purchase.order:0 @@ -66,14 +70,14 @@ msgstr "" #: view:purchase.report:0 #: view:stock.picking:0 msgid "Group By..." -msgstr "" +msgstr "Group By..." #. module: purchase #: field:purchase.order,create_uid:0 #: view:purchase.report:0 #: field:purchase.report,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Responsible" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_rfq @@ -87,11 +91,19 @@ msgid "" "supplier invoices: based on the order, based on the receptions or manual " "encoding." msgstr "" +"You can create a request for quotation when you want to buy products to a " +"supplier but the purchase is not confirmed yet. Use also this menu to review " +"requests for quotation created automatically based on your logistic rules " +"(minimum stock, MTO, etc). You can convert the request for quotation into a " +"purchase order once the order is confirmed. If you use the extended " +"interface (from user's preferences), you can select the way to control your " +"supplier invoices: based on the order, based on the receptions or manual " +"encoding." #. module: purchase #: view:purchase.order:0 msgid "Approved purchase order" -msgstr "" +msgstr "Approved purchase order" #. module: purchase #: view:purchase.order:0 @@ -100,23 +112,23 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,partner_id:0 msgid "Supplier" -msgstr "" +msgstr "Supplier" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist msgid "Pricelists" -msgstr "" +msgstr "Pricelists" #. module: purchase #: view:stock.picking:0 msgid "To Invoice" -msgstr "" +msgstr "To Invoice" #. module: purchase #: view:purchase.order.line_invoice:0 msgid "Do you want to generate the supplier invoices ?" -msgstr "" +msgstr "Do you want to generate the supplier invoices ?" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_form_action @@ -125,45 +137,48 @@ msgid "" "products, etc. For each purchase order, you can track the products received, " "and control the supplier invoices." msgstr "" +"Use this menu to search within your purchase orders by references, supplier, " +"products, etc. For each purchase order, you can track the products received, " +"and control the supplier invoices." #. module: purchase #: code:addons/purchase/wizard/purchase_line_invoice.py:145 #, python-format msgid "Supplier Invoices" -msgstr "" +msgstr "Supplier Invoices" #. module: purchase #: view:purchase.report:0 msgid "Purchase Orders Statistics" -msgstr "" +msgstr "Purchase Orders Statistics" #. module: purchase #: model:process.transition,name:purchase.process_transition_packinginvoice0 #: model:process.transition,name:purchase.process_transition_productrecept0 msgid "From a Pick list" -msgstr "" +msgstr "From a Pick list" #. module: purchase #: code:addons/purchase/purchase.py:708 #, python-format msgid "No Pricelist !" -msgstr "" +msgstr "No Pricelist !" #. module: purchase #: model:ir.model,name:purchase.model_purchase_config_wizard msgid "purchase.config.wizard" -msgstr "" +msgstr "purchase.config.wizard" #. module: purchase #: view:board.board:0 #: model:ir.actions.act_window,name:purchase.purchase_draft msgid "Request for Quotations" -msgstr "" +msgstr "Request for Quotations" #. module: purchase #: selection:purchase.config.wizard,default_method:0 msgid "Based on Receptions" -msgstr "" +msgstr "Based on Receptions" #. module: purchase #: field:purchase.order,company_id:0 @@ -171,34 +186,34 @@ msgstr "" #: view:purchase.report:0 #: field:purchase.report,company_id:0 msgid "Company" -msgstr "" +msgstr "Company" #. module: purchase #: help:res.company,po_lead:0 msgid "This is the leads/security time for each purchase order." -msgstr "" +msgstr "This is the leads/security time for each purchase order." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph #: view:purchase.report:0 msgid "Monthly Purchase by Category" -msgstr "" +msgstr "Monthly Purchase by Category" #. module: purchase #: view:purchase.order:0 msgid "Set to Draft" -msgstr "" +msgstr "Set to Draft" #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Invoice Exception" -msgstr "" +msgstr "Invoice Exception" #. module: purchase #: model:product.pricelist,name:purchase.list0 msgid "Default Purchase Pricelist" -msgstr "" +msgstr "Default Purchase Pricelist" #. module: purchase #: help:purchase.order,dest_address_id:0 @@ -207,6 +222,9 @@ msgid "" "customer.In this case, it will remove the warehouse link and set the " "customer location." msgstr "" +"Put an address if you want to deliver directly from the supplier to the " +"customer.In this case, it will remove the warehouse link and set the " +"customer location." #. module: purchase #: help:res.partner,property_product_pricelist_purchase:0 @@ -214,72 +232,74 @@ msgid "" "This pricelist will be used, instead of the default one, for purchases from " "the current partner" msgstr "" +"This pricelist will be used, instead of the default one, for purchases from " +"the current partner" #. module: purchase #: report:purchase.order:0 msgid "Fax :" -msgstr "" +msgstr "Fax :" #. module: purchase #: view:purchase.order:0 msgid "To Approve" -msgstr "" +msgstr "To Approve" #. module: purchase #: view:res.partner:0 msgid "Purchase Properties" -msgstr "" +msgstr "Purchase Properties" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_picking msgid "Partial Picking Processing Wizard" -msgstr "" +msgstr "Partial Picking Processing Wizard" #. module: purchase #: view:purchase.order.line:0 msgid "History" -msgstr "" +msgstr "History" #. module: purchase #: view:purchase.order:0 msgid "Approve Purchase" -msgstr "" +msgstr "Approve Purchase" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,day:0 msgid "Day" -msgstr "" +msgstr "Day" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "Based on generated draft invoice" -msgstr "" +msgstr "Based on generated draft invoice" #. module: purchase #: view:purchase.report:0 msgid "Order of Day" -msgstr "" +msgstr "Order of Day" #. module: purchase #: view:board.board:0 msgid "Monthly Purchases by Category" -msgstr "" +msgstr "Monthly Purchases by Category" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree msgid "Purchases" -msgstr "" +msgstr "Purchases" #. module: purchase #: view:purchase.order:0 msgid "Purchase order which are in draft state" -msgstr "" +msgstr "Purchase order which are in draft state" #. module: purchase #: view:purchase.order:0 msgid "Origin" -msgstr "" +msgstr "Origin" #. module: purchase #: view:purchase.order:0 @@ -287,12 +307,12 @@ msgstr "" #: view:purchase.order.line:0 #: field:purchase.order.line,notes:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: purchase #: selection:purchase.report,month:0 msgid "September" -msgstr "" +msgstr "September" #. module: purchase #: report:purchase.order:0 @@ -300,7 +320,7 @@ msgstr "" #: view:purchase.order.line:0 #: field:purchase.order.line,taxes_id:0 msgid "Taxes" -msgstr "" +msgstr "Taxes" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_order @@ -311,31 +331,31 @@ msgstr "" #: model:res.request.link,name:purchase.req_link_purchase_order #: field:stock.picking,purchase_id:0 msgid "Purchase Order" -msgstr "" +msgstr "Purchase Order" #. module: purchase #: field:purchase.order,name:0 #: view:purchase.order.line:0 #: field:purchase.order.line,order_id:0 msgid "Order Reference" -msgstr "" +msgstr "Order Reference" #. module: purchase #: report:purchase.order:0 msgid "Net Total :" -msgstr "" +msgstr "Net Total :" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_product #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form msgid "Products" -msgstr "" +msgstr "Products" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph #: view:purchase.report:0 msgid "Total Qty and Amount by month" -msgstr "" +msgstr "Total Qty and Amount by month" #. module: purchase #: model:process.transition,note:purchase.process_transition_packinginvoice0 @@ -343,94 +363,96 @@ msgid "" "A Pick list generates an invoice. Depending on the Invoicing control of the " "sale order, the invoice is based on delivered or on ordered quantities." msgstr "" +"A Pick list generates an invoice. Depending on the Invoicing control of the " +"sale order, the invoice is based on delivered or on ordered quantities." #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.order.line,state:0 #: selection:purchase.report,state:0 msgid "Cancelled" -msgstr "" +msgstr "Cancelled" #. module: purchase #: view:purchase.order:0 msgid "Convert to Purchase Order" -msgstr "" +msgstr "Convert to Purchase Order" #. module: purchase #: field:purchase.order,pricelist_id:0 #: field:purchase.report,pricelist_id:0 msgid "Pricelist" -msgstr "" +msgstr "Pricelist" #. module: purchase #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Shipping Exception" -msgstr "" +msgstr "Shipping Exception" #. module: purchase #: field:purchase.order.line,invoice_lines:0 msgid "Invoice Lines" -msgstr "" +msgstr "Invoice Lines" #. module: purchase #: model:process.node,name:purchase.process_node_packinglist0 #: model:process.node,name:purchase.process_node_productrecept0 msgid "Incoming Products" -msgstr "" +msgstr "Incoming Products" #. module: purchase #: model:process.node,name:purchase.process_node_packinginvoice0 msgid "Outgoing Products" -msgstr "" +msgstr "Outgoing Products" #. module: purchase #: view:purchase.order:0 msgid "Manually Corrected" -msgstr "" +msgstr "Manually Corrected" #. module: purchase #: view:purchase.order:0 msgid "Reference" -msgstr "" +msgstr "Reference" #. module: purchase #: model:ir.model,name:purchase.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Stock Move" #. module: purchase #: code:addons/purchase/purchase.py:418 #, python-format msgid "You must first cancel all invoices related to this purchase order." -msgstr "" +msgstr "You must first cancel all invoices related to this purchase order." #. module: purchase #: field:purchase.report,dest_address_id:0 msgid "Dest. Address Contact Name" -msgstr "" +msgstr "Dest. Address Contact Name" #. module: purchase #: report:purchase.order:0 msgid "TVA :" -msgstr "" +msgstr "TVA :" #. module: purchase #: code:addons/purchase/purchase.py:325 #, python-format msgid "Purchase order '%s' has been set in draft state." -msgstr "" +msgstr "Purchase order '%s' has been set in draft state." #. module: purchase #: field:purchase.order.line,account_analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Analytic Account" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,nbr:0 msgid "# of Lines" -msgstr "" +msgstr "# of Lines" #. module: purchase #: code:addons/purchase/purchase.py:748 @@ -438,106 +460,106 @@ msgstr "" #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning" -msgstr "" +msgstr "Warning" #. module: purchase #: field:purchase.order,validator:0 #: view:purchase.report:0 msgid "Validated by" -msgstr "" +msgstr "Validated by" #. module: purchase #: view:purchase.report:0 msgid "Order in last month" -msgstr "" +msgstr "Order in last month" #. module: purchase #: code:addons/purchase/purchase.py:411 #, python-format msgid "You must first cancel all receptions related to this purchase order." -msgstr "" +msgstr "You must first cancel all receptions related to this purchase order." #. module: purchase #: selection:purchase.order.line,state:0 msgid "Draft" -msgstr "" +msgstr "Draft" #. module: purchase #: report:purchase.order:0 msgid "Net Price" -msgstr "" +msgstr "Net Price" #. module: purchase #: view:purchase.order.line:0 msgid "Order Line" -msgstr "" +msgstr "Order Line" #. module: purchase #: help:purchase.order,shipped:0 msgid "It indicates that a picking has been done" -msgstr "" +msgstr "It indicates that a picking has been done" #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are in exception state" -msgstr "" +msgstr "Purchase orders which are in exception state" #. module: purchase #: report:purchase.order:0 #: field:purchase.report,validator:0 msgid "Validated By" -msgstr "" +msgstr "Validated By" #. module: purchase #: code:addons/purchase/purchase.py:772 #, python-format msgid "Wrong Product UOM !" -msgstr "" +msgstr "Wrong Product UOM !" #. module: purchase #: model:process.node,name:purchase.process_node_confirmpurchaseorder0 #: selection:purchase.order.line,state:0 msgid "Confirmed" -msgstr "" +msgstr "Confirmed" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_average:0 msgid "Average Price" -msgstr "" +msgstr "Average Price" #. module: purchase #: view:stock.picking:0 msgid "Incoming Shipments already processed" -msgstr "" +msgstr "Incoming Shipments already processed" #. module: purchase #: report:purchase.order:0 msgid "Total :" -msgstr "" +msgstr "Total :" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0 #: view:purchase.order.line_invoice:0 msgid "Confirm" -msgstr "" +msgstr "Confirm" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice #: selection:purchase.order,invoice_method:0 msgid "Based on receptions" -msgstr "" +msgstr "Based on receptions" #. module: purchase #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "Error! You can not create recursive companies." #. module: purchase #: field:purchase.order,partner_ref:0 msgid "Supplier Reference" -msgstr "" +msgstr "Supplier Reference" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 @@ -546,6 +568,9 @@ msgid "" "of the purchase order, the invoice is based on received or on ordered " "quantities." msgstr "" +"A Pick list generates a supplier invoice. Depending on the Invoicing control " +"of the purchase order, the invoice is based on received or on ordered " +"quantities." #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2 @@ -556,11 +581,16 @@ msgid "" "supplier invoice, you can generate a draft supplier invoice based on the " "lines from this menu." msgstr "" +"If you set the Invoicing Control on a purchase order as \"Based on Purchase " +"Order lines\", you can track here all the purchase order lines for which you " +"have not yet received the supplier invoice. Once you are ready to receive a " +"supplier invoice, you can generate a draft supplier invoice based on the " +"lines from this menu." #. module: purchase #: view:purchase.order:0 msgid "Purchase order which are in the exception state" -msgstr "" +msgstr "Purchase order which are in the exception state" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po @@ -568,74 +598,76 @@ msgid "" "Reception Analysis allows you to easily check and analyse your company order " "receptions and the performance of your supplier's deliveries." msgstr "" +"Reception Analysis allows you to easily check and analyse your company order " +"receptions and the performance of your supplier's deliveries." #. module: purchase #: report:purchase.quotation:0 msgid "Tel.:" -msgstr "" +msgstr "Tel.:" #. module: purchase #: model:ir.model,name:purchase.model_stock_picking #: field:purchase.order,picking_ids:0 msgid "Picking List" -msgstr "" +msgstr "Picking List" #. module: purchase #: view:purchase.order:0 msgid "Print" -msgstr "" +msgstr "Print" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group msgid "Merge Purchase orders" -msgstr "" +msgstr "Merge Purchase orders" #. module: purchase #: field:purchase.order,order_line:0 msgid "Order Lines" -msgstr "" +msgstr "Order Lines" #. module: purchase #: code:addons/purchase/purchase.py:710 #, python-format msgid "No Partner!" -msgstr "" +msgstr "No Partner!" #. module: purchase #: report:purchase.quotation:0 msgid "Fax:" -msgstr "" +msgstr "Fax:" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Total Price" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer msgid "Create or Import Suppliers" -msgstr "" +msgstr "Create or Import Suppliers" #. module: purchase #: view:stock.picking:0 msgid "Available" -msgstr "" +msgstr "Available" #. module: purchase #: field:purchase.report,partner_address_id:0 msgid "Address Contact Name" -msgstr "" +msgstr "Address Contact Name" #. module: purchase #: report:purchase.order:0 msgid "Shipping address :" -msgstr "" +msgstr "Shipping address :" #. module: purchase #: help:purchase.order,invoice_ids:0 msgid "Invoices generated for a purchase order" -msgstr "" +msgstr "Invoices generated for a purchase order" #. module: purchase #: code:addons/purchase/purchase.py:284 @@ -644,12 +676,12 @@ msgstr "" #: code:addons/purchase/wizard/purchase_line_invoice.py:111 #, python-format msgid "Error !" -msgstr "" +msgstr "Error !" #. module: purchase #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." -msgstr "" +msgstr "You can not move products from or to a location of the type view." #. module: purchase #: code:addons/purchase/purchase.py:710 @@ -658,12 +690,15 @@ msgid "" "You have to select a partner in the purchase form !\n" "Please set one partner before choosing a product." msgstr "" +"You have to select a partner in the purchase form !\n" +"Please set one partner before choosing a product." #. module: purchase #: code:addons/purchase/purchase.py:348 #, python-format msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)" msgstr "" +"There is no purchase journal defined for this company: \"%s\" (id:%d)" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0 @@ -672,11 +707,14 @@ msgid "" "order is 'On picking'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"The invoice is created automatically if the Invoice control of the purchase " +"order is 'On picking'. The invoice can also be generated manually by the " +"accountant (Invoice control = Manual)." #. module: purchase #: report:purchase.order:0 msgid "Purchase Order Confirmation N°" -msgstr "" +msgstr "Purchase Order Confirmation N°" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all @@ -685,83 +723,86 @@ msgid "" "purchase history and performance. From this menu you can track your " "negotiation performance, the delivery performance of your suppliers, etc." msgstr "" +"Purchase Analysis allows you to easily check and analyse your company " +"purchase history and performance. From this menu you can track your " +"negotiation performance, the delivery performance of your suppliers, etc." #. module: purchase #: model:ir.ui.menu,name:purchase.menu_configuration_misc msgid "Miscellaneous" -msgstr "" +msgstr "Miscellaneous" #. module: purchase #: code:addons/purchase/purchase.py:788 #, python-format msgid "The selected supplier only sells this product by %s" -msgstr "" +msgstr "The selected supplier only sells this product by %s" #. module: purchase #: view:purchase.report:0 msgid "Reference UOM" -msgstr "" +msgstr "Reference UOM" #. module: purchase #: field:purchase.order.line,product_qty:0 #: view:purchase.report:0 #: field:purchase.report,quantity:0 msgid "Quantity" -msgstr "" +msgstr "Quantity" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0 msgid "Create invoice" -msgstr "" +msgstr "Create invoice" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action msgid "Units of Measure" -msgstr "" +msgstr "Units of Measure" #. module: purchase #: field:purchase.order.line,move_dest_id:0 msgid "Reservation Destination" -msgstr "" +msgstr "Reservation Destination" #. module: purchase #: code:addons/purchase/purchase.py:235 #, python-format msgid "Invalid action !" -msgstr "" +msgstr "Invalid action !" #. module: purchase #: field:purchase.order,fiscal_position:0 msgid "Fiscal Position" -msgstr "" +msgstr "Fiscal Position" #. module: purchase #: selection:purchase.report,month:0 msgid "July" -msgstr "" +msgstr "July" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase #: view:res.company:0 msgid "Configuration" -msgstr "" +msgstr "Configuration" #. module: purchase #: view:purchase.order:0 msgid "Total amount" -msgstr "" +msgstr "Total amount" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking msgid "Receptions" -msgstr "" +msgstr "Receptions" #. module: purchase #: code:addons/purchase/purchase.py:284 #, python-format msgid "You cannot confirm a purchase order without any lines." -msgstr "" +msgstr "You cannot confirm a purchase order without any lines." #. module: purchase #: model:ir.actions.act_window,help:purchase.action_invoice_pending @@ -771,38 +812,42 @@ msgid "" "according to your settings. Once you receive a supplier invoice, you can " "match it with the draft invoice and validate it." msgstr "" +"Use this menu to control the invoices to be received from your supplier. " +"OpenERP pregenerates draft invoices from your purchase orders or receptions, " +"according to your settings. Once you receive a supplier invoice, you can " +"match it with the draft invoice and validate it." #. module: purchase #: model:process.node,name:purchase.process_node_draftpurchaseorder0 #: model:process.node,name:purchase.process_node_draftpurchaseorder1 msgid "RFQ" -msgstr "" +msgstr "RFQ" #. module: purchase #: code:addons/purchase/edi/purchase_order.py:139 #, python-format msgid "EDI Pricelist (%s)" -msgstr "" +msgstr "EDI Pricelist (%s)" #. module: purchase #: selection:purchase.order,state:0 msgid "Waiting Approval" -msgstr "" +msgstr "Waiting Approval" #. module: purchase #: selection:purchase.report,month:0 msgid "January" -msgstr "" +msgstr "January" #. module: purchase #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase msgid "Auto-email confirmed purchase orders" -msgstr "" +msgstr "Auto-email confirmed purchase orders" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 msgid "Approbation" -msgstr "" +msgstr "Approbation" #. module: purchase #: report:purchase.order:0 @@ -812,36 +857,36 @@ msgstr "" #: field:purchase.report,date:0 #: view:stock.picking:0 msgid "Order Date" -msgstr "" +msgstr "Order Date" #. module: purchase #: constraint:stock.move:0 msgid "You must assign a production lot for this product" -msgstr "" +msgstr "You must assign a production lot for this product" #. module: purchase #: model:ir.model,name:purchase.model_res_partner #: field:purchase.order.line,partner_id:0 #: view:stock.picking:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: purchase #: model:process.node,name:purchase.process_node_invoiceafterpacking0 #: model:process.node,name:purchase.process_node_invoicecontrol0 msgid "Draft Invoice" -msgstr "" +msgstr "Draft Invoice" #. module: purchase #: report:purchase.order:0 #: report:purchase.quotation:0 msgid "Qty" -msgstr "" +msgstr "Qty" #. module: purchase #: view:purchase.report:0 msgid "Month-1" -msgstr "" +msgstr "Month-1" #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -849,28 +894,30 @@ msgid "" "This is computed as the minimum scheduled date of all purchase order lines' " "products." msgstr "" +"This is computed as the minimum scheduled date of all purchase order lines' " +"products." #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_group msgid "Purchase Order Merge" -msgstr "" +msgstr "Purchase Order Merge" #. module: purchase #: view:purchase.report:0 msgid "Order in current month" -msgstr "" +msgstr "Order in current month" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay_pass:0 msgid "Days to Deliver" -msgstr "" +msgstr "Days to Deliver" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory msgid "Receive Products" -msgstr "" +msgstr "Receive Products" #. module: purchase #: model:ir.model,name:purchase.model_procurement_order @@ -881,69 +928,69 @@ msgstr "" #: view:purchase.order:0 #: field:purchase.order,invoice_ids:0 msgid "Invoices" -msgstr "" +msgstr "Invoices" #. module: purchase #: selection:purchase.report,month:0 msgid "December" -msgstr "" +msgstr "December" #. module: purchase #: field:purchase.config.wizard,config_logo:0 msgid "Image" -msgstr "" +msgstr "Image" #. module: purchase #: view:purchase.report:0 msgid "Total Orders Lines by User per month" -msgstr "" +msgstr "Total Orders Lines by User per month" #. module: purchase #: view:purchase.order:0 msgid "Approved purchase orders" -msgstr "" +msgstr "Approved purchase orders" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,month:0 msgid "Month" -msgstr "" +msgstr "Month" #. module: purchase #: model:email.template,subject:purchase.email_template_edi_purchase msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" -msgstr "" +msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" #. module: purchase #: report:purchase.quotation:0 msgid "Request for Quotation :" -msgstr "" +msgstr "Request for Quotation :" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_waiting msgid "Purchase Order Waiting Approval" -msgstr "" +msgstr "Purchase Order Waiting Approval" #. module: purchase #: view:purchase.order:0 msgid "Total Untaxed amount" -msgstr "" +msgstr "Total Untaxed amount" #. module: purchase #: model:res.groups,name:purchase.group_purchase_user msgid "User" -msgstr "" +msgstr "User" #. module: purchase #: field:purchase.order,shipped:0 #: field:purchase.order,shipped_rate:0 msgid "Received" -msgstr "" +msgstr "Received" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 msgid "List of ordered products." -msgstr "" +msgstr "List of ordered products." #. module: purchase #: help:purchase.order,picking_ids:0 @@ -954,7 +1001,7 @@ msgstr "" #. module: purchase #: view:stock.picking:0 msgid "Is a Back Order" -msgstr "" +msgstr "Is a Back Order" #. module: purchase #: model:process.node,note:purchase.process_node_invoiceafterpacking0 @@ -976,72 +1023,72 @@ msgstr "" #: field:purchase.order,invoiced_rate:0 #: field:purchase.order.line,invoiced:0 msgid "Invoiced" -msgstr "" +msgstr "Invoiced" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,category_id:0 msgid "Category" -msgstr "" +msgstr "Category" #. module: purchase #: model:process.node,note:purchase.process_node_approvepurchaseorder0 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 msgid "State of the Purchase Order." -msgstr "" +msgstr "State of the Purchase Order." #. module: purchase #: field:purchase.order,dest_address_id:0 msgid "Destination Address" -msgstr "" +msgstr "Destination Address" #. module: purchase #: field:purchase.report,state:0 msgid "Order State" -msgstr "" +msgstr "Order State" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase msgid "Product Categories" -msgstr "" +msgstr "Product Categories" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice msgid "Create invoices" -msgstr "" +msgstr "Create invoices" #. module: purchase #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "The company name must be unique !" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line #: view:purchase.order.line:0 #: field:stock.move,purchase_line_id:0 msgid "Purchase Order Line" -msgstr "" +msgstr "Purchase Order Line" #. module: purchase #: view:purchase.order:0 msgid "Calendar View" -msgstr "" +msgstr "Calendar View" #. module: purchase #: selection:purchase.config.wizard,default_method:0 msgid "Based on Purchase Order Lines" -msgstr "" +msgstr "Based on Purchase Order Lines" #. module: purchase #: help:purchase.order,amount_untaxed:0 msgid "The amount without tax" -msgstr "" +msgstr "The amount without tax" #. module: purchase #: code:addons/purchase/purchase.py:885 #, python-format msgid "PO: %s" -msgstr "" +msgstr "PO: %s" #. module: purchase #: model:process.transition,note:purchase.process_transition_purchaseinvoice0 @@ -1050,26 +1097,29 @@ msgid "" "the buyer. Depending on the Invoicing control of the purchase order, the " "invoice is based on received or on ordered quantities." msgstr "" +"A purchase order generates a supplier invoice, as soon as it is confirmed by " +"the buyer. Depending on the Invoicing control of the purchase order, the " +"invoice is based on received or on ordered quantities." #. module: purchase #: field:purchase.order,amount_untaxed:0 msgid "Untaxed Amount" -msgstr "" +msgstr "Untaxed Amount" #. module: purchase #: help:purchase.order,invoiced:0 msgid "It indicates that an invoice has been paid" -msgstr "" +msgstr "It indicates that an invoice has been paid" #. module: purchase #: model:process.node,note:purchase.process_node_packinginvoice0 msgid "Outgoing products to invoice" -msgstr "" +msgstr "Outgoing products to invoice" #. module: purchase #: selection:purchase.report,month:0 msgid "August" -msgstr "" +msgstr "August" #. module: purchase #: constraint:stock.move:0 @@ -1079,17 +1129,17 @@ msgstr "" #. module: purchase #: help:purchase.order,date_order:0 msgid "Date on which this document has been created." -msgstr "" +msgstr "Date on which this document has been created." #. module: purchase #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "" +msgstr "Sales & Purchases" #. module: purchase #: selection:purchase.report,month:0 msgid "June" -msgstr "" +msgstr "June" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0 @@ -1098,12 +1148,15 @@ msgid "" "order is 'On order'. The invoice can also be generated manually by the " "accountant (Invoice control = Manual)." msgstr "" +"The invoice is created automatically if the Invoice control of the purchase " +"order is 'On order'. The invoice can also be generated manually by the " +"accountant (Invoice control = Manual)." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_email_templates #: model:ir.ui.menu,name:purchase.menu_email_templates msgid "Email Templates" -msgstr "" +msgstr "Email Templates" #. module: purchase #: selection:purchase.config.wizard,default_method:0 @@ -1113,39 +1166,39 @@ msgstr "" #. module: purchase #: model:ir.model,name:purchase.model_purchase_report msgid "Purchases Orders" -msgstr "" +msgstr "Purchases Orders" #. module: purchase #: view:purchase.order.line:0 msgid "Manual Invoices" -msgstr "" +msgstr "Manual Invoices" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice #: view:purchase.order:0 msgid "Invoice Control" -msgstr "" +msgstr "Invoice Control" #. module: purchase #: selection:purchase.report,month:0 msgid "November" -msgstr "" +msgstr "November" #. module: purchase #: view:purchase.report:0 msgid "Extended Filters..." -msgstr "" +msgstr "Extended Filters..." #. module: purchase #: view:purchase.config.wizard:0 msgid "Invoicing Control on Purchases" -msgstr "" +msgstr "Invoicing Control on Purchases" #. module: purchase #: code:addons/purchase/wizard/purchase_order_group.py:48 #, python-format msgid "Please select multiple order to merge in the list view." -msgstr "" +msgstr "Please select multiple order to merge in the list view." #. module: purchase #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer @@ -1154,58 +1207,61 @@ msgid "" "can import your existing partners by CSV spreadsheet from \"Import Data\" " "wizard" msgstr "" +"Create or Import Suppliers and their contacts manually from this form or you " +"can import your existing partners by CSV spreadsheet from \"Import Data\" " +"wizard" #. module: purchase #: model:process.transition,name:purchase.process_transition_createpackinglist0 msgid "Pick list generated" -msgstr "" +msgstr "Pick list generated" #. module: purchase #: view:purchase.order:0 msgid "Exception" -msgstr "" +msgstr "Exception" #. module: purchase #: selection:purchase.report,month:0 msgid "October" -msgstr "" +msgstr "October" #. module: purchase #: view:purchase.order:0 msgid "Compute" -msgstr "" +msgstr "Compute" #. module: purchase #: view:stock.picking:0 msgid "Incoming Shipments Available" -msgstr "" +msgstr "Incoming Shipments Available" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat msgid "Address Book" -msgstr "" +msgstr "Address Book" #. module: purchase #: model:ir.model,name:purchase.model_res_company msgid "Companies" -msgstr "" +msgstr "Companies" #. module: purchase #: view:purchase.order:0 msgid "Cancel Purchase Order" -msgstr "" +msgstr "Cancel Purchase Order" #. module: purchase #: code:addons/purchase/purchase.py:410 #: code:addons/purchase/purchase.py:417 #, python-format msgid "Unable to cancel this purchase order!" -msgstr "" +msgstr "Unable to cancel this purchase order!" #. module: purchase #: model:process.transition,note:purchase.process_transition_createpackinglist0 msgid "A pick list is generated to track the incoming products." -msgstr "" +msgstr "A pick list is generated to track the incoming products." #. module: purchase #: help:purchase.order,pricelist_id:0 @@ -1213,38 +1269,40 @@ msgid "" "The pricelist sets the currency used for this purchase order. It also " "computes the supplier price for the selected products/quantities." msgstr "" +"The pricelist sets the currency used for this purchase order. It also " +"computes the supplier price for the selected products/quantities." #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard msgid "Dashboard" -msgstr "" +msgstr "Dashboard" #. module: purchase #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Reference must be unique per Company!" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,price_standard:0 msgid "Products Value" -msgstr "" +msgstr "Products Value" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form msgid "Partner Categories" -msgstr "" +msgstr "Partner Categories" #. module: purchase #: help:purchase.order,amount_tax:0 msgid "The tax amount" -msgstr "" +msgstr "The tax amount" #. module: purchase #: view:purchase.order:0 #: view:purchase.report:0 msgid "Quotations" -msgstr "" +msgstr "Quotations" #. module: purchase #: help:purchase.order,invoice_method:0 @@ -1254,38 +1312,43 @@ msgid "" "Based on generated invoice: create a draft invoice you can validate later.\n" "Based on receptions: let you create an invoice when receptions are validated." msgstr "" +"Based on Purchase Order lines: place individual lines in 'Invoice Control > " +"Based on P.O. lines' from where you can selectively create an invoice.\n" +"Based on generated invoice: create a draft invoice you can validate later.\n" +"Based on receptions: let you create an invoice when receptions are validated." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_supplier_address_form msgid "Addresses" -msgstr "" +msgstr "Addresses" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_rfq #: model:ir.ui.menu,name:purchase.menu_purchase_rfq msgid "Requests for Quotation" -msgstr "" +msgstr "Requests for Quotation" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form msgid "Products by Category" -msgstr "" +msgstr "Products by Category" #. module: purchase #: view:purchase.report:0 #: field:purchase.report,delay:0 msgid "Days to Validate" -msgstr "" +msgstr "Days to Validate" #. module: purchase #: help:purchase.order,origin:0 msgid "Reference of the document that generated this purchase order request." msgstr "" +"Reference of the document that generated this purchase order request." #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are not approved yet." -msgstr "" +msgstr "Purchase orders which are not approved yet." #. module: purchase #: help:purchase.order,state:0 @@ -1297,29 +1360,35 @@ msgid "" "received, the state becomes 'Done'. If a cancel action occurs in the invoice " "or in the reception of goods, the state becomes in exception." msgstr "" +"The state of the purchase order or the quotation request. A quotation is a " +"purchase order in a 'Draft' state. Then the order has to be confirmed by the " +"user, the state switch to 'Confirmed'. Then the supplier must confirm the " +"order to change the state to 'Approved'. When the purchase order is paid and " +"received, the state becomes 'Done'. If a cancel action occurs in the invoice " +"or in the reception of goods, the state becomes in exception." #. module: purchase #: field:purchase.order.line,price_subtotal:0 msgid "Subtotal" -msgstr "" +msgstr "Subtotal" #. module: purchase #: field:purchase.order,warehouse_id:0 #: view:purchase.report:0 #: field:purchase.report,warehouse_id:0 msgid "Warehouse" -msgstr "" +msgstr "Warehouse" #. module: purchase #: code:addons/purchase/purchase.py:288 #, python-format msgid "Purchase order '%s' is confirmed." -msgstr "" +msgstr "Purchase order '%s' is confirmed." #. module: purchase #: help:purchase.order,date_approve:0 msgid "Date on which purchase order has been approved" -msgstr "" +msgstr "Date on which purchase order has been approved" #. module: purchase #: view:purchase.order:0 @@ -1329,7 +1398,7 @@ msgstr "" #: view:purchase.report:0 #: view:stock.picking:0 msgid "State" -msgstr "" +msgstr "State" #. module: purchase #: model:process.node,name:purchase.process_node_approvepurchaseorder0 @@ -1337,23 +1406,23 @@ msgstr "" #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Approved" -msgstr "" +msgstr "Approved" #. module: purchase #: view:purchase.order.line:0 msgid "General Information" -msgstr "" +msgstr "General Information" #. module: purchase #: view:purchase.order:0 msgid "Not invoiced" -msgstr "" +msgstr "Not invoiced" #. module: purchase #: report:purchase.order:0 #: field:purchase.order.line,price_unit:0 msgid "Unit Price" -msgstr "" +msgstr "Unit Price" #. module: purchase #: view:purchase.order:0 @@ -1362,23 +1431,23 @@ msgstr "" #: selection:purchase.report,state:0 #: view:stock.picking:0 msgid "Done" -msgstr "" +msgstr "Done" #. module: purchase #: report:purchase.order:0 msgid "Request for Quotation N°" -msgstr "" +msgstr "Request for Quotation N°" #. module: purchase #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0 msgid "Invoice" -msgstr "" +msgstr "Invoice" #. module: purchase #: model:process.node,note:purchase.process_node_purchaseorder0 msgid "Confirmed purchase order to invoice" -msgstr "" +msgstr "Confirmed purchase order to invoice" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0 @@ -1387,18 +1456,18 @@ msgstr "" #: view:purchase.order.group:0 #: view:purchase.order.line_invoice:0 msgid "Cancel" -msgstr "" +msgstr "Cancel" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Purchase Order Lines" -msgstr "" +msgstr "Purchase Order Lines" #. module: purchase #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 msgid "The supplier approves the Purchase Order." -msgstr "" +msgstr "The supplier approves the Purchase Order." #. module: purchase #: code:addons/purchase/wizard/purchase_order_group.py:80 @@ -1408,70 +1477,70 @@ msgstr "" #: view:purchase.report:0 #, python-format msgid "Purchase Orders" -msgstr "" +msgstr "Purchase Orders" #. module: purchase #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Order Reference must be unique per Company!" #. module: purchase #: field:purchase.order,origin:0 msgid "Source Document" -msgstr "" +msgstr "Source Document" #. module: purchase #: view:purchase.order.group:0 msgid "Merge orders" -msgstr "" +msgstr "Merge orders" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line_invoice msgid "Purchase Order Line Make Invoice" -msgstr "" +msgstr "Purchase Order Line Make Invoice" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 msgid "Incoming Shipments" -msgstr "" +msgstr "Incoming Shipments" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all msgid "Total Orders by User per month" -msgstr "" +msgstr "Total Orders by User per month" #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation #: selection:purchase.order,state:0 #: selection:purchase.report,state:0 msgid "Request for Quotation" -msgstr "" +msgstr "Request for Quotation" #. module: purchase #: report:purchase.order:0 msgid "Tél. :" -msgstr "" +msgstr "Tél. :" #. module: purchase #: view:purchase.report:0 msgid "Order of Month" -msgstr "" +msgstr "Order of Month" #. module: purchase #: report:purchase.order:0 msgid "Our Order Reference" -msgstr "" +msgstr "Our Order Reference" #. module: purchase #: view:purchase.order:0 #: view:purchase.order.line:0 msgid "Search Purchase Order" -msgstr "" +msgstr "Search Purchase Order" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_config msgid "Set the Default Invoicing Control Method" -msgstr "" +msgstr "Set the Default Invoicing Control Method" #. module: purchase #: model:process.node,note:purchase.process_node_draftpurchaseorder0 diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po index 25d6b590db5..e03a81780a8 100644 --- a/addons/purchase_analytic_plans/i18n/tr.po +++ b/addons/purchase_analytic_plans/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-06-09 18:23+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:23+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 05:47+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: purchase_analytic_plans #: field:purchase.order.line,analytics_id:0 @@ -24,7 +24,7 @@ msgstr "Analitik Dağılım" #. module: purchase_analytic_plans #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!" #. module: purchase_analytic_plans #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line diff --git a/addons/sale_layout/i18n/tr.po b/addons/sale_layout/i18n/tr.po index 48a39c178e1..2e12cfff9e0 100644 --- a/addons/sale_layout/i18n/tr.po +++ b/addons/sale_layout/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-02-15 15:21+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 23:24+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: sale_layout #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!" #. module: sale_layout #: selection:sale.order.line,layout_type:0 @@ -45,7 +45,7 @@ msgstr "Not" #. module: sale_layout #: field:sale.order.line,layout_type:0 msgid "Line Type" -msgstr "" +msgstr "Satır Tipi" #. module: sale_layout #: report:sale.order.layout:0 diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po index 7964d4991d4..fa2d8a0093c 100644 --- a/addons/sale_margin/i18n/tr.po +++ b/addons/sale_margin/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-05-10 18:30+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:23+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: sale_margin #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!" #. module: sale_margin #: field:sale.order.line,purchase_price:0 diff --git a/addons/sale_mrp/i18n/tr.po b/addons/sale_mrp/i18n/tr.po index cd34cc6246e..3c7c5c54d63 100644 --- a/addons/sale_mrp/i18n/tr.po +++ b/addons/sale_mrp/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-02-15 15:58+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 23:24+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: sale_mrp #: help:mrp.production,sale_ref:0 @@ -40,12 +40,12 @@ msgstr "Satış İsmi" #. module: sale_mrp #: sql_constraint:mrp.production:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referans her şirket için tekil olmalı!" #. module: sale_mrp #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero!" -msgstr "" +msgstr "Sipariş adedi negatif ya da sıfır olamaz!" #. module: sale_mrp #: help:mrp.production,sale_name:0 diff --git a/addons/sale_order_dates/i18n/tr.po b/addons/sale_order_dates/i18n/tr.po index 8dce06b1f4a..36aa306deb1 100644 --- a/addons/sale_order_dates/i18n/tr.po +++ b/addons/sale_order_dates/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-02-16 11:54+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-23 23:22+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: sale_order_dates #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!" #. module: sale_order_dates #: help:sale.order,requested_date:0 diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po index ed0050c0201..c4fcddaf1a5 100644 --- a/addons/stock_invoice_directly/i18n/tr.po +++ b/addons/stock_invoice_directly/i18n/tr.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-05-10 18:57+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:21+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: stock_invoice_directly #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking msgid "Partial Picking Processing Wizard" -msgstr "" +msgstr "Kısmi Teslimat İşlem Sihirbazı" #~ msgid "Invoice Picking Directly" #~ msgstr "Ayıklananı Doğrudan Faturala" diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po index 8d9388ec6d4..662e75b04b9 100644 --- a/addons/stock_location/i18n/tr.po +++ b/addons/stock_location/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-06-27 18:21+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:23+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:10+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: stock_location #: selection:product.pulled.flow,picking_type:0 @@ -352,7 +352,7 @@ msgstr "Firmaya göre, göndermek veya almak istediğiniz ürünleri seçin" #. module: stock_location #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." -msgstr "" +msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız." #. module: stock_location #: field:stock.location.path,name:0 diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po index 144b3cbb504..06f238adb4c 100644 --- a/addons/stock_no_autopicking/i18n/tr.po +++ b/addons/stock_no_autopicking/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-06-27 18:34+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-23 23:24+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:05+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" +"X-Generator: Launchpad (build 14713)\n" #. module: stock_no_autopicking #: model:ir.model,name:stock_no_autopicking.model_product_product @@ -44,12 +44,12 @@ msgstr "Hata: Geçersiz EAN kodu" #. module: stock_no_autopicking #: sql_constraint:mrp.production:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referans her şirket için tekil olmalı!" #. module: stock_no_autopicking #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero!" -msgstr "" +msgstr "Sipariş adedi negatif ya da sıfır olamaz!" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Görüntüleme mimarisi için Geçersiz XML" From a0bc35050e1769769df0f2a03dbb33d31b1dc47d Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 24 Jan 2012 05:44:41 +0000 Subject: [PATCH 146/170] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120124054441-b00zvps5nfizid80 --- addons/web/po/hr.po | 63 ++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/addons/web/po/hr.po b/addons/web/po/hr.po index a7c2724ca1c..e9b35d6768d 100644 --- a/addons/web/po/hr.po +++ b/addons/web/po/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-20 18:48+0100\n" -"PO-Revision-Date: 2011-12-21 15:10+0000\n" -"Last-Translator: Goran Kliska \n" +"PO-Revision-Date: 2012-01-23 17:37+0000\n" +"Last-Translator: Goran Cvijanović \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-04 05:17+0000\n" -"X-Generator: Launchpad (build 14616)\n" +"X-Launchpad-Export-Date: 2012-01-24 05:44+0000\n" +"X-Generator: Launchpad (build 14713)\n" #: addons/web/static/src/js/chrome.js:162 #: addons/web/static/src/js/chrome.js:175 @@ -107,7 +107,7 @@ msgstr "Neispravno traženje" #: addons/web/static/src/js/search.js:403 msgid "triggered from search view" -msgstr "" +msgstr "pokrenuto iz ekrana za pretraživanje" #: addons/web/static/src/js/search.js:490 #, python-format @@ -206,7 +206,7 @@ msgstr "je laž" #: addons/web/static/src/js/view_editor.js:42 msgid "ViewEditor" -msgstr "" +msgstr "Uređivač" #: addons/web/static/src/js/view_editor.js:46 #: addons/web/static/src/js/view_list.js:17 @@ -538,20 +538,23 @@ msgid "" "We think that daily job activities can be more intuitive, efficient, " "automated, .. and even fun." msgstr "" +"Mi smatramo da dnevne poslovne aktivnosti mogu biti intuitivnije, " +"efikasnije, automatizirane, .. i zabavne." #: addons/web/static/src/xml/base.xml:0 msgid "OpenERP's vision to be:" -msgstr "" +msgstr "Vizija OpenERP-a da postane:" #: addons/web/static/src/xml/base.xml:0 msgid "Full featured" -msgstr "" +msgstr "Pune funkcionalnosti" #: addons/web/static/src/xml/base.xml:0 msgid "" "Today's enterprise challenges are multiple. We provide one module for each " "need." msgstr "" +"Mnoštvo je izazova danas pred tvrtkama. Mi imamo modul za svaku od potreba." #: addons/web/static/src/xml/base.xml:0 msgid "Open Source" @@ -562,15 +565,18 @@ msgid "" "To Build a great product, we rely on the knowledge of thousands of " "contributors." msgstr "" +"Za izgradnju vrhunskog rješenja, osanjamo se na znanja tisuće kontributora." #: addons/web/static/src/xml/base.xml:0 msgid "User Friendly" -msgstr "" +msgstr "prilagođen korisniku" #: addons/web/static/src/xml/base.xml:0 msgid "" "In order to be productive, people need clean and easy to use interface." msgstr "" +"Da bi bili produktivni, ljudi trebaju uredno i jednostavno korisničko " +"sučelje." #: addons/web/static/src/xml/base.xml:0 msgid "(" @@ -618,7 +624,7 @@ msgstr "Debug pogled#" #: addons/web/static/src/xml/base.xml:0 msgid "- Fields View Get" -msgstr "" +msgstr "Dohvat polja ekrana" #: addons/web/static/src/xml/base.xml:0 msgid "- Edit" @@ -630,11 +636,11 @@ msgstr "Pogled" #: addons/web/static/src/xml/base.xml:0 msgid "- Edit SearchView" -msgstr "" +msgstr "Uredi ekran za pretraživanje" #: addons/web/static/src/xml/base.xml:0 msgid "- Edit Action" -msgstr "" +msgstr "- Uredi akciju" #: addons/web/static/src/xml/base.xml:0 msgid "Field" @@ -662,11 +668,11 @@ msgstr "Dupliciraj" #: addons/web/static/src/xml/base.xml:0 msgid "Unhandled widget" -msgstr "" +msgstr "Nepodržani ekranski dodatak" #: addons/web/static/src/xml/base.xml:0 msgid "Notebook Page \"" -msgstr "" +msgstr "Stranica \"" #: addons/web/static/src/xml/base.xml:0 msgid "\"" @@ -674,7 +680,7 @@ msgstr "\"" #: addons/web/static/src/xml/base.xml:0 msgid "Modifiers:" -msgstr "" +msgstr "Izmjene:" #: addons/web/static/src/xml/base.xml:0 msgid "?" @@ -778,7 +784,7 @@ msgstr "Gumb" #: addons/web/static/src/xml/base.xml:0 msgid "(no string)" -msgstr "" +msgstr "(prazno)" #: addons/web/static/src/xml/base.xml:0 msgid "Special:" @@ -822,7 +828,7 @@ msgstr "(Zamjenit će postojeći filter istog naziva)" #: addons/web/static/src/xml/base.xml:0 msgid "Select Dashboard to add this filter to:" -msgstr "" +msgstr "Odaberite panel za dodati ovaj filter:" #: addons/web/static/src/xml/base.xml:0 msgid "Title of new Dashboard item:" @@ -867,6 +873,10 @@ msgid "" " You can export all data or only the fields that can be " "reimported after modification." msgstr "" +"Ovaj pomoćni program će izvesti u CSV datoteku sve podatke koji " +"zadovoljavaju postavljene uvjete.\n" +" Možete izvesti sve kolone ili samo one koje se mogu ponovno " +"učitati nakon izmjena." #: addons/web/static/src/xml/base.xml:0 msgid "Export Type:" @@ -937,6 +947,10 @@ msgid "" "Select a .CSV file to import. If you need a sample of file to import,\n" " you should use the export tool with the \"Import Compatible\" option." msgstr "" +"Odaberite .CSV datoteku za uvoz. Ukoliko trebate primjer za izgled " +"datoteke,\n" +" možete napraviti izvoz podataka koristeći \"Kompatibilnost za uvoz\" " +"opciju." #: addons/web/static/src/xml/base.xml:0 msgid "CSV File:" @@ -984,7 +998,7 @@ msgstr "Uvoz nije izvršen:" #: addons/web/static/src/xml/base.xml:0 msgid "Here is a preview of the file we could not import:" -msgstr "" +msgstr "Ovo je pregled datoteke koja se nije mogla uvesti:" #: addons/web/static/src/xml/base.xml:0 msgid "OpenERP Web" @@ -1031,6 +1045,12 @@ msgid "" "supply chain,\n" " project management, production, services, CRM, etc..." msgstr "" +"je slobodan poslovni softver dizajniran za unapređenje\n" +" produktivnost i profitabilnost kroz integraciju podataka. " +"Povezuje, unapređuje i\n" +" upravlja poslovnim procesima u područjima poput prodaje, " +"financija, nabave,\n" +" upravljanja projektima, proizvodnje, usluga, CRM, itd." #: addons/web/static/src/xml/base.xml:0 msgid "" @@ -1043,9 +1063,16 @@ msgid "" " production system and migration to a new version to be " "straightforward." msgstr "" +"Sustav je neovisan o platformi i može se instalirati na Windows, Mac OS X,\n" +" i različitim verzijama Linux i drugih Unix zasnovanih " +"distribucija. Arhitektura omogućava\n" +" brzo dodavanje novih funkcionalnosti, izmjene na produkcijskom " +"sustavu i,\n" +" olakšanu migraciju na nove verzije." #: addons/web/static/src/xml/base.xml:0 msgid "" "Depending on your needs, OpenERP is available through a web or application " "client." msgstr "" +"Ovisno o potrebama, OpenERP je dostupan kao web ili klasična aplikacija." From 8bd3c7035ec815694a5d2f355b20c29d14c75a31 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Jan 2012 10:30:33 +0100 Subject: [PATCH 147/170] [IMP] add a 'default' key to 'on_prev_view' so switchers can force an other view if needed bzr revid: xmo@openerp.com-20120124093033-297o9np9mxhm9zpy --- addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/js/views.js | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 2172ae103b8..0cd4c42f117 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -386,11 +386,11 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# on_button_save: function() { var self = this; return this.do_save().then(function(result) { - self.do_prev_view(result.created); + self.do_prev_view({'created': result.created, 'default': 'page'}); }); }, on_button_cancel: function() { - return this.do_prev_view(); + return this.do_prev_view({'default': 'page'}); }, on_button_new: function() { var self = this; diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 1aa76b9a6dd..9457f11f225 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -354,17 +354,19 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View * navigation history (the navigation history is appended to via * on_mode_switch) * - * @param {Boolean} [created=false] returning from a creation + * @param {Object} [options] + * @param {Boolean} [options.created=false] resource was created + * @param {String} [options.default=null] view to switch to if no previous view * @returns {$.Deferred} switching end signal */ - on_prev_view: function (created) { + on_prev_view: function (options) { var current_view = this.views_history.pop(); - var previous_view = this.views_history[this.views_history.length - 1]; - if (created && current_view === 'form' && previous_view === 'list') { + var previous_view = this.views_history[this.views_history.length - 1] || options['default']; + if (options.created && current_view === 'form' && previous_view === 'list') { // APR special case: "If creation mode from list (and only from a list), // after saving, go to page view (don't come back in list)" return this.on_mode_switch('page'); - } else if (created && !previous_view && this.action && this.action.flags.default_view === 'form') { + } else if (options.created && !previous_view && this.action && this.action.flags.default_view === 'form') { // APR special case: "If creation from dashboard, we have no previous view return this.on_mode_switch('page'); } @@ -1164,8 +1166,12 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ }, /** * Cancels the switch to the current view, switches to the previous one + * + * @param {Object} [options] + * @param {Boolean} [options.created=false] resource was created + * @param {String} [options.default=null] view to switch to if no previous view */ - do_prev_view: function () { + do_prev_view: function (options) { }, do_search: function(view) { }, From aebe04d321df9d49a2e0ba27cd49eb212559379f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Jan 2012 11:10:43 +0100 Subject: [PATCH 148/170] [FIX] typo in comment bzr revid: xmo@openerp.com-20120124101043-f8mgwbtj3zrao5na --- addons/web/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 9457f11f225..cf337d4647f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1212,7 +1212,7 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ session.web.json_node_to_xml = function(node, human_readable, indent) { // For debugging purpose, this function will convert a json node back to xml - // Maybe usefull for xml view editor + // Maybe useful for xml view editor indent = indent || 0; var sindent = (human_readable ? (new Array(indent + 1).join('\t')) : ''), r = sindent + '<' + node.tag, From c4f06ec8372587f638e4d4910b3b9c846944dd9a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 24 Jan 2012 11:38:47 +0100 Subject: [PATCH 149/170] [FIX] Reference field problem, missing get_selected_ids() bzr revid: fme@openerp.com-20120124103847-qqui2y5vbrqejey3 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0cd4c42f117..9e4b2738e1f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2917,6 +2917,7 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({ } }; this.get_fields_values = view.get_fields_values; + this.get_selected_ids = view.get_selected_ids; this.do_onchange = this.on_form_changed = this.on_nop; this.dataset = this.view.dataset; this.widgets_counter = 0; From f634d05b7d689a16a4625b75344c5c152763ec71 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 24 Jan 2012 13:31:04 +0100 Subject: [PATCH 150/170] [IMP] purchase: simplify a bit method onchange_product_id bzr revid: rco@openerp.com-20120124123104-l1tgpcnnthyrsn9k --- addons/purchase/purchase.py | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 908720eccd1..e91071a8e3f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -715,13 +715,12 @@ class purchase_order_line(osv.osv): """ onchange handler of product_id. """ - res = {} if context is None: context = {} - res_value = {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or'', 'product_uom' : uom_id or False} + res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or '', 'product_uom' : uom_id or False}} if not product_id: - return {'value': res_value} + return res product_product = self.pool.get('product.product') product_uom = self.pool.get('product.uom') @@ -741,11 +740,10 @@ class purchase_order_line(osv.osv): lang = res_partner.browse(cr, uid, partner_id).lang context_partner = {'lang': lang, 'partner_id': partner_id} product = product_product.browse(cr, uid, product_id, context=context_partner) - res_value.update({'name': product.name, 'notes': notes or product.description_purchase}) + res['value'].update({'name': product.name, 'notes': notes or product.description_purchase}) # - set a domain on product_uom - domain = {'product_uom':[('category_id','=',product.uom_id.category_id.id)]} - res.update({'domain': domain}) + res['domain'] = {'product_uom': [('category_id','=',product.uom_id.category_id.id)]} # - check that uom and product uom belong to the same category product_uom_po_id = product.uom_po_id.id @@ -753,10 +751,10 @@ class purchase_order_line(osv.osv): uom_id = product_uom_po_id if product.uom_id.category_id.id != product_uom.browse(cr, uid, uom_id, context=context).category_id.id: - res.update({'warning': {'title': _('Warning'), 'message': _('Selected UOM does not have same category of default UOM')}}) + res['warning'] = {'title': _('Warning'), 'message': _('Selected UOM does not belong to the same category as the product UOM')} uom_id = product_uom_po_id - res_value.update({'product_uom': uom_id}) + res['value'].update({'product_uom': uom_id}) # - determine product_qty and date_planned based on seller info if not date_order: @@ -768,29 +766,24 @@ class purchase_order_line(osv.osv): for supplierinfo in product_supplierinfo.browse(cr, uid, supplierinfo_ids, context=context): seller_delay = supplierinfo.delay if supplierinfo.product_uom.id != uom_id: - res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name }}) + res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name } min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. - res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)}}) + res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)} qty = min_qty dt = (datetime.strptime(date_order, '%Y-%m-%d') + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S') - res_value.update({'date_planned': date_planned or dt, 'product_qty': qty}) + res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty}) # - determine price_unit and taxes_id price = product_pricelist.price_get(cr, uid, [pricelist_id], - product.id, qty or 1.0, partner_id, { - 'uom': uom_id, - 'date': date_order, - })[pricelist_id] + product.id, qty or 1.0, partner_id, {'uom': uom_id, 'date': date_order})[pricelist_id] taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id)) fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes) - res_value.update({'price_unit': price, 'taxes_id': taxes_ids}) + res['value'].update({'price_unit': price, 'taxes_id': taxes_ids}) - - res.update({'value': res_value}) return res product_id_change = onchange_product_id From 4f6f2e2de2fd633154db9eda2b2f2e9c01630101 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 24 Jan 2012 13:34:21 +0100 Subject: [PATCH 151/170] [IMP] stock/test: improve English bzr revid: rco@openerp.com-20120124123421-z3qy9cria4ftkbss --- addons/stock/test/shipment.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml index 6482668bfae..d833409df51 100644 --- a/addons/stock/test/shipment.yml +++ b/addons/stock/test/shipment.yml @@ -48,7 +48,7 @@ assert backorder, "Backorder should be created after partial shipment." assert backorder.state == 'done', "Backorder should be close after received." for move_line in backorder.move_lines: - assert move_line.product_qty == 40, "Qty in backorder is not correspond." + assert move_line.product_qty == 40, "Qty in backorder does not correspond." assert move_line.state == 'done', "Move line of backorder should be closed." - I receive another 10kgm Ice-cream. @@ -72,7 +72,7 @@ shipment = self.browse(cr, uid, ref("incomming_shipment")) assert shipment.state == 'done', "shipment should be close after received." for move_line in shipment.move_lines: - assert move_line.product_qty == 10, "Qty is not correspond." + assert move_line.product_qty == 10, "Qty does not correspond." assert move_line.state == 'done', "Move line should be closed." - @@ -111,8 +111,8 @@ - !python {model: product.product}: | product = self.browse(cr, uid, ref('product_icecream'), context=context) - assert product.qty_available == 140, "Stock is not correspond." - assert product.virtual_available == 10, "Vitual stock is not correspond." + assert product.qty_available == 140, "Stock does not correspond." + assert product.virtual_available == 10, "Vitual stock does not correspond." - I split incomming shipment into lots. each lot contain 10 kgm Ice-cream. @@ -146,8 +146,8 @@ move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_refrigerator')),('prodlot_id','in',lot_ids)]) assert len(move_ids) == 4, 'move lines are not correspond per prodcution lot after splited.' for move in self.browse(cr, uid, move_ids, context=context): - assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot is not correspond." - assert move.product_qty == 10, "qty is not correspond per production lot." + assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot does not correspond." + assert move.product_qty == 10, "qty does not correspond per production lot." context.update({'active_model':'stock.move', 'active_id':move_ids[0],'active_ids': move_ids}) - I check the stock valuation account entries. @@ -161,11 +161,11 @@ for account_move_line in account_move.line_id: for stock_move in incomming_shipment.move_lines: if account_move_line.account_id.id == stock_move.product_id.property_stock_account_input.id: - assert account_move_line.credit == 800.0, "Credit amount is not correspond." - assert account_move_line.debit == 0.0, "Debit amount is not correspond." + assert account_move_line.credit == 800.0, "Credit amount does not correspond." + assert account_move_line.debit == 0.0, "Debit amount does not correspond." else: - assert account_move_line.credit == 0.0, "Credit amount is not correspond." - assert account_move_line.debit == 800.0, "Debit amount is not correspond." + assert account_move_line.credit == 0.0, "Credit amount does not correspond." + assert account_move_line.debit == 800.0, "Debit amount does not correspond." - I consume 1 kgm ice-cream from each incoming lots into internal production. - @@ -189,19 +189,19 @@ !python {model: stock.location}: | ctx = {'product_id': ref('product_icecream')} refrigerator_location = self.browse(cr, uid, ref('location_refrigerator'), context=ctx) - assert refrigerator_location.stock_real == 131.96, 'stock is not correspond in refrigerator location.' + assert refrigerator_location.stock_real == 131.96, 'stock does not correspond in refrigerator location.' scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx) - assert scrapped_location.stock_real == 0.010*4, 'scraped stock is not correspond in scrap location.' + assert scrapped_location.stock_real == 0.010*4, 'scraped stock does not correspond in scrap location.' production_location = self.browse(cr, uid, ref('location_production'), context=ctx) - assert production_location.stock_real == 1*4, 'consume stock is not correspond in production location.' #TOFIX: consume stock is not updated in default production location of product. + assert production_location.stock_real == 1*4, 'consume stock does not correspond in production location.' #TOFIX: consume stock is not updated in default production location of product. - I check availabile stock after consumed and scraped. - !python {model: product.product}: | product = self.browse(cr, uid, ref('product_icecream'), context=context) - assert product.qty_available == 131.96, "Stock is not correspond." - assert round(product.virtual_available, 2) == 1.96, "Vitual stock is not correspond." + assert product.qty_available == 131.96, "Stock does not correspond." + assert round(product.virtual_available, 2) == 1.96, "Vitual stock does not correspond." - I trace all incoming lots. - @@ -276,5 +276,5 @@ - !python {model: product.product}: | product = self.browse(cr, uid, ref('product_icecream'), context=context) - assert round(product.qty_available, 2) == 1.96, "Stock is not correspond." - assert round(product.virtual_available, 2) == 1.96, "Vitual stock is not correspond." + assert round(product.qty_available, 2) == 1.96, "Stock does not correspond." + assert round(product.virtual_available, 2) == 1.96, "Vitual stock does not correspond." From ac845b1bfa6958dfbf3dc90a81c76f6d6a1953c8 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 24 Jan 2012 15:33:18 +0100 Subject: [PATCH 152/170] [imp] nivified extended search bzr revid: nicolas.vanhoren@openerp.com-20120124143318-pw8eka0zvrh7n3mt --- addons/web/static/src/js/chrome.js | 2 +- addons/web/static/src/js/search.js | 13 ++++++------- addons/web/static/src/xml/base.xml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b8ee62c3749..05f52dd36d2 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -41,7 +41,7 @@ openerp.web.Dialog = openerp.web.Widget.extend(/** @lends openerp.web.Dialog# */ identifier_prefix: 'dialog', /** * @constructs openerp.web.Dialog - * @extends openerp.web.OldWidget + * @extends openerp.web.Widget * * @param parent * @param options diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index cf16843aed7..1a926cb0f05 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1038,7 +1038,7 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({ } }); -openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({ +openerp.web.search.ExtendedSearch = openerp.web.search.Widget.extend({ template: 'SearchView.extended_search', identifier_prefix: 'extended-search', init: function (parent, model) { @@ -1051,7 +1051,7 @@ openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({ this.check_last_element(); }, start: function () { - this.$element = $("#" + this.element_id); + this._super(); this.$element.closest("table.oe-searchview-render-line").css("display", "none"); var self = this; this.rpc("/web/searchview/fields_get", @@ -1105,7 +1105,7 @@ openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({ } }); -openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ +openerp.web.search.ExtendedSearchGroup = openerp.web.Widget.extend({ template: 'SearchView.extended_search.group', identifier_prefix: 'extended-search-group', init: function (parent, fields) { @@ -1119,7 +1119,6 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ prop.start(); }, start: function () { - this.$element = $("#" + this.element_id); var _this = this; this.add_prop(); this.$element.find('.searchview_extended_add_proposition').click(function () { @@ -1151,12 +1150,12 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ } }); -openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ +openerp.web.search.ExtendedSearchProposition = openerp.web.Widget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ template: 'SearchView.extended_search.proposition', identifier_prefix: 'extended-search-proposition', /** * @constructs openerp.web.search.ExtendedSearchProposition - * @extends openerp.web.OldWidget + * @extends openerp.web.Widget * * @param parent * @param fields @@ -1247,7 +1246,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** } }); -openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.extend({ +openerp.web.search.ExtendedSearchProposition.Field = openerp.web.Widget.extend({ start: function () { this.$element = $("#" + this.element_id); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5013f6423a4..860c26db4f0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1331,7 +1331,7 @@ -
+
- + @@ -1364,16 +1364,16 @@
- + - + - + - + From 37c632824af56a92ce39a907206165aea0a37a33 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 24 Jan 2012 15:42:30 +0100 Subject: [PATCH 153/170] [IMP] mrp_repair: add documentation in wizard, and fix a potential bug bzr revid: rco@openerp.com-20120124144230-hkc497if0wdve2r9 --- addons/mrp_repair/wizard/make_invoice.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py index 6b49aab5aba..4f0ec8f4b32 100644 --- a/addons/mrp_repair/wizard/make_invoice.py +++ b/addons/mrp_repair/wizard/make_invoice.py @@ -45,8 +45,13 @@ class make_invoice(osv.osv_memory): order_obj = self.pool.get('mrp.repair') newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'], group=inv.group,context=context) + + # We have to trigger the workflow of the given repairs, otherwise they remain 'to be invoiced'. + # Note that the signal 'action_invoice_create' will trigger another call to the method 'action_invoice_create', + # but that second call will not do anything, since the repairs are already invoiced. wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'mrp.repair', context.get('active_id'), 'action_invoice_create' , cr) + for repair_id in context['active_ids']: + wf_service.trg_validate(uid, 'mrp.repair', repair_id, 'action_invoice_create', cr) return { 'domain': [('id','in', newinv.values())], From 3002bd091fd4a0380c88b907e217b6828d96d2b1 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 24 Jan 2012 15:58:10 +0100 Subject: [PATCH 154/170] [imp] removed bunch of old stuff in widget bzr revid: nicolas.vanhoren@openerp.com-20120124145810-lr2y8igt9iqzqepn --- addons/web/static/src/js/chrome.js | 32 ++++++++--------- addons/web/static/src/js/core.js | 35 ++++++------------- addons/web/static/src/js/data.js | 10 +++--- addons/web/static/src/js/search.js | 16 ++++----- addons/web/static/src/js/view_editor.js | 2 +- addons/web/static/src/js/view_form.js | 8 ++--- addons/web/static/src/js/view_help.js | 4 +-- addons/web/static/src/js/views.js | 10 +++--- addons/web/static/src/xml/base.xml | 16 ++++----- addons/web_calendar/static/src/js/calendar.js | 4 +-- .../web_dashboard/static/src/js/dashboard.js | 4 +-- addons/web_kanban/static/src/js/kanban.js | 4 +-- .../web_mobile/static/src/js/chrome_mobile.js | 16 ++++----- .../web_mobile/static/src/js/form_mobile.js | 2 +- .../web_mobile/static/src/js/list_mobile.js | 2 +- addons/web_tests/static/src/js/web_tests.js | 2 +- 16 files changed, 76 insertions(+), 91 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 05f52dd36d2..f9e5ba327be 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -5,7 +5,7 @@ openerp.web.chrome = function(openerp) { var QWeb = openerp.web.qweb, _t = openerp.web._t; -openerp.web.Notification = openerp.web.Widget.extend(/** @lends openerp.web.Notification# */{ +openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web.Notification# */{ template: 'Notification', identifier_prefix: 'notification-', @@ -36,12 +36,12 @@ openerp.web.Notification = openerp.web.Widget.extend(/** @lends openerp.web.Not }); -openerp.web.Dialog = openerp.web.Widget.extend(/** @lends openerp.web.Dialog# */{ +openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{ dialog_title: "", identifier_prefix: 'dialog', /** * @constructs openerp.web.Dialog - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param options @@ -208,11 +208,11 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ } }); -openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# */{ +openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loading# */{ template: 'Loading', /** * @constructs openerp.web.Loading - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -267,11 +267,11 @@ openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# } }); -openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database# */{ +openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Database# */{ template: "DatabaseManager", /** * @constructs openerp.web.Database - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -551,14 +551,14 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database } }); -openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ +openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# */{ remember_credentials: true, template: "Login", identifier_prefix: 'oe-app-login-', /** * @constructs openerp.web.Login - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -649,12 +649,12 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ } }); -openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# */{ +openerp.web.Header = openerp.web.OldWidget.extend(/** @lends openerp.web.Header# */{ template: "Header", identifier_prefix: 'oe-app-header-', /** * @constructs openerp.web.Header - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent */ @@ -830,10 +830,10 @@ openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# * } }); -openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ +openerp.web.Menu = openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */{ /** * @constructs openerp.web.Menu - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -1045,10 +1045,10 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ } }); -openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{ +openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebClient */{ /** * @constructs openerp.web.WebClient - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param element_id */ @@ -1183,7 +1183,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie } }); -openerp.web.EmbeddedClient = openerp.web.Widget.extend({ +openerp.web.EmbeddedClient = openerp.web.OldWidget.extend({ template: 'EmptyComponent', init: function(action_id, options) { this._super(); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 43bd8a0abf7..8bc9cca32b9 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -932,13 +932,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W * @type string */ template: null, - /** - * The prefix used to generate an id automatically. Should be redefined in - * subclasses. If it is not defined, a generic identifier will be used. - * - * @type string - */ - identifier_prefix: 'generic-identifier-', /** * Tag name when creating a default $element. * @type string @@ -958,15 +951,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W * with the DOM insertion methods provided by the current implementation of Widget. So * for new components this argument should not be provided any more. */ - init: function(parent, /** @deprecated */ element_id) { + init: function(parent) { this._super(); this.session = openerp.connection; - // if given an element_id, try to get the associated DOM element and save - // a reference in this.$element. Else just generate a unique identifier. - this.element_id = element_id; - this.element_id = this.element_id || _.uniqueId(this.identifier_prefix); - var tmp = document.getElementById(this.element_id); - this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name)); this.widget_parent = parent; this.widget_children = []; @@ -1128,17 +1115,15 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W } }); -/** - * @class - * @extends openerp.web.Widget - * @deprecated - * For retro compatibility only, the only difference with is that render() uses - * directly ``this`` instead of context with a ``widget`` key. - */ -openerp.web.OldWidget = openerp.web.Widget.extend(/** @lends openerp.web.OldWidget# */{ - render: function (additional) { - return openerp.web.qweb.render(this.template, _.extend(_.extend({}, this), additional || {})); - } +openerp.web.OldWidget = openerp.web.Widget.extend({ + identifier_prefix: 'generic-identifier-', + init: function(parent, /** @deprecated */ element_id) { + this._super(parent); + this.element_id = element_id; + this.element_id = this.element_id || _.uniqueId(this.identifier_prefix); + var tmp = document.getElementById(this.element_id); + this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name)); + }, }); openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.web.TranslationDataBase# */{ diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index a4d9e9e4d71..13653a83c2b 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -18,7 +18,7 @@ openerp.web.serialize_sort = function (criterion) { }).join(', '); }; -openerp.web.DataGroup = openerp.web.Widget.extend( /** @lends openerp.web.DataGroup# */{ +openerp.web.DataGroup = openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{ /** * Management interface between views and grouped collections of OpenERP * records. @@ -30,9 +30,9 @@ openerp.web.DataGroup = openerp.web.Widget.extend( /** @lends openerp.web.DataG * content of the current grouping level. * * @constructs openerp.web.DataGroup - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * - * @param {openerp.web.Widget} parent widget + * @param {openerp.web.OldWidget} parent widget * @param {String} model name of the model managed by this DataGroup * @param {Array} domain search domain for this DataGroup * @param {Object} context context of the DataGroup's searches @@ -233,14 +233,14 @@ openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends } }); -openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet# */{ +openerp.web.DataSet = openerp.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{ identifier_prefix: "dataset", /** * DateaManagement interface between views and the collection of selected * OpenERP records (represents the view's state?) * * @constructs openerp.web.DataSet - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param {String} model the OpenERP model this dataset will manage */ diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 1a926cb0f05..99a6b2f4b01 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -3,11 +3,11 @@ var QWeb = openerp.web.qweb, _t = openerp.web._t, _lt = openerp.web._lt; -openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.SearchView# */{ +openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.SearchView# */{ template: "EmptyComponent", /** * @constructs openerp.web.SearchView - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -499,13 +499,13 @@ openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.se ); } }); -openerp.web.search.Widget = openerp.web.Widget.extend( /** @lends openerp.web.search.Widget# */{ +openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web.search.Widget# */{ template: null, /** * Root class of all search widgets * * @constructs openerp.web.search.Widget - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param view the ancestor view of this widget */ @@ -1105,7 +1105,7 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Widget.extend({ } }); -openerp.web.search.ExtendedSearchGroup = openerp.web.Widget.extend({ +openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ template: 'SearchView.extended_search.group', identifier_prefix: 'extended-search-group', init: function (parent, fields) { @@ -1150,12 +1150,12 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.Widget.extend({ } }); -openerp.web.search.ExtendedSearchProposition = openerp.web.Widget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ +openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ template: 'SearchView.extended_search.proposition', identifier_prefix: 'extended-search-proposition', /** * @constructs openerp.web.search.ExtendedSearchProposition - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param fields @@ -1246,7 +1246,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.Widget.extend(/** @le } }); -openerp.web.search.ExtendedSearchProposition.Field = openerp.web.Widget.extend({ +openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.extend({ start: function () { this.$element = $("#" + this.element_id); } diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 6ae15a5fdb8..f506d63a677 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -1,7 +1,7 @@ openerp.web.view_editor = function(openerp) { var _t = openerp.web._t; var QWeb = openerp.web.qweb; -openerp.web.ViewEditor = openerp.web.Widget.extend({ +openerp.web.ViewEditor = openerp.web.OldWidget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9e4b2738e1f..6eb7f13981d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -620,7 +620,7 @@ openerp.web.FormDialog = openerp.web.Dialog.extend({ /** @namespace */ openerp.web.form = {}; -openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({ +openerp.web.form.SidebarAttachments = openerp.web.OldWidget.extend({ init: function(parent, form_view) { var $section = parent.add_section(_t('Attachments'), 'attachments'); this.$div = $('
'); @@ -737,12 +737,12 @@ openerp.web.form.compute_domain = function(expr, fields) { return _.all(stack, _.identity); }; -openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.Widget# */{ +openerp.web.form.Widget = openerp.web.OldWidget.extend(/** @lends openerp.web.form.Widget# */{ template: 'Widget', identifier_prefix: 'formview-widget-', /** * @constructs openerp.web.form.Widget - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param view * @param node @@ -1388,7 +1388,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({ } }); -openerp.web.DateTimeWidget = openerp.web.Widget.extend({ +openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({ template: "web.datetimepicker", jqueryui_object: 'datetimepicker', type_of_date: "datetime", diff --git a/addons/web/static/src/js/view_help.js b/addons/web/static/src/js/view_help.js index f7e5f7c259e..6f590c359d1 100644 --- a/addons/web/static/src/js/view_help.js +++ b/addons/web/static/src/js/view_help.js @@ -4,10 +4,10 @@ openerp.web.view_help = function(openerp) { -openerp.web.ProcessView = openerp.web.Widget.extend({ +openerp.web.ProcessView = openerp.web.OldWidget.extend({ }); -openerp.web.HelpView = openerp.web.Widget.extend({ +openerp.web.HelpView = openerp.web.OldWidget.extend({ }); }; diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index cf337d4647f..163807d7a4c 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -16,7 +16,7 @@ session.web.client_actions = new session.web.Registry(); */ session.web.views = new session.web.Registry(); -session.web.ActionManager = session.web.Widget.extend({ +session.web.ActionManager = session.web.OldWidget.extend({ identifier_prefix: "actionmanager", init: function(parent) { this._super(parent); @@ -208,12 +208,12 @@ session.web.ActionManager = session.web.Widget.extend({ } }); -session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.ViewManager# */{ +session.web.ViewManager = session.web.OldWidget.extend(/** @lends session.web.ViewManager# */{ identifier_prefix: "viewmanager", template: "ViewManager", /** * @constructs session.web.ViewManager - * @extends session.web.Widget + * @extends session.web.OldWidget * * @param parent * @param dataset @@ -765,7 +765,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner } }); -session.web.Sidebar = session.web.Widget.extend({ +session.web.Sidebar = session.web.OldWidget.extend({ init: function(parent, element_id) { this._super(parent, element_id); this.items = {}; @@ -1042,7 +1042,7 @@ session.web.TranslateDialog = session.web.Dialog.extend({ } }); -session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ +session.web.View = session.web.OldWidget.extend(/** @lends session.web.View# */{ template: "EmptyComponent", // name displayed in view switchers display_name: '', diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 860c26db4f0..230ad629d3a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1378,27 +1378,27 @@ - + -
+
-
+
-
+
-
+
@@ -1416,8 +1416,8 @@ -
-
+
+
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 9cc576d132d..bc7c5f0ba1d 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -461,7 +461,7 @@ openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({ } }); -openerp.web_calendar.SidebarResponsible = openerp.web.Widget.extend({ +openerp.web_calendar.SidebarResponsible = openerp.web.OldWidget.extend({ init: function(parent, view) { var $section = parent.add_section(_t('Responsible'), 'responsible'); this.$div = $('
'); @@ -499,7 +499,7 @@ openerp.web_calendar.SidebarResponsible = openerp.web.Widget.extend({ } }); -openerp.web_calendar.SidebarNavigator = openerp.web.Widget.extend({ +openerp.web_calendar.SidebarNavigator = openerp.web.OldWidget.extend({ init: function(parent, view) { var $section = parent.add_section(_t('Navigator'), 'navigator'); this._super(parent, $section.attr('id')); diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 567591b84bb..dc433f961a8 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -395,7 +395,7 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da * install (if none is installed yet) or a list of root menu items */ openerp.web.client_actions.add('default_home', 'session.web_dashboard.ApplicationTiles'); -openerp.web_dashboard.ApplicationTiles = openerp.web.Widget.extend({ +openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({ template: 'web_dashboard.ApplicationTiles', init: function(parent) { this._super(parent); @@ -440,7 +440,7 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.Widget.extend({ * This client action display a list of applications to install. */ openerp.web.client_actions.add( 'board.application.installer', 'openerp.web_dashboard.ApplicationInstaller'); -openerp.web_dashboard.ApplicationInstaller = openerp.web.Widget.extend({ +openerp.web_dashboard.ApplicationInstaller = openerp.web.OldWidget.extend({ template: 'web_dashboard.ApplicationInstaller', start: function () { // TODO menu hide diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index a4baa27d42f..46c6ce4eaf6 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -279,7 +279,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ } }); -openerp.web_kanban.KanbanGroup = openerp.web.Widget.extend({ +openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({ template: 'KanbanView.group_header', init: function (parent, records, value, title, aggregates) { var self = this; @@ -352,7 +352,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.Widget.extend({ } }); -openerp.web_kanban.KanbanRecord = openerp.web.Widget.extend({ +openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({ template: 'KanbanView.record', init: function (parent, record) { this._super(parent); diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index a4e8f0acd44..41732391936 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -11,7 +11,7 @@ openerp.web_mobile.mobilewebclient = function(element_id) { return client; }; -openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({ +openerp.web_mobile.MobileWebClient = openerp.web.OldWidget.extend({ template: "WebClient", @@ -31,7 +31,7 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Login = openerp.web.Widget.extend({ +openerp.web_mobile.Login = openerp.web.OldWidget.extend({ template: "Login", @@ -119,7 +119,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Header = openerp.web.Widget.extend({ +openerp.web_mobile.Header = openerp.web.OldWidget.extend({ template: "Header", @@ -131,7 +131,7 @@ openerp.web_mobile.Header = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Footer = openerp.web.Widget.extend({ +openerp.web_mobile.Footer = openerp.web.OldWidget.extend({ template: "Footer", @@ -143,7 +143,7 @@ openerp.web_mobile.Footer = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({ +openerp.web_mobile.Shortcuts = openerp.web.OldWidget.extend({ template: "Shortcuts", @@ -182,7 +182,7 @@ openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Menu = openerp.web.Widget.extend({ +openerp.web_mobile.Menu = openerp.web.OldWidget.extend({ template: "Menu", @@ -248,7 +248,7 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Secondary = openerp.web.Widget.extend({ +openerp.web_mobile.Secondary = openerp.web.OldWidget.extend({ template: "Menu.secondary", @@ -305,7 +305,7 @@ openerp.web_mobile.Secondary = openerp.web.Widget.extend({ } }); -openerp.web_mobile.Options = openerp.web.Widget.extend({ +openerp.web_mobile.Options = openerp.web.OldWidget.extend({ template: "Options", diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 84eccd41dc5..cf44cca1879 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -4,7 +4,7 @@ openerp.web_mobile.form_mobile = function (openerp) { -openerp.web_mobile.FormView = openerp.web.Widget.extend({ +openerp.web_mobile.FormView = openerp.web.OldWidget.extend({ template: 'FormView', diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js index 7c7b7b33c15..16296df59e7 100644 --- a/addons/web_mobile/static/src/js/list_mobile.js +++ b/addons/web_mobile/static/src/js/list_mobile.js @@ -4,7 +4,7 @@ openerp.web_mobile.list_mobile = function (openerp) { -openerp.web_mobile.ListView = openerp.web.Widget.extend({ +openerp.web_mobile.ListView = openerp.web.OldWidget.extend({ template: 'ListView', diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js index b21275d1eb7..f98dd95f66f 100644 --- a/addons/web_tests/static/src/js/web_tests.js +++ b/addons/web_tests/static/src/js/web_tests.js @@ -2,7 +2,7 @@ openerp.web_tests = function (db) { db.web.client_actions.add( 'buncha-forms', 'instance.web_tests.BunchaForms'); db.web_tests = {}; - db.web_tests.BunchaForms = db.web.Widget.extend({ + db.web_tests.BunchaForms = db.web.OldWidget.extend({ init: function (parent) { this._super(parent); this.dataset = new db.web.DataSetSearch(this, 'test.listview.relations'); From 846c19bf88a592981168d37fc8c18e8177d986d5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 24 Jan 2012 15:59:00 +0100 Subject: [PATCH 155/170] [imp] refactoring in Widget in Web client bzr revid: nicolas.vanhoren@openerp.com-20120124145900-8a8gu19gfl2vrgw6 --- addons/edi/static/src/js/edi.js | 4 +-- addons/point_of_sale/static/src/js/pos.js | 32 +++++++++---------- .../static/src/js/web_livechat.js | 2 +- .../static/src/js/web_uservoice.js | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js index 3135c0f8102..5493077e831 100644 --- a/addons/edi/static/src/js/edi.js +++ b/addons/edi/static/src/js/edi.js @@ -1,7 +1,7 @@ openerp.edi = function(openerp) { openerp.edi = {} -openerp.edi.EdiView = openerp.web.Widget.extend({ +openerp.edi.EdiView = openerp.web.OldWidget.extend({ init: function(parent, db, token) { this._super(); this.db = db; @@ -113,7 +113,7 @@ openerp.edi.edi_view = function (db, token) { }); } -openerp.edi.EdiImport = openerp.web.Widget.extend({ +openerp.edi.EdiImport = openerp.web.OldWidget.extend({ init: function(parent,url) { this._super(); this.url = url; diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index b47ca2ab4a2..753239bfaa1 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -623,7 +623,7 @@ openerp.point_of_sale = function(db) { Views --- */ - var NumpadWidget = db.web.Widget.extend({ + var NumpadWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.state = new NumpadState(); @@ -660,7 +660,7 @@ openerp.point_of_sale = function(db) { /* Gives access to the payment methods (aka. 'cash registers') */ - var PaypadWidget = db.web.Widget.extend({ + var PaypadWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.shop = options.shop; @@ -691,7 +691,7 @@ openerp.point_of_sale = function(db) { }, this)); } }); - var PaymentButtonWidget = db.web.Widget.extend({ + var PaymentButtonWidget = db.web.OldWidget.extend({ template_fct: qweb_template('pos-payment-button-template'), render_element: function() { this.$element.html(this.template_fct({ @@ -709,7 +709,7 @@ openerp.point_of_sale = function(db) { It should be possible to go back to any step as long as step 3 hasn't been completed. Modifying an order after validation shouldn't be allowed. */ - var StepSwitcher = db.web.Widget.extend({ + var StepSwitcher = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.shop = options.shop; @@ -735,7 +735,7 @@ openerp.point_of_sale = function(db) { /* Shopping carts. */ - var OrderlineWidget = db.web.Widget.extend({ + var OrderlineWidget = db.web.OldWidget.extend({ tag_name: 'tr', template_fct: qweb_template('pos-orderline-template'), init: function(parent, options) { @@ -775,7 +775,7 @@ openerp.point_of_sale = function(db) { }, on_selected: function() {}, }); - var OrderWidget = db.web.Widget.extend({ + var OrderWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.shop = options.shop; @@ -858,7 +858,7 @@ openerp.point_of_sale = function(db) { /* "Products" step. */ - var CategoryWidget = db.web.Widget.extend({ + var CategoryWidget = db.web.OldWidget.extend({ start: function() { this.$element.find(".oe-pos-categories-list a").click(_.bind(this.changeCategory, this)); }, @@ -893,7 +893,7 @@ openerp.point_of_sale = function(db) { }, on_change_category: function(id) {}, }); - var ProductWidget = db.web.Widget.extend({ + var ProductWidget = db.web.OldWidget.extend({ tag_name:'li', template_fct: qweb_template('pos-product-template'), init: function(parent, options) { @@ -915,7 +915,7 @@ openerp.point_of_sale = function(db) { return this; }, }); - var ProductListWidget = db.web.Widget.extend({ + var ProductListWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.model = options.model; @@ -937,7 +937,7 @@ openerp.point_of_sale = function(db) { /* "Payment" step. */ - var PaymentlineWidget = db.web.Widget.extend({ + var PaymentlineWidget = db.web.OldWidget.extend({ tag_name: 'tr', template_fct: qweb_template('pos-paymentline-template'), init: function(parent, options) { @@ -971,7 +971,7 @@ openerp.point_of_sale = function(db) { $('.delete-payment-line', this.$element).click(this.on_delete); }, }); - var PaymentWidget = db.web.Widget.extend({ + var PaymentWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.model = options.model; @@ -1066,7 +1066,7 @@ openerp.point_of_sale = function(db) { this.currentPaymentLines.last().set({amount: val}); }, }); - var ReceiptWidget = db.web.Widget.extend({ + var ReceiptWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.model = options.model; @@ -1109,7 +1109,7 @@ openerp.point_of_sale = function(db) { $('.pos-receipt-container', this.$element).html(qweb_template('pos-ticket')({widget:this})); }, }); - var OrderButtonWidget = db.web.Widget.extend({ + var OrderButtonWidget = db.web.OldWidget.extend({ tag_name: 'li', template_fct: qweb_template('pos-order-selector-button-template'), init: function(parent, options) { @@ -1148,7 +1148,7 @@ openerp.point_of_sale = function(db) { this.$element.addClass('order-selector-button'); } }); - var ShopWidget = db.web.Widget.extend({ + var ShopWidget = db.web.OldWidget.extend({ init: function(parent, options) { this._super(parent); this.shop = options.shop; @@ -1283,7 +1283,7 @@ openerp.point_of_sale = function(db) { return App; })(); - db.point_of_sale.SynchNotification = db.web.Widget.extend({ + db.point_of_sale.SynchNotification = db.web.OldWidget.extend({ template: "pos-synch-notification", init: function() { this._super.apply(this, arguments); @@ -1301,7 +1301,7 @@ openerp.point_of_sale = function(db) { }); db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale'); - db.point_of_sale.PointOfSale = db.web.Widget.extend({ + db.point_of_sale.PointOfSale = db.web.OldWidget.extend({ init: function() { this._super.apply(this, arguments); diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js index ecfcb887ab3..6351ddb2d5c 100644 --- a/addons/web_livechat/static/src/js/web_livechat.js +++ b/addons/web_livechat/static/src/js/web_livechat.js @@ -22,7 +22,7 @@ var __lc_buttons = []; openerp.web_livechat = function (openerp) { -openerp.web_livechat.Livechat = openerp.web.Widget.extend({ +openerp.web_livechat.Livechat = openerp.web.OldWidget.extend({ template: 'Header-LiveChat', start: function() { diff --git a/addons/web_uservoice/static/src/js/web_uservoice.js b/addons/web_uservoice/static/src/js/web_uservoice.js index ecf73e3b625..b4b63584ca5 100644 --- a/addons/web_uservoice/static/src/js/web_uservoice.js +++ b/addons/web_uservoice/static/src/js/web_uservoice.js @@ -1,7 +1,7 @@ openerp.web_uservoice = function(instance) { -instance.web_uservoice.UserVoice = instance.web.Widget.extend({ +instance.web_uservoice.UserVoice = instance.web.OldWidget.extend({ template: 'Header-UserVoice', default_forum: '77459', From c044b704295345d7cbd6fb57cb54c8ad3addcd80 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 24 Jan 2012 16:13:43 +0100 Subject: [PATCH 156/170] [imp] removed identifier_prefix bzr revid: nicolas.vanhoren@openerp.com-20120124151343-t17b3obenv244io3 --- addons/web/static/src/js/chrome.js | 4 ---- addons/web/static/src/js/core.js | 5 +---- addons/web/static/src/js/data.js | 1 - addons/web/static/src/js/search.js | 10 ---------- addons/web/static/src/js/view_form.js | 4 ---- addons/web/static/src/js/views.js | 2 -- doc/source/addons.rst | 2 -- 7 files changed, 1 insertion(+), 27 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index f9e5ba327be..b4e52be6951 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -7,7 +7,6 @@ var QWeb = openerp.web.qweb, openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web.Notification# */{ template: 'Notification', - identifier_prefix: 'notification-', init: function() { this._super.apply(this, arguments); @@ -38,7 +37,6 @@ openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web. openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{ dialog_title: "", - identifier_prefix: 'dialog', /** * @constructs openerp.web.Dialog * @extends openerp.web.OldWidget @@ -555,7 +553,6 @@ openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# remember_credentials: true, template: "Login", - identifier_prefix: 'oe-app-login-', /** * @constructs openerp.web.Login * @extends openerp.web.OldWidget @@ -651,7 +648,6 @@ openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# openerp.web.Header = openerp.web.OldWidget.extend(/** @lends openerp.web.Header# */{ template: "Header", - identifier_prefix: 'oe-app-header-', /** * @constructs openerp.web.Header * @extends openerp.web.OldWidget diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 8bc9cca32b9..f7ef2c48243 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -892,8 +892,6 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. * MyWidget = openerp.base.Widget.extend({ * // the name of the QWeb template to use for rendering * template: "MyQWebTemplate", - * // identifier prefix, it is useful to put an obvious one for debugging - * identifier_prefix: 'my-id-prefix-', * * init: function(parent) { * this._super(parent); @@ -1116,11 +1114,10 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W }); openerp.web.OldWidget = openerp.web.Widget.extend({ - identifier_prefix: 'generic-identifier-', init: function(parent, /** @deprecated */ element_id) { this._super(parent); this.element_id = element_id; - this.element_id = this.element_id || _.uniqueId(this.identifier_prefix); + this.element_id = this.element_id || _.uniqueId('widget-'); var tmp = document.getElementById(this.element_id); this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name)); }, diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 13653a83c2b..0cf36fbf2f5 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -234,7 +234,6 @@ openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends }); openerp.web.DataSet = openerp.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{ - identifier_prefix: "dataset", /** * DateaManagement interface between views and the collection of selected * OpenERP records (represents the view's state?) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 99a6b2f4b01..564dd09ae4a 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1040,7 +1040,6 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({ openerp.web.search.ExtendedSearch = openerp.web.search.Widget.extend({ template: 'SearchView.extended_search', - identifier_prefix: 'extended-search', init: function (parent, model) { this._super(parent); this.model = model; @@ -1107,7 +1106,6 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Widget.extend({ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ template: 'SearchView.extended_search.group', - identifier_prefix: 'extended-search-group', init: function (parent, fields) { this._super(parent); this.fields = fields; @@ -1152,7 +1150,6 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ template: 'SearchView.extended_search.proposition', - identifier_prefix: 'extended-search-proposition', /** * @constructs openerp.web.search.ExtendedSearchProposition * @extends openerp.web.OldWidget @@ -1253,7 +1250,6 @@ openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.exten }); openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.char', - identifier_prefix: 'extended-search-proposition-char', operators: [ {value: "ilike", text: _lt("contains")}, {value: "not ilike", text: _lt("doesn't contain")}, @@ -1270,7 +1266,6 @@ openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedS }); openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.empty', - identifier_prefix: 'extended-search-proposition-datetime', operators: [ {value: "=", text: _lt("is equal to")}, {value: "!=", text: _lt("is not equal to")}, @@ -1290,7 +1285,6 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.Exten }); openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.empty', - identifier_prefix: 'extended-search-proposition-date', operators: [ {value: "=", text: _lt("is equal to")}, {value: "!=", text: _lt("is not equal to")}, @@ -1310,7 +1304,6 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedS }); openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.integer', - identifier_prefix: 'extended-search-proposition-integer', operators: [ {value: "=", text: _lt("is equal to")}, {value: "!=", text: _lt("is not equal to")}, @@ -1332,7 +1325,6 @@ openerp.web.search.ExtendedSearchProposition.Id = openerp.web.search.ExtendedSea }); openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.float', - identifier_prefix: 'extended-search-proposition-float', operators: [ {value: "=", text: _lt("is equal to")}, {value: "!=", text: _lt("is not equal to")}, @@ -1351,7 +1343,6 @@ openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.Extended }); openerp.web.search.ExtendedSearchProposition.Selection = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.selection', - identifier_prefix: 'extended-search-proposition-selection', operators: [ {value: "=", text: _lt("is")}, {value: "!=", text: _lt("is not")} @@ -1365,7 +1356,6 @@ openerp.web.search.ExtendedSearchProposition.Selection = openerp.web.search.Exte }); openerp.web.search.ExtendedSearchProposition.Boolean = openerp.web.search.ExtendedSearchProposition.Field.extend({ template: 'SearchView.extended_search.proposition.boolean', - identifier_prefix: 'extended-search-proposition-boolean', operators: [ {value: "=", text: _lt("is true")}, {value: "!=", text: _lt("is false")} diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 6eb7f13981d..743a1ecdf4e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -13,7 +13,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# searchable: false, readonly : false, form_template: "FormView", - identifier_prefix: 'formview-', display_name: _lt('Form'), /** * @constructs openerp.web.FormView @@ -739,7 +738,6 @@ openerp.web.form.compute_domain = function(expr, fields) { openerp.web.form.Widget = openerp.web.OldWidget.extend(/** @lends openerp.web.form.Widget# */{ template: 'Widget', - identifier_prefix: 'formview-widget-', /** * @constructs openerp.web.form.Widget * @extends openerp.web.OldWidget @@ -2593,7 +2591,6 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open * @extends openerp.web.OldWidget */ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends openerp.web.form.SelectCreatePopup# */{ - identifier_prefix: "selectcreatepopup", template: "SelectCreatePopup", /** * options: @@ -2811,7 +2808,6 @@ openerp.web.form.SelectCreateListView = openerp.web.ListView.extend({ * @extends openerp.web.OldWidget */ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp.web.form.FormOpenPopup# */{ - identifier_prefix: "formopenpopup", template: "FormOpenPopup", /** * options: diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 163807d7a4c..1e688da18c4 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -17,7 +17,6 @@ session.web.client_actions = new session.web.Registry(); session.web.views = new session.web.Registry(); session.web.ActionManager = session.web.OldWidget.extend({ - identifier_prefix: "actionmanager", init: function(parent) { this._super(parent); this.inner_action = null; @@ -209,7 +208,6 @@ session.web.ActionManager = session.web.OldWidget.extend({ }); session.web.ViewManager = session.web.OldWidget.extend(/** @lends session.web.ViewManager# */{ - identifier_prefix: "viewmanager", template: "ViewManager", /** * @constructs session.web.ViewManager diff --git a/doc/source/addons.rst b/doc/source/addons.rst index ac264758d2b..ddfeea06e57 100644 --- a/doc/source/addons.rst +++ b/doc/source/addons.rst @@ -163,8 +163,6 @@ override). Creating a subclass looks like this: var MyWidget = openerp.base.Widget.extend({ // QWeb template to use when rendering the object template: "MyQWebTemplate", - // autogenerated id prefix, specificity helps when debugging - identifier_prefix: 'my-id-prefix-', init: function(parent) { this._super(parent); From 9156efc4997af9a388f4e788be8da67804d38448 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 24 Jan 2012 13:40:21 +0100 Subject: [PATCH 157/170] [FIX] account: bug fixed in the generation of COA form templates + fixed default values in that wizard in order to have at least one journal of type 'bank' (hardly needed for bank statement encoding for example) bzr revid: qdp-launchpad@openerp.com-20120124124021-1i6x1qb3pbx6fcgw --- addons/account/account.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 432a90a653e..278e752cfe4 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2524,7 +2524,10 @@ class account_account_template(osv.osv): #deactivate the parent_store functionnality on account_account for rapidity purpose ctx = context.copy() ctx.update({'defer_parent_store_computation': True}) - children_acc_template = self.search(cr, uid, ['|', ('chart_template_id','=', chart_template_id),'&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False), ('nocreate','!=',True)], order='id') + children_acc_criteria = [('chart_template_id','=', chart_template_id)] + if template.account_root_id.id: + children_acc_criteria = ['|'] + children_acc_criteria + ['&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False)] + children_acc_template = self.search(cr, uid, [('nocreate','!=',True)] + children_acc_criteria, order='id') for account_template in self.browse(cr, uid, children_acc_template, context=context): # skip the root of COA if it's not the main one if (template.account_root_id.id == account_template.id) and template.parent_id: @@ -2982,7 +2985,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): tax_templ_obj = self.pool.get('account.tax.template') if 'bank_accounts_id' in fields: - res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'}]}) + res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]}) if 'company_id' in fields: res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id}) if 'seq_journal' in fields: From fb8255576c856c9f4d336916080cb7a37b1b3bc2 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 24 Jan 2012 16:27:08 +0100 Subject: [PATCH 158/170] [imp] added documentation bzr revid: nicolas.vanhoren@openerp.com-20120124152708-iuid1mrw0zvmmy8x --- addons/web/static/src/js/core.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index f7ef2c48243..25aacbe2cc3 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -1113,8 +1113,11 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W } }); +/** + * Deprecated. Do not use any more. + */ openerp.web.OldWidget = openerp.web.Widget.extend({ - init: function(parent, /** @deprecated */ element_id) { + init: function(parent, element_id) { this._super(parent); this.element_id = element_id; this.element_id = this.element_id || _.uniqueId('widget-'); From 947f5841622f84a081bacf9fa4cfbfd812b89457 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 24 Jan 2012 16:27:33 +0100 Subject: [PATCH 159/170] [FIX] account_bank_statement_extensions: fix creation of statement lines in web client. State field was needed in views as there are modifiers on this field lp bug: https://launchpad.net/bugs/920492 fixed bzr revid: qdp-launchpad@openerp.com-20120124152733-2v08ac0dnwfwes2o --- .../account_bank_statement_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index 8f132f1f34e..400cc92452b 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -47,12 +47,14 @@ + + From 6400a55c688843b7cc2b1d8a39464c8b8d54df65 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 24 Jan 2012 16:27:47 +0100 Subject: [PATCH 160/170] [FIX] account: fixed multi-company related stuffs on cash/bank statements bzr revid: qdp-launchpad@openerp.com-20120124152747-5ygkcu5z3i9awnw7 --- addons/account/account_bank_statement.py | 32 ++++++++++-------------- addons/account/account_view.xml | 9 ++++--- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index bd31b01a41d..c255775b83b 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -52,8 +52,9 @@ class account_bank_statement(osv.osv): journal_pool = self.pool.get('account.journal') journal_type = context.get('journal_type', False) journal_id = False + company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=context) if journal_type: - ids = journal_pool.search(cr, uid, [('type', '=', journal_type)]) + ids = journal_pool.search(cr, uid, [('type', '=', journal_type),('company_id','=',company_id)]) if ids: journal_id = ids[0] return journal_id @@ -169,30 +170,21 @@ class account_bank_statement(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c), } - def onchange_date(self, cr, user, ids, date, context=None): + def onchange_date(self, cr, uid, ids, date, company_id, context=None): """ - Returns a dict that contains new values and context - @param cr: A database cursor - @param user: ID of the user currently logged in - @param date: latest value from user input for field date - @param args: other arguments - @param context: context arguments, like lang, time zone - @return: Returns a dict which contains new values, and context + Find the correct period to use for the given date and company_id, return it and set it in the context """ res = {} period_pool = self.pool.get('account.period') if context is None: context = {} - - pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)]) + ctx = context.copy() + ctx.update({'company_id': company_id}) + pids = period_pool.find(cr, uid, dt=date, context=ctx) if pids: - res.update({ - 'period_id':pids[0] - }) - context.update({ - 'period_id':pids[0] - }) + res.update({'period_id': pids[0]}) + context.update({'period_id': pids[0]}) return { 'value':res, @@ -385,8 +377,10 @@ class account_bank_statement(osv.osv): ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft')) res = cr.fetchone() balance_start = res and res[0] or 0.0 - account_id = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id'], context=context)['default_debit_account_id'] - return {'value': {'balance_start': balance_start, 'account_id': account_id}} + journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context) + account_id = journal_data['default_debit_account_id'] + company_id = journal_data['company_id'] + return {'value': {'balance_start': balance_start, 'account_id': account_id, 'company_id': company_id}} def unlink(self, cr, uid, ids, context=None): stat = self.read(cr, uid, ids, ['state'], context=context) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3d34396248b..3a28ea9a244 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -594,7 +594,7 @@ - + @@ -655,7 +655,8 @@ - + + @@ -2620,7 +2621,7 @@ action = pool.get('res.config').next(cr, uid, [], context) - + @@ -2693,7 +2694,7 @@ action = pool.get('res.config').next(cr, uid, [], context) - + From af30dcba24504c28b616ca2c0f6fb6196d314a2d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 24 Jan 2012 16:42:46 +0100 Subject: [PATCH 161/170] [fix] problem in Widget bzr revid: nicolas.vanhoren@openerp.com-20120124154246-bl3ulzt1luhyl9jb --- addons/web/static/src/js/core.js | 2 ++ addons/web/static/src/js/views.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 25aacbe2cc3..c735f113991 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -952,6 +952,8 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W init: function(parent) { this._super(); this.session = openerp.connection; + + this.$element = $(document.createElement(this.tag_name)); this.widget_parent = parent; this.widget_children = []; diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 1e688da18c4..9e64a8d9bf9 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1040,7 +1040,7 @@ session.web.TranslateDialog = session.web.Dialog.extend({ } }); -session.web.View = session.web.OldWidget.extend(/** @lends session.web.View# */{ +session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ template: "EmptyComponent", // name displayed in view switchers display_name: '', From b39e6ae7f122c98afb79e5bcb4ced467f472cbc5 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 24 Jan 2012 18:01:11 +0100 Subject: [PATCH 162/170] [ADD] Added View Log (perm_read) option in debug select box lp bug: https://launchpad.net/bugs/914277 fixed bzr revid: fme@openerp.com-20120124170111-i35l4qclarypsrh1 --- addons/web/static/src/css/base.css | 18 ++++++++++++++++++ addons/web/static/src/js/views.js | 14 ++++++++++++++ addons/web/static/src/xml/base.xml | 26 ++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 13068e123a5..75d4ee10feb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2286,6 +2286,24 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { color: black; } +/* Debug stuff */ +.openerp .oe_debug_view_log { + font-size: 95%; +} +.openerp .oe_debug_view_log label { + display: block; + width: 49%; + text-align: right; + float: left; + font-weight: bold; + color: #009; +} +.openerp .oe_debug_view_log span { + display: block; + width: 49%; + float: right; + color: #333; +} /* Internet Explorer Fix */ a img { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 9e64a8d9bf9..8499904f355 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -557,6 +557,20 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner var dialog = new session.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open(); $('
').text(session.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$element);
                 break;
+            case 'perm_read':
+                var ids = current_view.get_selected_ids();
+                if (ids.length === 1) {
+                    this.dataset.call('perm_read', [ids]).then(function(result) {
+                        var dialog = new session.web.Dialog(this, {
+                            title: _.str.sprintf(_t("View Log (%s)"), self.dataset.model),
+                            width: 400
+                        }, QWeb.render('ViewManagerDebugViewLog', {
+                            perm : result[0],
+                            format : session.web.format_value
+                        })).open();
+                    });
+                }
+                break;
             case 'fields':
                 this.dataset.call_and_eval(
                         'fields_get', [false, {}], null, 1).then(function (fields) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 230ad629d3a..1b965bd4206 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -471,17 +471,39 @@
 
 
     
-    
+    
     
+    
     
         
         
         
         
-        
         
+        
     
 
+
+    

+        
+        
+
+        
+        
+
+        
+        
+
+        
+        
+
+        
+        
+
+        
+        
+    

+
 
     
 

From 084bf9fb3fee99f1049fc9e0a3865ad242edcfd0 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Tue, 24 Jan 2012 15:19:27 +0100
Subject: [PATCH 163/170] [FIX] in m2o fields, abort previous name_get when new
 one (for same field) arrives in order to limit the number of requests
 in-flight

lp bug: https://launchpad.net/bugs/920884 fixed

bzr revid: xmo@openerp.com-20120124141927-wznbkd2tf3mngq31
---
 addons/web/static/src/js/core.js      | 14 +++++++++++++-
 addons/web/static/src/js/data.js      |  4 +++-
 addons/web/static/src/js/search.js    |  5 +++++
 addons/web/static/src/js/view_form.js |  5 +++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index c735f113991..098c6da104a 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -443,7 +443,9 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         };
         var deferred = $.Deferred();
         this.on_rpc_request();
-        this.rpc_function(url, payload).then(
+        var aborter = params.aborter;
+        delete params.aborter;
+        var request = this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {
                 self.on_rpc_response();
                 if (!response.error) {
@@ -469,6 +471,16 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                 };
                 deferred.reject(error, $.Event());
             });
+        if (aborter) {
+            aborter.abort_last = function () {
+                if (!(request.isResolved() || request.isRejected())) {
+                    deferred.fail(function (error, event) {
+                        event.preventDefault();
+                    });
+                    request.abort();
+                }
+            };
+        }
         // Allow deferred user to disable on_rpc_error in fail
         deferred.fail(function() {
             deferred.fail(function(error, event) {
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 0cf36fbf2f5..be7d707c91c 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -430,7 +430,9 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
             method: method,
             domain_id: domain_index == undefined ? null : domain_index,
             context_id: context_index == undefined ? null : context_index,
-            args: args || []
+            args: args || [],
+            // FIXME: API which does not suck for aborting requests in-flight
+            aborter: this
         }, callback, error_callback);
     },
     /**
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 564dd09ae4a..251bd22cd39 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -989,12 +989,17 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
         var self = this;
         this.$element.autocomplete({
             source: function (req, resp) {
+                if (self.abort_last) {
+                    self.abort_last();
+                    delete self.abort_last;
+                }
                 self.dataset.name_search(
                     req.term, self.attrs.domain, 'ilike', 8, function (data) {
                         resp(_.map(data, function (result) {
                             return {id: result[0], label: result[1]}
                         }));
                 });
+                self.abort_last = self.dataset.abort_last;
             },
             select: function (event, ui) {
                 self.id = ui.item.id;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 743a1ecdf4e..e296fcc1955 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1873,6 +1873,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
         var search_val = request.term;
         var self = this;
 
+        if (this.abort_last) {
+            this.abort_last();
+            delete this.abort_last;
+        }
         var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
 
         dataset.name_search(search_val, self.build_domain(), 'ilike',
@@ -1912,6 +1916,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
 
             response(values);
         });
+        this.abort_last = dataset.abort_last;
     },
     _quick_create: function(name) {
         var self = this;

From a6042ec08c5e691440e5e99560bafa150a1f36b8 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 25 Jan 2012 05:25:09 +0000
Subject: [PATCH 164/170] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120122053029-q0dszyf1d5joxomf
bzr revid: launchpad_translations_on_behalf_of_openerp-20120124052910-tzpibbaw7b1w2w83
bzr revid: launchpad_translations_on_behalf_of_openerp-20120125052509-uyix5j8ir1rdsuum
---
 openerp/addons/base/i18n/cs.po    | 320 ++++++++++++++++++++++++++----
 openerp/addons/base/i18n/de.po    |  19 +-
 openerp/addons/base/i18n/gl.po    |  20 +-
 openerp/addons/base/i18n/hr.po    |  17 +-
 openerp/addons/base/i18n/zh_CN.po |  49 +++--
 5 files changed, 340 insertions(+), 85 deletions(-)

diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 97ddf259079..84b11341bc7 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-11-25 11:49+0000\n"
+"PO-Revision-Date: 2012-01-23 09:27+0000\n"
 "Last-Translator: Jiří Hajda \n"
-"Language-Team: \n"
+"Language-Team: openerp-i18n-czech \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-19 04:41+0000\n"
-"X-Generator: Launchpad (build 14692)\n"
+"X-Launchpad-Export-Date: 2012-01-24 05:28+0000\n"
+"X-Generator: Launchpad (build 14713)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
@@ -839,11 +839,14 @@ msgid ""
 "Provide the field name that the record id refers to for the write operation. "
 "If it is empty it will refer to the active id of the object."
 msgstr ""
+"Poskytuje jméno pole, na které odkazuje id záznamu, pro operaci zápisu. "
+"Pokud je prázdné tak odkazuje na aktivní id objektu."
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
 msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 msgstr ""
+"Typ výkazu, např. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_webdav
@@ -906,7 +909,7 @@ msgstr ""
 #: help:ir.actions.act_window,domain:0
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
-msgstr ""
+msgstr "Volitelné filtrování domény cílových dat jako výraz Pythonu"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
@@ -953,7 +956,7 @@ msgstr ""
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "Jiné schválené licence OSI"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -970,7 +973,7 @@ msgstr "Indie"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr ""
+msgstr "Požadavek referenčních typů"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
@@ -990,7 +993,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr ""
+msgstr "Andorra, Knížectví"
 
 #. module: base
 #: field:res.partner.category,child_ids:0
@@ -1047,11 +1050,13 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
+"Kód jazyka \"%s\" není v systému určen !\n"
+"Určete jej přes Nabídku správy."
 
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "Guam (USA)"
 
 #. module: base
 #: code:addons/base/res/res_users.py:541
@@ -1198,6 +1203,9 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
+"%W - Číslo týdne v roce (Pondělí jako první den v týdnu) jako dekadické "
+"číslo [00,53]. Všechny dny v novém roce předcházející první pondělí jsou "
+"považovány za týden 0."
 
 #. module: base
 #: code:addons/base/module/wizard/base_language_install.py:55
@@ -1218,7 +1226,7 @@ msgstr "Odkaz zdroje"
 #. module: base
 #: model:res.country,name:base.gs
 msgid "S. Georgia & S. Sandwich Isls."
-msgstr ""
+msgstr "Ostrovy S. Georgia a S. Sandwich"
 
 #. module: base
 #: field:ir.actions.url,url:0
@@ -1404,6 +1412,9 @@ msgid ""
 "system. After the contract has been registered, you will be able to send "
 "issues directly to OpenERP."
 msgstr ""
+"Tento průvodce vám pomůže registrovat záruční smlouvu vydavatele ve vašem "
+"systému OpenERP. Poté co bude smlouva registrována, budete moci odeslílat "
+"dotazy přímo do OpenERP."
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
@@ -1454,6 +1465,8 @@ msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
 msgstr ""
+"Pokud toto zaškrtnete, vaše vlastní překlady budou přepsány a nahrazeny těmi "
+"oficiálními."
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
@@ -1474,6 +1487,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Pokud je nastaveno na pravda, akce nebude zobrazena v pravm nástrojovém "
+"panelu formulářového pohledu."
 
 #. module: base
 #: field:workflow,on_create:0
@@ -1487,6 +1502,8 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
+"'%s' obsahuje příliš mnoho teček. Id XML by nemělo obsahovat tečky ! Tyto "
+"jsou použity pro odkazování na data jiných modulů, jako module.reference_id"
 
 #. module: base
 #: field:partner.sms.send,user:0
@@ -1500,6 +1517,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Přístup ke všem polím vztaženým k aktuálnímu objektu použitím výrazů, např. "
+"object.partner_id.name "
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -1588,6 +1607,19 @@ msgid ""
 "%(user_signature)s\n"
 "%(company_name)s"
 msgstr ""
+"Datum : %(date)s\n"
+"\n"
+"Vážený %(partner_name)s,\n"
+"\n"
+"V příloze najdete upomínku vašich nezaplacených faktur s celkovou splatnou "
+"částkou:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Děkujeme,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s"
 
 #. module: base
 #: model:ir.module.module,description:base.module_share
@@ -2017,6 +2049,8 @@ msgid ""
 "When using CSV format, please also check that the first line of your file is "
 "one of the following:"
 msgstr ""
+"Prosíme zkontrolujte také, že první řádek vašeho souboru je následující, "
+"pokud je použit formát CSV."
 
 #. module: base
 #: view:res.log:0
@@ -2039,6 +2073,8 @@ msgid ""
 "This wizard will scan all module repositories on the server side to detect "
 "newly added modules as well as any change to existing modules."
 msgstr ""
+"Průvodce prozkoumá všechny repozitáře modulů na straně serveru pro zjištění "
+"nově přidaných modulů stejně jako změn existujících modulů."
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_journal
@@ -2132,6 +2168,7 @@ msgstr "Aktivní"
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
 msgstr ""
+"Nemůžu generovat další id, protože někteří partneři mají abecední id !"
 
 #. module: base
 #: view:ir.attachment:0
@@ -2169,6 +2206,8 @@ msgid ""
 "Views allows you to personalize each view of OpenERP. You can add new "
 "fields, move fields, rename them or delete the ones that you do not need."
 msgstr ""
+"Pohledy vám umožňují přizpůsobit každý pohled OpenERP. Můžete přidat nové "
+"pole, přesunout pole, přejmenovat je nebo smazat ty, které nepotřebujete."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_setup
@@ -2243,6 +2282,8 @@ msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
+"Čárkou oddělený seznam vám umožní prohlížet režimy jako 'form', 'tree', "
+"'calendar', aj. (Výchozí: tree, form)"
 
 #. module: base
 #: code:addons/orm.py:3582
@@ -2273,6 +2314,9 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
+"Zadejte pole/výraz, který vrátí seznam. Např. vyberte prodejní objednávku v "
+"objektu a můžete mít oprakování na řádcích prodejní objednávky. Výraz = "
+"`object.order_line`."
 
 #. module: base
 #: field:ir.mail_server,smtp_debug:0
@@ -2334,7 +2378,7 @@ msgstr "Zjednodušené"
 #. module: base
 #: model:res.country,name:base.st
 msgid "Saint Tome (Sao Tome) and Principe"
-msgstr ""
+msgstr "¨"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -2461,7 +2505,7 @@ msgstr "Zimbabwe"
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Teritorium indických britských ostrovů"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
@@ -2998,6 +3042,8 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"Určeno neplatné \"pořadí\". Platné učení \"pořadí\" je čárkou oddělený "
+"seznam platných jmen polí (volitelně následovaný asc/desc pro směr)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -3021,6 +3067,9 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
+"Spravuje tituly kontaktů, které chcete mít dostupné ve vašem systému a "
+"způsob, jakým je tisknout na dopisech a jiných dokumentech. Některé "
+"příklady: Pan, Paní "
 
 #. module: base
 #: view:ir.model.access:0
@@ -3036,6 +3085,8 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"Výraz výběru voleb není platný Pythonovský výraz. Prosíme poskytněte výraz "
+"ve formátu [('klíč', 'Titulek'), ...]."
 
 #. module: base
 #: model:res.groups,name:base.group_survey_user
@@ -3056,7 +3107,7 @@ msgstr "Hlavní společnost"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr ""
+msgstr "Jméno webové ikony (vznášející se)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_diagram
@@ -3143,6 +3194,8 @@ msgid ""
 "Please double-check that the file encoding is set to UTF-8 (sometimes called "
 "Unicode) when the translator exports it."
 msgstr ""
+"Prosíme dvakrát zkontrolujte, že kódování souboru je nastaveno na UTF-8 "
+"(někdy nazývané Unicode), když je překladatel exportoval."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3165,6 +3218,7 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
+"Odkaz cílového zdroje, jehož model/tabulka závisí na poli 'jméno zdroje'."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -3572,6 +3626,8 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
+"Číslo daně s přidané hodnoty. Zaškrtněte políčko, pokud partner podléha DPH. "
+"Použito pro daňové přiznání DPH."
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -3732,6 +3788,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: read, Document type: %s)."
 msgstr ""
+"Operace zakázána díky přístupovým právům, nebo vykonáno nad již smazaným "
+"dokumentem (Operace: read, Typ dokumentu: %s)."
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -3741,7 +3799,7 @@ msgstr "Nauru"
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Introspection report on objects"
-msgstr ""
+msgstr "Výkaz vnitřního náhledu objektů"
 
 #. module: base
 #: code:addons/base/module/module.py:236
@@ -4207,6 +4265,8 @@ msgid ""
 "Optional help text for the users with a description of the target view, such "
 "as its usage and purpose."
 msgstr ""
+"Volitelný text nápovědy pro uživatele s popisem cílového pohledu, jako třeba "
+"jejich použití a účel."
 
 #. module: base
 #: model:res.country,name:base.va
@@ -4318,6 +4378,9 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
+"Pokud máte skupiny, viditelnost této nabídky bude založena na těchto "
+"skupinách. Pokud je toto pole prázdné, OpenERP spočítá viditelnost na "
+"základě přístupu pro čtení vztažených objektů."
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -4835,7 +4898,7 @@ msgstr "%M - Minuty [00,59]."
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Affero GPL-3"
-msgstr ""
+msgstr "Affero GPL-3"
 
 #. module: base
 #: field:ir.sequence,number_next:0
@@ -5419,7 +5482,7 @@ msgstr "Kód státu ve třech znacích.\n"
 #. module: base
 #: model:res.country,name:base.sj
 msgid "Svalbard and Jan Mayen Islands"
-msgstr ""
+msgstr "Ostrovy Svalbard a Jan Mayen"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_test
@@ -5569,7 +5632,7 @@ msgstr "Seznam řízení přístupu (ACL)"
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr ""
+msgstr "Menší odlehlé ostrovy USA"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -5699,6 +5762,9 @@ msgid ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 msgstr ""
+"Když je operace přechodu přijde ze stisknutého tlačítka v klientském "
+"formuláři, signal otestuje jméno stisknutého tlačítka. Pokud je signál NULL, "
+"žádné tlačítko není potřeba ověřovat tímto přechodem."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_diagram
@@ -6233,7 +6299,7 @@ msgstr "res_config_contents"
 #. module: base
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
-msgstr ""
+msgstr "Aktivní pole vám umožní skrýt kategorii bez jejího odebrání."
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -6255,7 +6321,7 @@ msgstr "Jména společníků"
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr ""
+msgstr "Přidá automatické obnovení u pohledu"
 
 #. module: base
 #: help:res.partner,employee:0
@@ -6340,6 +6406,8 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
+"Zda lze překládat hodnoty tohoto pole (povoluje překladový mechanizmus pro "
+"toto pole)"
 
 #. module: base
 #: selection:res.currency,position:0
@@ -6357,11 +6425,13 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
+"Poskytuje jméno pole, kde je uloženo id záznamu po operacích vytvoření. "
+"Pokud je prázdné, nemůžete sledovat nové záznamy."
 
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr ""
+msgstr "Pro vztažené pole, technické jméno cílového modelu"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6398,12 +6468,12 @@ msgstr "Projekt"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Obrázek webové ikona (vznášející se)"
 
 #. module: base
 #: view:base.module.import:0
 msgid "Module file successfully imported!"
-msgstr ""
+msgstr "Soubor modulu úspěšně importován!"
 
 #. module: base
 #: model:res.country,name:base.ws
@@ -6513,7 +6583,7 @@ msgstr "Mapování polí"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Refresh Validation Dates"
-msgstr ""
+msgstr "Obnovit data platnosti"
 
 #. module: base
 #: field:ir.model.fields,ttype:0
@@ -6771,6 +6841,8 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
+"Ke změně vašeho vlastního hesla prosíme použijte průvodce změny hesla (v "
+"uživatelských předvolbách nebo uživatelské nabídce)."
 
 #. module: base
 #: code:addons/orm.py:1850
@@ -6789,6 +6861,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
+"Cesta k hlavnímu souboru výkazu (závisí na typu výkazu) nebo NULL, pokud "
+"obsah je jiné datové pole"
 
 #. module: base
 #: help:res.users,company_id:0
@@ -7014,6 +7088,8 @@ msgid ""
 "federal states you are working on from here. Each state is attached to one "
 "country."
 msgstr ""
+"Pokud pracujete na Americkém trhu, můžete odsud spravovat různé federální "
+"státy, se kterými pracujete. Každý stát je přiřazen k jedné zemi."
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery
@@ -7037,7 +7113,7 @@ msgstr "Položky Pracovního postupu"
 #. module: base
 #: model:res.country,name:base.vc
 msgid "Saint Vincent & Grenadines"
-msgstr ""
+msgstr "Svatý Vincent & Grenady"
 
 #. module: base
 #: field:ir.mail_server,smtp_pass:0
@@ -7094,6 +7170,7 @@ msgstr "Zaměstnanci"
 msgid ""
 "If this log item has been read, get() should not send it to the client"
 msgstr ""
+"Pokud byla tato položka záznamu přečtena, get() by ji neměl odeslat klientovi"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_uservoice
@@ -7115,7 +7192,7 @@ msgstr "Vnitřní hlavička RML"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Odkaz hledacího pohledu"
 
 #. module: base
 #: field:ir.module.module,installed_version:0
@@ -7269,7 +7346,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cc
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokosové ostrovy"
 
 #. module: base
 #: selection:base.language.install,state:0
@@ -7766,6 +7843,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
+"Toto je jméno souboru přílohy použité pro uchování výsledku tisku. "
+"Ponechejte prázdné pro neuložení tisknutých výkazů. Můžete použít výraz "
+"pythonu s objekty a časy proměnných."
 
 #. module: base
 #: sql_constraint:ir.model.data:0
@@ -8056,6 +8136,7 @@ msgstr "Aktualizovat seznam modulů"
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Modul \"%s\" nelze povýšit, protože vnější závislost nebyla vyhověna: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
@@ -8180,7 +8261,7 @@ msgstr "Soubor"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
 msgid "Module Upgrade Install"
-msgstr ""
+msgstr "Instalace povýšení modulu"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
@@ -8464,7 +8545,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.re
 msgid "Reunion (French)"
-msgstr ""
+msgstr "Reunion (Francouzský)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:348
@@ -8943,7 +9024,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bn
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail_crm
@@ -9765,7 +9846,7 @@ msgstr "res.log"
 #: help:ir.translation,module:0
 #: help:ir.translation,xml_id:0
 msgid "Maps to the ir_model_data for which this translation is provided."
-msgstr ""
+msgstr "Mapy k ir_model_data, pro který je poskytnut tento překlad."
 
 #. module: base
 #: view:workflow.activity:0
@@ -10242,6 +10323,8 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
+"Spravuje tituly partnerů, které chcete mít dostupné ve vašem systému. Titul "
+"partnerů je zákonná forma společnosti: s.r.o., a.s., aj."
 
 #. module: base
 #: view:base.language.export:0
@@ -10409,7 +10492,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.kn
 msgid "Saint Kitts & Nevis Anguilla"
-msgstr ""
+msgstr "Saint Kitts & Nevis Anguilla"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_point_of_sale
@@ -10466,6 +10549,8 @@ msgid ""
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
 msgstr ""
+"Přizpůsobené pohledy jsou použity, pokud uživatelů přeorganizují obsah "
+"jejich pohledů nástěnek (přes webového klienta)"
 
 #. module: base
 #: help:publisher_warranty.contract,check_opw:0
@@ -10485,6 +10570,8 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Objekt, ve kterém chcete vytvořit / zapsat objekt. Pokud je prázdné, pak "
+"odkazuje na pole objektu."
 
 #. module: base
 #: view:ir.module.module:0
@@ -10754,7 +10841,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.tg
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -10934,7 +11021,7 @@ msgstr "Posloupnosti"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
 msgid "Mss"
-msgstr ""
+msgstr "Paní"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11824,7 +11911,7 @@ msgstr "- type,name,res_id,src,value"
 #. module: base
 #: model:res.country,name:base.hm
 msgid "Heard and McDonald Islands"
-msgstr ""
+msgstr "Ostrovy Heard a McDonald"
 
 #. module: base
 #: help:ir.model.data,name:0
@@ -12293,6 +12380,9 @@ msgid ""
 "OpenERP. They are launched during the installation of new modules, but you "
 "can choose to restart some wizards manually from this menu."
 msgstr ""
+"Potvrzovací průvodce je použit, aby vám pomohl nastavit novou instanci "
+"OpenERP. Je spuštěn během instalace nových modulů, ale nemůžet zvolit ručně "
+"z této nabídky restart některých průvodců."
 
 #. module: base
 #: view:res.company:0
@@ -12316,6 +12406,8 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
+"Důležité, pokud se vypořádáváte s více akcemi, pořadí vykonání bude "
+"rozhodnuto na základě tohoto, nízké číslo má vyšší přednost."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
@@ -12522,6 +12614,8 @@ msgid ""
 "Indicates whether this object model lives in memory only, i.e. is not "
 "persisted (osv.osv_memory)"
 msgstr ""
+"Indikuje, zda je tento model objektu je udržován pouze v paměti, např. není "
+"trvalý (osv.osv_memory)"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:416
@@ -12715,7 +12809,7 @@ msgstr ""
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
-msgstr ""
+msgstr "Výraz výběru voleb musí být ve formátu [('key','Label'], ...]!"
 
 #. module: base
 #: view:ir.filters:0
@@ -12774,6 +12868,8 @@ msgid ""
 "Create and manage the companies that will be managed by OpenERP from here. "
 "Shops or subsidiaries can be created and maintained from here."
 msgstr ""
+"Vytváří a spravuje společnosti, které budou odsud spravovány OpenERP. "
+"Obchody nebo pobočky mohou být vytvořeny a spravovány odsud."
 
 #. module: base
 #: model:res.country,name:base.id
@@ -12787,6 +12883,9 @@ msgid ""
 "you can then add translations manually or perform a complete export (as a "
 "template for a new language example)."
 msgstr ""
+"Tento průvodce zjistí nové termíny k překladu v aplikaci, takže pak budete "
+"moci ručně přidávat překlady nebo vykonávat celkové exporty (jako šablonu "
+"pro příklad nového jazyka)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ch
@@ -12841,6 +12940,8 @@ msgid ""
 "Expression, must be True to match\n"
 "use context.get or user (browse)"
 msgstr ""
+"Výraz musí být Pravda, aby odpovídal\n"
+"použitému kontextu.get nebo user (procházet)"
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -13113,6 +13214,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: %s, Document type: %s)."
 msgstr ""
+"Operace zakázána díky přístupovým právům nebo prováděna na již smazaném "
+"dokumentu (Operace: %s, Typ dokumentu: %s)."
 
 #. module: base
 #: model:res.country,name:base.zr
@@ -13228,7 +13331,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.wf
 msgid "Wallis and Futuna Islands"
-msgstr ""
+msgstr "Ostrovy Wallis a Futuna"
 
 #. module: base
 #: help:multi_company.default,name:0
@@ -13339,7 +13442,7 @@ msgstr ""
 #. module: base
 #: help:ir.actions.report.xml,header:0
 msgid "Add or not the coporate RML header"
-msgstr ""
+msgstr "Přidat nebo nepřidat RML hlavičku společnosti"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13538,6 +13641,8 @@ msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
 "may be uploaded to launchpad."
 msgstr ""
+"Uložit tento dokument do souboru .tgz. Tento archív obsahuje souboru UTF-8 "
+"%s a může být nahrán do launchpadu."
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -13591,6 +13696,8 @@ msgid ""
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"Neplatná označení group_by: \"%s\".\n"
+"Označení group_by musí být seznam platných polí."
 
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
@@ -13623,6 +13730,8 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Zaškrtněte toto políčko, pokud je partner dodavatel. Pokud není zaškrtnuto, "
+"nakupující osoby ho neuvidí, když zadávají nákupní objednávku."
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -13707,6 +13816,8 @@ msgid ""
 "3. If user belongs to several groups, the results from step 2 are combined "
 "with logical OR operator"
 msgstr ""
+"3. Pokud uživatel patří do více skupin, výsledky z kroku 2 jsou kombinovány "
+"s logickým operátorem OR"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
@@ -13883,6 +13994,11 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"Spravuje a přizpůsobuje položky dostupné a zobrazované ve vaší nabídce "
+"systému OpenERP. Můžete mazat položky kliknutím na políčko na začátku "
+"každého řádku a pak jej smazat přes zjevené tlačítko. Položky mohou být "
+"přiřazeny k určitým skupinám za účelem nechání je přistupnými některým "
+"uživatelům v systému."
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
@@ -13960,7 +14076,7 @@ msgstr "Pohled :"
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "Zobrazit automatické načtení"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:259
@@ -14275,6 +14391,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Spravuje kategorie partnerů v pořadí pro jejich lepší třídění pro účely "
+"sledování a analýzy. Partner může patřit do několika kategorií a kategorie "
+"mají hierarchickou strukturu: partner patřící do kategorie také může patřit "
+"do jeho nadřazené kategorie."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -14379,6 +14499,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Můžete přistupovat ke všem informacím ohledně vašich dodavatelů z formuláče "
+"dodavatele: účetní data, historie emailů, setkání, nákupy, aj. Můžete "
+"odškrtnout filtrovací tlačítko 'Dodavatelé' za účelem hledání ve všech "
+"vašich partnerech, včetně zákazníků a vyhlídek."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -14531,6 +14655,8 @@ msgid ""
 "1. Global rules are combined together with a logical AND operator, and with "
 "the result of the following steps"
 msgstr ""
+"1. Globální pravidla jsou kombinována společně s logickým operátorem AND, a "
+"s výsledky následujících kroků"
 
 #. module: base
 #: view:res.partner:0
@@ -15511,3 +15637,121 @@ msgstr "Ruština / русский язык"
 
 #~ msgid "Client Actions Connections"
 #~ msgstr "Nastavení akcí klienta"
+
+#~ msgid ""
+#~ "Groups are used to define access rights on objects and the visibility of "
+#~ "screens and menus"
+#~ msgstr ""
+#~ "Skupiny jsou použity pro určení přístupových práv nad objekty a viditelnost "
+#~ "obrazovek a nabídek"
+
+#~ msgid ""
+#~ "Sets the language for the user's user interface, when UI translations are "
+#~ "available"
+#~ msgstr ""
+#~ "Pokud jsou dostupné překlady rozhraní, nastaví jazyk pro uživatelské "
+#~ "rozhraní uživatele."
+
+#~ msgid ""
+#~ "2. Group-specific rules are combined together with a logical AND operator"
+#~ msgstr ""
+#~ "2. Pravidla určitá pro skupinu jsou kombinována společně s logickým "
+#~ "operátorem AND"
+
+#~ msgid ""
+#~ "Provides the fields that will be used to fetch the email address, e.g. when "
+#~ "you select the invoice, then `object.invoice_address_id.email` is the field "
+#~ "which gives the correct address"
+#~ msgstr ""
+#~ "Poskytuje pole, která budou použita pro získání emailové adresy, např. když "
+#~ "vyberete fakturu, pak `object.invoice_address_id.email` je pole, které dává "
+#~ "platnou adresu"
+
+#, python-format
+#~ msgid "The search method is not implemented on this object !"
+#~ msgstr "Metoda hledání není u tohoto objektu realizována !"
+
+#~ msgid ""
+#~ "Condition that is to be tested before action is executed, e.g. "
+#~ "object.list_price > object.cost_price"
+#~ msgstr ""
+#~ "Podmínka, která musí být otestována před vykonáním akce, např. "
+#~ "object.list_price > object.cost_price"
+
+#~ msgid ""
+#~ "Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
+#~ "GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
+#~ msgstr ""
+#~ "Příklad: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
+#~ "GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
+
+#~ msgid ""
+#~ "Create additional users and assign them groups that will allow them to have "
+#~ "access to selected functionalities within the system. Click on 'Done' if you "
+#~ "do not wish to add more users at this stage, you can always do this later."
+#~ msgstr ""
+#~ "Vytvoří dodatečné uživatele a přiřadí je do skupin, které vám umožní, aby "
+#~ "měly přístup k vybraným funkcím v systému. Klikněte na 'Dokončeno', pokud "
+#~ "již nechcete přidávat v této fázi další uživatele. Toto můžete vždy provést "
+#~ "později."
+
+#, python-format
+#~ msgid "\"email_from\" needs to be set to send welcome mails to users"
+#~ msgstr ""
+#~ "\"email_from\" potřebuje být nastaveno pro odeslání uvítacích dopisů "
+#~ "uživatelům"
+
+#~ msgid "Select the object from the model on which the workflow will executed."
+#~ msgstr "Vyberte objekty z modelu, u kterého bude vykonán pracovní tok."
+
+#~ msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
+#~ msgstr ""
+#~ "Jednoduše odkazovaná jméno akce např. Jedena prodejní objednávka -> Mnoho "
+#~ "faktur"
+
+#, python-format
+#~ msgid ""
+#~ "Invalid value for reference field \"%s\" (last part must be a non-zero "
+#~ "integer): \"%s\""
+#~ msgstr ""
+#~ "Neplatná hodnota pole odkazu \"%s\" (poslední část musí být nenulové číslo): "
+#~ "\"%s\""
+
+#~ msgid ""
+#~ "If an email is provided, the user will be sent a message welcoming him.\n"
+#~ "\n"
+#~ "Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
+#~ "be possible to email new users."
+#~ msgstr ""
+#~ "Pokud je zadán email, uživateli bude zaslán uvítací email.\n"
+#~ "\n"
+#~ "Varování: pokud \"email_from\" a \"smtp_server\" nejsou nastaveny, nebude "
+#~ "možné odeslat email novým uživatelům."
+
+#~ msgid ""
+#~ "Number of time the function is called,\n"
+#~ "a negative number indicates no limit"
+#~ msgstr ""
+#~ "Počet kolikrát je volána funkce,\n"
+#~ "záporné číslo vyjadřuje bez limitu"
+
+#~ msgid "Open Source Service Company"
+#~ msgstr "Open Source servisní společnost"
+
+#~ msgid ""
+#~ "This wizard helps you add a new language to you OpenERP system. After "
+#~ "loading a new language it becomes available as default interface language "
+#~ "for users and partners."
+#~ msgstr ""
+#~ "Tento průvodce vám pomůže přidat nový jazyk do vašeho systému OpenERP. Po "
+#~ "načtení se nový jazyk stane dostupným jako výchozí jazyk rozhraní pro "
+#~ "uživatele a partnery."
+
+#~ msgid ""
+#~ "If you use OpenERP for the first time we strongly advise you to select the "
+#~ "simplified interface, which has less features but is easier. You can always "
+#~ "switch later from the user preferences."
+#~ msgstr ""
+#~ "Pokud používáte OpenERP poprvé, silně vám doporučujeme vybrat si "
+#~ "zjednodušené rozhraní, které má méně funkcí a je snadnější. Vždycky můžete "
+#~ "později přepnout z uživatelských předvoleb."
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index a4d51ad0512..6c061cdebac 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-09-30 21:28+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
+"PO-Revision-Date: 2012-01-23 20:54+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-19 04:42+0000\n"
-"X-Generator: Launchpad (build 14692)\n"
+"X-Launchpad-Export-Date: 2012-01-24 05:28+0000\n"
+"X-Generator: Launchpad (build 14713)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -36,7 +35,7 @@ msgstr "Datum Zeit"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mailgate
 msgid "Tasks-Mail Integration"
-msgstr ""
+msgstr "Aufgaben EMail Integration"
 
 #. module: base
 #: code:addons/fields.py:571
@@ -92,7 +91,7 @@ msgstr "Workflow"
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "Ohne Lücken"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -110,6 +109,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Anwendung für das Management, Planung und zeitlicher Überwachung von "
+"Projekten und Aufgaben ..."
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -120,7 +121,7 @@ msgstr "Zeige Menütips"
 #: help:ir.cron,model:0
 msgid ""
 "Model name on which the method to be called is located, e.g. 'res.partner'."
-msgstr ""
+msgstr "Modellname, für die diese Methode gilt (zB res.partner)."
 
 #. module: base
 #: view:ir.module.module:0
@@ -166,7 +167,7 @@ msgstr "Referenz"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
 msgid "Belgium - Structured Communication"
-msgstr ""
+msgstr "Beligen - strukturierte Kommunikaiton"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 3841b7e4677..08516b28d29 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-11-13 17:25+0000\n"
+"PO-Revision-Date: 2012-01-21 22:43+0000\n"
 "Last-Translator: Xosé \n"
 "Language-Team: Galician \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-19 04:43+0000\n"
-"X-Generator: Launchpad (build 14692)\n"
+"X-Launchpad-Export-Date: 2012-01-22 05:30+0000\n"
+"X-Generator: Launchpad (build 14700)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -1091,7 +1091,7 @@ msgstr "XML válido para Arquitectura de Vistas!"
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr "Illas Caymans"
+msgstr "Illas Caimán"
 
 #. module: base
 #: model:res.country,name:base.kr
@@ -2628,7 +2628,7 @@ msgstr "Personalización"
 #. module: base
 #: model:res.country,name:base.py
 msgid "Paraguay"
-msgstr "Paraguay"
+msgstr "Paraguai"
 
 #. module: base
 #: model:res.country,name:base.fj
@@ -5379,7 +5379,7 @@ msgstr "Inglés (Reino Unido)"
 #. module: base
 #: model:res.country,name:base.aq
 msgid "Antarctica"
-msgstr "Antártica"
+msgstr "Antártida"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -5852,18 +5852,18 @@ msgstr "Mes"
 #. module: base
 #: model:res.country,name:base.my
 msgid "Malaysia"
-msgstr "Malaisia"
+msgstr "Malasia"
 
 #. module: base
 #: view:base.language.install:0
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 msgid "Load Official Translation"
-msgstr "Cargar Traducción Oficial"
+msgstr "Cargar a tradución oficial"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr ""
+msgstr "Cancelar as entradas do xornal"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -14426,7 +14426,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gl
 msgid "Greenland"
-msgstr "Grenlandia"
+msgstr "Groenlandia"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index dc4aecd198e..82a532b3a1a 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-09-30 20:43+0000\n"
-"Last-Translator: Goran Kliska \n"
+"PO-Revision-Date: 2012-01-23 18:00+0000\n"
+"Last-Translator: Goran Cvijanović \n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-19 04:46+0000\n"
-"X-Generator: Launchpad (build 14692)\n"
+"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n"
+"X-Generator: Launchpad (build 14713)\n"
 "Language: hr\n"
 
 #. module: base
@@ -35,7 +35,7 @@ msgstr "DateTime"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mailgate
 msgid "Tasks-Mail Integration"
-msgstr ""
+msgstr "Integracija zadaci-email"
 
 #. module: base
 #: code:addons/fields.py:571
@@ -91,7 +91,7 @@ msgstr "Tijek procesa"
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "Bez razmaka"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -109,6 +109,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Omogućuje upravljanje projektima i zadacima, praćenjem, planiranjem i "
+"ostalim."
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -120,6 +122,7 @@ msgstr "Prikaži savjete (tips)"
 msgid ""
 "Model name on which the method to be called is located, e.g. 'res.partner'."
 msgstr ""
+"Naziv objekta koji sadrži metodu koja će se pozvati, npr. 'res.partner'."
 
 #. module: base
 #: view:ir.module.module:0
@@ -193,6 +196,8 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"Svojstva osnovnih polja ne mogu se ovdje mijenjati. Potrebno ih je "
+"promijeniti u Python kodu, najbolje u korisničkom modulu."
 
 #. module: base
 #: code:addons/osv.py:129
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 68d77f23613..59504db8394 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2012-01-13 16:46+0000\n"
+"PO-Revision-Date: 2012-01-24 16:48+0000\n"
 "Last-Translator: Wei \"oldrev\" Li \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-19 04:49+0000\n"
-"X-Generator: Launchpad (build 14692)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -105,7 +105,7 @@ msgstr "Spanish (PY) / Español (PY)"
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "帮助您管理项目、跟踪任务、生成计划等"
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -172,7 +172,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
 msgid "Billing Rates on Contracts"
-msgstr ""
+msgstr "合同开单率"
 
 #. module: base
 #: code:addons/base/res/res_users.py:541
@@ -1727,7 +1727,7 @@ msgstr "日"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_rpc
 msgid "OpenERP Web web"
-msgstr ""
+msgstr "OpenERP Web web"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_html_view
@@ -1737,7 +1737,7 @@ msgstr "HTML 视图"
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol position"
-msgstr ""
+msgstr "货币符号位置"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
@@ -1747,7 +1747,7 @@ msgstr "企业流程"
 #. module: base
 #: help:ir.cron,function:0
 msgid "Name of the method to be called when this job is processed."
-msgstr ""
+msgstr "指定在任务运行时将被调用的方法名称"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
@@ -1812,6 +1812,11 @@ msgid ""
 "        ============================================================\n"
 "    "
 msgstr ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"        ============================================================\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -2091,7 +2096,7 @@ msgstr ""
 #. module: base
 #: field:ir.values,action_id:0
 msgid "Action (change only)"
-msgstr ""
+msgstr "动作（仅用于修改）"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_subscription
@@ -2754,7 +2759,7 @@ msgstr "主需求计划表"
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
 msgid "Application"
-msgstr ""
+msgstr "应用程序"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -3039,7 +3044,7 @@ msgstr "Web 图标文件（悬停）"
 #. module: base
 #: model:ir.module.module,description:base.module_web_diagram
 msgid "Openerp web Diagram view"
-msgstr ""
+msgstr "OpenERP Web 图表视图"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_user
@@ -3111,7 +3116,7 @@ msgstr "SMTP-over-SSL 模式不可用"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 msgid "Survey"
-msgstr ""
+msgstr "调查"
 
 #. module: base
 #: view:base.language.import:0
@@ -3155,7 +3160,7 @@ msgstr "乌拉圭"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_crm
 msgid "eMail Gateway for Leads"
-msgstr ""
+msgstr "用于销售线索的电子邮件网关"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3185,7 +3190,7 @@ msgstr "字段映射"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_dashboard
 msgid "web Dashboard"
-msgstr ""
+msgstr "Web 仪表盘"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale
@@ -3335,7 +3340,7 @@ msgstr "实例"
 #. module: base
 #: help:ir.mail_server,smtp_host:0
 msgid "Hostname or IP of SMTP server"
-msgstr ""
+msgstr "SMTP 服务器的主机名或 IP 地址"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3365,7 +3370,7 @@ msgstr "分割符格式"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit
 msgid "Webkit Report Engine"
-msgstr ""
+msgstr "Webkit 报表引擎"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -3392,13 +3397,13 @@ msgstr "马约特"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "CRM 任务"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "会计"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_payment
@@ -3513,12 +3518,12 @@ msgstr "检测到循环。"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit_sample
 msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Webkit报表示例"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
 msgid "Point Of Sale"
-msgstr ""
+msgstr "销售点"
 
 #. module: base
 #: code:addons/base/module/module.py:298
@@ -7023,7 +7028,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Firm"
-msgstr ""
+msgstr "公司性质"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -11867,7 +11872,7 @@ msgstr "选中内容"
 #. module: base
 #: field:ir.module.module,icon:0
 msgid "Icon URL"
-msgstr ""
+msgstr "图标 URL"
 
 #. module: base
 #: field:ir.actions.act_window,type:0

From 846cd871b64a4f3620f5616c5f1f801741586aa5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 25 Jan 2012 05:26:05 +0000
Subject: [PATCH 165/170] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120125052605-te0tdl9chnuj1riv
---
 addons/account/i18n/tr.po                     |   4 +-
 .../account_analytic_analysis/i18n/en_GB.po   |  12 +-
 addons/account_analytic_plans/i18n/tr.po      |   8 +-
 addons/account_anglo_saxon/i18n/tr.po         |  18 +-
 addons/account_followup/i18n/tr.po            |  23 ++-
 addons/account_invoice_layout/i18n/tr.po      |   4 +-
 addons/account_payment/i18n/tr.po             |  18 +-
 addons/account_sequence/i18n/tr.po            |  10 +-
 .../analytic_journal_billing_rate/i18n/tr.po  |   8 +-
 addons/base_module_record/i18n/tr.po          |  11 +-
 addons/board/i18n/tr.po                       |   4 +-
 addons/crm/i18n/tr.po                         | 191 +++++++++---------
 addons/crm_claim/i18n/tr.po                   |  24 +--
 addons/crm_helpdesk/i18n/tr.po                |  48 ++---
 addons/crm_profiling/i18n/tr.po               |  18 +-
 addons/delivery/i18n/tr.po                    |  44 ++--
 addons/document/i18n/tr.po                    |  26 +--
 addons/hr_attendance/i18n/tr.po               |  10 +-
 addons/mrp/i18n/tr.po                         |  78 ++++---
 addons/portal/i18n/tr.po                      | 151 ++++++++------
 addons/project_retro_planning/i18n/tr.po      |   8 +-
 addons/purchase/i18n/tr.po                    | 129 ++++++------
 addons/purchase_double_validation/i18n/tr.po  |  10 +-
 addons/sale_crm/i18n/tr.po                    |  20 +-
 addons/sale_journal/i18n/tr.po                |  14 +-
 addons/share/i18n/tr.po                       |  27 ++-
 addons/warning/i18n/tr.po                     |  18 +-
 27 files changed, 504 insertions(+), 432 deletions(-)

diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 85f6ab44208..bb580ccffc5 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account_analytic_analysis/i18n/en_GB.po b/addons/account_analytic_analysis/i18n/en_GB.po
index e1129145dc4..d8de82627b8 100644
--- a/addons/account_analytic_analysis/i18n/en_GB.po
+++ b/addons/account_analytic_analysis/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2012-01-23 15:49+0000\n"
+"PO-Revision-Date: 2012-01-24 09:06+0000\n"
 "Last-Translator: mrx5682 \n"
 "Language-Team: English (United Kingdom) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -117,6 +117,12 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"You will find here the contracts to be renewed because the deadline is "
+"passed or the working hours are higher than the allocated hours. OpenERP "
+"automatically sets these analytic accounts to the pending state, in order to "
+"raise a warning during the timesheets recording. Salesmen should review all "
+"pending accounts and reopen or close the according to the negotiation with "
+"the customer."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 3dd6f8b775c..b4e2a5efbdc 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2012-01-23 23:33+0000\n"
+"PO-Revision-Date: 2012-01-25 00:10+0000\n"
 "Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -139,7 +139,7 @@ msgstr "Analitik Planınızı Tanımlayın"
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Geçersiz BBA Yapılı İletişim !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po
index e1ab6374080..276d1d53561 100644
--- a/addons/account_anglo_saxon/i18n/tr.po
+++ b/addons/account_anglo_saxon/i18n/tr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-06-02 17:13+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-25 00:15+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -35,17 +35,17 @@ msgstr "Ürün Kategorisi"
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Birbirinin alt kategorisi olan kategoriler oluşturamazsınız."
 
 #. module: account_anglo_saxon
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Geçersiz BBA Yapılı İletişim !"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
@@ -88,7 +88,7 @@ msgstr "Toplama Listesi"
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index d05fc2e2234..042647d851e 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-11-11 15:22+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-01-24 20:05+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -117,7 +117,7 @@ msgstr "Kapanmış bir hesap için hareket yaratamazsınız."
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Amount"
-msgstr ""
+msgstr "Tutar"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
@@ -335,7 +335,7 @@ msgstr "Paydaşa göre İzleme İstatistikleri"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -425,12 +425,12 @@ msgstr "Email Onayı gönder"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr ""
+msgstr "Toplam:"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -566,6 +566,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Aşağıdaki carilere e-posta gönderilmedi, E-posta bulunmuyor!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -633,7 +636,7 @@ msgstr "Gönderilen İzlemeler"
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Şirket adı tekil olmalı !"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -715,7 +718,7 @@ msgstr "Müşteri Ref :"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Test Baskısı"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index 653a5b8ca0d..f4c56bc35cd 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 9e0beb8846e..9999d3d997b 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-05-29 17:44+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-24 22:37+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 06:51+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -87,7 +87,7 @@ msgstr "İstenen Tarih"
 #. module: account_payment
 #: model:res.groups,name:account_payment.group_account_payment
 msgid "Accounting / Payments"
-msgstr ""
+msgstr "Muhasebe / Ödemeler"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -171,7 +171,7 @@ msgstr "Ödeme satırı adı eşsiz olmalı!"
 #. module: account_payment
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Geçersiz BBA Yapılı İletişim !"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -527,7 +527,7 @@ msgstr "Fatura Ref."
 #. module: account_payment
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!"
 
 #. module: account_payment
 #: field:payment.line,name:0
@@ -572,7 +572,7 @@ msgstr "İptal"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank Account"
-msgstr ""
+msgstr "Hedef Banka Hesabı"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -637,7 +637,7 @@ msgstr "Ödemeleri Onayla"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!"
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
diff --git a/addons/account_sequence/i18n/tr.po b/addons/account_sequence/i18n/tr.po
index a3f7cc6c22c..4b30a1756ec 100644
--- a/addons/account_sequence/i18n/tr.po
+++ b/addons/account_sequence/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-05-29 17:45+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-25 00:14+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:32+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -126,7 +126,7 @@ msgstr "Ad"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!"
 
 #. module: account_sequence
 #: constraint:account.journal:0
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index f65da009ac9..59bd7a701bb 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2012-01-23 23:27+0000\n"
+"PO-Revision-Date: 2012-01-25 00:10+0000\n"
 "Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: analytic_journal_billing_rate
 #: sql_constraint:account.invoice:0
@@ -34,7 +34,7 @@ msgstr "Fatura"
 #. module: analytic_journal_billing_rate
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Geçersiz BBA Yapılı İletişim !"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index d6588b13aaa..ee5ca2403bf 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2010-09-09 07:16+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-01-24 19:00+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 06:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -89,6 +89,9 @@ msgid ""
 "publish it on http://www.openerp.com, in the 'Modules' section. You can do "
 "it through the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Eğer modülünüzün başka kullanıcıların ilgisini çekeceğini düşünüyorsanız, "
+"modülünüzü  http://apps.openerp.com sitesinde yayınlamak isteriz. Modül "
+"yayını için yine 'base_module_publish' modülünü de kullanabilirsiniz."
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,check_date:0
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 6a89b783805..b6750c9b164 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 081977e1181..f1ac0cb45b2 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:43+0000\n"
-"PO-Revision-Date: 2011-06-20 20:31+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-24 22:23+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 06:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -109,7 +109,7 @@ msgstr "Aşama Adı"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM Fırsat Analizleri"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -138,7 +138,7 @@ msgstr "Aday '%s' kapatılmıştır."
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Bekl. Kapanış"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -148,7 +148,7 @@ msgstr "Yıllık"
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -178,7 +178,7 @@ msgstr "Fırsatları Ara"
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Tahmini Kapatma Ayı"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -238,7 +238,7 @@ msgstr "Çekildi"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Tekrarları sonlandırma"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -345,7 +345,7 @@ msgstr "Olası Paydaş"
 #: code:addons/crm/crm_lead.py:733
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Konu Yok"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -431,7 +431,7 @@ msgstr "Güncelleme Tarihi"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "Takım Lideri"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -465,7 +465,7 @@ msgstr "Kategori"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "Fırsat / Müşteri"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -511,7 +511,7 @@ msgstr "Fırsat için normal ya da telefonla toplantı"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "Eposta Geçidi"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -550,7 +550,7 @@ msgstr "Postalama"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "Yapılacaklar"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -573,7 +573,7 @@ msgstr "E-Posta"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Son 7 günlük telefon kayıtları"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -622,7 +622,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Cari İlgili Kişisi"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -633,7 +633,7 @@ msgstr "Bitiş Tarihi"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a call"
-msgstr ""
+msgstr "Telefon görüşmesi programla/kaydet"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -669,7 +669,7 @@ msgstr "'%s' görüşmesi onaylandı."
 #: selection:crm.add.note,state:0
 #: selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Sürüyor"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -683,7 +683,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Oluşturma Ayı"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -739,7 +739,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "Satış Temsilcisi"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -749,7 +749,7 @@ msgstr "Olası Gelir"
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Oluşturma Ayı"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -765,7 +765,7 @@ msgstr "Olasılık (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Şirket Dövizi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -812,7 +812,7 @@ msgstr "Süreci durdur"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Ay-1"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -855,12 +855,12 @@ msgstr "Ayrıcalıklı"
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "%s den: %s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "Oluşturulma Yılı"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -881,7 +881,7 @@ msgstr "Satış Alımları"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "Açık günleri hesaplamak için kullanılır"
 
 #. module: crm
 #: view:crm.lead:0
@@ -916,7 +916,7 @@ msgstr "Yinelenen Toplantı"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Atanmamış Telefon Görüşmeleri"
 
 #. module: crm
 #: view:crm.lead:0
@@ -980,7 +980,7 @@ msgstr "Uyarı !"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Bu yıl yapılan telefon görüşmeleri"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -1021,7 +1021,7 @@ msgstr "Toplantılarım"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Bugün yapılan telefon görüşmeleri"
 
 #. module: crm
 #: view:board.board:0
@@ -1083,7 +1083,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "Renk Değiştir"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1101,7 +1101,7 @@ msgstr "Sorumlu"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "Sadece fırsatı göster"
 
 #. module: crm
 #: view:res.partner:0
@@ -1126,12 +1126,12 @@ msgstr "Gönderen"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "Fırsata Dönüştür"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "Satış Ekibini Göster"
 
 #. module: crm
 #: view:res.partner:0
@@ -1194,7 +1194,7 @@ msgstr "Oluşturma Tarihi"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Fırsatlarım"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1204,7 +1204,7 @@ msgstr "Websitesi Tasarımına ihtiyaç var"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "Arama Yılı"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1246,7 +1246,7 @@ msgstr "İş Ortağına e-posta"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "Arama detayları"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1257,7 +1257,7 @@ msgstr "İşaretle"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "Arama Kaydet"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1272,7 +1272,7 @@ msgstr "Durum Alanları Koşulları"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "Bekleme durumundaki Telefon Aramaları"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1340,7 +1340,7 @@ msgstr "Dakika olarak Süre"
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Kanal Adı"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
@@ -1351,7 +1351,7 @@ msgstr "Fırsat Adı"
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "Beklenen Bitiş Günü"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1416,7 +1416,7 @@ msgstr "Bu sefer etkinlikten önce alarm ayarla"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Arama Programla"
 
 #. module: crm
 #: view:crm.lead2partner:0
@@ -1490,7 +1490,7 @@ msgstr "Genişletilmiş Filtreler..."
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "Kapalı durumdaki Telefon Görüşmeleri"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1505,13 +1505,14 @@ msgstr "Kategorilere göre fırsatlar"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Arama Tarihi"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
+"E-posta gönderilirken, Öntanımlı e-posta adresi satış ekibinden alınır."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1533,12 +1534,12 @@ msgstr "Toplantı Planla"
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Birleştirilmiş Fırsatlar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "Satış Ekiplerini Tanımla"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1564,7 +1565,7 @@ msgstr "Çocuk Takımları"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "Taslak veya açık durumdaki telefon görüşmeleri"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -1623,7 +1624,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "E-Posta"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1638,7 +1639,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "KAtegorilerine Göre Fırsatlar"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1656,13 +1657,13 @@ msgstr "Hata ! Yinelenen Satış takımı oluşturamazsınız."
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "Görüşme kaydet"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "Bir cariye bağlama"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1726,7 +1727,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "Fırsatları Dönüştür"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1766,7 +1767,7 @@ msgstr "Olasıyı iş ortağına dönüştür"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "Toplantı / Cari"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1878,7 +1879,7 @@ msgstr "Gelen"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "Arama Ayı"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1912,7 +1913,7 @@ msgstr "En yüksek"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "Oluşturma Yılı"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1991,7 +1992,7 @@ msgstr "Fırsata Dönüştür"
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "Kanallar"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2219,7 +2220,7 @@ msgstr "Elde Değil"
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunities."
-msgstr ""
+msgstr "Lütfen birden fazla fırsat seçin."
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2229,7 +2230,7 @@ msgstr "Olasılık"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Bekleyen Fırsatlar"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2282,7 +2283,7 @@ msgstr "Yeni iş ortağı oluştur"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "Planlanmış Görüşmeler"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2293,7 +2294,7 @@ msgstr "Başlangıç Tarihi"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Planlanmış Telefon Görüşmeleri"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2303,7 +2304,7 @@ msgstr "Reddet"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Kullanıcı E-posta"
 
 #. module: crm
 #: help:crm.lead,optin:0
@@ -2354,7 +2355,7 @@ msgstr "Toplam Planlanan Gelir"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Açık Fırsatlar"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2394,7 +2395,7 @@ msgstr "Telefon Görüşmeleri"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Sahne Arama"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0
@@ -2405,7 +2406,7 @@ msgstr "Durumun açılması için gün sayısı"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "Tekrar Sayısı"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2444,7 +2445,7 @@ msgstr ">"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule call"
-msgstr ""
+msgstr "Görüşme Programla"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2480,7 +2481,7 @@ msgstr "Azalt (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Bekl. Kapanış Günü"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2507,7 +2508,7 @@ msgstr "Muhtelif"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Satış"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -2560,7 +2561,7 @@ msgstr "Meşgul"
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "Oluşturulma Günü"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -2575,7 +2576,7 @@ msgstr "Yinelenen"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Geçen Ay yapılan Telefon görüşmeleri"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
@@ -2707,7 +2708,7 @@ msgstr "Bölümleme Testi"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Kullanıcı Adı"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2752,12 +2753,12 @@ msgstr "Süre"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Ülkeleri Göster"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Satış Temsilcisi Seç"
 
 #. module: crm
 #: view:board.board:0
@@ -2845,7 +2846,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "E-posta Konusu"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2904,7 +2905,7 @@ msgstr "Mesajlar"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "İletişim Kanalı (eposta, doğrudan, telefon, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -2969,7 +2970,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Renk İndeksi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3135,7 +3136,7 @@ msgstr "Kanal"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Satış Ekiplerim"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3176,7 +3177,7 @@ msgstr "Adaylardan iş fırsatları oluşturma"
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "CRM Kontrol Paneli"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -3196,7 +3197,7 @@ msgstr "Kategoriyi şuna Ayarla"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "Kime"
 
 #. module: crm
 #: field:crm.meeting,th:0
@@ -3230,13 +3231,13 @@ msgstr "Yeterlik"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Cari İletişim E-postası"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "Bir Cari zaten Tanımlanmış"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3246,7 +3247,7 @@ msgstr "İlk"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "Bekl. Kapanış Ayı"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3264,7 +3265,7 @@ msgstr "İletişim Geçmişi Koşulları"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Arama Tarihi"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3327,7 +3328,7 @@ msgstr "Tekrarla"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "Belk. Kapanış Yılı"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3387,7 +3388,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "Kayıtlı Aramalar"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3522,12 +3523,12 @@ msgstr "Twitter Reklamları"
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "'%s' Fırsatı kazanıldı."
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Bütün Ekiplerde Ortak"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
@@ -3553,7 +3554,7 @@ msgstr "Hata ! Yinelen profiller oluşturamazsınız."
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Beklenen Kapanış Yılı"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3584,7 +3585,7 @@ msgstr "Kapat"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Görüşme Programla"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3620,7 +3621,7 @@ msgstr "Kime"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3630,7 +3631,7 @@ msgstr "Özel"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Çalışanlara açık"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3655,7 +3656,7 @@ msgstr "Açıklama"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Bu ay yapılan telefon görüşmeleri"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3673,13 +3674,13 @@ msgstr "Aksesuarlara ilgi duyuyor"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Yeni Fırsatlar"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Şirket adresinizde E-posta bulunamadı"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3764,7 +3765,7 @@ msgstr "Kayıp"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Düzenle"
 
 #. module: crm
 #: field:crm.lead,country_id:0
@@ -3859,7 +3860,7 @@ msgstr "Sıra No"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "E-posta oluşturma sihirbazı"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3897,7 +3898,7 @@ msgstr "Yıl"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm_claim/i18n/tr.po b/addons/crm_claim/i18n/tr.po
index ec0fd8614b9..ee9ff7cc1db 100644
--- a/addons/crm_claim/i18n/tr.po
+++ b/addons/crm_claim/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-02-05 10:21+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-01-24 22:26+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -90,7 +90,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Kapatılma Tarihi"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -227,7 +227,7 @@ msgstr "Yeni e-posta gönder"
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,7 +254,7 @@ msgstr "Sonraki İşlem"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Satış Ekiplerim"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -321,7 +321,7 @@ msgstr "İletişim"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Ay-1"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
@@ -402,7 +402,7 @@ msgstr "Fiyat Şikayetleri"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -489,7 +489,7 @@ msgstr "Kullanıcı"
 #. module: crm_claim
 #: field:crm.claim,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -763,7 +763,7 @@ msgstr "Yıl"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My company"
-msgstr ""
+msgstr "Şirketim"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -783,7 +783,7 @@ msgstr "Kimlik"
 #. module: crm_claim
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: crm_claim
 #: view:crm.claim:0
diff --git a/addons/crm_helpdesk/i18n/tr.po b/addons/crm_helpdesk/i18n/tr.po
index ba702408a58..161dca579e0 100644
--- a/addons/crm_helpdesk/i18n/tr.po
+++ b/addons/crm_helpdesk/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-02-21 15:10+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-01-24 22:32+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -46,7 +46,7 @@ msgstr "Mart"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current year"
-msgstr ""
+msgstr "Bu yıl oluşturulan Destek talepleri"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -80,7 +80,7 @@ msgstr "Şirket dahili not ekle"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Date of helpdesk requests"
-msgstr ""
+msgstr "Destek talebi tarihi"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -95,7 +95,7 @@ msgstr "Mesajlar"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My company"
-msgstr ""
+msgstr "Şirketim"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
@@ -156,7 +156,7 @@ msgstr "Bölüm"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in last month"
-msgstr ""
+msgstr "geçen ay yapılan destek talepleri"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -166,14 +166,14 @@ msgstr "Yeni e-posta gönder"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk requests during last 7 days"
-msgstr ""
+msgstr "son 7 günde yapılan destek talepleri"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: view:crm.helpdesk.report:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
@@ -207,7 +207,7 @@ msgstr "Posta sayısı"
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Satış Ekiplerim"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -252,7 +252,7 @@ msgstr "Kategoriler"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "New Helpdesk Request"
-msgstr ""
+msgstr "Yeni Destek Talebi"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -267,13 +267,13 @@ msgstr "Tarihler"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Month of helpdesk requests"
-msgstr ""
+msgstr "Destek taleplerinin ayı"
 
 #. module: crm_helpdesk
 #: code:addons/crm_helpdesk/crm_helpdesk.py:101
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Konu Yok"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -283,12 +283,12 @@ msgstr "# Danışma Masası"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "All pending Helpdesk Request"
-msgstr ""
+msgstr "Bekleyen bütün destek talepleri"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Year of helpdesk requests"
-msgstr ""
+msgstr "Destek Talebinin Yılı"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -324,7 +324,7 @@ msgstr "Güncelleme Tarihi"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current month"
-msgstr ""
+msgstr "Bu ay oluşan destek talepleri"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -345,7 +345,7 @@ msgstr "Kategori"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -361,7 +361,7 @@ msgstr "Planlanan Maliyet"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,channel_id:0
 msgid "Communication channel."
-msgstr ""
+msgstr "İletişim Kanalı"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -574,7 +574,7 @@ msgstr "Danışma Masası Destek Ağacı"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Sürüyor"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -662,7 +662,7 @@ msgstr "Ad"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Ay-1"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
@@ -701,17 +701,17 @@ msgstr ""
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Todays's Helpdesk Requests"
-msgstr ""
+msgstr "Bugünün destek talepleri"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Request Date"
-msgstr ""
+msgstr "Talep Tarihi"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Open Helpdesk Request"
-msgstr ""
+msgstr "Destek Talebi Aç"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index ca1030cb69b..e7ebbf011e0 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-05-16 20:15+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-25 00:16+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -68,7 +68,7 @@ msgstr "Yanıt"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire_line
 msgid "open.questionnaire.line"
-msgstr ""
+msgstr "open.questionnaire.line"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
@@ -101,7 +101,7 @@ msgstr "Yanıtlar"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire
 msgid "open.questionnaire"
-msgstr ""
+msgstr "open.questionnaire"
 
 #. module: crm_profiling
 #: field:open.questionnaire,questionnaire_id:0
@@ -116,12 +116,12 @@ msgstr "Bir Anket Kullan"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_İptal"
 
 #. module: crm_profiling
 #: field:open.questionnaire,question_ans_ids:0
 msgid "Question / Answers"
-msgstr ""
+msgstr "Soru /Cevap"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -154,7 +154,7 @@ msgstr "Profil Kurallarını Kullan"
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 6c23d516cba..010653aa37d 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2010-09-09 07:15+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-01-24 20:57+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 05:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -69,7 +69,7 @@ msgstr "Grid Satırı"
 #. module: delivery
 #: help:delivery.carrier,partner_id:0
 msgid "The partner that is doing the delivery service."
-msgstr ""
+msgstr "Teslimat Servisini veren Cari"
 
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
@@ -89,7 +89,7 @@ msgstr "Faturalanmak üzere seçilen"
 #. module: delivery
 #: field:delivery.carrier,pricelist_ids:0
 msgid "Advanced Pricing"
-msgstr ""
+msgstr "Gelişmiş Fiyatlama"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.carrier,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Tutar"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -214,7 +214,7 @@ msgstr "Lot"
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Transport Company"
-msgstr ""
+msgstr "Taşıma Şirketi"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -287,17 +287,17 @@ msgstr "Bitiş P. Kodu"
 #: code:addons/delivery/delivery.py:143
 #, python-format
 msgid "Default price"
-msgstr ""
+msgstr "Öntanımlı Fiyat"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard
 msgid "delivery.define.delivery.steps.wizard"
-msgstr ""
+msgstr "delivery.define.delivery.steps.wizard"
 
 #. module: delivery
 #: field:delivery.carrier,normal_price:0
 msgid "Normal Price"
-msgstr ""
+msgstr "Normal Fiyat"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -344,7 +344,7 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:94
@@ -420,7 +420,7 @@ msgstr ""
 #. module: delivery
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -441,7 +441,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
 msgid "Define Delivery Methods"
-msgstr ""
+msgstr "Teslimat Yöntemini Tanımla"
 
 #. module: delivery
 #: help:delivery.carrier,free_if_more_than:0
@@ -471,7 +471,7 @@ msgstr ""
 #. module: delivery
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -499,7 +499,7 @@ msgstr "Bu ürün için bir üretim lotu oluşturmanız gerekir"
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If More Than"
-msgstr ""
+msgstr "Ücretsiz Eğer fazlaysa"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -571,17 +571,17 @@ msgstr "Nakliyeci %s (id: %d) teslimat gridine sahip değil!"
 #. module: delivery
 #: view:delivery.carrier:0
 msgid "Pricing Information"
-msgstr ""
+msgstr "Fiyat Bilgisi"
 
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "Tüm ürünleri tek seferde teslim et"
 
 #. module: delivery
 #: field:delivery.carrier,use_detailed_pricelist:0
 msgid "Advanced Pricing per Destination"
-msgstr ""
+msgstr "Adrese göre Gelişmiş Fiyatlama"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -613,7 +613,7 @@ msgstr ""
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
@@ -634,12 +634,12 @@ msgstr "Teslimat Maliyeti"
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "Her ürün hazır olduğunda teslim et"
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
 msgid "Apply"
-msgstr ""
+msgstr "Uygula"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 55ff5b033d1..e9f4483671b 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-06-10 19:43+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-24 20:09+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -150,7 +150,7 @@ msgstr "Klasör adı eşsiz olmalı !"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Dökümanlarımdaki filtreler"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -169,7 +169,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Bilgi Yönetimi"
 
 #. module: document
 #: view:document.directory:0
@@ -203,7 +203,7 @@ msgstr "Her kaynağın klasörü"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "İndekslenmiş İçerik - Deneysel"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -522,7 +522,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "Klasörleri Ayarla"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -675,7 +675,7 @@ msgstr "Salt Okunur"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "Dökümanlar Klasörü"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -794,7 +794,7 @@ msgstr "Ay"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "Bu ayın Dosyaları"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
@@ -859,7 +859,7 @@ msgstr "Paydaşa göre Dosyalar"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Direcories"
-msgstr ""
+msgstr "Klasörleri Ayarla"
 
 #. module: document
 #: view:report.document.user:0
@@ -874,7 +874,7 @@ msgstr "Notlar"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "Klasör Ayarları"
 
 #. module: document
 #: help:document.directory,type:0
@@ -969,7 +969,7 @@ msgstr "Mime Türü"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "Bütün Ayların Dosyaları"
 
 #. module: document
 #: field:document.directory.content,name:0
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index fe4e91bdabd..c903980a421 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2010-09-09 07:20+0000\n"
-"Last-Translator: Angel Spy \n"
+"PO-Revision-Date: 2012-01-25 00:14+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:08+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -266,7 +266,7 @@ msgstr "Ay"
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action Type"
-msgstr ""
+msgstr "Eylem Türü"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index bce4766f568..a602a32ee41 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:43+0000\n"
-"PO-Revision-Date: 2011-12-06 10:17+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-01-24 22:15+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 05:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -138,7 +138,7 @@ msgstr "Bitmiş Ürünler"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Şu an Üretilen Üretim Emirleri"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -220,6 +220,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Satın aldığınız ve sattığınız her ürün için bir ürün formu oluştur. Eğer "
+"ürün satınalınıyorsa bir tedarikçi belirleyin."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -255,7 +257,7 @@ msgstr "Kapasite Bilgisi"
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Üretilmiş Ürünler"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -314,7 +316,7 @@ msgstr "Ürün Üretimi"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Hata ! Kendini İçeren  BoM oluşturamazsınız."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -335,7 +337,7 @@ msgstr "Varsayılan Birim"
 #: sql_constraint:mrp.production:0
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -447,7 +449,7 @@ msgstr "Ürün tipi hizmettir"
 #. module: mrp
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Şirket adı tekil olmalı !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -514,7 +516,7 @@ msgstr "Hata: Geçersiz ean kodu"
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Products to Produce"
-msgstr ""
+msgstr "Üretilecek Ürünler"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -530,7 +532,7 @@ msgstr "Miktarı Değiştir"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
 msgid "Configure your work centers"
-msgstr ""
+msgstr "İş merkezlerinizi ayarlayın"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -567,12 +569,12 @@ msgstr "Birim Başına Tedarikçi Fiyatı"
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
-msgstr ""
+msgstr "Rota iş merkezlerinin listesini gösterirken sıra numarası verir"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -677,7 +679,7 @@ msgstr "Bir çevrimin tamamlanması için saat olarak süre."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "BoM satırındaki ürün BoM ürünü ile aynı olamaz."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -749,7 +751,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:734
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -796,7 +798,7 @@ msgstr "Acil"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are waiting for raw materials."
-msgstr ""
+msgstr "Hammadde bekleyen Üretim Emirleri"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -807,6 +809,10 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"İş merkezleri üretim birimlerini oluşturup yönetmenizi sağlar. İş merkezleri "
+"kapasite planlamasında kullanılan işçiler ve veya makielerden oluşur. Lütfen "
+"çalışma saatlerinin ve çalışan izinlerinin bu hesaplarda dikkate "
+"alınmadığını unutmayın."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -892,7 +898,7 @@ msgstr "Minimum Stok"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "'%s' durumundaki üretim emirini silinemez."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -904,7 +910,7 @@ msgstr "Kontrol paneli"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr ""
+msgstr "Toplam maliyet %s %s"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1045,7 +1051,7 @@ msgstr "Üretim Paneli"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
 msgid "Manager"
-msgstr ""
+msgstr "Yönetici"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1106,12 +1112,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "MRP Yönetimi"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr ""
+msgstr "İş Merkezinin saatlik maliyetini belirleyin"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1168,6 +1174,7 @@ msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Bu iş merkezinin belirlenen rotadaki operasyonu yapması için gereken saat"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1201,7 +1208,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Ürünleri Oluştur ya da İçeri Aktar"
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1221,7 +1228,7 @@ msgstr "Notlar"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr ""
+msgstr "Üretime başlamaya hazır Üretim Emirleri"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1253,6 +1260,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Rotalar kullanılan bütün iş merkezlerini ne kadar süre/kaç döngü "
+"kullanıldığını gösterir. Eğer rotalar işaretlenirse üretim emrinin (iş "
+"merkezleri) üçüncü sekmesi otomatik olarak doldurulacaktır"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1268,7 +1278,7 @@ msgstr ""
 #: code:addons/mrp/report/price.py:187
 #, python-format
 msgid "Components Cost of %s %s"
-msgstr ""
+msgstr "%s %s Bileşen Maliyeti"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1316,7 +1326,7 @@ msgstr "Planlı Ürün Üretimi"
 #: code:addons/mrp/report/price.py:204
 #, python-format
 msgid "Work Cost of %s %s"
-msgstr ""
+msgstr "İşçilik Maliyeti %s %s"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1338,7 +1348,7 @@ msgstr "Stoğa Üretim"
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "Sipariş adedi negatif ya da sıfır olamaz!"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1507,7 +1517,7 @@ msgstr "Acil Değil"
 #. module: mrp
 #: field:mrp.production,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1592,6 +1602,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"İş Merkezinin Açıklaması. Bu alanda her döngünün bu iş merkezine göre ne "
+"olduğunu açıklayın."
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1849,7 +1861,7 @@ msgstr "Ürün Yuvarlama"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -1908,7 +1920,7 @@ msgstr "Ayarlar"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:734
@@ -2053,7 +2065,7 @@ msgstr "Normal"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production started late"
-msgstr ""
+msgstr "Üretim Geç Başladı"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
@@ -2070,7 +2082,7 @@ msgstr "Maliyet Yapısı"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_user
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2114,7 +2126,7 @@ msgstr "Hata"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Production Started"
-msgstr ""
+msgstr "Üretim Başladı"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
@@ -2273,7 +2285,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:954
 #, python-format
 msgid "PROD: %s"
-msgstr ""
+msgstr "ÜRET: %s"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po
index badc14533dc..d026da06d24 100644
--- a/addons/portal/i18n/tr.po
+++ b/addons/portal/i18n/tr.po
@@ -8,47 +8,47 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-01-25 00:09+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
 #, python-format
 msgid "Please select at least one user to share with"
-msgstr ""
+msgstr "Lütfen paylaşılacak en az bir kullanıcı seçin"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
 #, python-format
 msgid "Please select at least one group to share with"
-msgstr ""
+msgstr "Lütfen paylaşılacak en az bir grup seçin"
 
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Varolan gruplar"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "Portal Kullanıcı Ayarları"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal User"
-msgstr ""
+msgstr "Portal Kullanıcısı"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal_manager
@@ -56,92 +56,99 @@ msgid ""
 "Portal managers have access to the portal definitions, and can easily "
 "configure the users, access rights and menus of portal users."
 msgstr ""
+"Portal yöneticileri portal tanımlarına erişebilir, kullanıcılar, erişim "
+"hakları ve menüleri kolayca yapılandırabilirler."
 
 #. module: portal
 #: help:res.portal,override_menu:0
 msgid "Enable this option to override the Menu Action of portal users"
 msgstr ""
+"Bu opsiyonu portal kullanıcılarının menü eylemlerini değiştirmek için "
+"kullanın"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-posta"
 
 #. module: portal
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Bu kullanıcının seçilen şirkete erişim hakkı yok"
 
 #. module: portal
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Parçalar"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Davetleri Gönder"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Widgets assigned to Users"
-msgstr ""
+msgstr "Kullanıcıya atanmış parçalar"
 
 #. module: portal
 #: help:res.portal,url:0
 msgid "The url where portal users can connect to the server"
-msgstr ""
+msgstr "Portal kullanıcılarının sunucuya bağlanacağı adres"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal_officer
 msgid "Portal officers can create new portal users with the portal wizard."
 msgstr ""
+"Portal yetkilileri portal sihirbazını kullanarak yeni portal kullanıcıları "
+"oluşturabilirler."
 
 #. module: portal
 #: help:res.portal.wizard,message:0
 msgid "This text is included in the welcome email sent to the users"
-msgstr ""
+msgstr "Bu yazı kullanıcıya gönderilen hoşgeldin e-posta mesajına eklenecek"
 
 #. module: portal
 #: help:res.portal,menu_action_id:0
 msgid "If set, replaces the standard menu for the portal's users"
 msgstr ""
+"Eğer seçilirse portal kullanıcıları için olan standart menüyü değiştirir"
 
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Dil"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Name"
-msgstr ""
+msgstr "Portal Adı"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal Users"
-msgstr ""
+msgstr "Portal Kullanıcıları"
 
 #. module: portal
 #: field:res.portal,override_menu:0
 msgid "Override Menu Action of Users"
-msgstr ""
+msgstr "Kullanıcıların menü eylemlerini değiştir"
 
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Menü Eylemi"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Kullanıcı Adı"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
 msgid "Portal Widgets"
-msgstr ""
+msgstr "Portal Parçaları"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal
@@ -150,52 +157,52 @@ msgstr ""
 #: field:res.portal.widget,portal_id:0
 #: field:res.portal.wizard,portal_id:0
 msgid "Portal"
-msgstr ""
+msgstr "Portal"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:35
 #, python-format
 msgid "Your OpenERP account at %(company)s"
-msgstr ""
+msgstr "%(company)s şirketindeki OpenERP hesabınız"
 
 #. module: portal
 #: code:addons/portal/portal.py:106
 #: code:addons/portal/portal.py:177
 #, python-format
 msgid "%s Menu"
-msgstr ""
+msgstr "%s Menü"
 
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
 msgid "The portal in which new users must be added"
-msgstr ""
+msgstr "Yeni kullanıcıların eklenmesi gereken portal"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard
 msgid "Portal Wizard"
-msgstr ""
+msgstr "Portal Sihirbazı"
 
 #. module: portal
 #: help:res.portal,widget_ids:0
 msgid "Widgets assigned to portal users"
-msgstr ""
+msgstr "Portal kullanıcılarına atanmış parçacıklar"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:163
 #, python-format
 msgid "(missing url)"
-msgstr ""
+msgstr "(kayıp url)"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Varolan kullanıcılar"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Sihirbaz"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -203,63 +210,65 @@ msgid ""
 "Will be used as user login.  Also necessary to send the account information "
 "to new users"
 msgstr ""
+"Kullanıcı adı olarak kullanılacak. Ayrıca yeni hesap bilgileri yeni "
+"kullanıcıya gönderilmeli"
 
 #. module: portal
 #: field:res.portal,parent_menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Üst Menü"
 
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: portal
 #: field:res.portal.widget,widget_id:0
 msgid "Widget"
-msgstr ""
+msgstr "Parçacık"
 
 #. module: portal
 #: help:res.portal.wizard.user,lang:0
 msgid "The language for the user's user interface"
-msgstr ""
+msgstr "Kullanıcının kullanıcı arayüzü dili"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "İptal Et"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Website"
-msgstr ""
+msgstr "Web sitesi"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Create Parent Menu"
-msgstr ""
+msgstr "Üst Menü Oluştur"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid ""
 "The following text will be included in the welcome email sent to users."
-msgstr ""
+msgstr "Aşağıdaki yazı kullanıcıya gönderilen hoşgeldin mesajına eklenecek"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:135
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "E-posta Gerekli"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
 msgid "Invalid email address"
-msgstr ""
+msgstr "Geçersiz e-posta adresi"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:136
@@ -267,23 +276,25 @@ msgstr ""
 msgid ""
 "You must have an email address in your User Preferences to send emails."
 msgstr ""
+"E-posta gönderebilmek için kullanıcı seçeneklerinde e-posta adresiniz "
+"tanımlı olmalı."
 
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: portal
 #: help:res.portal,group_id:0
 msgid "The group extended by this portal"
-msgstr ""
+msgstr "Bu portal ile grup genişletilmiş"
 
 #. module: portal
 #: view:res.portal:0
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.portal_list_action
@@ -291,38 +302,38 @@ msgstr ""
 #: model:ir.ui.menu,name:portal.portal_menu
 #: view:res.portal:0
 msgid "Portals"
-msgstr ""
+msgstr "Portallar"
 
 #. module: portal
 #: help:res.portal,parent_menu_id:0
 msgid "The menu action opens the submenus of this menu item"
-msgstr ""
+msgstr "Menü eylemi bu menü kaleminde alt menüler açar"
 
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sıra"
 
 #. module: portal
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "İlgili Cari"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Menu"
-msgstr ""
+msgstr "Portal Menüsü"
 
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
 #. module: portal
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,message:0
 msgid "Invitation message"
-msgstr ""
+msgstr "Davet mesajı"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:36
@@ -343,28 +354,42 @@ msgid ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 msgstr ""
+"Sayın %(name)s,\n"
+"\n"
+"Size %(url)s adresinde bir OpenERP hesabı açıldı.\n"
+"\n"
+"Giriş bilgileriniz:\n"
+"Veritabanı: %(db)s\n"
+"Kullanıcı adı:     %(login)s\n"
+"Şifre: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
 
 #. module: portal
 #: model:res.groups,name:portal.group_portal_manager
 msgid "Manager"
-msgstr ""
+msgstr "Yönetici"
 
 #. module: portal
 #: help:res.portal.wizard.user,name:0
 msgid "The user's real name"
-msgstr ""
+msgstr "Kullanıcının Gerçek Adı"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.address_wizard_action
 #: model:ir.actions.act_window,name:portal.partner_wizard_action
 #: view:res.portal.wizard:0
 msgid "Add Portal Access"
-msgstr ""
+msgstr "Portal erişimi ekle"
 
 #. module: portal
 #: field:res.portal.wizard.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Cari"
 
 #. module: portal
 #: model:ir.actions.act_window,help:portal.portal_list_action
@@ -376,13 +401,19 @@ msgid ""
 "the portal's users.\n"
 "            "
 msgstr ""
+"\n"
+"Portal bir kullanıcı grubuna belirli ekranlar ve kurallar tanımlanmasına "
+"olanak verir.\n"
+" Portal kullanıcılarına bir portal menüsü, parçacıklar, ve özel gruplar "
+"atanabilir.\n"
+"            "
 
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "Paylaşım Sihirbazı"
 
 #. module: portal
 #: model:res.groups,name:portal.group_portal_officer
 msgid "Officer"
-msgstr ""
+msgstr "Yetkili"
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 49ca1b8db58..ba2accacc2a 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2012-01-23 23:28+0000\n"
+"PO-Revision-Date: 2012-01-25 00:12+0000\n"
 "Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n"
-"X-Generator: Launchpad (build 14713)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -29,4 +29,4 @@ msgstr "Hata! Proje başlangıç tarihi bitiş tarihinden sonra olamaz."
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Hata! Aynı projeye yükselme atayamazsınız!"
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index c7f2a3f5bd7..d36d113a353 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:43+0000\n"
-"PO-Revision-Date: 2011-11-07 12:44+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-01-24 23:32+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 05:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -46,7 +46,7 @@ msgstr "Hedef"
 #: code:addons/purchase/purchase.py:235
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "Bir satınalma emrini silmeden önce iptal etmelisiniz."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:772
@@ -102,7 +102,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Onaylanmış Satınalma emri"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -122,7 +122,7 @@ msgstr "Fiyat listeleri"
 #. module: purchase
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Faturalandırılacak"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
@@ -166,7 +166,7 @@ msgstr "Fiyat listesi yok!"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "purchase.config.wizard"
 
 #. module: purchase
 #: view:board.board:0
@@ -252,7 +252,7 @@ msgstr "Satınalma Özellikleri"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Kısmi Teslimat İşlem Sihirbazı"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -273,17 +273,17 @@ msgstr "Gün"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Oluşturulmuş taslak fatura temelinde"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "Günün Siparişi"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Kategorilere Göre Aylık Satınalmalar"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -293,7 +293,7 @@ msgstr "Satınalmalar"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Taslak durumundaki Satınalma emirleri"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -425,6 +425,7 @@ msgstr "Stok Hareketi"
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Önce bu satınalma emriyle ilişkili bütün faturaları iptal etmelisiniz."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -470,13 +471,13 @@ msgstr "Onaylayan"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "Geçen Aydaki Emirler"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:411
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "Önce bu satınalma emriyle ilişkili bütün alımları iptal etmelisiniz."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -501,7 +502,7 @@ msgstr "Bir alım gerçekleştirildiğini gösterir"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "İstisna durumundaki satınalma emirleri"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -530,7 +531,7 @@ msgstr "Ortalama Fiyat"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Gelen sevkiyatlar halihazırda işlenmiş"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -548,7 +549,7 @@ msgstr "Onayla"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "sevkiyatlar Temelinde"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -584,7 +585,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "İstisna durumundaki Satınalma Emirleri"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -642,12 +643,12 @@ msgstr "Toplam Fiyat"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "Tedarikçileri Oluştur ya da Aktar"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "Müsait"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -676,7 +677,7 @@ msgstr "Hata!"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:710
@@ -725,7 +726,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Çeşitli"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:788
@@ -797,7 +798,7 @@ msgstr "Resepsiyonlar"
 #: code:addons/purchase/purchase.py:284
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Hiçbir kalemi olmayan satınalma emirlerini onaylayamazsınız"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -822,12 +823,12 @@ msgstr "Teklif İsteği"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI Fiyat Listesi (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Onay Bekliyor"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -837,7 +838,7 @@ msgstr "Ocak"
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "Otomatik-eposta onaylı satınalma emirleri"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -881,7 +882,7 @@ msgstr "Mik."
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Ay-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -900,7 +901,7 @@ msgstr "Satınalma Siparişi Birleştirme"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "Bu ayki Emirler"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -943,7 +944,7 @@ msgstr "Aylık Toplam Kullanıcı Sipariş Kalemleri"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "Onaylı Satınalma Emirleri"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -954,7 +955,7 @@ msgstr "Ay"
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Satınalma (Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -974,7 +975,7 @@ msgstr "Vergilendirilmemiş toplam tutar"
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -996,7 +997,7 @@ msgstr "Bu satınalma için oluşturulmuş satınalma listesidir"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Birikmiş Sipariş mi (backorder)"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
@@ -1045,7 +1046,7 @@ msgstr "Sipariş Durumu"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "Ürün Kategorileri"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1055,7 +1056,7 @@ msgstr "Fatura oluştur"
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Şirket adı tekil olmalı !"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
@@ -1072,7 +1073,7 @@ msgstr "Takvimi Göster"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Satınalma emri kalemleri temelinde"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1083,7 +1084,7 @@ msgstr "Vergilendirilmemiş tutar"
 #: code:addons/purchase/purchase.py:885
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "SA: %s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1151,12 +1152,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-Posta Şablonları"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices on Based Purchase Orders"
-msgstr ""
+msgstr "Satınalma emri temelinde taslak faturaları oluştur"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
@@ -1187,7 +1188,7 @@ msgstr "Uzatılmış Filtreler..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "Satınalmalardaki Faturalama Kontrolü"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
@@ -1232,7 +1233,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "Adres Defteri"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
@@ -1249,7 +1250,7 @@ msgstr "Alış Siparişini İptal Et"
 #: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Bu satınalma emri iptal edilemiyor!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1274,7 +1275,7 @@ msgstr "Performans tablosu"
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1285,7 +1286,7 @@ msgstr "Ürün Tutarı"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "Cari Kategorileri"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
@@ -1337,7 +1338,7 @@ msgstr "Bu satınalma sipariş talebini oluşturan belge referansı."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Henüz onaylanmamış satınalma emirleri"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1406,7 +1407,7 @@ msgstr "Genel Bilgiler"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not invoiced"
-msgstr ""
+msgstr "Faturalanmamış"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1472,7 +1473,7 @@ msgstr "Alış Siparişleri"
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
 
 #. module: purchase
 #: field:purchase.order,origin:0
@@ -1514,7 +1515,7 @@ msgstr "Tél. :"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Aylık Emirler"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1530,7 +1531,7 @@ msgstr "Satınalma Siparişi Arama"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Öntanımlı Faturalama kontrol yöntemini belirle"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1562,7 +1563,7 @@ msgstr "Tedarikçi Onayı Bekleniyor"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Taslak faturalar temelinde"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1604,6 +1605,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s, you should not "
 "purchase less."
 msgstr ""
+"Seçilmiş tedarikçinin minimum sipariş miktarı %s, daha az miktar "
+"satınalmamalısınız."
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1618,7 +1621,7 @@ msgstr "Tahmini Teslimat Adresi"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "Yevmiye"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1650,7 +1653,7 @@ msgstr "Teslimat"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "Tamamlandı durumundaki satınalma emirleri"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1686,7 +1689,7 @@ msgstr "Rezervasyon"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "İçinde faturalanmamış kalemler içeren satınalma emirleri"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1696,7 +1699,7 @@ msgstr "Tutar"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Faturalacak teslimat"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1704,6 +1707,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Bu araç, tedarikçi faturalarını kontrol etmek için kullanmak istediğiniz "
+"yöntemi seçmek için yardımcı olacaktır."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1803,7 +1808,7 @@ msgstr "Satınalma-Standart Fiyat"
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Öntanımlı fatura kontrol metodu"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1819,7 +1824,7 @@ msgstr "Faturalama Kontrolü"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Sipariş Bakiyeleri"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1875,7 +1880,7 @@ msgstr "Fiyat Listesi Sürümleri"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:358
@@ -1964,7 +1969,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Taslak durumundaki satınalma emirleri"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1974,17 +1979,17 @@ msgstr "Mayıs"
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "Yönetici"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Bu yılki Emirler"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -2002,7 +2007,7 @@ msgstr "Yıl"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Satınalma Emri kalemleri temelinde"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
diff --git a/addons/purchase_double_validation/i18n/tr.po b/addons/purchase_double_validation/i18n/tr.po
index a4c5a8b6887..4d6d7982964 100644
--- a/addons/purchase_double_validation/i18n/tr.po
+++ b/addons/purchase_double_validation/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2011-06-09 18:32+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-25 00:14+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:32+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -47,7 +47,7 @@ msgstr "Satınalmalar için Sınır Miktarlarını Yapılandır"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Onay Bekleyen Alış Siparişi"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index cd23cdb3d70..27405d5574d 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2011-05-16 21:14+0000\n"
-"Last-Translator: Ayhan KIZILTAN \n"
+"PO-Revision-Date: 2012-01-25 00:17+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Satış Teklifine (%s) cevirilmiş"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "_Oluştur"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Satış Ekiplerim"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -74,7 +74,7 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Fırsatlarım"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -105,7 +105,7 @@ msgstr "Fırsatı Kapat"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Sahneye göre Planlanan Gelirlerim"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 827d9862f84..3e6ddc57c0e 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2010-09-09 07:19+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-01-25 00:15+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 06:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -41,7 +41,7 @@ msgstr ""
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -98,7 +98,7 @@ msgstr ""
 #. module: sale_journal
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index 1de0c7b2028..729110fecab 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2012-01-11 00:04+0000\n"
+"PO-Revision-Date: 2012-01-24 22:52+0000\n"
 "Last-Translator: Ahmet Altınışık \n"
 "Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-12 05:40+0000\n"
-"X-Generator: Launchpad (build 14640)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -163,7 +163,7 @@ msgstr "Kapat"
 #: code:addons/share/wizard/share_wizard.py:641
 #, python-format
 msgid "Action and Access Mode are required to create a shared access"
-msgstr ""
+msgstr "Paylaşım oluşturmak için Eylem ve Erişim modu gereklidir"
 
 #. module: share
 #: view:share.wizard:0
@@ -171,6 +171,7 @@ msgid ""
 "Please select the action that opens the screen containing the data you want "
 "to share."
 msgstr ""
+"Lütfen paylaşmak istediğiniz verileri içeren ekranı açan eylemi seçin."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:782
@@ -204,6 +205,8 @@ msgid ""
 "Optionally, you may specify an additional domain restriction that will be "
 "applied to the shared data."
 msgstr ""
+"İsterseniz, paylaştığınız bilgiler için ek alan adı (domain) kısıtları "
+"belirleyebilirsiniz."
 
 #. module: share
 #: help:share.wizard,name:0
@@ -271,7 +274,7 @@ msgstr ""
 #: help:share.wizard,action_id:0
 msgid ""
 "The action that opens the screen containing the data you wish to share."
-msgstr ""
+msgstr "Paylaşmak istediğiniz ekranı açan eylem"
 
 #. module: share
 #: constraint:res.users:0
@@ -294,6 +297,8 @@ msgstr "Yeni Oluşturuldu"
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
+"Kullanıcı %s(%s) tarafından %s grubu için oluşturulan dolaylı paylaşım "
+"filtresi"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:768
@@ -449,6 +454,10 @@ msgid ""
 "Members of this groups have access to the sharing wizard, which allows them "
 "to invite external users to view or edit some of their documents."
 msgstr ""
+"\n"
+"Bu grubun üyelerinin dış dünyadaki kullanıcılarla dökümanları görüntülemek "
+"veya düzenlemek için paylaşabilecekleri paylaşım sihirbazına erişimleri "
+"vardır."
 
 #. module: share
 #: model:ir.model,name:share.model_res_groups
@@ -506,12 +515,12 @@ msgstr "Sadece normal kullanıcılar (paylaşım kullanıcısı değil)"
 #. module: share
 #: field:share.wizard,access_mode:0
 msgid "Access Mode"
-msgstr ""
+msgstr "Erişim Modu"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing: preparation"
-msgstr ""
+msgstr "Paylaşım: Hazırlama"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:199
@@ -520,8 +529,10 @@ msgid ""
 "You must configure your e-mail address in the user preferences before using "
 "the Share button."
 msgstr ""
+"Share (Paylaş) düğmesi kullanmadan önce, kullanıcı tercihleri ​​e-posta "
+"adresini yapılandırmanız gerekir."
 
 #. module: share
 #: help:share.wizard,access_mode:0
 msgid "Access rights to be granted on the shared documents."
-msgstr ""
+msgstr "Paylaşılan belgeler verilebilen Erişim hakları."
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 409bd2dc784..24aeabbbcfb 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-22 18:46+0000\n"
-"PO-Revision-Date: 2010-09-09 07:16+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-01-25 00:10+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-23 07:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n"
+"X-Generator: Launchpad (build 14719)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -134,7 +134,7 @@ msgstr "Satınalma Siparişi"
 #. module: warning
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
@@ -178,17 +178,17 @@ msgstr "%s için uyarı !"
 #. module: warning
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!"
 
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 
 #. module: warning
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Geçersiz BBA Yapılı İletişim !"
 
 #. module: warning
 #: view:res.partner:0

From 627fe9fed99c546f3410fe3df69dd0a9b782a9ce Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Wed, 25 Jan 2012 09:42:44 +0100
Subject: [PATCH 166/170] [IMP] use @deprecated on OldWidget

bzr revid: xmo@openerp.com-20120125084244-wcok11mlyagh1ck1
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 098c6da104a..a703a11b91c 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1128,7 +1128,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
 });
 
 /**
- * Deprecated. Do not use any more.
+ * @deprecated use :class:`openerp.web.Widget`
  */
 openerp.web.OldWidget = openerp.web.Widget.extend({
     init: function(parent, element_id) {

From a6d883ee0522f30190b28d32996461ccf7235a56 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Wed, 25 Jan 2012 09:44:59 +0100
Subject: [PATCH 167/170] [FIX] trailing comma, breaks IE <= 8

bzr revid: xmo@openerp.com-20120125084459-eysc6e80l0mdeuqm
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index a703a11b91c..fb22b46adf8 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1137,7 +1137,7 @@ openerp.web.OldWidget = openerp.web.Widget.extend({
         this.element_id = this.element_id || _.uniqueId('widget-');
         var tmp = document.getElementById(this.element_id);
         this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name));
-    },
+    }
 });
 
 openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.web.TranslationDataBase# */{

From fa10430e2536c3992cc5c445ecdf7d38d43db081 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Wed, 25 Jan 2012 09:46:41 +0100
Subject: [PATCH 168/170] [REM] unused view_help file

bzr revid: xmo@openerp.com-20120125084641-glyiqqemy41b4k23
---
 addons/web/static/src/js/view_help.js | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 addons/web/static/src/js/view_help.js

diff --git a/addons/web/static/src/js/view_help.js b/addons/web/static/src/js/view_help.js
deleted file mode 100644
index 6f590c359d1..00000000000
--- a/addons/web/static/src/js/view_help.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------
- * OpenERP web library
- *---------------------------------------------------------*/
-
-openerp.web.view_help = function(openerp) {
-
-openerp.web.ProcessView = openerp.web.OldWidget.extend({
-});
-
-openerp.web.HelpView = openerp.web.OldWidget.extend({
-});
-
-};
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 7ce1aad7ecbbe66f99bd345fa6b0028e64b65386 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Wed, 25 Jan 2012 09:53:10 +0100
Subject: [PATCH 169/170] [IMP] terminate statements, remove extraneous
 statement terminations

bzr revid: xmo@openerp.com-20120125085310-zzwjrll47n61hw8w
---
 addons/web/static/src/js/core.js              |  6 +--
 addons/web/static/src/js/view_editor.js       | 37 +++++++++----------
 addons/web/static/src/js/view_form.js         |  8 ++--
 addons/web_calendar/static/src/js/calendar.js |  2 +-
 .../web_dashboard/static/src/js/dashboard.js  |  4 +-
 addons/web_gantt/static/src/js/gantt.js       | 15 +++-----
 addons/web_kanban/static/src/js/kanban.js     |  6 +--
 .../web_mobile/static/src/js/chrome_mobile.js |  2 +-
 addons/web_process/static/src/js/process.js   |  2 +-
 9 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index fb22b46adf8..500cf58d05f 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1223,7 +1223,7 @@ openerp.web.qweb.default_dict = {
     '_' : _,
     '_t' : openerp.web._t
 };
-openerp.web.qweb.format_text_node = function(s) {
+openerp.web.qweb.format_text_node = function (s) {
     // Note that 'this' is the Qweb Node of the text
     var translation = this.node.parentNode.attributes['t-translation'];
     if (translation && translation.value === 'off') {
@@ -1235,13 +1235,13 @@ openerp.web.qweb.format_text_node = function(s) {
     }
     var tr = openerp.web._t(ts);
     return tr === ts ? s : tr;
-}
+};
 
 /** Jquery extentions */
 $.Mutex = (function() {
     function Mutex() {
         this.def = $.Deferred().resolve();
-    };
+    }
     Mutex.prototype.exec = function(action) {
         var current = this.def;
         var next = this.def = $.Deferred();
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f506d63a677..26376f24da2 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -4,8 +4,8 @@ var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
-        this.element_id = element_id
-        this.parent = parent
+        this.element_id = element_id;
+        this.parent = parent;
         this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
         this.xml_element_id = 0;
@@ -107,7 +107,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                 type_widget.dirty = true;
             }
             type_widget.start();
-            type_widget.set_value(value)
+            type_widget.set_value(value);
             self.create_view_widget.push(type_widget);
         });
     },
@@ -177,7 +177,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             'att_list': [],
             'name': this.add_node_name(node),
             'child_id': []
-        }
+        };
         ViewNode.att_list.push(node.tagName.toLowerCase());
         _.each(node.attributes, function(att) {
             ViewNode.att_list.push([att.nodeName, att.nodeValue]);
@@ -576,7 +576,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             var check = _.detect(one_object , function(obj) {
                 return id == obj.id;
             });
-            if (check) {result.push(check);};
+            if (check) {result.push(check);}
             _.each(one_object, function(obj) {
                self.get_object_by_id(id,obj.child_id, result);
             });
@@ -817,7 +817,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             values.push('');
             values.sort();
             _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
-            var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function(property){ return _.include(properties, property.name)})
+            var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function (property) { return _.include(properties, property.name)});
             _.each(widgets, function(widget) {
                 var type_widget =  new (self.property.get_any([widget.type])) (self.edit_node_dialog, widget);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
@@ -842,24 +842,23 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         var group_ids = [], group_names = {}, groups = [];
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
-            res_groups
-            .read_slice([], {})
-            .done(function(res_grp) {
-                _.each(res_grp,function(res){
+            res_groups.read_slice([], {}).done(function (res_grp) {
+                _.each(res_grp, function (res) {
                     var key = res.id;
-                    group_names[key]=res.name;
+                    group_names[key] = res.name;
                     group_ids.push(res.id);
                 });
-                model_data
-                .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
-                .done(function(model_grp) {
-                    _.each(model_grp, function(res_group) {
-                        groups.push([res_group.module + "." + res_group.name,group_names[res_group.res_id]]);
+                model_data.read_slice([], {domain: [
+                    ['res_id', 'in', group_ids],
+                    ['model', '=', 'res.groups']
+                ]}).done(function (model_grp) {
+                    _.each(model_grp, function (res_group) {
+                        groups.push([res_group.module + "." + res_group.name, group_names[res_group.res_id]]);
                     });
                     self.groups = groups;
                     def.resolve();
                 });
-            })
+            });
         return def.promise();
     },
     on_add_node: function(properties, fields){
@@ -922,7 +921,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     render_new_field :function(id){
         var self = this;
         var action = {
-            context: {'default_model_id': id, 'manual':true},
+            context: {'default_model_id': id, 'manual': true},
             res_model: "ir.model.fields",
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
@@ -930,7 +929,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             flags: {
                 action_buttons: true
             }
-        }
+        };
         var action_manager = new openerp.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_viewmanager.views['form'].controller;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e296fcc1955..3f13c95a3a5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -125,7 +125,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         if (state.id && this.datarecord.id != state.id) {
             var idx = this.dataset.get_id_index(state.id);
             if (idx === null) {
-                this.dataset.ids.push(state.id)
+                this.dataset.ids.push(state.id);
                 this.dataset.index = this.dataset.ids.length - 1;
             }
             this.do_show();
@@ -233,7 +233,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     do_update_pager: function(hide_index) {
         var $pager = this.$form_header.find('div.oe_form_pager');
         var index = hide_index ? '-' : this.dataset.index + 1;
-        $pager.find('button').prop('disabled', this.dataset.ids.length < 2)
+        $pager.find('button').prop('disabled', this.dataset.ids.length < 2);
         $pager.find('span.oe_pager_index').html(index);
         $pager.find('span.oe_pager_count').html(this.dataset.ids.length);
     },
@@ -1920,10 +1920,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
     },
     _quick_create: function(name) {
         var self = this;
-        var slow_create = function() {
+        var slow_create = function () {
             self._change_int_value(null);
             self._search_create_popup("form", undefined, {"default_name": name});
-        }
+        };
         if (self.get_definition_options().quick_create === undefined || self.get_definition_options().quick_create) {
             var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
             dataset.name_create(name, function(data) {
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index bc7c5f0ba1d..282d3dfd883 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -381,7 +381,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.do_ranged_search();
     },
     do_ranged_search: function() {
-        var self = this
+        var self = this;
         scheduler.clearAll();
         $.when(this.has_been_loaded, this.ready).then(function() {
             self.dataset.read_slice(_.keys(self.fields), {
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index dc433f961a8..ec2975d48d4 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -190,9 +190,9 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
         this.action_managers.push(am);
         am.appendTo($action);
         am.do_action(action);
-        am.do_action = function(action) {
+        am.do_action = function (action) {
             self.do_action(action);
-        }
+        };
         if (action_attrs.creatable && action_attrs.creatable !== 'false') {
             var action_id = parseInt(action_attrs.creatable, 10);
             $action.parent().find('button.oe_dashboard_button_create').click(function() {
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 80b29fe4368..01bff96acbc 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -368,16 +368,11 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
         
         if (!event_id) {
             var pop = new openerp.web.form.SelectCreatePopup(this);
-            pop.select_element(
-                this.model,
-                {
-                    title: _t("Create: ") + this.name,
-                    initial_view: 'form',
-                    disable_multiple_selection: true
-                },
-                this.dataset.domain,
-                this.context || this.dataset.context
-            )
+            pop.select_element(this.model, {
+                        title: _t("Create: ") + this.name,
+                        initial_view: 'form',
+                        disable_multiple_selection: true
+                    }, this.dataset.domain, this.context || this.dataset.context);
             pop.on_select_elements.add_last(function(element_ids) {
                 self.dataset.read_ids(element_ids,[]).done(function(projects) {
                     self.database_projects.concat(projects);
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 46c6ce4eaf6..5afb04c00f8 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -78,7 +78,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
                 node.tag = qweb_prefix;
                 node.attrs[qweb_prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value';
                 this.extract_aggregates(node);
-                break
+                break;
             case 'button':
             case 'a':
                 var type = node.attrs.type || '';
@@ -395,7 +395,7 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
         this.qweb_context = {
             record: this.record,
             widget: this
-        }
+        };
         for (var p in this) {
             if (_.str.startsWith(p, 'kanban_')) {
                 this.qweb_context[p] = _.bind(this[p], this);
@@ -444,7 +444,7 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
         var self = this;
         if (confirm(_t("Are you sure you want to delete this record ?"))) {
             return $.when(this.view.dataset.unlink([this.id])).then(function() {
-                self.group.remove_record(self.id)
+                self.group.remove_record(self.id);
                 self.stop();
             });
         }
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 41732391936..bcfedd49dba 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -153,7 +153,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
     start: function() {
         var self = this;
         this.rpc('/web/session/sc_list',{} ,function(res){
-            self.$element.html(self.render({'sc' : res}))
+            self.$element.html(self.render({'sc': res}));
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
                 $.mobile.changePage("#oe_menu", "slide", false, true);
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index 5bfd1d39587..150db955cf3 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -169,7 +169,7 @@ openerp.web_process = function (openerp) {
                 // Node text
                 process_node_text =  r.text(n.node.x, n.node.y, (n.node.name))
                     .attr({"fill": "#fff", "font-weight": "bold", "cursor": "pointer"});
-                process_node_text.translate((process_node.getBBox().width/ 2) + 5, 10)
+                process_node_text.translate((process_node.getBBox().width / 2) + 5, 10);
                 if(n.node.subflow) {
                     process_node_text.click(function() {
                         self.process_id = n.node.subflow[0];

From 1f8536a33459d732a9ad372f0da78d0606bbc053 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" 
Date: Wed, 25 Jan 2012 10:29:32 +0100
Subject: [PATCH 170/170] [IMP] account: multi company enhancements

bzr revid: qdp-launchpad@openerp.com-20120125092932-x07yucdn1mjaxv8z
---
 addons/account/account_bank_statement.py      | 10 +++++++++
 .../account/wizard/account_report_common.py   | 22 +++++++++++++++++++
 .../wizard/account_report_common_view.xml     |  7 +++---
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index c255775b83b..9cfda051ec1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -170,6 +170,16 @@ class account_bank_statement(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
     }
 
+    def _check_company_id(self, cr, uid, ids, context=None):
+        for statement in self.browse(cr, uid, ids, context=context):
+            if statement.company_id.id != statement.period_id.company_id.id:
+                return False
+        return True
+
+    _constraints = [
+        (_check_company_id, 'The journal and period chosen have to belong to the same company.', ['journal_id','period_id']),
+    ]
+
     def onchange_date(self, cr, uid, ids, date, company_id, context=None):
         """
             Find the correct period to use for the given date and company_id, return it and set it in the context
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 8ae425e0b15..55e61360fe7 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -29,8 +29,14 @@ class account_common_report(osv.osv_memory):
     _name = "account.common.report"
     _description = "Account Common Report"
 
+    def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None):
+        if chart_account_id:
+            company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
+        return {'value': {'company_id': company_id}}
+
     _columns = {
         'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
+        'company_id': fields.related('chart_account_id', 'company_id', type='many2one', relation='res.company', string='Company', readonly=True),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'),
         'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
         'period_from': fields.many2one('account.period', 'Start Period'),
@@ -44,6 +50,22 @@ class account_common_report(osv.osv_memory):
 
         }
 
+    def _check_company_id(self, cr, uid, ids, context=None):
+        for wiz in self.browse(cr, uid, ids, context=context):
+            company_id = wiz.company_id.id
+            if company_id != wiz.fiscalyear_id.company_id.id:
+                return False
+            if wiz.period_from and company_id != wiz.period_from.company_id.id:
+                return False
+            if wiz.period_to and company_id != wiz.period_to.company_id.id:
+                return False
+        return True
+
+    _constraints = [
+        (_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']),
+    ]
+
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         if context.get('active_model', False) == 'account.account' and view_id:
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 30d90a55245..db1da8223d5 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -10,8 +10,9 @@