From ceca1f72ee964982b32c539932688dc6cc67d243 Mon Sep 17 00:00:00 2001
From: "Somesh Khare (OpenERP)"
Date: Thu, 13 Jun 2013 17:15:46 +0530
Subject: [PATCH 01/44] [FIX]: analytic_account: Analytic account of type view
does not aggregate costs and revenues (Case: ref 593243)
bzr revid: skh@openerp.com-20130613114546-del4g1nmy8v3czh6
---
addons/hr_timesheet/hr_timesheet_view.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 6edd2a74eea..21da4f22229 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -79,7 +79,8 @@
- {'search_default_account_id': [active_id], 'default_account_id': active_id, 'search_default_group_date': 1, 'search_default_group_journal': 1}
+ {'search_default_group_date': 1, 'search_default_group_journal': 1}
+ [('account_id','child_of', active_id)]
Costs & Revenues
account.analytic.line
account.analytic.account
From 2401d7f18ea0ed5a8ac7b0976dab3aa16347ce74 Mon Sep 17 00:00:00 2001
From: Rifakat
Date: Mon, 29 Jul 2013 11:51:58 +0530
Subject: [PATCH 02/44] [FIX] stock_invoice_directly: automatic creation of
invoice when validating delivery order does not invoice correct partial
delivery. It does invoice remain delivery instead of processed delivery
bzr revid: rha@tinyerp.com-20130729062158-zyh6uy659jvv3s03
---
addons/stock_invoice_directly/wizard/stock_invoice.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 5de6490dc0f..c91647a1a74 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -32,8 +32,8 @@ class invoice_directly(osv.osv_memory):
result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
partial = self.browse(cr, uid, ids[0], context)
context.update(active_model='stock.picking',
- active_ids=[partial.picking_id.id])
- if partial.picking_id.invoice_state == '2binvoiced':
+ active_ids=[partial.picking_id.backorder_id.id])
+ if partial.picking_id.backorder_id.invoice_state == '2binvoiced':
return {
'name': 'Create Invoice',
'view_type': 'form',
From 9382f31c7d72ec20739a16d8fdacb379e162903b Mon Sep 17 00:00:00 2001
From: Nhomar Hernandez
Date: Sun, 1 Sep 2013 02:14:06 -0430
Subject: [PATCH 03/44] [FIX] pass correct parameter to compute the balance on
partner form with all entries not complete reconciled
lp bug: https://launchpad.net/bugs/1219381 fixed
bzr revid: nhomar@gmail.com-20130901064406-ehfuhwpjq0ti6oed
---
addons/account/partner.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 4914a17dd2b..22d6fcea394 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -110,7 +110,9 @@ class res_partner(osv.osv):
_description = 'Partner'
def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None):
- query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+ ctx = context.copy()
+ ctx['all_fiscalyear'] = True
+ query = self.pool.get('account.move.line')._query_get(cr, uid, context=ctx)
cr.execute("""SELECT l.partner_id, a.type, SUM(l.debit-l.credit)
FROM account_move_line l
LEFT JOIN account_account a ON (l.account_id=a.id)
From ffe8490aefa344cbf477ef7770a50a8cc3861a55 Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Thu, 10 Oct 2013 11:11:25 +0200
Subject: [PATCH 04/44] Enabled sort in o2m
bzr revid: nicolas.vanhoren@openerp.com-20131010091125-0t1v8wmkrn8bnc5y
---
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 b9f1d91b700..0d4119af74b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3542,7 +3542,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
_.extend(view.options, {
addable: null,
selectable: self.multi_selection,
- sortable: false,
+ sortable: true,
import_enabled: false,
deletable: true
});
From 7040fb35dd8fcba26ca74566fa0d64e7ef07ffbb Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Tue, 15 Oct 2013 10:55:23 +0200
Subject: [PATCH 05/44] [FIX] double-escaping of section labels in m2o
completion
bzr revid: xmo@openerp.com-20131015085523-5s5f587486gaa9zj
---
addons/web/static/src/js/search.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 07d1407392e..570c17649c1 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1547,7 +1547,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
context: context
}).then(function (results) {
if (_.isEmpty(results)) { return null; }
- return [{label: _.escape(self.attrs.string)}].concat(
+ return [{label: self.attrs.string}].concat(
_(results).map(function (result) {
return {
label: _.escape(result[1]),
From 98d31e411f93f623f459a7bb59f590a89ae5d8b2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 15 Oct 2013 13:20:16 +0200
Subject: [PATCH 06/44] [FIX] stock: correctly handle case when we have no
child location
bzr revid: mat@openerp.com-20131015112016-vj6yr6kfxfe8go2p
---
addons/stock/stock.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6008ce7ab5f..ca6733e5cf0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -403,14 +403,15 @@ class stock_location(osv.osv):
uom_rounding = uom_obj.browse(cr, uid, context.get('uom'), context=context).rounding
locations_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
- # Fetch only the locations in which this product has ever been processed (in or out)
- cr.execute("""SELECT l.id FROM stock_location l WHERE l.id in %s AND
- EXISTS (SELECT 1 FROM stock_move m WHERE m.product_id = %s
- AND ((state = 'done' AND m.location_dest_id = l.id)
- OR (state in ('done','assigned') AND m.location_id = l.id)))
- """, (tuple(locations_ids), product_id,))
-
- for id in [i for (i,) in cr.fetchall()]:
+ if locations_ids:
+ # Fetch only the locations in which this product has ever been processed (in or out)
+ cr.execute("""SELECT l.id FROM stock_location l WHERE l.id in %s AND
+ EXISTS (SELECT 1 FROM stock_move m WHERE m.product_id = %s
+ AND ((state = 'done' AND m.location_dest_id = l.id)
+ OR (state in ('done','assigned') AND m.location_id = l.id)))
+ """, (tuple(locations_ids), product_id,))
+ locations_ids = [i for (i,) in cr.fetchall()]
+ for id in locations_ids:
if lock:
try:
# Must lock with a separate select query because FOR UPDATE can't be used with
From d36a90b39e264be4716ce81087ab4a0fe08c4c2b Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 15 Oct 2013 14:10:15 +0200
Subject: [PATCH 07/44] [FIX] account: correctly compute debit/credit for
partner including previous moves reported to new fiscal year
lp bug: https://launchpad.net/bugs/1219381 fixed
bzr revid: mat@openerp.com-20131015121015-jdwkzv9tjicg2m1u
---
addons/account/partner.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 4914a17dd2b..64896338476 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -116,7 +116,8 @@ class res_partner(osv.osv):
LEFT JOIN account_account a ON (l.account_id=a.id)
WHERE a.type IN ('receivable','payable')
AND l.partner_id IN %s
- AND l.reconcile_id IS NULL
+ AND (l.reconcile_id IS NULL OR
+ reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
AND """ + query + """
GROUP BY l.partner_id, a.type
""",
From 6b20e1baea153d5ce5b184623fb932b2012b0846 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Tue, 15 Oct 2013 15:27:38 +0200
Subject: [PATCH 08/44] [FIX] product: wrong product and supplierinfo demo
data. Because product_id of product.supplierinfo is a product.template field
and not a product.product field
bzr revid: chm@openerp.com-20131015132738-d1l7bb8vbndz5mu5
---
addons/product/product_demo.xml | 480 ++++++++++++++++++++++----------
1 file changed, 336 insertions(+), 144 deletions(-)
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index fead62f8521..bba5d6139ca 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -64,7 +64,7 @@
-
+
On Site Monitoring
20.5
@@ -75,8 +75,12 @@
This type of service include basic monitoring of products.
This type of service include basic monitoring of products.
+
+
+
-
+
+
On Site Assistance
25.5
@@ -86,10 +90,13 @@
This type of service include assistance for security questions, system configuration requirements, implementation or special needs.
+
+
+
-
+
+
PC Assemble SC234
- PCSC234
450.0
300.0
@@ -101,10 +108,14 @@ Processor AMD 8-Core
512MB RAM
HDD SH-1
+
+
+ PCSC234
+
-
+
+
PC Assemble SC349
- PCSC349
500.0
750.0
@@ -117,10 +128,14 @@ Processor Core i5 2.70 Ghz
2GB RAM
HDD SH-1
+
+
+ PCSC349
+
-
+
+
PC Assemble + Custom (PC on Demand)
- PC-DEM
600.0
900.0
@@ -129,10 +144,14 @@ HDD SH-1
Custom computer assembled on order based on customer's requirement.
+
+
+ PC-DEM
+
-
+
+
15” LCD Monitor
- LCD15
800.0
1200.0
@@ -140,9 +159,13 @@ HDD SH-1
-
+
+
+ LCD15
+
+
+
17” LCD Monitor
- LCD17
880.0
1350.0
@@ -150,9 +173,27 @@ HDD SH-1
-
+
+
+ LCD17
+
+
+
USB Keyboard, QWERTY
+
+ 10.0
+ 13.0
+ consu
+
+
+
+
+
KeyQ
+
+
+
+ USB Keyboard, AZERTY
10.0
13.0
@@ -161,18 +202,12 @@ HDD SH-1
- USB Keyboard, AZERTY
+
KeyA
-
- 10.0
- 13.0
- consu
-
-
-
+
+
Mouse, Optical
- M-Opt
12.50
14
@@ -180,9 +215,13 @@ HDD SH-1
-
+
+
+ M-Opt
+
+
+
Mouse, Laser
- M-Las
14
16.50
@@ -190,9 +229,13 @@ HDD SH-1
-
+
+
+ M-Las
+
+
+
Mouse, Wireless
- M-Wir
18
12.50
@@ -200,9 +243,13 @@ HDD SH-1
-
+
+
+ M-Wir
+
+
+
RAM SR5
- RAM-SR5
78.0
85.0
@@ -210,9 +257,13 @@ HDD SH-1
-
+
+
+ RAM-SR5
+
+
+
RAM SR2
- RAM-SR2
87.0
95.0
@@ -220,9 +271,13 @@ HDD SH-1
-
+
+
+ RAM-SR2
+
+
+
RAM SR3
- RAM-SR3
80.0
85.0
@@ -230,9 +285,13 @@ HDD SH-1
-
+
+
+ RAM-SR3
+
+
+
Computer Case
- C-Case
20.0
25.0
@@ -240,9 +299,13 @@ HDD SH-1
-
+
+
+ C-Case
+
+
+
HDD SH-1
- HDD-SH1
860.0
975.0
@@ -250,9 +313,13 @@ HDD SH-1
-
+
+
+ HDD-SH1
+
+
+
HDD SH-2
- HDD-SH2
1020.0
1150.0
@@ -260,9 +327,13 @@ HDD SH-1
-
+
+
+ HDD-SH2
+
+
+
HDD on Demand
- HDD-DEM
1100.0
1250.0
@@ -271,9 +342,13 @@ HDD SH-1
On demand hard-disk having capacity based on requirement.
-
+
+
+ HDD-DEM
+
+
+
Motherboard I9P57
- MBi9
1700.0
1950.0
@@ -281,9 +356,13 @@ HDD SH-1
-
+
+
+ MBi9
+
+
+
Motherboard A20Z7
- MBa20
1790.0
2000.0
@@ -291,9 +370,13 @@ HDD SH-1
-
+
+
+ MBa20
+
+
+
Processor Core i5 2.70 Ghz
- CPUi5
2010.0
2100.0
@@ -301,9 +384,13 @@ HDD SH-1
-
+
+
+ CPUi5
+
+
+
Processor AMD 8-Core
- CPUa8
1910.0
1980.0
@@ -311,9 +398,13 @@ HDD SH-1
-
+
+
+ CPUa8
+
+
+
Graphics Card
- CARD
876.0
885.0
@@ -321,9 +412,13 @@ HDD SH-1
-
+
+
+ CARD
+
+
+
Laptop E5023
- LAP-E5
2870.0
2950.0
@@ -335,9 +430,13 @@ HDD SH-1
Standard-1294P Processor
QWERTY keyboard
-
+
+
+ LAP-E5
+
+
+
Laptop S3450
- LAP-S3
3000.0
3245.0
@@ -349,9 +448,13 @@ QWERTY keyboard
Hi-Speed 234Q Processor
QWERTY keyboard
-
+
+
+ LAP-S3
+
+
+
Laptop Customized
- LAP-CUS
3300.0
3645.0
@@ -360,9 +463,13 @@ QWERTY keyboard
Custom Laptop based on customer's requirement.
-
+
+
+ LAP-CUS
+
+
+
External Hard disk
- EXT-HDD
390.0
405.0
@@ -370,10 +477,14 @@ QWERTY keyboard
+
+
+ EXT-HDD
+
-
+
+
Pen drive, SP-2
- PD-SP2
90.0
100.0
@@ -381,10 +492,14 @@ QWERTY keyboard
+
+
+ PD-SP2
+
-
+
+
Pen drive, SP-4
- PD-SP4
126.0
145.0
@@ -392,9 +507,13 @@ QWERTY keyboard
-
+
+
+ PD-SP4
+
+
+
Multimedia Speakers
- MM-SPK
134.0
150.0
@@ -403,9 +522,13 @@ QWERTY keyboard
.
-
+
+
+ MM-SPK
+
+
+
Headset standard
- HEAD
57.0
62.0
@@ -414,9 +537,13 @@ QWERTY keyboard
Hands free headset for laptop PC with in-line microphone and headphone plug.
-
+
+
+ HEAD
+
+
+
Headset USB
- HEAD-USB
60.0
65.0
@@ -425,10 +552,14 @@ QWERTY keyboard
Headset for laptop PC with USB connector.
+
+
+ HEAD-USB
+
-
+
+
Webcam
- WCAM
38.0
45.0
@@ -436,10 +567,14 @@ QWERTY keyboard
+
+
+ WCAM
+
-
+
+
Blank CD
- CD
18.40
20.0
@@ -447,10 +582,14 @@ QWERTY keyboard
+
+
+ CD
+
-
+
+
Blank DVD-RW
- DVD
21.60
24.0
@@ -458,10 +597,14 @@ QWERTY keyboard
+
+
+ DVD
+
-
+
+
Printer, All-in-one
- PRINT
4258.0
4410.0
@@ -470,10 +613,14 @@ QWERTY keyboard
All in one hi-speed printer with fax and scanner.
+
+
+ PRINT
+
-
+
+
Ink Cartridge
- INK
60.0
65.0
@@ -481,10 +628,14 @@ QWERTY keyboard
+
+
+ INK
+
-
+
+
Toner Cartridge
- TONER
66.0
70.0
@@ -492,10 +643,14 @@ QWERTY keyboard
+
+
+ TONER
+
-
+
+
Windows 7 Professional
- Win7
330.0
470.0
@@ -503,10 +658,14 @@ QWERTY keyboard
+
+
+ Win7
+
-
+
+
Windows Home Server 2011
- WServer
540.0
620.0
@@ -514,10 +673,14 @@ QWERTY keyboard
+
+
+ WServer
+
-
+
+
Office Suite
- OSuite
110.0
170.0
@@ -526,10 +689,14 @@ QWERTY keyboard
Office Editing Software with word processing, spreadsheets, presentations, graphics, and databases...
+
+
+ OSuite
+
-
+
+
Zed+ Antivirus
- Zplus
235.0
280.0
@@ -537,10 +704,14 @@ QWERTY keyboard
+
+
+ Zplus
+
-
+
+
GrapWorks Software
- GRAPs/w
155.0
173.0
@@ -549,10 +720,14 @@ QWERTY keyboard
Full featured image editing software.
+
+
+ GRAPs/w
+
-
+
+
Router R430
- ROUT_430
55.0
60.0
@@ -560,10 +735,14 @@ QWERTY keyboard
+
+
+ ROUT_430
+
-
+
+
Datacard
- DC
35.0
40.0
@@ -571,10 +750,14 @@ QWERTY keyboard
+
+
+ DC
+
-
+
+
Switch, 24 ports
- SW24
55.0
70.0
@@ -582,10 +765,14 @@ QWERTY keyboard
+
+
+ SW24
+
-
+
+
USB Adapter
- ADPT
13.0
18.0
@@ -593,328 +780,333 @@ QWERTY keyboard
+
+
+ ADPT
+
+
-
+
3
1
-
+
3
1
-
+
3
1
-
+
3
1
-
+
2
5
-
+
4
1
-
+
2
1
-
+
2
1
-
+
5
1
-
+
5
1
-
+
5
1
-
+
1
1
-
+
1
1
-
+
3
1
-
+
3
1
-
+
4
5
-
+
3
1
-
+
2
1
-
+
3
1
-
+
3
1
-
+
3
1
-
+
8
1
-
+
8
1
-
+
4
1
-
+
5
1
-
+
2
12
-
+
2
12
-
+
2
5
-
+
2
12
-
+
2
5
-
+
2
1
-
+
2
1
-
+
4
1
-
+
4
1
-
+
5
1
-
+
5
1
-
+
7
1
-
+
7
1
-
+
4
1
-
+
4
0
-
+
5
0
-
+
2
0
-
+
4
0
-
+
10
0
-
+
3
0
-
+
5
0
From afaa1159ad1ee8dda0aee373e0fd64f34380e348 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 15 Oct 2013 16:14:08 +0200
Subject: [PATCH 09/44] [ADD] account: test for added check
bzr revid: mat@openerp.com-20131015141408-rpdp110btoc0wll3
---
addons/account/__openerp__.py | 3 +-
.../account/test/account_fiscalyear_close.yml | 43 +++++++++++++++++--
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 43aaa2f58c1..18277dbb4dd 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -153,12 +153,11 @@ for a particular financial year and for preparation of vouchers there is a modul
'test/account_period_close.yml',
'test/account_use_model.yml',
'test/account_validate_account_move.yml',
- 'test/account_fiscalyear_close.yml',
#'test/account_bank_statement.yml',
#'test/account_cash_statement.yml',
'test/test_edi_invoice.yml',
'test/account_report.yml',
- 'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear
+ 'test/account_fiscalyear_close.yml', #last test, as it will definitively close the demo fiscalyear
],
'installable': True,
'auto_install': False,
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 1c3547ccefd..40d1b1a6a7b 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -17,7 +17,23 @@
fiscalyear_id: account_fiscalyear_fiscalyear0
name: !eval "'OP %s' %(datetime.now().year+1)"
special: 1
-
+-
+ I create a new account invoice a the partner in current fiscalyear
+-
+ !record {model: account.invoice, id: account_invoice_current1}:
+ partner_id: base.res_partner_2
+ invoice_line:
+ - partner_id: base.res_partner_2
+ quantity: 1.0
+ price_unit: 15.00
+ name: Bying stuff
+-
+ I validate it the invoice
+-
+ !python {model: account.invoice}: |
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'account.invoice', ref('account.account_invoice_current1'), 'invoice_open', cr)
-
I made modification in journal so it can move entries
-
@@ -41,9 +57,30 @@
report_name: End of Fiscal Year Entry
-
I clicked on create Button
-
-
!python {model: account.fiscalyear.close}: |
self.data_save(cr, uid, [ref("account_fiscalyear_close_0")], {"lang": 'en_US',
"active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close")],
- "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
\ No newline at end of file
+ "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
+-
+ I close the previous fiscalyear
+-
+ !record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
+ fy_id: data_fiscalyear
+-
+ I clicked on Close States Button to close fiscalyear
+-
+ !python {model: account.fiscalyear.close.state}: |
+ self.data_save(cr, uid, [ref("account_fiscalyear_close_state_0")], {"lang": 'en_US',
+ "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close_state")],
+ "tz": False, "active_id": ref("account.menu_wizard_fy_close_state"), })
+-
+ I check that the fiscalyear state is now "Done"
+-
+ !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
+ - state == 'done'
+-
+ I check that the past accounts are taken into account in partner credit
+-
+ !assert {model: res.partner, id: base.res_partner_2}:
+ - credit == 15.0, "Total Receivable does not takes unreconciled previous moves"
From 345f6739ebc5e5847175a9ab944c695c6b0d2fe3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 15 Oct 2013 16:14:53 +0200
Subject: [PATCH 10/44] [REM] account: unused test (merged with
account_fiscalyear_close.yml)
bzr revid: mat@openerp.com-20131015141453-dbznqlqfo4beglz9
---
.../test/account_fiscalyear_close_state.yml | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 addons/account/test/account_fiscalyear_close_state.yml
diff --git a/addons/account/test/account_fiscalyear_close_state.yml b/addons/account/test/account_fiscalyear_close_state.yml
deleted file mode 100644
index 18c7dd570ed..00000000000
--- a/addons/account/test/account_fiscalyear_close_state.yml
+++ /dev/null
@@ -1,19 +0,0 @@
--
- I run the Close a Fiscalyear wizard to close the demo fiscalyear
--
- !record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
- fy_id: data_fiscalyear
--
- I clicked on Close States Button to close fiscalyear
-
--
- !python {model: account.fiscalyear.close.state}: |
- self.data_save(cr, uid, [ref("account_fiscalyear_close_state_0")], {"lang": 'en_US',
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close_state")],
- "tz": False, "active_id": ref("account.menu_wizard_fy_close_state"), })
--
- I check that the fiscalyear state is now "Done"
--
- !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
- - state == 'done'
-
From ad7c84e43bef39038d78252eaa96551a81b79bf0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 16 Oct 2013 05:14:02 +0000
Subject: [PATCH 11/44] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131016051402-s4et4c32h28r73sg
---
addons/account/i18n/da.po | 18 +-
addons/account/i18n/hr.po | 280 ++++++++++++------
addons/account/i18n/ja.po | 26 +-
addons/account/i18n/nl.po | 10 +-
.../i18n/da.po | 2 +-
addons/account_report_company/i18n/da.po | 2 +-
addons/account_voucher/i18n/ja.po | 20 +-
addons/base_action_rule/i18n/nl.po | 10 +-
addons/base_setup/i18n/da.po | 142 ++++++---
addons/base_status/i18n/da.po | 80 +++++
addons/board/i18n/da.po | 65 ++--
addons/claim_from_delivery/i18n/da.po | 14 +-
addons/mrp/i18n/ja.po | 18 +-
addons/mrp/i18n/nl.po | 10 +-
addons/product_expiry/i18n/nl.po | 14 +-
addons/stock/i18n/ja.po | 32 +-
addons/stock/i18n/nl.po | 8 +-
17 files changed, 494 insertions(+), 257 deletions(-)
create mode 100644 addons/base_status/i18n/da.po
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 65dc15005d8..2c5cecb298d 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-10-14 19:52+0000\n"
+"PO-Revision-Date: 2013-10-15 21:19+0000\n"
"Last-Translator: Morten Schou \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account
@@ -430,7 +430,7 @@ msgstr ""
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
-msgstr ""
+msgstr "Standard Debit konto"
#. module: account
#: view:account.move:0
@@ -684,7 +684,7 @@ msgstr ""
#. module: account
#: field:account.journal,profit_account_id:0
msgid "Profit Account"
-msgstr ""
+msgstr "Indtægts konto"
#. module: account
#: code:addons/account/account_move_line.py:1156
@@ -837,7 +837,7 @@ msgstr ""
#. module: account
#: view:account.account:0
msgid "Account code"
-msgstr ""
+msgstr "Konto kode"
#. module: account
#: selection:account.financial.report,display_detail:0
@@ -953,7 +953,7 @@ msgstr ""
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
-msgstr ""
+msgstr "Konto kode og navn"
#. module: account
#: selection:account.entries.report,month:0
@@ -1184,7 +1184,7 @@ msgstr ""
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
msgid "Account Name."
-msgstr ""
+msgstr "Konto navn"
#. module: account
#: field:account.journal,with_last_closing_balance:0
@@ -1562,7 +1562,7 @@ msgstr ""
#. module: account
#: field:res.partner,property_account_receivable:0
msgid "Account Receivable"
-msgstr ""
+msgstr "Tigodehavende konto"
#. module: account
#: code:addons/account/account.py:612
@@ -2678,7 +2678,7 @@ msgstr ""
#. module: account
#: view:product.category:0
msgid "Account Properties"
-msgstr ""
+msgstr "Konto egenskaber"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 61e240dc6b2..8671838bfee 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-10-14 14:42+0000\n"
-"Last-Translator: Krešimir Jeđud \n"
+"PO-Revision-Date: 2013-10-15 13:59+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: 2013-10-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account
@@ -6527,9 +6527,9 @@ msgid ""
"document shows your debit and credit taking in consideration some criteria "
"you can choose by using the search tool."
msgstr ""
-"From this view, have an analysis of your different financial accounts. The "
-"document shows your debit and credit taking in consideration some criteria "
-"you can choose by using the search tool."
+"Iz ovog pogleda imate analizu vaših različitih financijskih konta. Dokument "
+"pokazuje vaše dugove i potražne stavke uzimajući u obzir neke kriterije "
+"koristeći alat pretrage."
#. module: account
#: help:account.partner.reconcile.process,progress:0
@@ -6537,8 +6537,8 @@ msgid ""
"Shows you the progress made today on the reconciliation process. Given by \n"
"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
msgstr ""
-"Shows you the progress made today on the reconciliation process. Given by \n"
-"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+"Prikazuje vaš današnji napredak u postupku zatvaranja. Daje ih\n"
+"partneri zatvoreni danas\\ (preostali partneri + partneri zatvoreni danas)"
#. module: account
#: field:account.invoice,period_id:0
@@ -6565,6 +6565,16 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Klikni za dodavanje konta.\n"
+"
\n"
+" Konto je dio glavne knjige i dozvoljava vašoj kompaniji\n"
+" evidenciju svih rsta dugovnih i potražnih transakcija.\n"
+" Kompanije podnose svoja godišnje izvješće po kontima u\n"
+" dva glavna dijela: bilanca stanja i račun dobiti i gubitka.\n"
+" Godišnje izvješće je zakonska obveza.\n"
+"
\n"
+" "
#. module: account
#: view:account.invoice.report:0
@@ -6600,7 +6610,7 @@ msgstr "Filtriraj po"
#: code:addons/account/account.py:2334
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Imate pogrešan izraz \"%(...)s\" u vašem modelu !"
#. module: account
#: view:account.tax.template:0
@@ -6610,7 +6620,7 @@ msgstr "Kod za izračun cijena sa uključenim porezima"
#. module: account
#: help:account.bank.statement,balance_end:0
msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "Saldo se računa na bazi početnog stanja i transakcija."
#. module: account
#: field:account.journal,loss_account_id:0
@@ -6638,6 +6648,11 @@ msgid ""
"created by the system on document validation (invoices, bank statements...) "
"and will be created in 'Posted' status."
msgstr ""
+"Ručno kreirane temeljnice su obično u statusu 'neknjižen', ali možete "
+"postaviti opciju da preskače taj status na povezanom dnevniku. U tom "
+"slučaju, ponašati će se kao temeljnice koje sistem kreira automatski na "
+"potvrdi dokumenata (računi, izvodi ...) i biti će kreirane u statusu "
+"'knjiženo'."
#. module: account
#: field:account.payment.term.line,days:0
@@ -6651,6 +6666,8 @@ msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"."
msgstr ""
+"Ne možete knjižiti ovu temeljnicu jer konto \"%s\" ne pripada kontnom planu "
+"\"%s\"."
#. module: account
#: view:account.financial.report:0
@@ -6689,12 +6706,12 @@ msgstr "Odobrenja kupcima"
#. module: account
#: field:account.account,foreign_balance:0
msgid "Foreign Balance"
-msgstr ""
+msgstr "Inozemni saldo"
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
-msgstr "Naziv dnevnika-razdoblja"
+msgstr "Naziv dnevnik-period"
#. module: account
#: field:account.invoice.tax,factor_base:0
@@ -6714,7 +6731,7 @@ msgstr "Dozvoljava korištenje više valuta"
#. module: account
#: view:account.subscription:0
msgid "Running Subscription"
-msgstr ""
+msgstr "Pretplata u toku"
#. module: account
#: report:account.invoice:0
@@ -6739,6 +6756,8 @@ msgid ""
"This journal will be created automatically for this bank account when you "
"save the record"
msgstr ""
+"Ovaj dnevnik će biti kreiran automatski za ovaj bankovni račun kada snimite "
+"zapis."
#. module: account
#: view:account.analytic.line:0
@@ -6773,7 +6792,7 @@ msgstr ""
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
-msgstr "Korijensko konto"
+msgstr "Osnovni konto"
#. module: account
#: view:account.analytic.line:0
@@ -6793,6 +6812,8 @@ msgid ""
"You cannot cancel an invoice which is partially paid. You need to "
"unreconcile related payment entries first."
msgstr ""
+"Ne možete otkazati račun koji je djelomićno plaćen. Morate prvo razvezati "
+"stavke zatvaranja."
#. module: account
#: field:product.template,taxes_id:0
@@ -6827,6 +6848,15 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Kliknite za unos odobrenja dobavljača.\n"
+"
\n"
+" Umjesto ručnog kreiranja odobrenja dobavljača, možete "
+"generirati \n"
+" odobrenja i zatvarati ih direktno iz povezanog ulaznog "
+"računa.\n"
+"
\n"
+" "
#. module: account
#: field:account.tax,type:0
@@ -6849,6 +6879,9 @@ msgid ""
"choice assumes that the set of tax defined for the chosen template is "
"complete"
msgstr ""
+"Odaberite da li želite predložiti korisniku da unosi prodajni i nabavni "
+"porez ili koristi uobičajena više na jedan polja. Zadnji izbor pretpostavlja "
+"da je set poreza definiran u odabranom predlošku potpun."
#. module: account
#: report:account.vat.declaration:0
@@ -6868,12 +6901,12 @@ msgstr "Otvoreni i plaćeni računi"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children flat"
-msgstr ""
+msgstr "Prikaži podređene bez grupiranja"
#. module: account
#: view:account.config.settings:0
msgid "Bank & Cash"
-msgstr "Banka i Gotovina"
+msgstr "Banka i gotovina"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6956,13 +6989,14 @@ msgstr "Potraživanja"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Ne možete kreirati stavke dnevnika na zatvorenom kontu."
#. module: account
#: code:addons/account/account_invoice.py:633
#, python-format
msgid "Invoice line account's company and invoice's compnay does not match."
msgstr ""
+"Kompanija iz stavke temeljnice i kompanija iz računa se ne poklapaju."
#. module: account
#: view:account.invoice:0
@@ -6977,7 +7011,7 @@ msgstr "Zadani konto potražuje"
#. module: account
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
-msgstr "The related account currency if not equal to the company one."
+msgstr "Povezani konto valute ako nije jednak onom od kompanije."
#. module: account
#: code:addons/account/installer.py:69
@@ -7005,7 +7039,7 @@ msgstr "Konto internog prijenosa"
#: code:addons/account/wizard/pos_box.py:32
#, python-format
msgid "Please check that the field 'Journal' is set on the Bank Statement"
-msgstr ""
+msgstr "Molimo provjerite da je polje 'dnevnik' postavljeno na izvodu"
#. module: account
#: selection:account.tax,type:0
@@ -7015,7 +7049,7 @@ msgstr "Postotak"
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
msgid "Round globally"
-msgstr "Zaokruži Globalno"
+msgstr "Zaokruži"
#. module: account
#: selection:account.report.general.ledger,sortby:0
@@ -7031,12 +7065,12 @@ msgstr "Eksponent"
#: code:addons/account/account.py:3465
#, python-format
msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Nije moguće generirati nekorištenu šifru dnevnika."
#. module: account
#: view:account.invoice:0
msgid "force period"
-msgstr ""
+msgstr "Prisili period"
#. module: account
#: view:project.account.analytic.line:0
@@ -7060,12 +7094,12 @@ msgid ""
"Indicates if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
-"Iznos poreza treba uključiti u osnovicu prilikom izračuna slijedećih poreza."
+"Iznos poreza treba uključiti u osnovicu prilikom izračuna sljedećih poreza."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
msgid "Reconciliation: Go to Next Partner"
-msgstr "Zatvaranje: Idi na slijedećeg partnera"
+msgstr "Zatvaranje: Idi na sljedećeg partnera"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -7087,6 +7121,10 @@ msgid ""
"due date, make sure that the payment term is not set on the invoice. If you "
"keep the payment term and the due date empty, it means direct payment."
msgstr ""
+"Ako koristiti uvjete plaćanja, datum dospijeća će biti automatski izračunat "
+"u trenutku nastanka knjiženja. Uvjeti plaćanja mogu računati nekoliko datuma "
+"dospijeća, npr. 50% odmah i 50% za mjesec dana, ali ako želite prisiliti "
+"datum dopsijeća, osigurajte da uvjet plaćanja nije postavljen na računu."
#. module: account
#: code:addons/account/account.py:414
@@ -7095,8 +7133,8 @@ msgid ""
"There is no opening/closing period defined, please create one to set the "
"initial balance."
msgstr ""
-"Nema početnog/završnog stanja definiranog. Molimo napravite jedna za početni "
-"saldo."
+"Nije definiran period početnog/završnog stanja. Molimo napravite jedan da bi "
+"postavili početni saldo."
#. module: account
#: help:account.tax.template,sequence:0
@@ -7105,10 +7143,9 @@ msgid ""
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
-"Sekvenciono polje se koristi da bi se poredjali porezi od najmanjeg do "
-"najveceg. Ovaj poredak je vazan, narocito ukoliko imate poreze koji, opet "
-"imaju nekoliko podredjenih poreza. U tom slucaju, ovaj evaluacioni poredak "
-"je vazan."
+"Sekvenciono polje se koristi da bi poredali stavke poreza od najmanjeg do "
+"najvećeg. Ovaj poredak je važan ukoliko imate poreze koji, imaju nekoliko "
+"podređenih poreza. U tom slučaju, važaj je slijed evaluacije poreza."
#. module: account
#: code:addons/account/account.py:1448
@@ -7173,10 +7210,10 @@ msgid ""
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
-"From this view, have an analysis of your different analytic entries "
-"following the analytic account you defined matching your business need. Use "
-"the tool search to analyse information about analytic entries generated in "
-"the system."
+"Iz ovog pogleda imate analizu vaših različitih analičkih unosa prateći "
+"analitički konto koji ste definirali prema vašim poslovnim potrebama. "
+"Koristite alat pretraživanja za analizu informacija o analitičkim unosima "
+"generiranim u sustavu."
#. module: account
#: sql_constraint:account.journal:0
@@ -7195,6 +7232,7 @@ msgid ""
"You cannot change the owner company of an account that already contains "
"journal items."
msgstr ""
+"Ne možete mijenjati kompaniju vlasnika na kontu koji već sadrži temeljnice."
#. module: account
#: report:account.invoice:0
@@ -7332,6 +7370,8 @@ msgid ""
"If you unreconcile transactions, you must also verify all the actions that "
"are linked to those transactions because they will not be disabled"
msgstr ""
+"Ako razvežete transakcije, morate također verificcirati sve akcije povezane "
+"sa tim transakcijama jer one neće biti onemogućene."
#. module: account
#: view:account.account.template:0
@@ -7353,7 +7393,7 @@ msgstr "Statistike analitike"
#: code:addons/account/account_move_line.py:955
#, python-format
msgid "Entries: "
-msgstr "Stavke: "
+msgstr "Temeljnice: "
#. module: account
#: help:res.partner.bank,currency_id:0
@@ -7366,6 +7406,7 @@ msgid ""
"You cannot provide a secondary currency if it is the same than the company "
"one."
msgstr ""
+"Ne možete odrediti sekundarnu valutu ako je ista kao i valuta kompanije."
#. module: account
#: selection:account.tax.template,applicable_type:0
@@ -7377,12 +7418,12 @@ msgstr "Točno"
#: code:addons/account/account.py:190
#, python-format
msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Bilanca stanja (konto aktive)"
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
msgid "State is draft"
-msgstr "Stanje je 'Nacrt'"
+msgstr "Stanje je 'nacrt'"
#. module: account
#: view:account.move.line:0
@@ -7397,7 +7438,7 @@ msgstr "Sljedeća stavka za zatvaranje"
#. module: account
#: report:account.invoice:0
msgid "Fax :"
-msgstr "Fax:"
+msgstr "Faks:"
#. module: account
#: help:res.partner,property_account_receivable:0
@@ -7453,7 +7494,7 @@ msgstr "Otkaži unose zatvaranja fiskalne godine"
#: code:addons/account/account.py:189
#, python-format
msgid "Profit & Loss (Expense account)"
-msgstr "Dobit i gubitak (konto troška)"
+msgstr "RDG (konto troška)"
#. module: account
#: field:account.bank.statement,total_entry_encoding:0
@@ -7481,7 +7522,7 @@ msgstr "Stil financijskog izvješća"
#. module: account
#: selection:account.financial.report,sign:0
msgid "Preserve balance sign"
-msgstr ""
+msgstr "Zadrži predznak"
#. module: account
#: view:account.vat.declaration:0
@@ -7508,7 +7549,7 @@ msgstr "Ručno"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: create refund and reconcile"
-msgstr "Otkaži : kreiraj povrat i zatvori."
+msgstr "Otkaži : kreiraj povrat i zatvori"
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7544,6 +7585,9 @@ msgid ""
"row to display the amount of debit/credit/balance that precedes the filter "
"you've set."
msgstr ""
+"Ako ste odabrali filter po datumu ili periodu, ovo polje će vam omogućiti da "
+"dodate redak za prikaz iznosa duguje/potražuje/saldo koje prethodi filteru "
+"koji ste postavili."
#. module: account
#: view:account.bank.statement:0
@@ -7552,7 +7596,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 "Stavke"
+msgstr "Temeljnice"
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:147
@@ -7598,7 +7642,7 @@ msgstr "Da"
#: code:addons/account/report/common_report_header.py:67
#, python-format
msgid "All Entries"
-msgstr "Sve stavke"
+msgstr "Sve temeljnice"
#. module: account
#: constraint:account.move.reconcile:0
@@ -7693,6 +7737,8 @@ msgid ""
"Configuration error!\n"
"The currency chosen should be shared by the default accounts too."
msgstr ""
+"Greška konfiguracije!\n"
+"Odabranu valutu je potrebno dijeliti i kod predodređenih konta."
#. module: account
#: code:addons/account/account.py:2304
@@ -7787,6 +7833,9 @@ msgid ""
"Make sure you have configured payment terms properly.\n"
"The latest payment term line should be of the \"Balance\" type."
msgstr ""
+"Ne možete potvrditi unos koji nije u ravnoteži.\n"
+"Provjerite da li ste podesili uvjete plaćanja kako treba.\n"
+"Zadnja linija načina plaćanja mora biti tip \"saldo\"."
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@@ -7857,12 +7906,12 @@ msgstr "Porezi:"
msgid "For taxes of type percentage, enter % ratio between 0-1."
msgstr ""
"Za poreze koji se računaju putem postotka upišite vrijednost između 0 i 1. "
-"Npr. 0,23 za 23%."
+"Npr. 0,25 za 25%."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
msgid "Financial Reports Hierarchy"
-msgstr "Hijerarhijski Financijski izvještaji"
+msgstr "Hijerarhija financijskog izvještaja"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7899,7 +7948,7 @@ msgstr "Sigurno želite otvoriti ovaj račun?"
#. module: account
#: field:account.chart.template,property_account_expense_opening:0
msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Konto troška početnog stanja"
#. module: account
#: view:account.invoice:0
@@ -7920,7 +7969,7 @@ msgstr "Cijena"
#: view:account.bank.statement:0
#: field:account.bank.statement,closing_details_ids:0
msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Zatvaranje stavaka blagajne"
#. module: account
#: view:account.bank.statement:0
@@ -7938,7 +7987,7 @@ msgstr "Uobičajeni konto za dugovni iznos"
#. module: account
#: view:account.entries.report:0
msgid "Posted entries"
-msgstr ""
+msgstr "Knjižene temeljnice"
#. module: account
#: help:account.payment.term.line,value_amount:0
@@ -7988,7 +8037,7 @@ msgstr "U redu"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
-msgstr "Korijenska porezna grupa"
+msgstr "Šifra glavnog konta"
#. module: account
#: help:account.journal,centralisation:0
@@ -8019,7 +8068,7 @@ msgstr "Uobičajen porez nabave"
#. module: account
#: field:account.chart.template,property_account_income_opening:0
msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Konto prihoda za početno stanje"
#. module: account
#: field:account.config.settings,group_proforma_invoices:0
@@ -8060,12 +8109,12 @@ msgstr "Stvori stavke"
#. module: account
#: model:ir.model,name:account.model_cash_box_out
msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
#. module: account
#: help:account.config.settings,currency_id:0
msgid "Main currency of the company."
-msgstr "Glavna valuta Tvrtke"
+msgstr "Glavna valuta kompanije"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8124,8 +8173,8 @@ msgid ""
"the system to go through the reconciliation process, based on the latest day "
"it have been reconciled."
msgstr ""
-"Pokazuje slijedećeg partnera u procesu zatvaranja IOS-a, a prema zadnjem "
-"danu zatvaranja IOS-a."
+"Pokazuje sljedećeg partnera u procesu zatvaranja IOS-a, a prema zadnjem danu "
+"zatvaranja IOS-a."
#. module: account
#: field:account.move.line.reconcile.writeoff,comment:0
@@ -8213,20 +8262,20 @@ msgstr "Izvorni/Pogled"
#: code:addons/account/account.py:3206
#, python-format
msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
msgid "PRO-FORMA"
-msgstr "Pro-forma"
+msgstr "Predračun"
#. module: account
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
-msgstr "Neuravnotežen"
+msgstr "Nije u ravnoteži"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -8309,6 +8358,11 @@ msgid ""
"few new accounts (You don't need to define the whole structure that is "
"common to both several times)."
msgstr ""
+"Ova opcionalno polje vam omogućava da povežete predložak konta na određeni "
+"predložak kontnog plana koji se mogu razlikovati od onog kojem njegov "
+"nadređeni pripada. To vam omogućava da definirate predloške koji proširuju "
+"druge i upotpunjuju ih sa par novih konta (ne morate definirati cijelu "
+"strukturu koja je zajednička za oba nekoliko puta)."
#. module: account
#: view:account.move:0
@@ -8463,6 +8517,8 @@ msgid ""
"Refund base on this type. You can not Modify and Cancel if the invoice is "
"already reconciled"
msgstr ""
+"Povrat baziran na ovom tipu. Ne možete mijenjati i otkazati ako je račun već "
+"zatvoren."
#. module: account
#: field:account.bank.statement.line,sequence:0
@@ -8485,7 +8541,7 @@ msgstr "Paypal račun"
#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
-msgstr "Broj unosa u dnevnik"
+msgstr "Broj temeljnice"
#. module: account
#: view:account.financial.report:0
@@ -8499,11 +8555,13 @@ msgid ""
"Error!\n"
"You cannot create recursive accounts."
msgstr ""
+"Greška!\n"
+"Ne možete kreirati rekurzivna konta."
#. module: account
#: model:ir.model,name:account.model_cash_box_in
msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
#. module: account
#: help:account.invoice,move_id:0
@@ -8513,7 +8571,7 @@ msgstr "Poveznica na automatski kreirane stavke knjiženja"
#. module: account
#: model:ir.model,name:account.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: account
#: selection:account.config.settings,period:0
@@ -8650,7 +8708,7 @@ msgstr "Stanje stavke"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile
msgid "Account move line reconcile"
-msgstr ""
+msgstr "Zatvaranje stavke temeljnice"
#. module: account
#: view:account.subscription.generate:0
@@ -8710,8 +8768,7 @@ msgid ""
"Select Fiscal Year which you want to remove entries for its End of year "
"entries journal"
msgstr ""
-"Select Fiscal Year which you want to remove entries for its End of year "
-"entries journal"
+"Odaberi fiskalnu godinu za koju želite ukoliniti temeljnice za kraj godine."
#. module: account
#: field:account.tax.template,type_tax_use:0
@@ -8760,7 +8817,7 @@ msgstr "Uvjeti plaćanja za partnera"
#: help:account.move.reconcile,opening_reconciliation:0
msgid ""
"Is this reconciliation produced by the opening of a new fiscal year ?."
-msgstr ""
+msgstr "Da li je ovo zatvaranje pooizvod otvaranja nove fiskalne godine ?"
#. module: account
#: view:account.analytic.line:0
@@ -8793,7 +8850,7 @@ msgstr "Uk. ostatak"
#. module: account
#: view:account.bank.statement:0
msgid "Opening Cash Control"
-msgstr "Kontrola blagajne - Otvaranje"
+msgstr "Kontrola početnog stanja blagajne"
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
@@ -8833,12 +8890,12 @@ msgstr "Knjiga troškova"
#. module: account
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
-msgstr "Nema definirane fiskalne godine za ovu Organizaciju"
+msgstr "Nema definirane fiskalne godine za ovu kompaniju"
#. module: account
#: view:account.invoice:0
msgid "Proforma"
-msgstr "Proforma"
+msgstr "Predračun"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -8873,7 +8930,7 @@ msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Current Accounts"
-msgstr ""
+msgstr "Trenutna konta"
#. module: account
#: view:account.invoice.report:0
@@ -8892,6 +8949,9 @@ msgid ""
"recalls.\n"
" This installs the module account_followup."
msgstr ""
+"Ovo omogućuje automatizaciju dopisa za neplaćene račune, sa opozivima na "
+"više razina.\n"
+" Instalira modul account_followup."
#. module: account
#: field:account.automatic.reconcile,period_id:0
@@ -8924,7 +8984,7 @@ msgid ""
"Total amount (in Company currency) for transactions held in secondary "
"currency for this account."
msgstr ""
-"Ukupni iznos (u valuti Organizacije) za transakcije izvršene u sekundarnoj "
+"Ukupni iznos (u valuti kompanije) za transakcije izvršene u sekundarnoj "
"valuti za ovaj konto."
#. module: account
@@ -9038,7 +9098,7 @@ msgstr "Završni saldo"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Centralizirana protustavka"
#. module: account
#: help:account.move.line,blocked:0
@@ -9058,7 +9118,7 @@ msgstr "Djelomično zatvaranje"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Obrnuti saldo analitičkog konta"
#. module: account
#: model:ir.model,name:account.model_account_common_report
@@ -9091,7 +9151,7 @@ msgstr "Automatski uvoz bankovnih izvoda"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
msgid "Move bank reconcile"
-msgstr ""
+msgstr "Zatvaranje bankovne temeljnice"
#. module: account
#: view:account.config.settings:0
@@ -9117,6 +9177,8 @@ msgid ""
"You cannot use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal."
msgstr ""
+"Ne možete koristiti ovaj opći konto u ovom dnevniku. Provjerite tab 'kontola "
+"unosa' na povezanom dnevniku."
#. module: account
#: field:account.account.type,report_type:0
@@ -9152,6 +9214,12 @@ msgid ""
"You should press this button to re-open it and let it continue its normal "
"process after having resolved the eventual exceptions it may have created."
msgstr ""
+"Ovaj se gumb pojavljuje samo kada je stanje računa 'plaćeno' (pokazujući da "
+"je u potpunosti zatvoreno) i opcija automatskog izračuna 'zatvaranja' je "
+"ugašena (opisujući da to više nije slučaj). Drugim riječima, račun je "
+"razvezan i ne odgovara više stanju 'plaćen'. Trebali bi pritisnuti ovaj gumb "
+"da bi ga ponovo otvorili i pustiti da nastavi sa normalnim procesom nakon "
+"što se razriješe eventualne iznimke koje bi mogle nastati."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9211,6 +9279,7 @@ msgstr "Filtriraj po"
msgid ""
"In order to close a period, you must first post related journal entries."
msgstr ""
+"Da bi zatvorili period, morate prvo proknjižiti temeljnice iz tog perioda."
#. module: account
#: view:account.entries.report:0
@@ -9246,7 +9315,7 @@ msgstr "Redak uvjeta plaćanja"
#: code:addons/account/account.py:3194
#, python-format
msgid "Purchase Journal"
-msgstr "Dnevnik URA"
+msgstr "Dnevnik ulaznik računa"
#. module: account
#: field:account.invoice,amount_untaxed:0
@@ -9286,7 +9355,7 @@ msgstr "Dozvoljene vrste konta (prazno za bez kontrole)"
#. module: account
#: view:account.payment.term:0
msgid "Payment term explanation for the customer..."
-msgstr ""
+msgstr "Opis uvjeta plaćanja za kupca..."
#. module: account
#: help:account.move.line,amount_residual:0
@@ -9313,6 +9382,9 @@ msgid ""
"computed. Because it is space consuming, we do not allow to use it while "
"doing a comparison."
msgstr ""
+"Ova vam opcija omogućava da dobijete više detalja o načinu na koji se vaša "
+"salda računaju. Pošto zauzima dosta prostora, ne dozvoljavamo njihovo "
+"korištenje kod usporedbi."
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close
@@ -9329,6 +9401,8 @@ msgstr "Šifra konta mora biti jedinstvena za jednu organizaciju !"
#: help:product.template,property_account_expense:0
msgid "This account will be used to value outgoing stock using cost price."
msgstr ""
+"Ovaj modul će se koristiti za vrednovanje izlaznog skladišnog prometa "
+"koristeći nabavnu cijenu."
#. module: account
#: view:account.invoice:0
@@ -9444,6 +9518,8 @@ msgid ""
"This allows you to check writing and printing.\n"
" This installs the module account_check_writing."
msgstr ""
+"Ovo omogućava provjenu pisanja i printanja.\n"
+" Instalira modul account_check_writing."
#. module: account
#: model:res.groups,name:account.group_account_invoice
@@ -9480,7 +9556,7 @@ msgstr "Iznos u drugoj valuti ."
#: code:addons/account/account_move_line.py:1006
#, python-format
msgid "The account move (%s) for centralisation has been confirmed."
-msgstr ""
+msgstr "Temeljnica (%s) za centralizaciju je potvrđena."
#. module: account
#: report:account.analytic.account.journal:0
@@ -9524,7 +9600,7 @@ msgstr ""
#: help:account.bank.statement.line,sequence:0
msgid ""
"Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "Daje redoslijed kod prikaza liste stavaka izvoda."
#. module: account
#: model:process.transition,note:account.process_transition_validentries0
@@ -9567,6 +9643,9 @@ msgid ""
"some non legal fields or you must unreconcile first.\n"
"%s."
msgstr ""
+"Ne možete vršiti ovu modifikaciju na zatvorenoj stavci. Možete samo "
+"mijenjati neka nevažna polja ili morate razvezati stavke.\n"
+"%s."
#. module: account
#: help:account.financial.report,sign:0
@@ -9577,6 +9656,11 @@ msgid ""
"accounts that are typically more credited than debited and that you would "
"like to print as positive amounts in your reports; e.g.: Income account."
msgstr ""
+"Za konta koja su tipično više dugovna nego potražna i koja bi željeli "
+"ispisati kao negativne iznose u vašim izvještajima, trebate obrnuti predznak "
+"salda; npr. konta troška. Isto se odnosi na konta koja su tipično više "
+"potražna nego dugovna i koja bi htjeli da ispisuje kao pozitivne iznose u "
+"vašim izvještajima; npr. konta prihoda."
#. module: account
#: field:res.partner,contract_ids:0
@@ -9608,7 +9692,7 @@ msgstr "Nacrti računa se provjeravaju, potvrđuju i ispisuju."
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
-msgstr "Pratitelj"
+msgstr "Je pratitelj"
#. module: account
#: view:account.move:0
@@ -9624,6 +9708,9 @@ msgid ""
"You cannot select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
msgstr ""
+"Greška konfiguracije!\n"
+"Ne možete odabrati tip konta sa metodom odgode različitom od \"nezatvoreno\" "
+"za konta sa internim tipom \"obveze/potraživanja\"."
#. module: account
#: field:account.config.settings,has_fiscal_year:0
@@ -9676,7 +9763,7 @@ msgstr "Otvori dnevnik"
#. module: account
#: report:account.analytic.account.journal:0
msgid "KI"
-msgstr ""
+msgstr "KI"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -9688,7 +9775,7 @@ msgstr "Od perioda"
#. module: account
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
-msgstr "Jedinica Valute"
+msgstr "Jedinica valute"
#. module: account
#: code:addons/account/account.py:3195
@@ -9724,12 +9811,12 @@ msgstr "Registrirana plaćanja"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Fiskalne godine i periodi u stanju zatvoreno"
#. module: account
#: field:account.config.settings,purchase_refund_journal_id:0
msgid "Purchase refund journal"
-msgstr ""
+msgstr "Dnevnik povrata dobavljaču"
#. module: account
#: view:account.analytic.line:0
@@ -9758,7 +9845,7 @@ msgstr "Konfiguracija računovodstvenih podataka"
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
msgid "Purchase Tax(%)"
-msgstr "Porez nabave(%)"
+msgstr "Pretporez(%)"
#. module: account
#: code:addons/account/account_invoice.py:901
@@ -9773,6 +9860,8 @@ msgid ""
"Please check that the field 'Internal Transfers Account' is set on the "
"payment method '%s'."
msgstr ""
+"Molimo provjerite da li je polje 'Konto internih prijenosa' postavljen na "
+"načinu plaćanja '%s'."
#. module: account
#: field:account.vat.declaration,display_detail:0
@@ -9798,7 +9887,7 @@ msgstr ""
#: view:account.analytic.line:0
#: view:analytic.entries.report:0
msgid "My Entries"
-msgstr "Moje stavke"
+msgstr "Moje temeljnice"
#. module: account
#: help:account.invoice,state:0
@@ -9838,7 +9927,7 @@ msgstr "Financijska izvješća"
#. module: account
#: model:account.account.type,name:account.account_type_liability_view1
msgid "Liability View"
-msgstr ""
+msgstr "Pogled obveza"
#. module: account
#: report:account.account.balance:0
@@ -9916,7 +10005,7 @@ msgstr "Konta potraživanja"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Sekvenca odobrenja dobavljača"
#. module: account
#: code:addons/account/wizard/account_state_open.py:37
@@ -9934,6 +10023,12 @@ msgid ""
"payments.\n"
" This installs the module account_payment."
msgstr ""
+"Omogućuje da kreirate i upravljate vašim nalozima za plaćanje, sa svrhom\n"
+" * da služi kao baza ua jednostavno ukopčavanje raznih "
+"automatiziranih mehanizama plaćanja\n"
+" * i da osigura efikasniji način za upravljanje plaćanjem "
+"računa.\n"
+" Instalira modul account_payment."
#. module: account
#: xsl:account.transfer:0
@@ -9951,7 +10046,7 @@ msgstr "Konto potraživanja"
#: code:addons/account/account_move_line.py:824
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
-msgstr ""
+msgstr "Kompanija treba biti ista za sve stavke zatvaranja."
#. module: account
#: field:account.account,balance:0
@@ -10017,13 +10112,13 @@ msgstr "Legenda"
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Temeljnice su prvi unos zatvaranja."
#. module: account
#: code:addons/account/account_cash_statement.py:301
#, python-format
msgid "There is no %s Account on the journal %s."
-msgstr ""
+msgstr "Nema %s konta na dnevniku %s."
#. module: account
#: report:account.third_party_ledger:0
@@ -10069,7 +10164,7 @@ msgstr "Datum / Period"
#. module: account
#: report:account.central.journal:0
msgid "A/C No."
-msgstr ""
+msgstr "A/C Br."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -10084,13 +10179,13 @@ msgid ""
"dates are not matching the scope of the fiscal year."
msgstr ""
"Greška!\n"
-"Period je neisprqavan. Ili se neki periodi preklapaju, ili datumi perioda ne "
+"Period je neispravan. Ili se neki periodi preklapaju, ili datumi perioda ne "
"odgovaraju rasponu fiskalne godine."
#. module: account
#: report:account.overdue:0
msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Nema dospijelih stavaka kod ovog kupca."
#. module: account
#: help:account.tax,account_paid_id:0
@@ -10098,12 +10193,15 @@ msgid ""
"Set the account that will be set by default on invoice tax lines for "
"refunds. Leave empty to use the expense account."
msgstr ""
+"Postavite konto koji će se koristiti kao predodređeni na stavkama poreza kod "
+"računa za povrat. Ostavite prazno za konto troška."
#. module: account
#: help:account.addtmpl.wizard,cparent_id:0
msgid ""
"Creates an account with the selected template under this existing parent."
msgstr ""
+"Kreira konto s odabranim predloškom pod postojećim nadređenim kontom."
#. module: account
#: report:account.invoice:0
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 81fb7f668dc..7d30c2b0b29 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-09-27 06:15+0000\n"
+"PO-Revision-Date: 2013-10-15 07:56+0000\n"
"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-28 05:53+0000\n"
-"X-Generator: Launchpad (build 16774)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -406,7 +406,7 @@ msgstr "請求書取消"
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
-msgstr "仕入返金"
+msgstr "購買返金"
#. module: account
#: selection:account.journal,type:0
@@ -782,7 +782,7 @@ msgstr ""
#. module: account
#: view:account.invoice.refund:0
msgid "Create Refund"
-msgstr ""
+msgstr "返金を作成"
#. module: account
#: constraint:account.move.line:0
@@ -1087,7 +1087,7 @@ msgstr "仕訳帳の一元化"
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
-msgstr "売上返金"
+msgstr "販売返金"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1218,7 +1218,7 @@ msgstr "これらのタイプはあなたの国に従って定義されていま
#. module: account
#: view:account.invoice:0
msgid "Refund "
-msgstr ""
+msgstr "返金 "
#. module: account
#: help:account.config.settings,company_footer:0
@@ -1245,7 +1245,7 @@ msgstr "キャッシュレジスタ"
#. module: account
#: field:account.config.settings,sale_refund_journal_id:0
msgid "Sale refund journal"
-msgstr ""
+msgstr "販売返金ジャーナル"
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1281,7 +1281,7 @@ msgstr "期首日"
#. module: account
#: view:account.tax:0
msgid "Refunds"
-msgstr ""
+msgstr "返金"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -2681,7 +2681,7 @@ msgstr ""
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft refund"
-msgstr ""
+msgstr "ドラフト返金を作成"
#. module: account
#: view:account.partner.reconcile.process:0
@@ -5796,7 +5796,7 @@ msgstr "年度エントリー仕訳帳の末尾"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund "
-msgstr ""
+msgstr "ドラフト返金 "
#. module: account
#: view:cash.box.in:0
@@ -5969,7 +5969,7 @@ msgstr "会計ポジションテンプレート"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund"
-msgstr ""
+msgstr "ドラフト返金"
#. module: account
#: view:account.analytic.chart:0
@@ -7353,7 +7353,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,module_account_voucher:0
msgid "Manage customer payments"
-msgstr ""
+msgstr "顧客入金を管理"
#. module: account
#: help:report.invoice.created,origin:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index fe3905d726e..ab441d81001 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-08-24 15:09+0000\n"
-"Last-Translator: Stefan Rijnhart (Therp) \n"
+"PO-Revision-Date: 2013-10-15 13:35+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-08-25 05:19+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4036,7 +4036,7 @@ msgid ""
"centralized counterpart box in the related journal from the configuration "
"menu."
msgstr ""
-"Het is niet mogelijk een factuur aan te maken op ene centrale tegenrekening. "
+"Het is niet mogelijk een factuur aan te maken op een centrale tegenrekening. "
"Vink de optie 'centrale tegenrekening' uit bij de instellingen van het "
"bijbehorende dagboek."
diff --git a/addons/account_bank_statement_extensions/i18n/da.po b/addons/account_bank_statement_extensions/i18n/da.po
index f9581e14ee9..35f57e9d614 100644
--- a/addons/account_bank_statement_extensions/i18n/da.po
+++ b/addons/account_bank_statement_extensions/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account_bank_statement_extensions
diff --git a/addons/account_report_company/i18n/da.po b/addons/account_report_company/i18n/da.po
index 90162e8af85..5432fd8391f 100644
--- a/addons/account_report_company/i18n/da.po
+++ b/addons/account_report_company/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:14+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account_report_company
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 38c09f84b13..388e4a7311d 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-15 08:09+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:49+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
msgid "Reconciliation"
-msgstr ""
+msgstr "消込"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_config_settings
@@ -158,7 +158,7 @@ msgstr "検証"
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
msgid "Supplier Payments"
-msgstr ""
+msgstr "仕入先支払"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -226,7 +226,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
msgid "Purchase Receipts"
-msgstr ""
+msgstr "購買領収書"
#. module: account_voucher
#: field:account.voucher.line,move_line_id:0
@@ -791,7 +791,7 @@ msgstr "支払済"
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
msgid "Sales Receipts"
-msgstr ""
+msgstr "販売領収書"
#. module: account_voucher
#: field:account.voucher,message_is_follower:0
@@ -889,14 +889,14 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
msgid "Customer Payments"
-msgstr ""
+msgstr "顧客入金"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
#: view:sale.receipt.report:0
msgid "Sales Receipts Analysis"
-msgstr ""
+msgstr "販売領収分析"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index f7bd65ce53a..14be315f4a8 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-08 09:49+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-15 13:33+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-07-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
@@ -80,7 +80,7 @@ msgid ""
"delay before thetrigger date, like sending a reminder 15 minutes before a "
"meeting."
msgstr ""
-"Vertraging na de aanroep datum. U kunt ene negatieve waarde invoeren, indien "
+"Vertraging na de aanroep datum. U kunt een negatieve waarde invoeren, indien "
"u een actie wilt uitvoeren voor de aanroepdatum, bijvoorbeeld een "
"herinnering, 15 minuten voor een afspraak."
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index a1674088c67..3020255c99d 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-15 20:13+0000\n"
+"Last-Translator: Morten Schou \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Emails Integration"
-msgstr ""
+msgstr "Email integration"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Guest"
-msgstr ""
+msgstr "Gæst"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Contacts"
-msgstr ""
+msgstr "Adressebog"
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_config_settings
@@ -41,7 +41,7 @@ msgstr ""
#: field:base.config.settings,module_auth_oauth:0
msgid ""
"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "Brug ekstern login godkendelse, login med google, facebook,..."
#. module: base_setup
#: view:sale.config.settings:0
@@ -55,88 +55,96 @@ msgid ""
"OpenERP using specific\n"
" plugins for your preferred email application."
msgstr ""
+"OpenERP tillader automatisk oprettelse af emner(eller andre poster)\n"
+" fra indkomne emails. Du kan automatisk "
+"synkronisere email med OpenERP\n"
+" ved hjælp af almindelig POP3/IMAP konti, ved "
+"brug af email integrations script til din\n"
+" email server, eller manuelt at overføre emails "
+"til OpenERP ved hjælp af dedikeret\n"
+" plugins til dit foretrukne email program."
#. module: base_setup
#: field:sale.config.settings,module_sale:0
msgid "SALE"
-msgstr ""
+msgstr "SALG"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Member"
-msgstr ""
+msgstr "Medlem"
#. module: base_setup
#: view:base.config.settings:0
msgid "Portal access"
-msgstr ""
+msgstr "Portal adgang"
#. module: base_setup
#: view:base.config.settings:0
msgid "Authentication"
-msgstr ""
+msgstr "Godkendelse"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Tilbud og Salgs Ordre"
#. module: base_setup
#: view:base.config.settings:0
#: model:ir.actions.act_window,name:base_setup.action_general_configuration
#: model:ir.ui.menu,name:base_setup.menu_general_configuration
msgid "General Settings"
-msgstr ""
+msgstr "Generelle indstillinger"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Donor"
-msgstr ""
+msgstr "Donor"
#. module: base_setup
#: view:base.config.settings:0
msgid "Email"
-msgstr ""
+msgstr "E-mail"
#. module: base_setup
#: field:sale.config.settings,module_crm:0
msgid "CRM"
-msgstr ""
+msgstr "CRM"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Patient"
-msgstr ""
+msgstr "Tålmodig"
#. module: base_setup
#: field:base.config.settings,module_base_import:0
msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Tillad brugere at importere data fra CSV filer"
#. module: base_setup
#: field:base.config.settings,module_multi_company:0
msgid "Manage multiple companies"
-msgstr ""
+msgstr "Administrere firmaer"
#. module: base_setup
#: view:sale.config.settings:0
msgid "On Mail Client"
-msgstr ""
+msgstr "Mail klient"
#. module: base_setup
#: view:base.config.settings:0
msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+msgstr "--db-filter=DIN_DATABASE"
#. module: base_setup
#: field:sale.config.settings,module_web_linkedin:0
msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Hent automatisk kontakter fra LinkedIn"
#. module: base_setup
#: field:sale.config.settings,module_plugin_thunderbird:0
msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Aktiver Thunderbird plug-in"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -146,22 +154,22 @@ msgstr "res_config_contents"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Customer Features"
-msgstr ""
+msgstr "Kunde funktioner"
#. module: base_setup
#: view:base.config.settings:0
msgid "Import / Export"
-msgstr ""
+msgstr "Import / Eksport"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Sale Features"
-msgstr ""
+msgstr "Salgs funktioner"
#. module: base_setup
#: field:sale.config.settings,module_plugin_outlook:0
msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Aktiver Outlook plug-in"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -169,21 +177,23 @@ msgid ""
"You can use this wizard to change the terminologies for customers in the "
"whole application."
msgstr ""
+"Du kan bruge denne wizard til at ændre terminologier for kunder i hele "
+"programmet."
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Tenant"
-msgstr ""
+msgstr "Lejer"
#. module: base_setup
#: help:base.config.settings,module_share:0
msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Del eller indlejre enhvert skærmbilled af openerp"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Customer"
-msgstr ""
+msgstr "Kunde"
#. module: base_setup
#: help:sale.config.settings,module_web_linkedin:0
@@ -191,6 +201,8 @@ msgid ""
"When you create a new contact (person or company), you will be able to load "
"all the data from LinkedIn (photos, address, etc)."
msgstr ""
+"Når du opretter en ny kontakt(person eller firma), kan du hente alle data "
+"fra LinkedIn (billeder, adresse, m.m.)."
#. module: base_setup
#: help:base.config.settings,module_multi_company:0
@@ -199,6 +211,8 @@ msgid ""
"companies.\n"
" This installs the module multi_company."
msgstr ""
+"Arbejd i et multi firma miljø, med styrede rettigheder mellem firmaer.\n"
+" Dette installerer mudulet multi_firma."
#. module: base_setup
#: view:base.config.settings:0
@@ -207,6 +221,8 @@ msgid ""
"You can\n"
" launch the OpenERP Server with the option"
msgstr ""
+"Den offentlige portal er kun tilgængelig i enkelt database mode. Du kan\n"
+" starte openerp server med denne option"
#. module: base_setup
#: view:base.config.settings:0
@@ -214,6 +230,8 @@ msgid ""
"You will find more options in your company details: address for the header "
"and footer, overdue payments texts, etc."
msgstr ""
+"Du vil finde flere optioner i detaljerne for firmaet: adresse til sidehoved "
+"og sidefod, rykker tekster, m.m."
#. module: base_setup
#: model:ir.model,name:base_setup.model_sale_config_settings
@@ -223,7 +241,7 @@ msgstr ""
#. module: base_setup
#: field:base.setup.terminology,partner:0
msgid "How do you call a Customer"
-msgstr ""
+msgstr "Hvordan kontakter du en kunde"
#. module: base_setup
#: view:base.config.settings:0
@@ -237,6 +255,13 @@ msgid ""
"projects,\n"
" etc."
msgstr ""
+"Når du sender et dokument til en kunde\n"
+" (tilbud, faktura), vil din kunde kunne\n"
+" tilmelde sig for at tilgå alle hans "
+"dokumenter,\n"
+" læse firma nyheder, kontrollere sine "
+"projekter,\n"
+" m.m."
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -246,12 +271,14 @@ msgstr ""
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Client"
-msgstr ""
+msgstr "Klient"
#. module: base_setup
#: help:base.config.settings,module_portal_anonymous:0
msgid "Enable the public part of openerp, openerp becomes a public website."
msgstr ""
+"Aktiver den offentlige del af openerp, openerp bliver en offentlig "
+"hjemmeside."
#. module: base_setup
#: help:sale.config.settings,module_plugin_thunderbird:0
@@ -264,22 +291,30 @@ msgid ""
" Partner from the selected emails.\n"
" This installs the module plugin_thunderbird."
msgstr ""
+"Denne plugin tillader at du arkiverer email og vedhæftede filer til det "
+"valgte\n"
+" OpenERP objekt. Du kan vælge en kunde eller et emne og\n"
+" vedhæfte den valgte mail som en .eml fil i\n"
+" dokumentstyringen til den valgte post. Du kan oprette poster "
+"for CRM emner,\n"
+" Partnere fra de valgte emails.\n"
+" Dette installerer modulet plugin_thunderbird."
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Partner"
-msgstr ""
+msgstr "Kontakt"
#. 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 "Brug alternativt ord for \"Kunde\""
#. module: base_setup
#: model:ir.actions.act_window,name:base_setup.action_sale_config
#: view:sale.config.settings:0
msgid "Configure Sales"
-msgstr ""
+msgstr "Tilpas Ordre"
#. module: base_setup
#: help:sale.config.settings,module_plugin_outlook:0
@@ -292,16 +327,22 @@ msgid ""
" email into an OpenERP mail message with attachments.\n"
" This installs the module plugin_outlook."
msgstr ""
+"Outlook plugin giver mulighed for at vælge et objekt du vil knytte til din "
+"email\n"
+" med vedhæftninger fra MS Outlook. Du kan vælge en partner,\n"
+" eller et emne object og arkivere den valgte email\n"
+" til en OpenERP mail meddelse med vedhæftninger.\n"
+" Dette installerer modulet plugin_outlook."
#. module: base_setup
#: view:base.config.settings:0
msgid "Options"
-msgstr ""
+msgstr "Muligheder"
#. module: base_setup
#: field:base.config.settings,module_portal:0
msgid "Activate the customer portal"
-msgstr ""
+msgstr "Aktiver kunde portal"
#. module: base_setup
#: view:base.config.settings:0
@@ -310,61 +351,64 @@ msgid ""
" Once activated, the login page will be "
"replaced by the public website."
msgstr ""
+"at gøre sådan.\n"
+" Når aktiveret, vil login side blive "
+"erstattet af den offentlige hjemmeside."
#. module: base_setup
#: field:base.config.settings,module_share:0
msgid "Allow documents sharing"
-msgstr ""
+msgstr "Tillad deling af dokumenter"
#. module: base_setup
#: view:base.config.settings:0
msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(firma nyheder, job, kontakt form, osv.)"
#. module: base_setup
#: field:base.config.settings,module_portal_anonymous:0
msgid "Activate the public portal"
-msgstr ""
+msgstr "Aktiver offentlig portal"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Opsætning udgående email server"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Social Network Integration"
-msgstr ""
+msgstr "Social Network integration"
#. module: base_setup
#: help:base.config.settings,module_portal:0
msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Giv dine kunder adgang til deres dokumenter"
#. module: base_setup
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "Cancel"
-msgstr ""
+msgstr "Fortryd"
#. module: base_setup
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Anvend"
#. module: base_setup
#: view:base.setup.terminology:0
msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Angiv din Terminologi"
#. module: base_setup
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "or"
-msgstr ""
+msgstr "eller"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure your company data"
-msgstr ""
+msgstr "Opsæt firma oplysninger"
diff --git a/addons/base_status/i18n/da.po b/addons/base_status/i18n/da.po
new file mode 100644
index 00000000000..c2e5f1d64dc
--- /dev/null
+++ b/addons/base_status/i18n/da.po
@@ -0,0 +1,80 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-10-15 20:25+0000\n"
+"Last-Translator: Morten Schou \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Fejl!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:166
+#, python-format
+msgid "%s has been opened."
+msgstr "%s er blevet åbnet."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:199
+#, python-format
+msgid "%s has been renewed."
+msgstr "%s er blevet fornyet."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid "Error!"
+msgstr "Fejl!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"Du kan ikke eskalere, du er allerede på øverste niveau i forhold til din "
+"salgs-teams kategori."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:193
+#, python-format
+msgid "%s is now pending."
+msgstr "%s er nu afventende."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been canceled."
+msgstr "%s er blevet afbrudt."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"Du er allerede på øverste niveau i dit salgs-team kategori.\n"
+"Du kan derfor ikke eskalere yderligere."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:181
+#, python-format
+msgid "%s has been closed."
+msgstr "%s er blevet lukket."
diff --git a/addons/board/i18n/da.po b/addons/board/i18n/da.po
index da679d82f49..922bc2bb990 100644
--- a/addons/board/i18n/da.po
+++ b/addons/board/i18n/da.po
@@ -8,94 +8,94 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-15 20:40+0000\n"
+"Last-Translator: Morten Schou \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: board
#: model:ir.actions.act_window,name:board.action_board_create
#: model:ir.ui.menu,name:board.menu_board_create
msgid "Create Board"
-msgstr ""
+msgstr "Opret Panel"
#. module: board
#: view:board.create:0
msgid "Create"
-msgstr ""
+msgstr "Opret"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:4
#, python-format
msgid "Reset Layout.."
-msgstr ""
+msgstr "Nulstil layout ..."
#. module: board
#: view:board.create:0
msgid "Create New Dashboard"
-msgstr ""
+msgstr "Opret nyt kontroltpanel"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:40
#, python-format
msgid "Choose dashboard layout"
-msgstr ""
+msgstr "Vælg layout for kontrolpanel"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:70
#, python-format
msgid "Add"
-msgstr ""
+msgstr "Tilføj"
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:139
#, python-format
msgid "Are you sure you want to remove this item ?"
-msgstr ""
+msgstr "Er du sikker på at du vil fjerne dette element?"
#. module: board
#: model:ir.model,name:board.model_board_board
msgid "Board"
-msgstr ""
+msgstr "Panel"
#. module: board
#: view:board.board:0
#: model:ir.actions.act_window,name:board.open_board_my_dash_action
#: model:ir.ui.menu,name:board.menu_board_my_dash
msgid "My Dashboard"
-msgstr ""
+msgstr "Mit kontrolpanel"
#. module: board
#: field:board.create,name:0
msgid "Board Name"
-msgstr ""
+msgstr "Panel navn"
#. module: board
#: model:ir.model,name:board.model_board_create
msgid "Board Creation"
-msgstr ""
+msgstr "Opret panel"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:67
#, python-format
msgid "Add to Dashboard"
-msgstr ""
+msgstr "Tilføj til kontrolpanel"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:28
#, python-format
msgid " "
-msgstr ""
+msgstr " "
#. module: board
#: model:ir.actions.act_window,help:board.open_board_my_dash_action
@@ -115,53 +115,68 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+"
\n"
+" Dit personlige kontrolpanel er tomt.\n"
+"
\n"
+" For at tilføje dit første element til dette "
+"kontrolpanel, gå til vilkårlig\n"
+" menu, skift til list graf visning, og klik 'Tilføj "
+"til\n"
+" Kontrolpanel' i udvidede søge optioner.\n"
+"
\n"
+" Du kan filtrere og gruppere data før de indsættes i\n"
+" kontrolpanelet med de valgte søge optioner.\n"
+"
\n"
+"
\n"
+" "
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:6
#, python-format
msgid "Reset"
-msgstr ""
+msgstr "Nulstil"
#. module: board
#: field:board.create,menu_parent_id:0
msgid "Parent Menu"
-msgstr ""
+msgstr "Overordnet menu"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:8
#, python-format
msgid "Change Layout.."
-msgstr ""
+msgstr "Skift layout ..."
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:93
#, python-format
msgid "Edit Layout"
-msgstr ""
+msgstr "Redigér layout"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:10
#, python-format
msgid "Change Layout"
-msgstr ""
+msgstr "Skift layout"
#. module: board
#: view:board.create:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuller"
#. module: board
#: view:board.create:0
msgid "or"
-msgstr ""
+msgstr "eller"
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:69
#, python-format
msgid "Title of new dashboard item"
-msgstr ""
+msgstr "Beskrivelse på nye kontrolpanel element"
diff --git a/addons/claim_from_delivery/i18n/da.po b/addons/claim_from_delivery/i18n/da.po
index a433a19f9f6..0fa1d9c41a3 100644
--- a/addons/claim_from_delivery/i18n/da.po
+++ b/addons/claim_from_delivery/i18n/da.po
@@ -8,26 +8,26 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-15 20:43+0000\n"
+"Last-Translator: Morten Schou \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: claim_from_delivery
#: view:stock.picking.out:0
msgid "Claims"
-msgstr ""
+msgstr "Reklamationer"
#. module: claim_from_delivery
#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
msgid "Delivery Order"
-msgstr ""
+msgstr "Følgeseddel"
#. module: claim_from_delivery
#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
msgid "Claim From Delivery"
-msgstr ""
+msgstr "Reklamation fra følgeseddel"
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index b576505face..8fe08a2cf4a 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-15 08:33+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:09+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: mrp
#: help:mrp.config.settings,module_mrp_repair:0
@@ -192,7 +192,7 @@ msgstr "仕入済材料"
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
msgid "Order Planning"
-msgstr ""
+msgstr "生産計画"
#. module: mrp
#: field:mrp.config.settings,module_mrp_operations:0
@@ -408,7 +408,7 @@ msgstr "これは例えばトレーニングセッションといった、シス
#: field:mrp.production,product_qty:0
#: field:mrp.production.product.line,product_qty:0
msgid "Product Quantity"
-msgstr ""
+msgstr "製品数量"
#. module: mrp
#: help:mrp.production,picking_id:0
@@ -643,7 +643,7 @@ msgstr "材料の経路"
#: field:mrp.production,move_lines2:0
#: report:mrp.production.order:0
msgid "Consumed Products"
-msgstr "消費製品"
+msgstr "消費構成品"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -1252,7 +1252,7 @@ msgstr "時間の単位の選択"
#: model:ir.ui.menu,name:mrp.menu_mrp_product_form
#: view:mrp.config.settings:0
msgid "Products"
-msgstr ""
+msgstr "製品"
#. module: mrp
#: view:report.workcenter.load:0
@@ -1519,7 +1519,7 @@ msgstr ""
#: field:mrp.production,origin:0
#: report:mrp.production.order:0
msgid "Source Document"
-msgstr "基となるドキュメント"
+msgstr "参照元"
#. module: mrp
#: selection:mrp.production,priority:0
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index f88eda96b69..0543446949b 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-12 09:44+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-15 15:15+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-08-13 06:06+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: mrp
#: help:mrp.config.settings,module_mrp_repair:0
@@ -2338,7 +2338,7 @@ msgstr "Productie startdatum"
#. module: mrp
#: model:process.node,note:mrp.process_node_routing0
msgid "Manufacturing Steps."
-msgstr "Porductiestappen"
+msgstr "Productiestappen"
#. module: mrp
#: code:addons/mrp/report/price.py:146
diff --git a/addons/product_expiry/i18n/nl.po b/addons/product_expiry/i18n/nl.po
index cf0da6716d0..0234232315e 100644
--- a/addons/product_expiry/i18n/nl.po
+++ b/addons/product_expiry/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-25 15:37+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-15 13:32+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-07-11 06:16+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: product_expiry
#: model:product.template,name:product_expiry.product_product_from_product_template
@@ -88,7 +88,7 @@ msgstr ""
#. module: product_expiry
#: model:ir.model,name:product_expiry.model_stock_production_lot
msgid "Serial Number"
-msgstr "Serienummer"
+msgstr "Partijnummer"
#. module: product_expiry
#: help:product.product,alert_time:0
@@ -97,7 +97,7 @@ msgid ""
"alert should be notified."
msgstr ""
"Wanneer een nieuw partijnummer wordt aangemaakt, is dit het het aantal dagen "
-"voordat ene waarschuwing wordt gegeven."
+"voordat een waarschuwing wordt gegeven."
#. module: product_expiry
#: field:stock.production.lot,removal_date:0
@@ -112,7 +112,7 @@ msgstr "Brood"
#. module: product_expiry
#: view:product.product:0
msgid "Dates"
-msgstr "Data"
+msgstr "Datums"
#. module: product_expiry
#: field:stock.production.lot,life_date:0
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index a01d313c1e2..b35bf5e6c13 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-15 07:11+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:23+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:14+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: stock
#: field:stock.inventory.line.split,line_exist_ids:0
@@ -24,7 +24,7 @@ msgstr ""
#: field:stock.move.split,line_exist_ids:0
#: field:stock.move.split,line_ids:0
msgid "Serial Numbers"
-msgstr ""
+msgstr "シリアル番号"
#. module: stock
#: help:stock.config.settings,group_product_variant:0
@@ -403,7 +403,7 @@ msgstr ""
#. module: stock
#: selection:stock.return.picking,invoice_state:0
msgid "No invoicing"
-msgstr "未請求"
+msgstr "請求なし"
#. module: stock
#: view:stock.move:0
@@ -414,7 +414,7 @@ msgstr "処理された在庫移動"
#: field:stock.inventory.line.split,use_exist:0
#: field:stock.move.split,use_exist:0
msgid "Existing Serial Numbers"
-msgstr ""
+msgstr "既存のシリアル番号"
#. module: stock
#: model:res.groups,name:stock.group_inventory_valuation
@@ -439,7 +439,7 @@ msgstr "この梱包のための移動"
#. module: stock
#: view:stock.picking.in:0
msgid "Incoming Shipments Available"
-msgstr "内部出荷可能"
+msgstr "入荷可能"
#. module: stock
#: selection:report.stock.inventory,location_type:0
@@ -1013,7 +1013,7 @@ msgstr "将来の損益計算書"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
#: view:stock.picking.in:0
msgid "Incoming Shipments"
-msgstr "内部出荷"
+msgstr "入荷"
#. module: stock
#: help:stock.picking,date:0
@@ -1036,7 +1036,7 @@ msgstr "在庫場所"
#. module: stock
#: constraint:stock.move:0
msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "この品目にシリアル番号をアサインしてください。"
#. module: stock
#: code:addons/stock/stock.py:2255
@@ -1502,7 +1502,7 @@ msgstr "棚卸の統合"
#. module: stock
#: selection:stock.return.picking,invoice_state:0
msgid "To be refunded/invoiced"
-msgstr "返金 / 請求"
+msgstr "返金/請求あり"
#. module: stock
#: code:addons/stock/stock.py:2448
@@ -1561,7 +1561,7 @@ msgstr "開始"
#. module: stock
#: view:stock.picking.in:0
msgid "Incoming Shipments already processed"
-msgstr "内部出荷は処理済です。"
+msgstr "入荷は処理済です。"
#. module: stock
#: code:addons/stock/wizard/stock_return_picking.py:102
@@ -1826,7 +1826,7 @@ msgstr "バックオーダー"
#. module: stock
#: report:stock.picking.list:0
msgid "Incoming Shipment :"
-msgstr ""
+msgstr "入荷:"
#. module: stock
#: field:stock.location,valuation_out_account_id:0
@@ -2117,7 +2117,7 @@ msgstr "集荷の戻し"
#: model:ir.actions.act_window,name:stock.act_stock_return_picking_in
#: model:ir.actions.act_window,name:stock.act_stock_return_picking_out
msgid "Return Shipment"
-msgstr ""
+msgstr "顧客返品"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory_merge
@@ -2134,7 +2134,7 @@ msgstr "全在庫"
#. module: stock
#: view:stock.return.picking:0
msgid "Provide the quantities of the returned products."
-msgstr "返品製品の数量を与えます。"
+msgstr "返品数量を指定してください。"
#. module: stock
#: view:product.product:0
@@ -3391,7 +3391,7 @@ msgstr "戻り"
#. module: stock
#: field:stock.return.picking,invoice_state:0
msgid "Invoicing"
-msgstr "請求中"
+msgstr "請求方針"
#. module: stock
#: view:stock.picking:0
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index b6d850601bc..2fdadf5ebd0 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-10 10:04+0000\n"
+"PO-Revision-Date: 2013-10-15 13:37+0000\n"
"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-10-11 05:29+0000\n"
+"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: stock
@@ -1989,9 +1989,9 @@ msgid ""
"Check this option to select existing serial numbers in the list below, "
"otherwise you should enter new ones line by line."
msgstr ""
-"Vink deze optie aan op ene bestaand partijnummer te gebruiken uit de "
+"Vink deze optie aan om een bestaand partijnummer te gebruiken uit de "
"onderstaande lijst. Anders dient u, regel voor regel, nieuwe partijen aan te "
-"maken"
+"maken."
#. module: stock
#: selection:report.stock.move,type:0
From aa34259629f5aadc9e05495e1200b63287619a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 16 Oct 2013 11:21:06 +0200
Subject: [PATCH 12/44] [FIX] hr: fixed priorities of kanban views. Employees
see the kanban view defined for portal users because of priorities all equal
to 16. Now employees see the correct kanban view defined in HR, portal users
see the portal kanban view defined in portal_hr_employees.
bzr revid: tde@openerp.com-20131016092106-pqtjp7tyw27or3ow
---
addons/hr/hr_view.xml | 1 +
addons/portal_hr_employees/hr_employee_view.xml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index dc65fa80e8b..3e79c0ca7d6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -128,6 +128,7 @@
HR - Employess Kanban
hr.employee
+ 10
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 7b038747c60..8e8cece12c8 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -33,8 +33,9 @@
- HR - Employees Kanban
+ HR - Employees Kanban (Portal)
hr.employee
+ 32
From 06b2ce213ce6f0bd99e2d11345a0047066af2c74 Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Wed, 16 Oct 2013 12:58:12 +0200
Subject: [PATCH 13/44] [FIX] document: overridden ORM methods need to respect
API idiosyncrasies, otherwise check() calls may fail
bzr revid: odo@openerp.com-20131016105812-844cd9xljvkjwtm3
---
openerp/addons/base/ir/ir_attachment.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index f8da4db972d..857ebc72095 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -261,10 +261,14 @@ class ir_attachment(osv.osv):
return len(result) if count else list(result)
def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
self.check(cr, uid, ids, 'read', context=context)
return super(ir_attachment, self).read(cr, uid, ids, fields_to_read, context, load)
def write(self, cr, uid, ids, vals, context=None):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
self.check(cr, uid, ids, 'write', context=context, values=vals)
if 'file_size' in vals:
del vals['file_size']
@@ -275,6 +279,8 @@ class ir_attachment(osv.osv):
return super(ir_attachment, self).copy(cr, uid, id, default, context)
def unlink(self, cr, uid, ids, context=None):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
self.check(cr, uid, ids, 'unlink', context=context)
location = self.pool.get('ir.config_parameter').get_param(cr, uid, 'ir_attachment.location')
if location:
From b801e6eab97cc8331b870654d37f57d228e13a2b Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 16 Oct 2013 17:03:35 +0200
Subject: [PATCH 14/44] [IMP] procurement: better workflow
bzr revid: mat@openerp.com-20131016150335-oikqm6twbukp666t
---
addons/procurement/procurement.py | 2 +-
addons/procurement/procurement_workflow.xml | 2 --
addons/procurement/schedulers.py | 23 ---------------------
addons/purchase/purchase.py | 3 +--
4 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 2bc095a9661..a39b2d79843 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -371,7 +371,7 @@ class procurement_order(osv.osv):
#temporary context passed in write to prevent an infinite loop
ctx_wkf = dict(context or {})
ctx_wkf['workflow.trg_write.%s' % self._name] = False
- self.write(cr, uid, [procurement.id], {'message': message},context=ctx_wkf)
+ self.write(cr, uid, [procurement.id], {'message': message, 'state': 'exception'},context=ctx_wkf)
return ok
def _workflow_trigger(self, cr, uid, ids, trigger, context=None):
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 76b54370ef2..8ddd619a527 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -29,8 +29,6 @@
confirm_wait
- function
- write({'state':'exception'})
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 07280b38ae7..cf08cb91a06 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -72,10 +72,6 @@ class procurement_order(osv.osv):
maxdate = (datetime.today() + relativedelta(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
start_date = fields.datetime.now()
offset = 0
- report = []
- report_total = 0
- report_except = 0
- report_later = 0
while True:
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context)
for proc in procurement_obj.browse(cr, uid, ids, context=context):
@@ -83,14 +79,7 @@ class procurement_order(osv.osv):
wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
else:
offset += 1
- report_later += 1
- if proc.state == 'exception':
- report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \
- (proc.id, proc.product_qty, proc.product_uom.name,
- proc.product_id.name))
- report_except += 1
- report_total += 1
if use_new_cursor:
cr.commit()
if not ids:
@@ -98,22 +87,10 @@ class procurement_order(osv.osv):
offset = 0
ids = []
while True:
- report_ids = []
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
for proc in procurement_obj.browse(cr, uid, ids):
if maxdate >= proc.date_planned:
wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
- report_ids.append(proc.id)
- else:
- report_later += 1
- report_total += 1
-
- if proc.state == 'exception':
- report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \
- (proc.id, proc.product_qty, proc.product_uom.name,
- proc.product_id.name,))
- report_except += 1
-
if use_new_cursor:
cr.commit()
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 992af37222e..04b380ef098 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1044,10 +1044,9 @@ class procurement_order(osv.osv):
message = _('No default supplier defined for this product')
elif not partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']:
message = _('No address defined for the supplier')
-
if message:
if procurement.message != message:
- cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
+ cr.execute("update procurement_order set message=%s, state='exception' where id=%s", (message, procurement.id))
return False
if user.company_id and user.company_id.partner_id:
From 5c3b065bc80735ce01a7f746bc014e9f32fa1b71 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 17 Oct 2013 05:59:26 +0000
Subject: [PATCH 15/44] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131017055926-8w96inwlj7rhey0e
---
addons/account/i18n/hr.po | 175 +++++++++++++++++----
addons/account_analytic_default/i18n/hr.po | 12 +-
addons/account_voucher/i18n/hr.po | 12 +-
addons/board/i18n/lv.po | 18 +--
addons/contacts/i18n/lv.po | 37 +++++
5 files changed, 205 insertions(+), 49 deletions(-)
create mode 100644 addons/contacts/i18n/lv.po
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 8671838bfee..352f8a8b197 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-10-15 13:59+0000\n"
+"PO-Revision-Date: 2013-10-16 11:57+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: 2013-10-16 05:13+0000\n"
+"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account
@@ -482,7 +482,7 @@ msgstr ""
#. module: account
#: help:account.bank.statement.line,name:0
msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Informacije o pokretaču i korisniku"
#. module: account
#. openerp-web
@@ -1840,7 +1840,7 @@ msgstr "Ponavljajući"
#. module: account
#: report:account.invoice:0
msgid "TIN :"
-msgstr ""
+msgstr "TIN :"
#. module: account
#: field:account.journal,groups_id:0
@@ -2054,7 +2054,7 @@ msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Pending Accounts"
-msgstr ""
+msgstr "Konta na čekanju"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
@@ -3757,6 +3757,86 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"\n"
+"\n"
+"
Pozdrav ${object.partner_id.name},
\n"
+"\n"
+"
Obavještavamo vam o novom računu:
\n"
+" \n"
+"
\n"
+" REFERENCA
\n"
+" Broj računa: ${object.number}
\n"
+" Ukupni iznos računa: ${object.amount_total} "
+"${object.currency_id.name}
\n"
+" Datum računa: ${object.date_invoice}
\n"
+" % if object.origin:\n"
+" Broj narudžbe: ${object.origin}
\n"
+" % endif\n"
+" % if object.user_id:\n"
+" Vaš kontakt: ${object.user_id.name}\n"
+" % endif\n"
+"
\n"
+" \n"
+" % if object.paypal_url:\n"
+"
\n"
+"
Ovaj račun je moguće platiti i direktno Paypal-om:
\n"
+"
\n"
+" \n"
+" \n"
+" % endif\n"
+" \n"
+"
\n"
+"
Stojimo na raspolaganju za sva dodatna pitanja.
\n"
+"
Hvala vam što ste odabrali ${object.company_id.name or 'us'}!
\n"
+"
\n"
+"
\n"
+"
\n"
+"
\n"
+" ${object.company_id.name}
\n"
+" \n"
+"
\n"
+"
\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}
\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}
\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}
\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}
\n"
+" % endif\n"
+" \n"
+" % if object.company_id.phone:\n"
+"
\n"
+" Phone: ${object.company_id.phone}\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+"
\n"
+" %endif\n"
+"
\n"
+"
\n"
+"
\n"
+" "
#. module: account
#: view:account.period:0
@@ -3793,7 +3873,7 @@ msgstr "Transakcije"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Zatvaranje neztvorenih konta"
#. module: account
#: help:account.account.type,close_method:0
@@ -4925,7 +5005,7 @@ msgstr "Bilješka"
#. module: account
#: selection:account.financial.report,sign:0
msgid "Reverse balance sign"
-msgstr ""
+msgstr "Obrnuti predznak"
#. module: account
#: selection:account.account.type,report_type:0
@@ -5200,7 +5280,7 @@ msgstr "ECNJ"
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Analitički troškovnik za izvještaj dnevnika"
#. module: account
#: model:ir.actions.act_window,name:account.action_model_form
@@ -6053,7 +6133,7 @@ msgstr "Pogled aktive"
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
-msgstr ""
+msgstr "Izvještaj za uobičajena konta"
#. module: account
#: view:account.analytic.account:0
@@ -9595,6 +9675,8 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
+"Možete odabrati dnevnik za odobrenja koja će se kreirati. Ako ostavite polje "
+"praznokoristiti će se isti dnevnik kao i za trenutni račun."
#. module: account
#: help:account.bank.statement.line,sequence:0
@@ -10211,7 +10293,7 @@ msgstr "Izvor"
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Date of the day"
-msgstr ""
+msgstr "Datum dana"
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -10229,6 +10311,7 @@ msgid ""
"This field contains the information related to the numbering of the journal "
"entries of this journal."
msgstr ""
+"Ovo polje sadržava informacije vezane uz sljednosti temeljnica dnevnika"
#. module: account
#: field:account.invoice,sent:0
@@ -10255,7 +10338,7 @@ msgstr "Saldo :"
#: code:addons/account/account.py:1587
#, python-format
msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Nije moguće kreirati knjiženja za različite kompanije."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -10265,7 +10348,7 @@ msgstr "Periodična obrada"
#. module: account
#: view:account.invoice.report:0
msgid "Customer And Supplier Invoices"
-msgstr "Ulazni i izlazni računi Invoices"
+msgstr "Ulazni i izlazni računi"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
@@ -10296,7 +10379,7 @@ msgstr "Pretplata"
#. module: account
#: model:ir.model,name:account.model_account_analytic_balance
msgid "Account Analytic Balance"
-msgstr "Saldo Analitike"
+msgstr "Saldo analitike"
#. module: account
#: report:account.account.balance:0
@@ -10340,13 +10423,13 @@ msgstr "Datum dospijeća"
#: model:account.payment.term,name:account.account_payment_term_immediate
#: model:account.payment.term,note:account.account_payment_term_immediate
msgid "Immediate Payment"
-msgstr ""
+msgstr "Neposredno plaćanje"
#. module: account
#: code:addons/account/account.py:1502
#, python-format
msgid " Centralisation"
-msgstr ""
+msgstr " Centralizacija"
#. module: account
#: help:account.journal,type:0
@@ -10357,6 +10440,11 @@ msgid ""
"journals. Select 'Opening/Closing Situation' for entries generated for new "
"fiscal years."
msgstr ""
+"Odaberite 'Prodaja' za dnevnike izlaznih računa. Odaberite 'Nabava' za "
+"dnevnike ulaznih računa. Odaberite 'Gotovina' ili 'Banka' za dnevnike koji "
+"se koriste kod plaćanja izlaznih ili ulaznih računa. Odaberite 'Općenito' za "
+"dnevnike raznih drugih operacija. Odaberite 'Početno/završno stanje' za "
+"unose generirane s novom fiskalnom godinom."
#. module: account
#: view:account.subscription:0
@@ -10410,12 +10498,14 @@ msgid ""
"It indicates that the invoice has been paid and the journal entry of the "
"invoice has been reconciled with one or several journal entries of payment."
msgstr ""
+"Označava da je račun plaćen i da je temeljnica računa zatvorena sa jednim "
+"ili više izvoda."
#. module: account
#: code:addons/account/account_move_line.py:780
#, python-format
msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!"
-msgstr ""
+msgstr "Stavka dnevnika '%s' (id: %s), Knjiženje '%s' je već zatvoreno!"
#. module: account
#: view:account.invoice:0
@@ -10429,7 +10519,7 @@ msgstr "Nacrti računa"
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
msgid "Nothing more to reconcile"
-msgstr ""
+msgstr "Nema stavaka za zatvaranje"
#. module: account
#: view:cash.box.in:0
@@ -10466,6 +10556,13 @@ msgid ""
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
+"Period je fiskalno razdoblje tijekom kojeg treba biti zabilježena evidencija "
+"svih računovodstvenih aktivnosti. Mjesečni periodu su standard, ali ovisno o "
+"vašoj državi ili potrebama kompanije možete također imati i kvartalne "
+"periode. Zatvaranje perioda će onemogućiti unos novih knjiženja. Sva nova "
+"knjiženja trebaju tada ići na sljedeći otvoreni period. Zatvorite perioda "
+"kada ne želite nova knjiženja i kada želite zaključati period za potrebe "
+"poreznih evidencija."
#. module: account
#: view:account.analytic.account:0
@@ -10492,7 +10589,7 @@ msgstr "Postavite fiskalnu godinu"
#. module: account
#: field:account.period,name:0
msgid "Period Name"
-msgstr "Naziv Perioda"
+msgstr "Naziv perioda"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:68
@@ -10507,7 +10604,7 @@ msgstr ""
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Code/Date"
-msgstr "Šifra/Datum"
+msgstr "Šifra/datum"
#. module: account
#: view:account.bank.statement:0
@@ -10539,6 +10636,9 @@ msgid ""
"some non legal fields or you must unconfirm the journal entry first.\n"
"%s."
msgstr ""
+"Ne možete raditi ovu promjenu na knjiženom unosu. Možete samo mijenjati neka "
+"sporedna polja ili morate prvo otknjižiti temeljnicu.\n"
+"%s."
#. module: account
#: help:account.config.settings,module_account_budget:0
@@ -10549,11 +10649,17 @@ msgid ""
"analytic account.\n"
" This installs the module account_budget."
msgstr ""
+"Ovo omogućuje računovođama da upravljalju analitičkim i miješanim "
+"proračunima.\n"
+" Jednom kada je glavni proračun definiran,\n"
+" voditelji projekta mogu postaviti planirani iznos na svaki "
+"analitički konto.\n"
+" Instalira modul account_budget."
#. module: account
#: field:account.bank.statement.line,name:0
msgid "OBI"
-msgstr ""
+msgstr "OBI"
#. module: account
#: help:res.partner,property_account_payable:0
@@ -10579,7 +10685,7 @@ msgstr "Sekundarna valuta"
#. module: account
#: model:ir.model,name:account.model_validate_account_move
msgid "Validate Account Move"
-msgstr ""
+msgstr "Potvrdi knjiženje"
#. module: account
#: field:account.account,credit:0
@@ -10686,7 +10792,7 @@ msgstr "Tečaj"
#. module: account
#: view:account.config.settings:0
msgid "e.g. sales@openerp.com"
-msgstr ""
+msgstr "npr. prodaja@openerp.com"
#. module: account
#: field:account.account,tax_ids:0
@@ -10708,12 +10814,12 @@ msgstr "Travanj"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Dobit (gubitak) za prijavu"
#. module: account
#: view:account.move.line.reconcile.select:0
msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Otvori za saldakonti zatvaranje"
#. module: account
#: field:account.account,parent_left:0
@@ -10879,6 +10985,8 @@ msgstr "Statusi"
#: help:product.template,property_account_income:0
msgid "This account will be used to value outgoing stock using sale price."
msgstr ""
+"Ovaj će se konto koristiti za vrednovanje skladišnog izlaza koristeći "
+"prodajnu cijenu."
#. module: account
#: field:account.invoice,check_total:0
@@ -10901,12 +11009,12 @@ msgstr "Ukupno"
#: code:addons/account/wizard/account_invoice_refund.py:109
#, python-format
msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Ne mogu %s nacrt/predračun/otkaži račun."
#. module: account
#: field:account.tax,account_analytic_paid_id:0
msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Analitički konto poreza kod povrata"
#. module: account
#: view:account.move.bank.reconcile:0
@@ -10994,6 +11102,8 @@ msgid ""
"reconciliation process today. The current partner is counted as already "
"processed."
msgstr ""
+"Ova brojka opisuje ukupni broj partenra koji su prošli proces zatvaranja "
+"danas. Trenutni partner se računa."
#. module: account
#: view:account.fiscalyear:0
@@ -11032,6 +11142,8 @@ msgid ""
"If you unreconcile transactions, you must also verify all the actions that "
"are linked to those transactions because they will not be disable"
msgstr ""
+"Ako razvezujete transakcije, morate također provjeriti akcije koje su "
+"povezane sa tim transakcijama jer će one ostati aktivne."
#. module: account
#: code:addons/account/account_move_line.py:1056
@@ -11066,6 +11178,9 @@ msgid ""
"customer. The tool search can also be used to personalise your Invoices "
"reports and so, match this analysis to your needs."
msgstr ""
+"Iz ovog izvještaja imate pregled iznosa fakturiranog vašem kupcu. Alat "
+"pretrage može se također koristiti za personalizaciju vaših ispisa računa i "
+"priagođavanje analize vašim potrebama."
#. module: account
#: view:account.partner.reconcile.process:0
@@ -11086,7 +11201,7 @@ msgstr "Stanje računa je zatvoreno/plaćeno"
#. module: account
#: field:account.config.settings,module_account_followup:0
msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Upravljanje naplatom"
#. module: account
#: model:ir.model,name:account.model_report_account_sales
@@ -11184,6 +11299,10 @@ msgid ""
"payable/receivable are for partners accounts (for debit/credit "
"computations), closed for depreciated accounts."
msgstr ""
+"'Interni tip' se koristi za značajke dostupne na različitim tipovima konta: "
+"pogled ne može imati stavke dnevnika, konsolidacija su konta koja mogu imati "
+"podređena konta za potrebe konsolidacije više kompanija, obveze/potraživanja "
+"su za saldakonti, zatvoreno za konta koja se više ne koriste."
#. module: account
#: report:account.account.balance:0
@@ -11543,7 +11662,7 @@ msgstr "Veljača"
#: view:account.bank.statement:0
#: help:account.cashbox.line,number_closing:0
msgid "Closing Unit Numbers"
-msgstr ""
+msgstr "Broj jedinice zatvaranja"
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index e34f539cb83..376af7a888a 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-16 12:25+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: 2013-07-11 05:46+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -32,7 +32,7 @@ msgstr "Grupiraj po..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Predodređeni datum završetka za ovaj analitički konto"
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
@@ -56,7 +56,7 @@ msgstr "Uvjeti"
#: view:account.analytic.default:0
#: field:account.analytic.default,product_id:0
msgid "Product"
-msgstr "Proizvod"
+msgstr "Artikl"
#. module: account_analytic_default
#: help:account.analytic.default,partner_id:0
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 5ffeb378842..d68411955db 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-09-25 11:32+0000\n"
-"Last-Translator: Krešimir Jeđud \n"
+"PO-Revision-Date: 2013-10-16 13:13+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: 2013-09-26 05:54+0000\n"
-"X-Generator: Launchpad (build 16771)\n"
+"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
@@ -25,7 +25,7 @@ msgstr "Zatvaranje"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:417
@@ -59,7 +59,7 @@ msgstr "Grupiraj po..."
msgid ""
"Computed as the difference between the amount stated in the voucher and the "
"sum of allocation on the voucher lines."
-msgstr ""
+msgstr "Izračunato kao razlika između iznosa"
#. module: account_voucher
#: view:account.voucher:0
diff --git a/addons/board/i18n/lv.po b/addons/board/i18n/lv.po
index 67aa565a7d1..654ace9cdea 100644
--- a/addons/board/i18n/lv.po
+++ b/addons/board/i18n/lv.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-16 19:14+0000\n"
+"Last-Translator: Jānis-Marks Gailis \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: board
#: model:ir.actions.act_window,name:board.action_board_create
@@ -26,7 +26,7 @@ msgstr ""
#. module: board
#: view:board.create:0
msgid "Create"
-msgstr ""
+msgstr "Izveidot"
#. module: board
#. openerp-web
@@ -52,7 +52,7 @@ msgstr ""
#: code:addons/board/static/src/xml/board.xml:70
#, python-format
msgid "Add"
-msgstr ""
+msgstr "Pievienot"
#. module: board
#. openerp-web
@@ -121,7 +121,7 @@ msgstr ""
#: code:addons/board/static/src/xml/board.xml:6
#, python-format
msgid "Reset"
-msgstr ""
+msgstr "Atstatīt"
#. module: board
#: field:board.create,menu_parent_id:0
@@ -147,7 +147,7 @@ msgstr ""
#: code:addons/board/static/src/xml/board.xml:10
#, python-format
msgid "Change Layout"
-msgstr ""
+msgstr "Mainīt Izkārtojumu"
#. module: board
#: view:board.create:0
@@ -157,7 +157,7 @@ msgstr "Atcelt"
#. module: board
#: view:board.create:0
msgid "or"
-msgstr ""
+msgstr "vai"
#. module: board
#. openerp-web
diff --git a/addons/contacts/i18n/lv.po b/addons/contacts/i18n/lv.po
new file mode 100644
index 00000000000..e0d92a9b88f
--- /dev/null
+++ b/addons/contacts/i18n/lv.po
@@ -0,0 +1,37 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-10-16 19:12+0000\n"
+"Last-Translator: Jānis-Marks Gailis \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kontakti"
From c4370b47f8049cad7a5000aaf93de49bea5143a1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Thu, 17 Oct 2013 09:46:35 +0200
Subject: [PATCH 16/44] [IMP] procurement: redifine workflow to avoid going
back to confrmed state
bzr revid: mat@openerp.com-20131017074635-qp1n3x8955bf3aqd
---
addons/procurement/procurement_workflow.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 8ddd619a527..086a92214f0 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -119,7 +119,7 @@
-
+
button_restart
@@ -129,7 +129,7 @@
-
+
button_restart
From b98f935d271b6aa25329420ee3afe49f6bdd7616 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Thu, 17 Oct 2013 12:44:26 +0200
Subject: [PATCH 17/44] revert change of workflow
bzr revid: mat@openerp.com-20131017104426-260y7v0113q8iue9
---
addons/procurement/procurement.py | 2 +-
addons/procurement/procurement_workflow.xml | 6 ++++--
addons/procurement/schedulers.py | 23 +++++++++++++++++++++
addons/purchase/purchase.py | 3 ++-
4 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index a39b2d79843..2bc095a9661 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -371,7 +371,7 @@ class procurement_order(osv.osv):
#temporary context passed in write to prevent an infinite loop
ctx_wkf = dict(context or {})
ctx_wkf['workflow.trg_write.%s' % self._name] = False
- self.write(cr, uid, [procurement.id], {'message': message, 'state': 'exception'},context=ctx_wkf)
+ self.write(cr, uid, [procurement.id], {'message': message},context=ctx_wkf)
return ok
def _workflow_trigger(self, cr, uid, ids, trigger, context=None):
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 086a92214f0..76b54370ef2 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -29,6 +29,8 @@
confirm_wait
+ function
+ write({'state':'exception'})
@@ -119,7 +121,7 @@
-
+
button_restart
@@ -129,7 +131,7 @@
-
+
button_restart
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index cf08cb91a06..07280b38ae7 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -72,6 +72,10 @@ class procurement_order(osv.osv):
maxdate = (datetime.today() + relativedelta(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
start_date = fields.datetime.now()
offset = 0
+ report = []
+ report_total = 0
+ report_except = 0
+ report_later = 0
while True:
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context)
for proc in procurement_obj.browse(cr, uid, ids, context=context):
@@ -79,7 +83,14 @@ class procurement_order(osv.osv):
wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
else:
offset += 1
+ report_later += 1
+ if proc.state == 'exception':
+ report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \
+ (proc.id, proc.product_qty, proc.product_uom.name,
+ proc.product_id.name))
+ report_except += 1
+ report_total += 1
if use_new_cursor:
cr.commit()
if not ids:
@@ -87,10 +98,22 @@ class procurement_order(osv.osv):
offset = 0
ids = []
while True:
+ report_ids = []
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
for proc in procurement_obj.browse(cr, uid, ids):
if maxdate >= proc.date_planned:
wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
+ report_ids.append(proc.id)
+ else:
+ report_later += 1
+ report_total += 1
+
+ if proc.state == 'exception':
+ report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \
+ (proc.id, proc.product_qty, proc.product_uom.name,
+ proc.product_id.name,))
+ report_except += 1
+
if use_new_cursor:
cr.commit()
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 04b380ef098..992af37222e 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1044,9 +1044,10 @@ class procurement_order(osv.osv):
message = _('No default supplier defined for this product')
elif not partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']:
message = _('No address defined for the supplier')
+
if message:
if procurement.message != message:
- cr.execute("update procurement_order set message=%s, state='exception' where id=%s", (message, procurement.id))
+ cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
return False
if user.company_id and user.company_id.partner_id:
From b60da2a9a3693866cd018e73faab2034d6673c45 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Thu, 17 Oct 2013 13:35:21 +0200
Subject: [PATCH 18/44] [IMP] procurement: track only once the change of state
to exception and confirmed
bzr revid: mat@openerp.com-20131017113521-5u2k9glb3o7cnmmk
---
addons/procurement/procurement.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 2bc095a9661..f5d4761642b 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -128,6 +128,22 @@ class procurement_order(osv.osv):
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c)
}
+ def message_track(self, cr, uid, ids, tracked_fields, initial_values, context=None):
+ """ Overwrite message_track to avoid tracking more than once the confirm-exception loop
+ Add '_first_pass_done_' to the note field only the first time stuck in exception state
+ Will avoid getting furthur confirmed and exception change of state messages
+
+ TODO: this hack is necessary for a stable version but should be avoided for the next release.
+ Instead find a more elegant way to prevent redundant messages or entirely stop tracking states on procurement orders
+ """
+ for proc in self.browse(cr, uid, ids, context=context):
+ if not proc.note or '_first_pass_done_' not in proc.note or proc.state not in ('confirmed', 'exception'):
+ super(procurement_order, self).message_track(cr, uid, [proc.id], tracked_fields, initial_values, context=context)
+ if proc.state == 'exception':
+ cr.execute("""UPDATE procurement_order set note = CONCAT(note, %s) WHERE id = %s""", ('_first_pass_done_',proc.id))
+
+ return True
+
def unlink(self, cr, uid, ids, context=None):
procurements = self.read(cr, uid, ids, ['state'], context=context)
unlink_ids = []
From afe290b844b6444524dffe401a79b3ae2dd4f5d2 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 18 Oct 2013 06:11:29 +0000
Subject: [PATCH 19/44] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131018061129-4wcyxayj6darv5op
---
addons/mail/i18n/fi.po | 18 +++++++++---------
addons/mail/i18n/ja.po | 8 ++++----
addons/sale/i18n/fi.po | 18 +++++++++---------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index 9efca3ee162..e9b3f9341a4 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-17 16:34+0000\n"
+"Last-Translator: Miku Laitinen \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:08+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: mail
#: view:mail.followers:0
@@ -97,7 +97,7 @@ msgstr ""
#. module: mail
#: view:mail.group:0
msgid "Group Name"
-msgstr ""
+msgstr "Ryhmän nimi"
#. module: mail
#: selection:mail.group,public:0
@@ -190,7 +190,7 @@ msgstr ""
#: code:addons/mail/static/src/js/mail.js:1029
#, python-format
msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Haluatko varmasti poistaa tämän viestin?"
#. module: mail
#: view:mail.message:0
@@ -912,7 +912,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/mail.xml:188
#, python-format
msgid "Compose a new message"
-msgstr ""
+msgstr "Kirjoita uusi viesti"
#. module: mail
#: view:mail.mail:0
@@ -1233,7 +1233,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/mail.xml:193
#, python-format
msgid "Write to my followers"
-msgstr ""
+msgstr "Kirjoita seuraajilleni"
#. module: mail
#: model:ir.model,name:mail.model_res_groups
@@ -1694,7 +1694,7 @@ msgstr ""
#: model:ir.ui.menu,name:mail.mail_feeds
#: model:ir.ui.menu,name:mail.mail_feeds_main
msgid "Messaging"
-msgstr ""
+msgstr "Viestit"
#. module: mail
#: view:mail.alias:0
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index e7254ede597..60e06c2ffcc 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-06 04:06+0000\n"
+"PO-Revision-Date: 2013-10-17 09:12+0000\n"
"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 16721)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: mail
#: view:mail.followers:0
@@ -770,7 +770,7 @@ msgstr "高度"
#: code:addons/mail/static/src/xml/mail.xml:244
#, python-format
msgid "Move to Inbox"
-msgstr ""
+msgstr "受信箱に移動"
#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:193
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 96e8dca0f33..e74edde14aa 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-17 16:42+0000\n"
+"Last-Translator: Miku Laitinen \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:21+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
@@ -36,7 +36,7 @@ msgstr ""
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Myyjä"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -456,8 +456,8 @@ msgid ""
"The salesman confirms the quotation. The state of the sales order becomes "
"'In progress' or 'Manual in progress'."
msgstr ""
-"Myyntimies vahvistaa tarjouksen. Myyntitilauksen tila muuttuu 'käynnissä' "
-"tai 'manuaalinen käynnissä'."
+"Myyjä vahvistaa tarjouksen. Myyntitilauksen tilaksi muuttuu \"käsittelyssä\" "
+"tai \"manuaalisessa käsittelyssä\"."
#. module: sale
#: view:sale.order.line:0
@@ -621,7 +621,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
msgid "Sales Order Line"
-msgstr "Myyntitilauksen Rivi"
+msgstr "Myyntitilausrivi"
#. module: sale
#: field:sale.config.settings,module_analytic_user_function:0
@@ -1746,7 +1746,7 @@ msgstr "Peruutettu"
#. module: sale
#: view:sale.order.line:0
msgid "Search Uninvoiced Lines"
-msgstr "Etsi Laskuttamattomia Rivejä"
+msgstr "Etsi laskuttamattomia rivejä"
#. module: sale
#: selection:sale.order,state:0
From 44bc4f3151df9af2a41a794798cd189ea7636faf Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Fri, 18 Oct 2013 13:44:00 +0200
Subject: [PATCH 20/44] [FIX] mrp_repair: use action_done to validate a
operation componenents when ending a repair
bzr revid: mat@openerp.com-20131018114400-f1iaoynu1vlq325o
---
addons/mrp_repair/mrp_repair.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 7bab1c04c99..9c0ab0e2c18 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -521,8 +521,9 @@ class mrp_repair(osv.osv):
'location_dest_id': move.location_dest_id.id,
'tracking_id': False,
'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
- 'state': 'done',
+ 'state': 'assigned',
})
+ move_obj.action_done(cr, uid, [move_id], context=context)
repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
if repair.deliver_bool:
pick_name = seq_obj.get(cr, uid, 'stock.picking.out')
From 10b09c13c7a6ce6d2ea70d9de36f631b3c2995bc Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Fri, 18 Oct 2013 14:43:42 +0200
Subject: [PATCH 21/44] [IMP] account: set test on closing account invoice on
previous year instead of next one
bzr revid: mat@openerp.com-20131018124342-yccp0ftebmug4aco
---
.../account/test/account_fiscalyear_close.yml | 34 ++++++++-----------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 40d1b1a6a7b..a0516a3a6ee 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -4,31 +4,27 @@
!record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
code: !eval "'FY%s'% (datetime.now().year+1)"
company_id: base.main_company
- date_start: !eval "'%s-01-01' %(datetime.now().year+1)"
- date_stop: !eval "'%s-12-31' %(datetime.now().year+1)"
- name: !eval "'Fiscal Year %s' %(datetime.now().year+1)"
+ date_start: !eval "'%s-01-01' %(datetime.now().year-1)"
+ date_stop: !eval "'%s-12-31' %(datetime.now().year-1)"
+ name: !eval "'Fiscal Year %s' %(datetime.now().year-1)"
-
- I create a period for the opening entries for the new fiscalyear
+ I generate periods for the new fiscalyear
-
- !record {model: account.period, id: account_period_jan11}:
- company_id: base.main_company
- date_start: !eval "'%s-01-01'% (datetime.now().year+1)"
- date_stop: !eval "'%s-01-01'% (datetime.now().year+1)"
- fiscalyear_id: account_fiscalyear_fiscalyear0
- name: !eval "'OP %s' %(datetime.now().year+1)"
- special: 1
+ !python {model: account.fiscalyear}: |
+ self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")])
-
- I create a new account invoice a the partner in current fiscalyear
+ I create a new account invoice in the created fiscalyear
-
!record {model: account.invoice, id: account_invoice_current1}:
partner_id: base.res_partner_2
+ date_invoice: !eval "'%s-01-02' %(datetime.now().year-1)"
invoice_line:
- partner_id: base.res_partner_2
quantity: 1.0
price_unit: 15.00
name: Bying stuff
-
- I validate it the invoice
+ I validate the invoice
-
!python {model: account.invoice}: |
import netsvc
@@ -47,13 +43,13 @@
company_id: base.main_company
centralisation: 1
-
- I called the Generate Fiscalyear Opening Entries wizard
+ I call the Generate Fiscalyear Opening Entries wizard
-
!record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
- fy2_id: account_fiscalyear_fiscalyear0
- fy_id: account.data_fiscalyear
+ fy2_id: account.data_fiscalyear
+ fy_id: account_fiscalyear_fiscalyear0
journal_id: account.close_journal
- period_id: account_period_jan11
+ period_id: account.period_1
report_name: End of Fiscal Year Entry
-
I clicked on create Button
@@ -66,7 +62,7 @@
I close the previous fiscalyear
-
!record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
- fy_id: data_fiscalyear
+ fy_id: account_fiscalyear_fiscalyear0
-
I clicked on Close States Button to close fiscalyear
-
@@ -77,7 +73,7 @@
-
I check that the fiscalyear state is now "Done"
-
- !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
+ !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}:
- state == 'done'
-
I check that the past accounts are taken into account in partner credit
From f6bb46217271433b07bfb7ba4d21c0df9efd2aea Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Fri, 18 Oct 2013 15:40:58 +0200
Subject: [PATCH 22/44] [FIX] account: correct test with valid error message
bzr revid: mat@openerp.com-20131018134058-wpuyqnhb3xtshqs8
---
addons/account/test/account_fiscalyear_close.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index a0516a3a6ee..92e2cfff7d6 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -78,5 +78,5 @@
-
I check that the past accounts are taken into account in partner credit
-
- !assert {model: res.partner, id: base.res_partner_2}:
- - credit == 15.0, "Total Receivable does not takes unreconciled previous moves"
+ !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled previous moves}:
+ - credit == 15.0
From 6f2f0b17eddef1fdc97d61b5fe68c158bd2960f4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Fri, 18 Oct 2013 15:46:13 +0200
Subject: [PATCH 23/44] [TEST] test with failing test
bzr revid: mat@openerp.com-20131018134613-27lsl5vln5yu26pa
---
addons/account/partner.py | 3 +-
.../account/test/account_fiscalyear_close.yml | 34 +++++++++++--------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 64896338476..4914a17dd2b 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -116,8 +116,7 @@ class res_partner(osv.osv):
LEFT JOIN account_account a ON (l.account_id=a.id)
WHERE a.type IN ('receivable','payable')
AND l.partner_id IN %s
- AND (l.reconcile_id IS NULL OR
- reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
+ AND l.reconcile_id IS NULL
AND """ + query + """
GROUP BY l.partner_id, a.type
""",
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 92e2cfff7d6..a9c989be65b 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -4,27 +4,31 @@
!record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
code: !eval "'FY%s'% (datetime.now().year+1)"
company_id: base.main_company
- date_start: !eval "'%s-01-01' %(datetime.now().year-1)"
- date_stop: !eval "'%s-12-31' %(datetime.now().year-1)"
- name: !eval "'Fiscal Year %s' %(datetime.now().year-1)"
+ date_start: !eval "'%s-01-01' %(datetime.now().year+1)"
+ date_stop: !eval "'%s-12-31' %(datetime.now().year+1)"
+ name: !eval "'Fiscal Year %s' %(datetime.now().year+1)"
-
- I generate periods for the new fiscalyear
+ I create a period for the opening entries for the new fiscalyear
-
- !python {model: account.fiscalyear}: |
- self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")])
+ !record {model: account.period, id: account_period_jan11}:
+ company_id: base.main_company
+ date_start: !eval "'%s-01-01'% (datetime.now().year+1)"
+ date_stop: !eval "'%s-01-01'% (datetime.now().year+1)"
+ fiscalyear_id: account_fiscalyear_fiscalyear0
+ name: !eval "'OP %s' %(datetime.now().year+1)"
+ special: 1
-
- I create a new account invoice in the created fiscalyear
+ I create a new account invoice a the partner in current fiscalyear
-
!record {model: account.invoice, id: account_invoice_current1}:
partner_id: base.res_partner_2
- date_invoice: !eval "'%s-01-02' %(datetime.now().year-1)"
invoice_line:
- partner_id: base.res_partner_2
quantity: 1.0
price_unit: 15.00
name: Bying stuff
-
- I validate the invoice
+ I validate it the invoice
-
!python {model: account.invoice}: |
import netsvc
@@ -43,13 +47,13 @@
company_id: base.main_company
centralisation: 1
-
- I call the Generate Fiscalyear Opening Entries wizard
+ I called the Generate Fiscalyear Opening Entries wizard
-
!record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
- fy2_id: account.data_fiscalyear
- fy_id: account_fiscalyear_fiscalyear0
+ fy2_id: account_fiscalyear_fiscalyear0
+ fy_id: account.data_fiscalyear
journal_id: account.close_journal
- period_id: account.period_1
+ period_id: account_period_jan11
report_name: End of Fiscal Year Entry
-
I clicked on create Button
@@ -62,7 +66,7 @@
I close the previous fiscalyear
-
!record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
- fy_id: account_fiscalyear_fiscalyear0
+ fy_id: data_fiscalyear
-
I clicked on Close States Button to close fiscalyear
-
@@ -73,7 +77,7 @@
-
I check that the fiscalyear state is now "Done"
-
- !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}:
+ !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
- state == 'done'
-
I check that the past accounts are taken into account in partner credit
From 7d3e01bea30dbfa70c56b77b3e019a2074a53e38 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Fri, 18 Oct 2013 15:59:25 +0200
Subject: [PATCH 24/44] [FIX] account: go green test\!, also set the test to
previous year
bzr revid: mat@openerp.com-20131018135925-x2n1yw96973srmk1
---
addons/account/partner.py | 3 +-
.../account/test/account_fiscalyear_close.yml | 36 +++++++++----------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 4914a17dd2b..64896338476 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -116,7 +116,8 @@ class res_partner(osv.osv):
LEFT JOIN account_account a ON (l.account_id=a.id)
WHERE a.type IN ('receivable','payable')
AND l.partner_id IN %s
- AND l.reconcile_id IS NULL
+ AND (l.reconcile_id IS NULL OR
+ reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
AND """ + query + """
GROUP BY l.partner_id, a.type
""",
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index a9c989be65b..73e34f2cca8 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -4,31 +4,27 @@
!record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
code: !eval "'FY%s'% (datetime.now().year+1)"
company_id: base.main_company
- date_start: !eval "'%s-01-01' %(datetime.now().year+1)"
- date_stop: !eval "'%s-12-31' %(datetime.now().year+1)"
- name: !eval "'Fiscal Year %s' %(datetime.now().year+1)"
+ date_start: !eval "'%s-01-01' %(datetime.now().year-1)"
+ date_stop: !eval "'%s-12-31' %(datetime.now().year-1)"
+ name: !eval "'Fiscal Year %s' %(datetime.now().year-1)"
-
- I create a period for the opening entries for the new fiscalyear
+ I generate periods for the new fiscalyear
-
- !record {model: account.period, id: account_period_jan11}:
- company_id: base.main_company
- date_start: !eval "'%s-01-01'% (datetime.now().year+1)"
- date_stop: !eval "'%s-01-01'% (datetime.now().year+1)"
- fiscalyear_id: account_fiscalyear_fiscalyear0
- name: !eval "'OP %s' %(datetime.now().year+1)"
- special: 1
+ !python {model: account.fiscalyear}: |
+ self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")])
-
- I create a new account invoice a the partner in current fiscalyear
+ I create a new account invoice in the created fiscalyear
-
!record {model: account.invoice, id: account_invoice_current1}:
partner_id: base.res_partner_2
+ date_invoice: !eval "'%s-01-02' %(datetime.now().year-1)"
invoice_line:
- partner_id: base.res_partner_2
quantity: 1.0
price_unit: 15.00
name: Bying stuff
-
- I validate it the invoice
+ I validate the invoice
-
!python {model: account.invoice}: |
import netsvc
@@ -47,13 +43,13 @@
company_id: base.main_company
centralisation: 1
-
- I called the Generate Fiscalyear Opening Entries wizard
+ I call the Generate Fiscalyear Opening Entries wizard
-
!record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
- fy2_id: account_fiscalyear_fiscalyear0
- fy_id: account.data_fiscalyear
+ fy2_id: account.data_fiscalyear
+ fy_id: account_fiscalyear_fiscalyear0
journal_id: account.close_journal
- period_id: account_period_jan11
+ period_id: account.period_1
report_name: End of Fiscal Year Entry
-
I clicked on create Button
@@ -66,7 +62,7 @@
I close the previous fiscalyear
-
!record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
- fy_id: data_fiscalyear
+ fy_id: account_fiscalyear_fiscalyear0
-
I clicked on Close States Button to close fiscalyear
-
@@ -77,10 +73,10 @@
-
I check that the fiscalyear state is now "Done"
-
- !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
+ !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}:
- state == 'done'
-
I check that the past accounts are taken into account in partner credit
-
- !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled previous moves}:
+ !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled moves of previous years}:
- credit == 15.0
From 1a9297aaed79ed0e267bf119ae352220cf711bf1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Fri, 18 Oct 2013 16:04:24 +0200
Subject: [PATCH 25/44] [FIX] account: correct test on closing fiscal year to
fail with error message and set the test to the previous year instead of next
year (makes more sense)
bzr revid: mat@openerp.com-20131018140424-yyfc561nisym2gem
---
.../account/test/account_fiscalyear_close.yml | 38 +++++++++----------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 40d1b1a6a7b..73e34f2cca8 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -4,31 +4,27 @@
!record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
code: !eval "'FY%s'% (datetime.now().year+1)"
company_id: base.main_company
- date_start: !eval "'%s-01-01' %(datetime.now().year+1)"
- date_stop: !eval "'%s-12-31' %(datetime.now().year+1)"
- name: !eval "'Fiscal Year %s' %(datetime.now().year+1)"
+ date_start: !eval "'%s-01-01' %(datetime.now().year-1)"
+ date_stop: !eval "'%s-12-31' %(datetime.now().year-1)"
+ name: !eval "'Fiscal Year %s' %(datetime.now().year-1)"
-
- I create a period for the opening entries for the new fiscalyear
+ I generate periods for the new fiscalyear
-
- !record {model: account.period, id: account_period_jan11}:
- company_id: base.main_company
- date_start: !eval "'%s-01-01'% (datetime.now().year+1)"
- date_stop: !eval "'%s-01-01'% (datetime.now().year+1)"
- fiscalyear_id: account_fiscalyear_fiscalyear0
- name: !eval "'OP %s' %(datetime.now().year+1)"
- special: 1
+ !python {model: account.fiscalyear}: |
+ self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")])
-
- I create a new account invoice a the partner in current fiscalyear
+ I create a new account invoice in the created fiscalyear
-
!record {model: account.invoice, id: account_invoice_current1}:
partner_id: base.res_partner_2
+ date_invoice: !eval "'%s-01-02' %(datetime.now().year-1)"
invoice_line:
- partner_id: base.res_partner_2
quantity: 1.0
price_unit: 15.00
name: Bying stuff
-
- I validate it the invoice
+ I validate the invoice
-
!python {model: account.invoice}: |
import netsvc
@@ -47,13 +43,13 @@
company_id: base.main_company
centralisation: 1
-
- I called the Generate Fiscalyear Opening Entries wizard
+ I call the Generate Fiscalyear Opening Entries wizard
-
!record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
- fy2_id: account_fiscalyear_fiscalyear0
- fy_id: account.data_fiscalyear
+ fy2_id: account.data_fiscalyear
+ fy_id: account_fiscalyear_fiscalyear0
journal_id: account.close_journal
- period_id: account_period_jan11
+ period_id: account.period_1
report_name: End of Fiscal Year Entry
-
I clicked on create Button
@@ -66,7 +62,7 @@
I close the previous fiscalyear
-
!record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
- fy_id: data_fiscalyear
+ fy_id: account_fiscalyear_fiscalyear0
-
I clicked on Close States Button to close fiscalyear
-
@@ -77,10 +73,10 @@
-
I check that the fiscalyear state is now "Done"
-
- !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
+ !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}:
- state == 'done'
-
I check that the past accounts are taken into account in partner credit
-
- !assert {model: res.partner, id: base.res_partner_2}:
- - credit == 15.0, "Total Receivable does not takes unreconciled previous moves"
+ !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled moves of previous years}:
+ - credit == 15.0
From 16fd47c3e11d15d0d5ae8b2b5cf2251dc1dae1d8 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 21 Oct 2013 04:57:23 +0000
Subject: [PATCH 26/44] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052801-ouw53m70o0eabxnv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050509-ar8koyz20p82rdjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131021045723-bkmqoimoalwb3lzq
---
addons/account/i18n/hr.po | 8 +-
addons/account/i18n/ja.po | 16 ++--
addons/account_voucher/i18n/hr.po | 30 ++++---
addons/analytic/i18n/hr.po | 80 +++++++++---------
addons/crm/i18n/hr.po | 49 +++++++++--
addons/crm/i18n/nl.po | 10 +--
addons/event/i18n/nl.po | 28 +++++--
addons/mail/i18n/hr.po | 10 ++-
addons/mail/i18n/ja.po | 10 +--
addons/mrp/i18n/zh_CN.po | 12 +--
addons/mrp_operations/i18n/zh_CN.po | 12 +--
addons/mrp_repair/i18n/zh_CN.po | 36 +++++----
addons/portal_crm/i18n/nl.po | 10 +--
addons/procurement/i18n/zh_CN.po | 20 +++--
addons/project_issue_sheet/i18n/sl.po | 72 +++++++++++++++++
addons/sale/i18n/ja.po | 112 +++++++++++++-------------
addons/sale/i18n/nl.po | 14 ++--
addons/sale_stock/i18n/ja.po | 58 ++++++-------
addons/warning/i18n/hr.po | 10 +--
19 files changed, 373 insertions(+), 224 deletions(-)
create mode 100644 addons/project_issue_sheet/i18n/sl.po
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 352f8a8b197..7a25397cf63 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-10-16 11:57+0000\n"
+"PO-Revision-Date: 2013-10-18 14:36+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: 2013-10-17 05:59+0000\n"
-"X-Generator: Launchpad (build 16799)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4377,7 +4377,7 @@ msgstr "Datum"
#. module: account
#: view:account.move:0
msgid "Post"
-msgstr "Objava"
+msgstr "Knjiženje"
#. module: account
#: view:account.unreconcile:0
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 7d30c2b0b29..336395964a0 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-10-15 07:56+0000\n"
+"PO-Revision-Date: 2013-10-21 04:18+0000\n"
"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n"
-"X-Generator: Launchpad (build 16799)\n"
+"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -421,7 +421,7 @@ msgstr "明細入力に使用される通貨"
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
-msgstr "デフォルト借方アカウント"
+msgstr "デフォルト借方勘定"
#. module: account
#: view:account.move:0
@@ -1629,7 +1629,7 @@ msgstr "桁数"
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries"
-msgstr "手動入力のため、ドラフト状態をスキップします。"
+msgstr "マニュアル入力につき「ドラフト」状態をスキップ"
#. module: account
#: code:addons/account/report/common_report_header.py:92
@@ -1739,7 +1739,7 @@ msgstr "非課税"
#. module: account
#: view:account.journal:0
msgid "Advanced Settings"
-msgstr ""
+msgstr "詳細設定"
#. module: account
#: view:account.bank.statement:0
@@ -8618,7 +8618,7 @@ msgstr "期末残高"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
-msgstr ""
+msgstr "相手勘定を集約"
#. module: account
#: help:account.move.line,blocked:0
@@ -8927,7 +8927,7 @@ msgstr "許可アカウント(制御なしは空)"
#. module: account
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
-msgstr ""
+msgstr "売上税 (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index d68411955db..93f35161e45 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-16 13:13+0000\n"
+"PO-Revision-Date: 2013-10-18 15:15+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: 2013-10-17 05:59+0000\n"
-"X-Generator: Launchpad (build 16799)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
@@ -124,6 +124,8 @@ msgid ""
"This sentence helps you to know how to specify the payment rate by giving "
"you the direct effect it has"
msgstr ""
+"Ovo vam pomaže da znate kako specificirati termin plaćanja tako što vam daje "
+"opis učinka"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -260,7 +262,7 @@ msgstr "Opcije plaćanja"
#. module: account_voucher
#: view:account.voucher:0
msgid "e.g. 003/10"
-msgstr ""
+msgstr "npr. 003/10"
#. module: account_voucher
#: view:account.voucher:0
@@ -278,7 +280,7 @@ msgstr "Otkazani"
#, python-format
msgid ""
"You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
+msgstr "Morate podesiti konto osnovice i poreza na '%s' porezu!"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -408,6 +410,8 @@ msgid ""
"settings, to manage automatically the booking of accounting entries related "
"to differences between exchange rates."
msgstr ""
+"Trebali bi podesiti 'Konto pozitivne tečajne razlike' u postavkama "
+"računovodstva, za automatsko knjiženje tečajnih razlika."
#. module: account_voucher
#: view:account.voucher:0
@@ -673,6 +677,8 @@ msgid ""
"Fields with internal purpose only that depicts if the voucher is a multi "
"currency one or not"
msgstr ""
+"Polja sa internom svrhom koja samo opisuje ako je vaučer u višestrukoj "
+"valuti ili ne."
#. module: account_voucher
#: view:account.invoice:0
@@ -739,7 +745,7 @@ msgstr "Vaučer je plaćen u potpunosti"
#. module: account_voucher
#: selection:account.voucher,payment_option:0
msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Zatvori saldo plaćanja"
#. module: account_voucher
#: view:account.voucher:0
@@ -825,7 +831,7 @@ msgstr "Lipanj"
#. module: account_voucher
#: field:account.voucher,payment_rate_currency_id:0
msgid "Payment Rate Currency"
-msgstr ""
+msgstr "Tečaj plaćanja"
#. module: account_voucher
#: field:account.voucher,paid:0
@@ -895,7 +901,7 @@ msgstr "Predhodna plaćanja ?"
#: code:addons/account_voucher/account_voucher.py:1208
#, python-format
msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "Račun koji želite platiti nije više važeći."
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -941,7 +947,7 @@ msgstr "Plaćanja kupaca"
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
#: view:sale.receipt.report:0
msgid "Sales Receipts Analysis"
-msgstr ""
+msgstr "Analiza potvrda"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -961,7 +967,7 @@ msgstr "Računi i otvorene stavke"
#. module: account_voucher
#: field:account.voucher,currency_help_label:0
msgid "Helping Sentence"
-msgstr ""
+msgstr "Pomoć"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -1003,7 +1009,7 @@ msgstr "Izvod banke"
#. module: account_voucher
#: view:account.bank.statement:0
msgid "onchange_amount(amount)"
-msgstr ""
+msgstr "onchange_amount(amount)"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -1216,7 +1222,7 @@ msgstr "Godina"
#: field:account.config.settings,income_currency_exchange_account_id:0
#: field:res.company,income_currency_exchange_account_id:0
msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "Konto pozitivne tečajne razlike"
#. module: account_voucher
#: selection:account.voucher,type:0
diff --git a/addons/analytic/i18n/hr.po b/addons/analytic/i18n/hr.po
index d9c677860b4..acf6195e3db 100644
--- a/addons/analytic/i18n/hr.po
+++ b/addons/analytic/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-18 14:57+0000\n"
+"Last-Translator: Krešimir Jeđud \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: 2013-07-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
@@ -25,18 +25,18 @@ msgstr "Podređena konta"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "In Progress"
-msgstr ""
+msgstr "U tijeku"
#. module: analytic
#: code:addons/analytic/analytic.py:229
#, python-format
msgid "Contract: "
-msgstr ""
+msgstr "Ugovor: "
#. module: analytic
#: model:mail.message.subtype,description:analytic.mt_account_pending
msgid "Contract pending"
-msgstr ""
+msgstr "Ugovor u tijeku"
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -47,7 +47,7 @@ msgstr "Predložak"
#: view:account.analytic.account:0
#: field:account.analytic.account,date:0
msgid "End Date"
-msgstr ""
+msgstr "Datum završetka"
#. module: analytic
#: help:account.analytic.line,unit_amount:0
@@ -76,12 +76,12 @@ msgstr ""
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Contract or Project"
-msgstr ""
+msgstr "Ugovor ili projekt"
#. module: analytic
#: field:account.analytic.account,name:0
msgid "Account/Contract Name"
-msgstr ""
+msgstr "Naziv ugovora"
#. module: analytic
#: field:account.analytic.account,manager_id:0
@@ -91,7 +91,7 @@ msgstr "Voditelj računovodstva"
#. module: analytic
#: field:account.analytic.account,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Pratitelji"
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -101,7 +101,7 @@ msgstr "Zatvoren"
#. module: analytic
#: model:mail.message.subtype,name:analytic.mt_account_pending
msgid "Contract to Renew"
-msgstr ""
+msgstr "Ugovor za obnovu"
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -111,18 +111,18 @@ msgstr "Novi"
#. module: analytic
#: field:account.analytic.account,user_id:0
msgid "Project Manager"
-msgstr ""
+msgstr "Voditelj projekta"
#. module: analytic
#: field:account.analytic.account,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: analytic
#: code:addons/analytic/analytic.py:271
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
@@ -144,12 +144,12 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Nepročitane poruke"
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivna analitička konta."
#. module: analytic
#: field:account.analytic.account,company_id:0
@@ -160,7 +160,7 @@ msgstr "Organizacija"
#. module: analytic
#: view:account.analytic.account:0
msgid "Renewal"
-msgstr ""
+msgstr "Obnova"
#. module: analytic
#: help:account.analytic.account,message_summary:0
@@ -168,11 +168,13 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
#. module: analytic
#: help:account.analytic.account,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ako je odabrano, nove poruke zahtijevaju Vašu pažnju."
#. module: analytic
#: help:account.analytic.account,quantity_max:0
@@ -196,7 +198,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Je pratitelj"
#. module: analytic
#: field:account.analytic.line,user_id:0
@@ -216,12 +218,12 @@ msgstr "Datum"
#. module: analytic
#: model:mail.message.subtype,name:analytic.mt_account_closed
msgid "Contract Finished"
-msgstr ""
+msgstr "Ugovor završen"
#. module: analytic
#: view:account.analytic.account:0
msgid "Terms and Conditions"
-msgstr ""
+msgstr "Opći uvjeti"
#. module: analytic
#: help:account.analytic.line,amount:0
@@ -235,7 +237,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,partner_id:0
msgid "Customer"
-msgstr ""
+msgstr "Partner"
#. module: analytic
#: field:account.analytic.account,child_complete_ids:0
@@ -245,12 +247,12 @@ msgstr "Hijerarhija konta"
#. module: analytic
#: field:account.analytic.account,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Poruke"
#. module: analytic
#: help:account.analytic.account,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i povijest komunikacije"
#. module: analytic
#: constraint:account.analytic.line:0
@@ -260,23 +262,23 @@ msgstr ""
#. module: analytic
#: view:account.analytic.account:0
msgid "Contract Information"
-msgstr ""
+msgstr "Informacije o ugovoru"
#. module: analytic
#: field:account.analytic.account,template_id:0
#: selection:account.analytic.account,type:0
msgid "Template of Contract"
-msgstr ""
+msgstr "Predložak ugovora"
#. module: analytic
#: field:account.analytic.account,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
#. module: analytic
#: field:account.analytic.account,quantity_max:0
msgid "Prepaid Service Units"
-msgstr ""
+msgstr "Jedinica unaprijed plaćene usluge"
#. module: analytic
#: field:account.analytic.account,credit:0
@@ -286,7 +288,7 @@ msgstr "Potražuje"
#. module: analytic
#: model:mail.message.subtype,name:analytic.mt_account_opened
msgid "Contract Opened"
-msgstr ""
+msgstr "Ugovor je otvoren"
#. module: analytic
#: help:account.analytic.account,type:0
@@ -309,7 +311,7 @@ msgstr "Otkazano"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Analytic View"
-msgstr ""
+msgstr "Analitički pogled"
#. module: analytic
#: field:account.analytic.account,balance:0
@@ -319,12 +321,12 @@ msgstr "Saldo"
#. module: analytic
#: field:account.analytic.account,complete_name:0
msgid "Full Name"
-msgstr ""
+msgstr "Puno ime"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "To Renew"
-msgstr ""
+msgstr "Za obnovu"
#. module: analytic
#: field:account.analytic.account,quantity:0
@@ -335,18 +337,18 @@ msgstr "Količina"
#. module: analytic
#: field:account.analytic.account,code:0
msgid "Reference"
-msgstr ""
+msgstr "Veza"
#. module: analytic
#: code:addons/analytic/analytic.py:160
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Greška!"
#. module: analytic
#: model:mail.message.subtype,description:analytic.mt_account_closed
msgid "Contract closed"
-msgstr ""
+msgstr "Ugovor zatvoren"
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
@@ -374,13 +376,13 @@ msgstr "Valuta"
#. module: analytic
#: model:mail.message.subtype,description:analytic.mt_account_opened
msgid "Contract opened"
-msgstr ""
+msgstr "Ugovor otvoren"
#. module: analytic
#: code:addons/analytic/analytic.py:262
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Upozoranje"
#. module: analytic
#: field:account.analytic.account,type:0
@@ -390,7 +392,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,date_start:0
msgid "Start Date"
-msgstr ""
+msgstr "Datum početka"
#. module: analytic
#: field:account.analytic.account,line_ids:0
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 08c2e6b2622..a2d61018510 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-09-24 11:36+0000\n"
-"Last-Translator: Krešimir Jeđud \n"
+"PO-Revision-Date: 2013-10-18 14:26+0000\n"
+"Last-Translator: Drazen Bosak \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: 2013-09-25 05:48+0000\n"
-"X-Generator: Launchpad (build 16771)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -283,7 +283,7 @@ msgstr "Kampanje"
#: view:crm.lead:0
#: field:crm.lead,state_id:0
msgid "State"
-msgstr "Stanje"
+msgstr "Država"
#. module: crm
#: view:crm.lead:0
@@ -496,6 +496,15 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Pritisnite za kreiranje novog prodajnog tima.\n"
+"
\n"
+" Prodajne timove koristite za organizaciju različitih "
+"referenata ili\n"
+" odjela u zasebne timove. Svaki će tim raditi sa svojom\n"
+" listom prilika.\n"
+"
\n"
+" "
#. module: crm
#: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -668,6 +677,14 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Pritisnite za kreiranje nove kategorije.\n"
+"
\n"
+" Kreirajte specifične kategorije telefonskih poziva kako biste "
+"kvalitetnije definirali vrstu\n"
+" poziva koja se prati u sustavu.\n"
+"
\n"
+" "
#. module: crm
#: help:crm.case.section,reply_to:0
@@ -847,7 +864,7 @@ msgstr "ili"
#: field:crm.lead.report,create_date:0
#: field:crm.phonecall.report,create_date:0
msgid "Create Date"
-msgstr "Kreiraj datum"
+msgstr "Datum kreiranja"
#. module: crm
#: field:crm.lead,ref2:0
@@ -2701,6 +2718,18 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Pritisnite za kreiranje nove oznake prodaje.\n"
+"
\n"
+" Kreirajte specifičnih oznaka (tag-ova) koje odgovaraju "
+"aktivnostima vaše tvrtke\n"
+" kako biste bolje klasificirali i analizirali svoje "
+"potencijale i prilike.\n"
+" Takve bi se kategorije, na primjer, mogle reflektirati na "
+"strukturu vaših proizvoda\n"
+" ili različitu strukturu vaše prodaje.\n"
+"
\n"
+" "
#. module: crm
#: selection:crm.lead.report,creation_month:0
@@ -3206,6 +3235,14 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Pritisnite za kreiranje nove faze za potencijale/prilike.\n"
+"
\n"
+" Faze omogućuju prodajnom osoblju lakše praćenje "
+"pozicioniranja \n"
+" određenih potencijala ili prilika unutar prodajnog ciklusa.\n"
+"
\n"
+" "
#~ msgid "Send Mail"
#~ msgstr "Pošalji mail"
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 4abea0917d9..c6577109f8c 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-08 11:18+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-18 13:15+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-07-11 05:53+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -235,7 +235,7 @@ msgstr "Telefoongesprek"
#. module: crm
#: field:crm.lead,opt_out:0
msgid "Opt-Out"
-msgstr "Uitschrijven"
+msgstr "Opt-Out"
#. module: crm
#: view:crm.lead:0
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index c1360fdfd91..ada67514d52 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-08-02 12:54+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-18 12:28+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-08-03 06:13+0000\n"
-"X-Generator: Launchpad (build 16718)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: event
#: view:event.event:0
@@ -530,7 +530,7 @@ msgstr ""
#. module: event
#: field:report.event.registration,draft_state:0
msgid " # No of Draft Registrations"
-msgstr " # aantal voorlopige inschrijvingen"
+msgstr " # Aantal voorlopige inschrijvingen"
#. module: event
#: field:event.event,email_registration_id:0
@@ -742,6 +742,10 @@ msgid ""
"emails sent automatically at event or registrations confirmation. You can "
"also put your email address of your mail gateway if you use one."
msgstr ""
+"Het e-mail adres van de organisator wat wordt ingesteld als 'antwoord aan' "
+"van alle e-mails welke automatisch worden verstuurt bij een evenement en "
+"registratie bevestiging. Het is ook mogelijk een e-mail adres van uw e-mail "
+"gateway in te stellen, indien u deze gebruikt."
#. module: event
#: help:event.event,message_ids:0
@@ -847,6 +851,8 @@ msgid ""
"You have already set a registration for this event as 'Attended'. Please "
"reset it to draft if you want to cancel this event."
msgstr ""
+"U heeft de registratie van dit evenement al gezet op \"aanwezig\". Zet deze "
+"status terug naar concept als u het evenement wilt annuleren."
#. module: event
#: view:res.partner:0
@@ -1148,6 +1154,14 @@ msgid ""
" Thank you for your participation!
\n"
" Best regards
"
msgstr ""
+"\n"
+" Hallo ${object.name},
\n"
+" Hierbij bevestigen wij uw registratie voor het evenement "
+"${object.event_id.name}.\n"
+" U ontvangt automatisch een e-mail met meer praktische informatie, "
+"zoals agenda en tijden, zodra het evenement definitief is bevestigd.
\n"
+" Onze dank voor uw deelname!
\n"
+" Best regards
"
#. module: event
#: help:event.event,reply_to:0
@@ -1157,6 +1171,10 @@ msgid ""
"registrations confirmation. You can also put the email address of your mail "
"gateway if you use one."
msgstr ""
+"Het e-mail adres van de organisator wat wordt ingesteld als 'antwoord aan' "
+"van alle e-mails welke automatisch worden verstuurt bij een evenement en "
+"registratie bevestiging. Het is ook mogelijk een e-mail adres van uw e-mail "
+"gateway in te stellen, indien u deze gebruikt."
#. module: event
#: view:event.event:0
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 69d31181214..07f9f82a0e0 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-04 10:42+0000\n"
-"Last-Translator: Krešimir Jeđud \n"
+"PO-Revision-Date: 2013-10-18 13:09+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: 2013-10-05 06:16+0000\n"
-"X-Generator: Launchpad (build 16791)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: mail
#: view:mail.followers:0
@@ -195,6 +195,8 @@ msgid ""
"Members of those groups will automatically added as followers. Note that "
"they will be able to manage their subscription manually if necessary."
msgstr ""
+"Članovi tih grupa će biti automatski dodani kao sljedbenici. Imajte na umu "
+"da će oni prema potrebi moći ručno upravljati svojom pretplatom."
#. module: mail
#. openerp-web
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 60e06c2ffcc..e7af52d95cd 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-17 09:12+0000\n"
+"PO-Revision-Date: 2013-10-19 05:47+0000\n"
"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n"
-"X-Generator: Launchpad (build 16799)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:04+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: mail
#: view:mail.followers:0
@@ -1168,7 +1168,7 @@ msgstr ""
#. module: mail
#: model:mail.group,name:mail.group_best_sales_practices
msgid "Best Sales Practices"
-msgstr ""
+msgstr "最適な販売プラクティス"
#. module: mail
#: selection:mail.group,public:0
@@ -1693,7 +1693,7 @@ msgstr ""
#: model:ir.ui.menu,name:mail.mail_feeds
#: model:ir.ui.menu,name:mail.mail_feeds_main
msgid "Messaging"
-msgstr ""
+msgstr "メッセージング"
#. module: mail
#: view:mail.alias:0
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 7e71020da03..14bef1a5d23 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/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: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-04 07:37+0000\n"
-"Last-Translator: Joshua Jan(SHINEIT) \n"
+"PO-Revision-Date: 2013-10-19 00:42+0000\n"
+"Last-Translator: 盈通 ccdos \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-05 06:30+0000\n"
-"X-Generator: Launchpad (build 16718)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: mrp
#: help:mrp.config.settings,module_mrp_repair:0
@@ -81,7 +81,7 @@ msgstr "小时成本"
#. module: mrp
#: view:mrp.production:0
msgid "Scrap Products"
-msgstr "报废原料"
+msgstr "损耗产品"
#. module: mrp
#: view:mrp.workcenter:0
@@ -2218,7 +2218,7 @@ msgstr "产品类型是可库存或消耗品"
#. module: mrp
#: selection:mrp.production,state:0
msgid "Production Started"
-msgstr "生产开始了"
+msgstr "已开始生产"
#. module: mrp
#: model:process.node,name:mrp.process_node_procureproducts0
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 2e5703ecf18..1978c98a82f 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/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: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-19 00:09+0000\n"
+"Last-Translator: openerp-china.black-jack \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:11+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -77,7 +77,7 @@ msgstr "重新开始"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Product to Produce"
-msgstr "产品到产品"
+msgstr "待生产的产品"
#. module: mrp_operations
#: view:mrp_operations.operation:0
@@ -489,7 +489,7 @@ msgstr "总加工次数"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
msgid "Ready to Produce"
-msgstr "生产准备就绪"
+msgstr "准备生产"
#. module: mrp_operations
#: field:stock.move,move_dest_id_lines:0
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index 93e9aed9f38..cfe10772932 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-19 01:00+0000\n"
+"Last-Translator: 盈通 ccdos \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:11+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: mrp_repair
#: field:mrp.repair.line,move_id:0
msgid "Inventory Move"
-msgstr "库存调拨"
+msgstr "存货调拨"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -30,7 +30,7 @@ msgstr "分组..."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Recreate Invoice"
-msgstr "再创建发票"
+msgstr "重新生成发票"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:371
@@ -48,12 +48,12 @@ msgstr "作废维修单"
#: field:mrp.repair.fee,to_invoice:0
#: field:mrp.repair.line,to_invoice:0
msgid "To Invoice"
-msgstr "开票"
+msgstr "开发票"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "计量单位"
#. module: mrp_repair
#: report:repair.order:0
@@ -68,7 +68,7 @@ msgstr "业务伙伴发票地址组"
#. module: mrp_repair
#: field:mrp.repair,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:435
@@ -95,7 +95,7 @@ msgstr "发票异常"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Serial Number"
-msgstr ""
+msgstr "序列号:"
#. module: mrp_repair
#: field:mrp.repair,address_id:0
@@ -121,7 +121,7 @@ msgstr "发票地址:"
#. module: mrp_repair
#: help:mrp.repair,partner_id:0
msgid "Choose partner for whom the order will be invoiced and delivered."
-msgstr ""
+msgstr "为将要开票或者发运的订单选择业务伙伴"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -136,7 +136,7 @@ msgstr "备注"
#. module: mrp_repair
#: field:mrp.repair,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "信息"
#. module: mrp_repair
#: field:mrp.repair,amount_tax:0
@@ -151,7 +151,7 @@ msgstr "税"
#: code:addons/mrp_repair/mrp_repair.py:442
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "错误!"
#. module: mrp_repair
#: report:repair.order:0
@@ -162,12 +162,12 @@ msgstr "净合计:"
#: selection:mrp.repair,state:0
#: selection:mrp.repair.line,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "取消"
#. module: mrp_repair
#: help:mrp.repair,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息,勾选此项"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -194,6 +194,12 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" 创建维修单 \n"
+"
\n"
+" 在维修单中,你能详细描述零部件的移除, 替换并且记录在不同操作上面花费的时间。\n"
+"
\n"
+" "
#. module: mrp_repair
#: help:mrp.repair.line,state:0
diff --git a/addons/portal_crm/i18n/nl.po b/addons/portal_crm/i18n/nl.po
index 54cfed25d8d..b62ac0e13b1 100644
--- a/addons/portal_crm/i18n/nl.po
+++ b/addons/portal_crm/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-06-08 12:19+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-18 13:16+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-07-11 06:14+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: portal_crm
#: selection:portal_crm.crm_contact_us,type:0
@@ -161,7 +161,7 @@ msgstr "Onderwerp"
#. module: portal_crm
#: field:portal_crm.crm_contact_us,opt_out:0
msgid "Opt-Out"
-msgstr "Uitschrijven"
+msgstr "Opt-Out"
#. module: portal_crm
#: field:portal_crm.crm_contact_us,priority:0
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index 8c9da383f4a..c9ed51a3df7 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: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-06-10 18:22+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) \n"
+"PO-Revision-Date: 2013-10-19 01:05+0000\n"
+"Last-Translator: 盈通 ccdos \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:15+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: procurement
#: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -118,7 +118,7 @@ msgstr "销售单位数量"
#. module: procurement
#: view:procurement.order:0
msgid "Reason"
-msgstr "理由"
+msgstr "原因"
#. module: procurement
#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
@@ -133,6 +133,12 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" 你能定义最小库存规则,这样Openerp 将能自动根据最小库存规则创建生产单或者采购报价单\n"
+" 一旦产品的虚拟库存(= 在手库存 ,所有已经确定的订单和预定)小于最小数量, OpenERP 将产生补货请求, "
+"增加库存到最大数量。\n"
+"
\n"
+" "
#. module: procurement
#: view:procurement.order.compute:0
@@ -187,7 +193,7 @@ msgstr "永久性生产需求异常"
#. module: procurement
#: help:procurement.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息,勾选此项"
+msgstr "如果勾选此项,有新消息会提醒你"
#. module: procurement
#: view:procurement.order.compute.all:0
@@ -202,7 +208,7 @@ msgstr "库存调拨"
#. module: procurement
#: view:product.product:0
msgid "Stockable products"
-msgstr "可库存的产品"
+msgstr "可储存的产品"
#. module: procurement
#: code:addons/procurement/procurement.py:138
diff --git a/addons/project_issue_sheet/i18n/sl.po b/addons/project_issue_sheet/i18n/sl.po
new file mode 100644
index 00000000000..610a32ddcdf
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/sl.po
@@ -0,0 +1,72 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-10-20 08:52+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Slovenian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#, python-format
+msgid "The Analytic Account is pending !"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "on_change_project(project_id)"
+msgstr ""
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#: field:project.issue,analytic_account_id:0
+#, python-format
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 2e09f12dade..daa8195504d 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-30 04:29+0000\n"
+"PO-Revision-Date: 2013-10-19 05:51+0000\n"
"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-31 05:28+0000\n"
-"X-Generator: Launchpad (build 16750)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
@@ -41,7 +41,7 @@ msgstr "営業担当者"
#. module: sale
#: help:sale.order,pricelist_id:0
msgid "Pricelist for current sales order."
-msgstr "現在の受注オーダーのための価格リスト"
+msgstr "現在の受注の価格リスト"
#. module: sale
#: view:sale.report:0
@@ -141,7 +141,7 @@ msgstr ""
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Invoice the whole sales order"
-msgstr "販売オーダ全体を請求"
+msgstr "受注全体を請求"
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -178,7 +178,7 @@ msgstr "合計価格"
#. module: sale
#: field:sale.config.settings,group_invoice_so_lines:0
msgid "Generate invoices based on the sales order lines"
-msgstr "販売オーダ明細に基づき顧客請求書を生成"
+msgstr "受注明細に基づき顧客請求書を生成"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -227,7 +227,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Sales Order done"
-msgstr "販売オーダ完了"
+msgstr "受注完了"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -282,7 +282,7 @@ msgstr "店名"
#: code:addons/sale/sale.py:598
#, python-format
msgid "You cannot confirm a sales order which has no line."
-msgstr "明細のない販売オーダは確定できません。"
+msgstr "明細のない受注は確定できません。"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -337,17 +337,17 @@ msgstr "8月"
#. module: sale
#: field:sale.config.settings,module_sale_stock:0
msgid "Trigger delivery orders automatically from sales orders"
-msgstr "販売オーダより自動で出荷オーダを生成"
+msgstr "受注より自動で出荷を生成"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
msgid "Sales Orders Statistics"
-msgstr "販売オーダ統計"
+msgstr "受注統計"
#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sales order."
-msgstr "販売オーダに紐づく分析アカウント"
+msgstr "受注に紐づく分析アカウント"
#. module: sale
#: selection:sale.report,month:0
@@ -413,7 +413,7 @@ msgstr "数量"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "現在の受注の出荷先"
#. module: sale
#: report:sale.order:0
@@ -423,7 +423,7 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sales order lines"
-msgstr ""
+msgstr "受注明細単位の請求を有効化"
#. module: sale
#: selection:sale.report,month:0
@@ -460,7 +460,7 @@ msgstr "販売員は見積を確認します。受注オーダーの状態は進
#. module: sale
#: view:sale.order.line:0
msgid "Sales Order Lines ready to be invoiced"
-msgstr ""
+msgstr "請求可能な受注明細"
#. module: sale
#: code:addons/sale/sale.py:308
@@ -478,7 +478,7 @@ msgstr "TEL:"
#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
-msgstr "現在の受注オーダーのための請求書住所"
+msgstr "現在の受注の請求先アドレス"
#. module: sale
#: model:ir.model,name:sale.model_sale_config_settings
@@ -506,7 +506,7 @@ msgstr ""
#. module: sale
#: view:sale.report:0
msgid "Ordered month of the sales order"
-msgstr "受注オーダーのオーダー月"
+msgstr "受注月"
#. module: sale
#: code:addons/sale/sale.py:505
@@ -619,7 +619,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
msgid "Sales Order Line"
-msgstr "販売オーダ明細"
+msgstr "受注明細"
#. module: sale
#: field:sale.config.settings,module_analytic_user_function:0
@@ -640,7 +640,7 @@ msgstr "オーダー番号"
#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
-msgstr "オーダー行"
+msgstr "受注明細"
#. module: sale
#: field:account.config.settings,module_sale_analytic_plans:0
@@ -664,7 +664,7 @@ msgstr "作成日"
#. module: sale
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sales Orders"
-msgstr "販売オーダ内のアドレス"
+msgstr "受注内のアドレス"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -719,7 +719,7 @@ msgstr ""
#. module: sale
#: help:sale.order,invoice_exists:0
msgid "It indicates that sales order has at least one invoice."
-msgstr ""
+msgstr "受注に紐づく請求が少なくとも1件存在することを示します。"
#. module: sale
#: view:sale.order:0
@@ -777,7 +777,7 @@ msgstr "製品分類"
#: code:addons/sale/sale.py:564
#, python-format
msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "この受注は取消できません。"
#. module: sale
#: view:sale.order:0
@@ -815,7 +815,7 @@ msgstr ""
#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
-msgstr "販売オーダ"
+msgstr "受注"
#. module: sale
#: selection:sale.order,order_policy:0
@@ -888,7 +888,7 @@ msgstr "適切な価格リスト行が見つかりません:"
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
msgid "Display margins on sales orders"
-msgstr "販売オーダにマージンを表示"
+msgstr "受注にマージンを表示"
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -911,7 +911,7 @@ msgstr "数量"
#. module: sale
#: view:sale.order.line:0
msgid "My Sales Order Lines"
-msgstr "私の受注オーダー行"
+msgstr "自分の受注明細"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -1007,7 +1007,7 @@ msgstr "送付先住所:"
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
-msgstr "受注オーダーのドラフト状態"
+msgstr "受注のドラフト状態"
#. module: sale
#: help:sale.order,message_ids:0
@@ -1028,7 +1028,7 @@ msgstr ""
#: code:addons/sale/sale.py:983
#, python-format
msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "'%s'状態の受注明細は削除できません。"
#. module: sale
#: model:res.groups,name:sale.group_mrp_properties
@@ -1041,7 +1041,7 @@ msgstr ""
msgid ""
"Before choosing a product,\n"
" select a customer in the sales form."
-msgstr ""
+msgstr "品目を選択する前に受注フォームで顧客を選択してください。"
#. module: sale
#: view:sale.order:0
@@ -1057,7 +1057,7 @@ msgstr ""
#. module: sale
#: view:sale.report:0
msgid "Ordered date of the sales order"
-msgstr "販売オーダの注文日"
+msgstr "受注日"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1068,7 +1068,7 @@ msgstr "見積の確認"
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "請求対象受注明細"
#. module: sale
#: view:sale.order:0
@@ -1124,7 +1124,7 @@ msgstr "税金"
#. module: sale
#: view:sale.order:0
msgid "Sales Order ready to be invoiced"
-msgstr "請求可能な販売オーダ"
+msgstr "請求可能な受注"
#. module: sale
#: help:sale.config.settings,module_analytic_user_function:0
@@ -1141,7 +1141,7 @@ msgstr ""
#. module: sale
#: help:sale.order,create_date:0
msgid "Date on which sales order is created."
-msgstr "受注オーダーの作成日"
+msgstr "受注作成日"
#. module: sale
#: view:sale.order:0
@@ -1180,7 +1180,7 @@ msgstr "出荷数量"
#. module: sale
#: view:sale.order:0
msgid "Sales Order that haven't yet been confirmed"
-msgstr "未確認状態の受注オーダー"
+msgstr "未確認状態の受注"
#. module: sale
#: help:sale.order,invoice_quantity:0
@@ -1199,7 +1199,7 @@ msgstr "請求書作成"
#. module: sale
#: help:account.config.settings,group_analytic_account_for_sales:0
msgid "Allows you to specify an analytic account on sales orders."
-msgstr ""
+msgstr "受注での分析勘定の選択を可能にします。"
#. module: sale
#: view:sale.order:0
@@ -1210,7 +1210,7 @@ msgstr "請求対象"
#. module: sale
#: view:sale.report:0
msgid "Ordered Year of the sales order"
-msgstr "受注オーダーのオーダー年"
+msgstr "受注年"
#. module: sale
#: selection:sale.report,month:0
@@ -1259,7 +1259,7 @@ msgstr "会計士によってレビューされます。"
#. module: sale
#: view:sale.order:0
msgid "My Sales Orders"
-msgstr "マイ販売オーダ"
+msgstr "自分の受注"
#. module: sale
#: view:sale.make.invoice:0
@@ -1308,7 +1308,7 @@ msgstr ""
#. module: sale
#: field:sale.config.settings,group_discount_per_so_line:0
msgid "Allow setting a discount on the sales order lines"
-msgstr "販売オーダ行での値引入力を可能にする"
+msgstr "受注明細での値引き入力を可能にする"
#. module: sale
#: field:sale.order,paypal_url:0
@@ -1331,7 +1331,7 @@ msgstr ""
#, python-format
msgid ""
"In order to delete a confirmed sales order, you must cancel it before !"
-msgstr "確定した販売オーダを削除するには、はじめに取り消してください。"
+msgstr "確定済の受注を削除するには、始めに取消が必要です。"
#. module: sale
#: model:ir.actions.act_window,name:sale.open_board_sales
@@ -1389,7 +1389,7 @@ msgstr "ToDo"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Invoice Sales Order"
-msgstr "販売オーダを請求登録"
+msgstr "受注を請求登録"
#. module: sale
#: help:sale.order,amount_untaxed:0
@@ -1554,7 +1554,7 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
msgid "From a sales order"
-msgstr "販売オーダより"
+msgstr "受注より"
#. module: sale
#: view:sale.order:0
@@ -1614,7 +1614,7 @@ msgstr "販売ダッシュボード"
#. module: sale
#: view:sale.order.line:0
msgid "Sales Order Lines that are in 'done' state"
-msgstr ""
+msgstr "未完了受注明細"
#. module: sale
#: help:sale.config.settings,module_account_analytic_analysis:0
@@ -1639,13 +1639,13 @@ msgstr ""
#. module: sale
#: help:sale.order,date_confirm:0
msgid "Date on which sales order is confirmed."
-msgstr "販売オーダ確定日"
+msgstr "受注確定日"
#. module: sale
#: code:addons/sale/sale.py:565
#, python-format
msgid "First cancel all invoices attached to this sales order."
-msgstr "始めにこの販売オーダに紐づく全ての請求書を取り消してください。"
+msgstr "始めにこの受注に紐づく全ての請求書を取り消してください。"
#. module: sale
#: field:sale.order,company_id:0
@@ -1790,7 +1790,7 @@ msgstr ""
#: selection:sale.order,state:0
#, python-format
msgid "Sales Order"
-msgstr "販売オーダ"
+msgstr "受注"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
@@ -1816,7 +1816,7 @@ msgstr "確認"
#: code:addons/sale/sale.py:820
#, python-format
msgid "You cannot cancel a sales order line that has already been invoiced."
-msgstr ""
+msgstr "請求済の受注明細は取り消せません。"
#. module: sale
#: field:sale.order,message_follower_ids:0
@@ -1833,7 +1833,7 @@ msgstr "請求書行"
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
-msgstr "販売オーダ明細"
+msgstr "受注明細"
#. module: sale
#: view:sale.config.settings:0
@@ -1869,7 +1869,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
msgid "Sales order lines done"
-msgstr ""
+msgstr "完了済受注明細"
#. module: sale
#: code:addons/sale/wizard/sale_line_invoice.py:107
@@ -1880,9 +1880,9 @@ msgid ""
"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
"2.The Sales Order Line is Invoiced!"
msgstr ""
-"請求書は次の何れかの理由により、この販売オーダ行のために作成されません。\n"
-"1. この販売オーダ明細の状態は「ドラフト」または「取消済」の何れかである。\n"
-"2. 販売オーダ明細は請求されている。"
+"請求書は次の何れかの理由により、この受注明細のために作成されません。\n"
+"1. 受注明細の状態が「ドラフト」もしくは「取消済」である。\n"
+"2. 受注明細は既に請求済み。"
#. module: sale
#: field:sale.order.line,th_weight:0
@@ -1993,7 +1993,7 @@ msgstr "1月"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_orders_in_progress
msgid "Sales Order in Progress"
-msgstr "進行中の受注オーダー"
+msgstr "進行中の受注"
#. module: sale
#: field:sale.config.settings,timesheet:0
@@ -2003,7 +2003,7 @@ msgstr ""
#. module: sale
#: help:sale.order,origin:0
msgid "Reference of the document that generated this sales order request."
-msgstr "この受注オーダー要求を生成したドキュメントへの参照"
+msgstr "この受注の生成の基となったドキュメント"
#. module: sale
#: view:sale.report:0
@@ -2029,12 +2029,12 @@ msgstr "日付順"
#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "Confirmed sales order to invoice."
-msgstr "請求する確認済受注オーダー"
+msgstr "請求対象の確定受注"
#. module: sale
#: model:mail.message.subtype,name:sale.mt_order_confirmed
msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "確定受注"
#. module: sale
#: selection:sale.order.line,type:0
@@ -2050,7 +2050,7 @@ msgstr "価格リストがありません: "
#. module: sale
#: view:sale.order:0
msgid "Sales Order "
-msgstr ""
+msgstr "受注 "
#. module: sale
#: field:sale.config.settings,module_account_analytic_analysis:0
@@ -2118,7 +2118,7 @@ msgstr ""
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
-msgstr "受注オーダーの検索"
+msgstr "受注検索"
#. module: sale
#: field:sale.advance.payment.inv,advance_payment_method:0
@@ -2128,7 +2128,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
msgid "Confirmed sales order lines, not yet delivered"
-msgstr ""
+msgstr "確定済・未出荷の受注明細"
#. module: sale
#: field:sale.order.line,sequence:0
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index bae6c28c39d..42956e96e74 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-09-02 10:40+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2013-10-20 07:02+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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: 2013-09-03 06:08+0000\n"
-"X-Generator: Launchpad (build 16753)\n"
+"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
@@ -1863,9 +1863,9 @@ msgid ""
" will create a draft invoice that can be modified\n"
" before validation."
msgstr ""
-"Selecteer hoe u deze order wilt factureren. Hiermee\n"
-" maakt u een concept factuur gemaakt, die\n"
-" kan worden gewijzigd voor validatie."
+"Selecteer hoe u deze order wilt factureren. Dit resulteert\n"
+" in een concept factuur, die u voordat u deze\n"
+" definitief bevestigd nog kunt wijzigen."
#. module: sale
#: view:board.board:0
diff --git a/addons/sale_stock/i18n/ja.po b/addons/sale_stock/i18n/ja.po
index b4111c186da..3137b01cee9 100644
--- a/addons/sale_stock/i18n/ja.po
+++ b/addons/sale_stock/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-19 06:08+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:22+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: sale_stock
#: help:sale.config.settings,group_invoice_deli_orders:0
@@ -27,24 +27,24 @@ msgstr ""
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_deliveryorder0
msgid "Delivery Order"
-msgstr "配達オーダー"
+msgstr "出荷"
#. module: sale_stock
#: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
#: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "請求対象出荷"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:570
#, python-format
msgid "Picking Information ! : "
-msgstr "集荷情報: "
+msgstr "ピッキング情報: "
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_packinglist0
msgid "Pick List"
-msgstr "集荷リスト"
+msgstr "ピックリスト"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:565
@@ -68,24 +68,24 @@ msgstr "製造品へのあるいは顧客への移動のドキュメント"
#. module: sale_stock
#: field:sale.config.settings,group_multiple_shops:0
msgid "Manage multiple shops"
-msgstr ""
+msgstr "複数店舗を管理"
#. module: sale_stock
#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
msgid "Validate"
-msgstr "検証"
+msgstr "確認"
#. module: sale_stock
#: view:sale.order:0
msgid "Cancel Order"
-msgstr ""
+msgstr "オーダ取消"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:209
#, python-format
msgid ""
"You must first cancel all delivery order(s) attached to this sales order."
-msgstr ""
+msgstr "始めにこの受注に紐づく出荷を取り消してください。"
#. module: sale_stock
#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
@@ -95,7 +95,7 @@ msgstr "調達オーダーの作成"
#. module: sale_stock
#: field:stock.picking.out,sale_id:0
msgid "Sale Order"
-msgstr ""
+msgstr "受注"
#. module: sale_stock
#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
@@ -107,12 +107,12 @@ msgstr "全ての受注オーダー行について、調達オーダーは販売
#. module: sale_stock
#: field:sale.order,picking_policy:0
msgid "Shipping Policy"
-msgstr ""
+msgstr "出荷方針"
#. module: sale_stock
#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
msgid "Shop"
-msgstr "店"
+msgstr "店舗"
#. module: sale_stock
#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
@@ -128,12 +128,12 @@ msgstr "在庫移動"
#: code:addons/sale_stock/sale_stock.py:163
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "操作は無効です。"
#. module: sale_stock
#: field:sale.config.settings,module_project_timesheet:0
msgid "Project Timesheet"
-msgstr ""
+msgstr "プロジェクトタイムシート"
#. module: sale_stock
#: field:sale.config.settings,group_sale_delivery_address:0
@@ -145,7 +145,7 @@ msgstr ""
#: code:addons/sale_stock/sale_stock.py:623
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "設定エラー"
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_saleprocurement0
@@ -155,7 +155,7 @@ msgstr "調達オーダー"
#. module: sale_stock
#: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children
msgid "Contact Details"
-msgstr ""
+msgstr "コンタクトの詳細"
#. module: sale_stock
#: selection:sale.config.settings,default_order_policy:0
@@ -166,7 +166,7 @@ msgstr "配達基準の請求書"
#: model:ir.model,name:sale_stock.model_sale_order
#: field:stock.picking,sale_id:0
msgid "Sales Order"
-msgstr "受注オーダー"
+msgstr "受注"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking_out
@@ -177,7 +177,7 @@ msgstr ""
#: model:ir.model,name:sale_stock.model_sale_order_line
#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
-msgstr "受注オーダー行"
+msgstr "受注明細"
#. module: sale_stock
#: model:process.transition,note:sale_stock.process_transition_packing0
@@ -193,7 +193,7 @@ msgstr ""
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking
msgid "Picking List"
-msgstr "集荷リスト"
+msgstr "ピッキングリスト"
#. module: sale_stock
#: field:sale.shop,warehouse_id:0
@@ -208,7 +208,7 @@ msgstr "強制割当"
#. module: sale_stock
#: field:sale.config.settings,default_order_policy:0
msgid "The default invoicing method is"
-msgstr ""
+msgstr "デフォルト請求方法は"
#. module: sale_stock
#: field:sale.order.line,delay:0
@@ -233,12 +233,12 @@ msgstr "在庫移動"
#. module: sale_stock
#: view:sale.config.settings:0
msgid "Default Options"
-msgstr ""
+msgstr "デフォルトオプション"
#. module: sale_stock
#: field:sale.config.settings,module_project_mrp:0
msgid "Project MRP"
-msgstr ""
+msgstr "プロジェクトMRP"
#. module: sale_stock
#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
@@ -297,7 +297,7 @@ msgstr ""
#. module: sale_stock
#: view:sale.order:0
msgid "days"
-msgstr ""
+msgstr "日数"
#. module: sale_stock
#: field:sale.order.line,product_packaging:0
@@ -350,7 +350,7 @@ msgstr ""
#: code:addons/sale_stock/sale_stock.py:208
#, python-format
msgid "Cannot cancel sales order!"
-msgstr ""
+msgstr "受注を取り消せません。"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_shop
@@ -380,7 +380,7 @@ msgstr ""
#. module: sale_stock
#: field:sale.config.settings,group_mrp_properties:0
msgid "Product properties on order lines"
-msgstr ""
+msgstr "受注明細上の品目属性"
#. module: sale_stock
#: help:sale.config.settings,default_order_policy:0
@@ -391,7 +391,7 @@ msgstr "受注オーダー基準、または出荷基準の請求書を生成し
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_report
msgid "Sales Orders Statistics"
-msgstr "受注オーダーの統計値"
+msgstr "受注統計"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_res_company
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 90ddb5e77f4..bd51987f1ab 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/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: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-09-20 11:23+0000\n"
-"Last-Translator: Tomislav Bosnjakovic \n"
+"PO-Revision-Date: 2013-10-18 11:13+0000\n"
+"Last-Translator: Marko Carevic \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
"Language: hr\n"
#. module: warning
@@ -46,7 +46,7 @@ msgstr "Upozorenje kod kupnje ovog proizvoda"
#. module: warning
#: model:ir.model,name:warning.model_product_product
msgid "Product"
-msgstr "Proizvod"
+msgstr "Artikl"
#. module: warning
#: view:product.product:0
From 6ba45e5cbf37a1fe762ea19950cddb353fd850ae Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Mon, 21 Oct 2013 11:57:35 +0200
Subject: [PATCH 27/44] [FIX] procurement: change SQL query to be compatible
with both postgres 8.4 and 9.3
bzr revid: mat@openerp.com-20131021095735-yz9pb5pphfdgl44j
---
addons/procurement/procurement.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index f5d4761642b..66024256f9a 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -140,7 +140,7 @@ class procurement_order(osv.osv):
if not proc.note or '_first_pass_done_' not in proc.note or proc.state not in ('confirmed', 'exception'):
super(procurement_order, self).message_track(cr, uid, [proc.id], tracked_fields, initial_values, context=context)
if proc.state == 'exception':
- cr.execute("""UPDATE procurement_order set note = CONCAT(note, %s) WHERE id = %s""", ('_first_pass_done_',proc.id))
+ cr.execute("""UPDATE procurement_order set note = TRIM(both E'\n' FROM COALESCE(note, '') || %s) WHERE id = %s""", ('\n\n_first_pass_done_',proc.id))
return True
From 6a3683f116ef051a0f883fdc8ef3d10095d7ebd8 Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Mon, 21 Oct 2013 14:47:48 +0200
Subject: [PATCH 28/44] [FIX] l10n_fr: 2014 tax update patch has removed
obsolete templates, causing an error at module update
Due to the relationship between fiscal position
templates and tax templates, the removal of
obsolete tax templates may crash if the corresponding
fiscal positions are not deleted before.
In a recent l10n_fr patch [1] a number of
templates disappeared, which causes an error during
subsequent updates on databases where the obsolete
templates are still present.
As a workaround, we can force a deletion of
all fiscal position templates before loading
them. This is relatively safe because the templates
are not connected to live data, and will be
re-created during the update (except for the
obsolete ones which will be gone forever).
[1] addons 7.0 rev 9515 rev-id: odo@openerp.com-20131010114424-atzr3bl9e9diir2g
lp bug: https://launchpad.net/bugs/1240265 fixed
bzr revid: odo@openerp.com-20131021124748-x4jnibwyab4gam23
---
addons/l10n_fr/fr_fiscal_templates.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml
index b11f8d4f0dd..bf49d15e08c 100644
--- a/addons/l10n_fr/fr_fiscal_templates.xml
+++ b/addons/l10n_fr/fr_fiscal_templates.xml
@@ -2,6 +2,12 @@
+
+
+
+
From 1433c5fc0b1e99da342685e066cb8c7d6df2027c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 22 Oct 2013 05:15:35 +0000
Subject: [PATCH 29/44] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131022051531-skzykboyadt54zs1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131018061132-rzws6tazubx0zysd
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050513-83ofvmdau85nhc89
bzr revid: launchpad_translations_on_behalf_of_openerp-20131022051535-g7vpsdx91u9d7zbs
---
addons/account/i18n/ja.po | 10 +-
addons/account_payment/i18n/ja.po | 32 +-
addons/contacts/i18n/ja.po | 37 ++
addons/hr_expense/i18n/ja.po | 34 +-
addons/project_issue/i18n/sl.po | 16 +-
addons/project_long_term/i18n/es_MX.po | 886 +++++++++++--------------
addons/web/i18n/fi.po | 10 +-
addons/web/i18n/lv.po | 102 +--
8 files changed, 524 insertions(+), 603 deletions(-)
create mode 100644 addons/contacts/i18n/ja.po
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 336395964a0..351606a3e4d 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-10-21 04:18+0000\n"
+"PO-Revision-Date: 2013-10-22 03:36+0000\n"
"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
"X-Generator: Launchpad (build 16807)\n"
#. module: account
@@ -205,7 +205,7 @@ msgstr "列ラベル"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "勘定コードで使用する桁数"
#. module: account
#: help:account.analytic.journal,type:0
@@ -269,7 +269,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
-msgstr ""
+msgstr "次のクレジットノート番号"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@@ -371,7 +371,7 @@ msgstr "消込する勘定科目を選択してください。"
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "分析会計を使用。"
#. module: account
#: view:account.invoice:0
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index de6c0e399d0..55bd4a39395 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-22 03:33+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:48+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -121,7 +121,7 @@ msgstr ""
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "エラー!"
#. module: account_payment
#: report:payment.order:0
@@ -211,7 +211,7 @@ msgstr "構造化済"
#. module: account_payment
#: view:account.bank.statement:0
msgid "Import Payment Lines"
-msgstr ""
+msgstr "支払明細をインポート"
#. module: account_payment
#: view:payment.line:0
@@ -251,7 +251,7 @@ msgstr ""
#. module: account_payment
#: field:payment.order,date_created:0
msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
#. module: account_payment
#: help:payment.mode,journal:0
@@ -334,7 +334,7 @@ msgstr "通貨"
#. module: account_payment
#: view:account.payment.make.payment:0
msgid "Yes"
-msgstr ""
+msgstr "はい"
#. module: account_payment
#: help:payment.line,info_owner:0
@@ -357,7 +357,7 @@ msgstr "設定済取引明細書によるアカウント支払"
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "入力明細に取引先が設定されていません。"
#. module: account_payment
#: help:payment.mode,name:0
@@ -389,7 +389,7 @@ msgstr "ドラフト"
#: view:payment.order:0
#: field:payment.order,state:0
msgid "Status"
-msgstr ""
+msgstr "状態"
#. module: account_payment
#: help:payment.line,communication2:0
@@ -436,7 +436,7 @@ msgstr "検索"
#. module: account_payment
#: field:payment.order,user_id:0
msgid "Responsible"
-msgstr ""
+msgstr "担当"
#. module: account_payment
#: field:payment.line,date:0
@@ -451,7 +451,7 @@ msgstr "合計:"
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution Date"
-msgstr ""
+msgstr "実行日"
#. module: account_payment
#: view:account.payment.populate.statement:0
@@ -568,7 +568,7 @@ msgstr "通信2"
#. module: account_payment
#: field:payment.order,date_scheduled:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "予定日"
#. module: account_payment
#: view:account.payment.make.payment:0
@@ -650,7 +650,7 @@ msgstr "オーダー"
#. module: account_payment
#: view:payment.order:0
msgid "Cancel Payments"
-msgstr ""
+msgstr "支払を取消"
#. module: account_payment
#: field:payment.order,total:0
@@ -661,7 +661,7 @@ msgstr "合計"
#: code:addons/account_payment/wizard/account_payment_order.py:112
#, python-format
msgid "Entry Lines"
-msgstr ""
+msgstr "入力明細"
#. module: account_payment
#: view:account.payment.make.payment:0
@@ -684,7 +684,7 @@ msgstr ""
#: view:account.payment.populate.statement:0
#: view:payment.order.create:0
msgid "or"
-msgstr ""
+msgstr "または"
#. module: account_payment
#: help:payment.mode,bank_id:0
diff --git a/addons/contacts/i18n/ja.po b/addons/contacts/i18n/ja.po
new file mode 100644
index 00000000000..5a03dcf6ad3
--- /dev/null
+++ b/addons/contacts/i18n/ja.po
@@ -0,0 +1,37 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-10-22 03:49+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "連絡先"
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index dd9b41e4523..19c52d7c607 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-10-22 04:04+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:01+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: hr_expense
#: view:hr.expense.expense:0
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
msgid "Confirmed Expenses"
-msgstr "承認された経費"
+msgstr "承認済経費"
#. module: hr_expense
#: code:addons/hr_expense/hr_expense.py:349
@@ -66,7 +66,7 @@ msgstr "航空券"
#. module: hr_expense
#: report:hr.expense:0
msgid "Validated By"
-msgstr "検証済み"
+msgstr "検証者"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -85,7 +85,7 @@ msgstr "新規経費"
#: field:hr.expense.line,uom_id:0
#: view:product.product:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "単位"
#. module: hr_expense
#: selection:hr.expense.report,month:0
@@ -95,12 +95,12 @@ msgstr "3月"
#. module: hr_expense
#: field:hr.expense.expense,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "未読メッセージ"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Waiting Payment"
-msgstr ""
+msgstr "支払待ち"
#. module: hr_expense
#: field:hr.expense.expense,company_id:0
@@ -112,7 +112,7 @@ msgstr "会社"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Set to Draft"
-msgstr "草稿に設定"
+msgstr "ドラフトに設定"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -125,7 +125,7 @@ msgstr "支払い"
msgid ""
"No expense journal found. Please make sure you have a journal with type "
"'purchase' configured."
-msgstr ""
+msgstr "経費用の仕訳帳がありません。タイプが「購買」の仕訳帳を登録してください。"
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_report
@@ -153,7 +153,7 @@ msgstr "注記"
#. module: hr_expense
#: field:hr.expense.expense,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
#. module: hr_expense
#: code:addons/hr_expense/hr_expense.py:172
@@ -174,17 +174,17 @@ msgstr ""
#: model:ir.actions.act_window,name:hr_expense.hr_expense_product
#: view:product.product:0
msgid "Products"
-msgstr "プロダクト"
+msgstr "品目"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Confirm Expenses"
-msgstr "経費を確認する。"
+msgstr ""
#. module: hr_expense
#: selection:hr.expense.report,state:0
msgid "Cancelled"
-msgstr "キャンセルされました"
+msgstr "取消済"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_refused0
@@ -209,7 +209,7 @@ msgstr "確認待ち"
#. module: hr_expense
#: selection:hr.expense.report,state:0
msgid "Accepted"
-msgstr "受理済み"
+msgstr "受理済"
#. module: hr_expense
#: field:hr.expense.line,ref:0
@@ -245,7 +245,7 @@ msgstr ""
#: code:addons/hr_expense/hr_expense.py:453
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "警告"
#. module: hr_expense
#: report:hr.expense:0
diff --git a/addons/project_issue/i18n/sl.po b/addons/project_issue/i18n/sl.po
index 561e18680da..6ed33573826 100644
--- a/addons/project_issue/i18n/sl.po
+++ b/addons/project_issue/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-02 06:31+0000\n"
+"PO-Revision-Date: 2013-10-21 06:49+0000\n"
"Last-Translator: Matmoz \n"
"Language-Team: Slovenian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-03 05:55+0000\n"
-"X-Generator: Launchpad (build 16791)\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_03
@@ -194,6 +194,16 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klikni za poročanje nove razprave.\n"
+"
\n"
+" OpenERP sledilec razpravam omogoča učinkovito upravljanje "
+"stvari,\n"
+" kot so notranje zahteve, razvojna problematika, reklamacije "
+"strank,\n"
+" projektne težave, okvare, ipd.\n"
+"
\n"
+" "
#. module: project_issue
#: selection:project.issue,state:0
diff --git a/addons/project_long_term/i18n/es_MX.po b/addons/project_long_term/i18n/es_MX.po
index 0b930ae70a6..709b9d474dd 100644
--- a/addons/project_long_term/i18n/es_MX.po
+++ b/addons/project_long_term/i18n/es_MX.po
@@ -1,168 +1,328 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
+# FIRST AUTHOR , 2013.
#
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: 2011-01-18 09:17+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) \n"
-"Language-Team: Spanish \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-10-21 16:57+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Gestión de proyectos a largo plazo"
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr ""
#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Calcular planificación de fases"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_long_term
+#: field:account.analytic.account,use_phases:0
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+#: view:project.project:0
+msgid "Phases"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,next_phase_ids:0
msgid "Next Phases"
-msgstr "Siguientes fases"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
msgid "Project's Tasks"
-msgstr "Tareas del proyecto"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fases"
-
-#. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
msgstr ""
-"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
-"del proyecto."
#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Asignación de recursos"
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+" "
+msgstr ""
#. module: project_long_term
-#: view:project.phase:0
-msgid "Displaying Settings"
-msgstr "Mostrando configuración"
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr ""
#. module: project_long_term
#: field:project.compute.phases,target_project:0
-msgid "Schedule"
-msgstr "Programa"
-
-#. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-" Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-" Mainly used with Big project management.\n"
-" - Project Phases will be maintained by Manager of the project\n"
-" - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-" If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-" - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-" - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-" "
+msgid "Action"
msgstr ""
-"\n"
-"\n"
-" Módulo de Gestión de Proyectos a Largo Plazo que realiza el "
-"seguimiento de planeamiento, programación, asignación de recursos.\n"
-" Utilizado principalmente con la gestión de proyectos grandes.\n"
-" - Las Fases del Proyecto serán gestionadas por el Administrador "
-"del proyecto\n"
-" - Calcula la Programación de Fases: Calcula la fecha de inicio y "
-"fecha de finalización de las fases del proyecto en estado borrador, abierto "
-"y pendiente.\n"
-" Si no hay ningún proyecto concreto, "
-"entonces se llevarán todas las fases en estado borrador, abierto y "
-"pendiente\n"
-" - Calcula la Programación de Tareas: Esto funciona igual que el "
-"botón programador de project.phase. Toma el proyecto como argumento y "
-"calcula todas las tareas abiertas, en borrador y pendientes.\n"
-" - Programa tareas: Todas las tareas en estado borrador, "
-"pendiente y abierto se programan desde la fecha de inicio de la fase\n"
-"\n"
-" "
#. module: project_long_term
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No se pueden crear tareas recursivas."
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Asignación de recursos"
-
-#. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
-#, python-format
-msgid "Day"
-msgstr "Día"
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr ""
#. module: project_long_term
#: model:ir.model,name:project_long_term.model_project_task
msgid "Task"
-msgstr "Tarea"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration Unit of Measure"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:140
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The resources on the project can be computed automatically by the scheduler."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel Phase"
+msgstr ""
+
+#. module: project_long_term
+#: help:account.analytic.account,use_phases:0
+msgid "Check this field if you plan to use phase-based scheduling"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the status 'Draft'.\n"
+" If the phase is started, the status becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' status. "
+" \n"
+" If the phase is over, the status is set to 'Done'."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.project:0
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Related Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
#. module: project_long_term
#: selection:project.compute.phases,target_project:0
msgid "Compute a Single Project"
-msgstr "Calcular un sólo proyecto"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,previous_phase_ids:0
msgid "Previous Phases"
-msgstr "Fases previas"
+msgstr ""
#. module: project_long_term
-#: help:project.phase,product_uom:0
-msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
+#: view:project.phase:0
+msgid "New Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.project,phase_count:0
+msgid "Open Phases"
+msgstr ""
#. module: project_long_term
#: help:project.phase,date_end:0
msgid ""
" It's computed by the scheduler according to the start date and the duration."
msgstr ""
-" Es calculado por el planificador en fucnión de la fecha de inicio y la "
-"duración"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr ""
#. module: project_long_term
#: model:ir.model,name:project_long_term.model_project_project
@@ -170,175 +330,94 @@ msgstr ""
#: field:project.compute.tasks,project_id:0
#: view:project.phase:0
#: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
msgid "Project"
-msgstr "Proyecto"
+msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr ""
#. module: project_long_term
#: selection:project.phase,state:0
msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_long_term
-#: help:project.resource.allocation,date_end:0
-msgid "Ending Date"
-msgstr "Fecha de fin"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
-msgid "Planning"
-msgstr "Planificación"
+msgid "Total Hours"
+msgstr ""
#. module: project_long_term
-#: field:project.phase,constraint_date_end:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr ""
#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Calcular planificación de fases"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
-#, python-format
-msgid " (copy)"
-msgstr " (copia)"
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilidad"
+msgid "Constraints"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "C_ompute"
-msgstr "C_alcular"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
+msgid "Status"
msgstr ""
-"Calcular planificación de fases para todos o el proyecto especificado"
#. module: project_long_term
-#: field:project.phase,product_uom:0
-msgid "Duration UoM"
-msgstr "UdM duración"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Calcular planificación de tareas"
-
-#. module: project_long_term
-#: field:project.phase,constraint_date_start:0
-msgid "Minimum Start Date"
-msgstr "Fecha de inicio mínima"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Asignación de recursos de proyecto"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Calcular planificación de tarea"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
-msgid "Resources"
-msgstr "Recursos"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
-msgid ""
-"To schedule phases of all or a specified project. It then open a gantt "
-"view.\n"
-"\t "
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
msgstr ""
-"Para programar las fases de todos los proyectos, o uno específico. A "
-"continuación, abrirá una vista de Gantt.\n"
-"\t "
-
-#. module: project_long_term
-#: help:project.resource.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
#. module: project_long_term
#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
-msgid "Related Tasks"
-msgstr "Tareas relacionadas"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+msgid "Tasks"
msgstr ""
-"La disponibilidad de este recurso para esta fase de proyecto en porcentaje "
-"(=50%)"
#. module: project_long_term
-#: help:project.phase,constraint_date_start:0
-msgid "force the phase to start after this date"
-msgstr "Forzar que la fase epiece después de esta fecha"
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr ""
#. module: project_long_term
-#: field:project.phase,task_ids:0
-msgid "Project Tasks"
-msgstr "Tareas de proyecto"
-
-#. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Recursos de proyecto"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Aceptar"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Planificar y mostrar información"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr ""
#. module: project_long_term
#: help:project.phase,date_start:0
@@ -346,103 +425,6 @@ msgid ""
"It's computed by the scheduler according the project date or the end date of "
"the previous phase."
msgstr ""
-"Es calculado por el planificador en función de la fecha inicio o fecha fin "
-"de la fase anterior"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: project_long_term
-#: constraint:project.phase:0
-msgid "Phase start-date must be lower than phase end-date."
-msgstr "La fecha-inicio de la fase debe ser anterior a la fecha-fin."
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "proyecto.planificar.tareas"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,help:project_long_term.act_project_phase
-msgid ""
-"A project can be split into the different phases. For each phase, you can "
-"define your resources allocation, describe different tasks and link your "
-"phase to previous and next phases, add date constraints for the automated "
-"scheduling. Use the long term planning in order to planify your available "
-"human resources, convert your phases into a series of tasks when you start "
-"working on the project."
-msgstr ""
-"Un proyecto se puede dividir en diferentes fases. Para cada fase, puede "
-"definir su asignación de recursos, describir diferentes tareas y vincular su "
-"fase a fases previas y posteriores, añadir restricciones de fecha para la "
-"programación automática. Cuando empiece a trabajar en el proyecto, use el "
-"planeamiento a largo plazo para planificar sus recursos humanos disponibles "
-"y convertir sus fases en una serie de tareas."
-
-#. module: project_long_term
-#: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Asignación de recursos"
-
-#. module: project_long_term
-#: help:project.phase,constraint_date_end:0
-msgid "force the phase to finish before this date"
-msgstr "Forzar que la fase termine antes de esta fecha"
-
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "desconocido"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Detalles tarea"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Horario de trabajo para ajustar el informe del diagrama de Gantt"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_compute_tasks
-msgid "Project Compute Tasks"
-msgstr "Calcular tareas proyecto"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Constraints"
-msgstr "Restricciones"
-
-#. module: project_long_term
-#: help:project.phase,sequence:0
-msgid "Gives the sequence order when displaying a list of phases."
-msgstr "Indica el orden cuando se muestra la lista de fases"
#. module: project_long_term
#: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -452,182 +434,74 @@ msgstr "Indica el orden cuando se muestra la lista de fases"
#: view:project.phase:0
#: field:project.project,phase_ids:0
msgid "Project Phases"
-msgstr "Fases proyecto"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
#: selection:project.phase,state:0
msgid "Done"
-msgstr "Hecho"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
-msgid "Working Time"
-msgstr "Horario de trabajo"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Start Phase"
-msgstr "Comenzar fase"
-
-#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Por favor seleccione el proyecto a planificar"
-
-#. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,total_hours:0
-msgid "Total Hours"
-msgstr "Total horas"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Planificación de tareas completada satisfactoriamente."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Calcular planificación de tareas para un proyecto específico"
-
-#. module: project_long_term
-#: view:project.resource.allocation:0
-msgid "Phase"
-msgstr "Fase"
-
-#. module: project_long_term
-#: help:project.phase,state:0
-msgid ""
-"If the phase is created the state 'Draft'.\n"
-" If the phase is started, the state becomes 'In Progress'.\n"
-" If review is needed the phase is in 'Pending' state. "
-" \n"
-" If the phase is over, the states is set to 'Done'."
msgstr ""
-"Si la fase se crea, el estado es \"Borrador\".\n"
-" Si la fase comienza, el estado cambia a \"En Proceso\".\n"
-" Si se necesita revisión, la fase está en estado \"Pendiente\".\n"
-" Si la fase está terminada, el estado se fija en \"Hecho\"."
#. module: project_long_term
-#: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
-msgid "End Date"
-msgstr "Fecha de fin"
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
#. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Recurso"
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
#. module: project_long_term
#: field:project.phase,name:0
msgid "Name"
-msgstr "Nombre"
+msgstr ""
#. module: project_long_term
-#: view:project.phase:0
-msgid "Tasks Details"
-msgstr "Detalles tareas"
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Periodo de trabajo"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Detalle recurso"
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Planificación"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_phase
-#: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
-#: view:project.task:0
-#: field:project.task,phase_id:0
-msgid "Project Phase"
-msgstr "Fase proyecto"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_compute_phases
-msgid "Project Compute Phases"
-msgstr "Calcular fases del proyecto"
-
-#. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Mensaje"
-
-#. module: project_long_term
-#: constraint:project.phase:0
-msgid "Loops in phases not allowed"
-msgstr "No se permiten bucles en fases"
-
-#. module: project_long_term
-#: field:project.phase,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Calcular todos los proyectos"
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
-msgid "Resource Leaves"
-msgstr "Ausencias recursos"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
-msgid "Schedule Tasks"
-msgstr "Planificar tareas"
-
-#. module: project_long_term
-#: help:project.phase,duration:0
-msgid "By default in days"
-msgstr "Por defecto en días"
-
-#. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Duración"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 165f2bc584b..58f0daeb8ba 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-16 06:34+0000\n"
-"Last-Translator: Samuli Kivistö \n"
+"PO-Revision-Date: 2013-10-17 16:10+0000\n"
+"Last-Translator: Miku Laitinen \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
#. module: web
#. openerp-web
@@ -670,7 +670,7 @@ msgstr "UTF-8"
#: code:addons/web/static/src/xml/base.xml:443
#, python-format
msgid "For more information visit"
-msgstr "Lisätieto löytyy tuolta"
+msgstr "Lisätietoja löytyy osoitteesta"
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index 35d05e4eade..5bfbf359dca 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-10 12:02+0000\n"
-"Last-Translator: Arnis Putniņš \n"
+"PO-Revision-Date: 2013-10-21 11:06+0000\n"
+"Last-Translator: Jānis-Marks Gailis \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-10-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
#. module: web
#. openerp-web
@@ -81,21 +81,21 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:292
#, python-format
msgid "Change Master Password"
-msgstr ""
+msgstr "Izmainīt galveno paroli"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/view_form.js:2439
#, python-format
msgid "Today"
-msgstr ""
+msgstr "Šodien"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/chrome.js:513
#, python-format
msgid "Do you really want to delete the database: %s ?"
-msgstr ""
+msgstr "Vai tiešam velties dzēst %s datubāzi ?"
#. module: web
#. openerp-web
@@ -109,21 +109,21 @@ msgstr ""
#: code:addons/web/static/src/js/chrome.js:559
#, python-format
msgid "Access Denied"
-msgstr ""
+msgstr "Piekļuve Liegta"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/view_form.js:2462
#, python-format
msgid "Now"
-msgstr ""
+msgstr "Tagad"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/coresetup.js:593
#, python-format
msgid "about an hour ago"
-msgstr ""
+msgstr "apmēram stundu atpakaļ"
#. module: web
#. openerp-web
@@ -154,7 +154,7 @@ msgstr ""
#: code:addons/web/static/src/js/dates.js:53
#, python-format
msgid "'%s' is not a valid date"
-msgstr ""
+msgstr "'%s' ir datums nepareizā formātā"
#. module: web
#. openerp-web
@@ -182,7 +182,7 @@ msgstr "Lūdzu, ievadiet iepriekšējo paroli"
#: code:addons/web/static/src/js/coresetup.js:591
#, python-format
msgid "about a minute ago"
-msgstr ""
+msgstr "apmēram minūti atpakaļ"
#. module: web
#: code:addons/web/controllers/main.py:869
@@ -195,7 +195,7 @@ msgstr ""
#: code:addons/web/static/src/js/chrome.js:732
#, python-format
msgid "Invalid username or password"
-msgstr ""
+msgstr "Nederīgs lietotājsvārds vai parole"
#. module: web
#. openerp-web
@@ -204,7 +204,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:278
#, python-format
msgid "Master Password:"
-msgstr ""
+msgstr "Galvenā parole:"
#. module: web
#. openerp-web
@@ -212,7 +212,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1402
#, python-format
msgid "Select"
-msgstr ""
+msgstr "Izvēlēties"
#. module: web
#. openerp-web
@@ -226,7 +226,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:437
#, python-format
msgid "Version"
-msgstr ""
+msgstr "Versija"
#. module: web
#. openerp-web
@@ -269,7 +269,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_form.js:320
#, python-format
msgid "Form"
-msgstr ""
+msgstr "Veidne"
#. module: web
#. openerp-web
@@ -297,7 +297,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:343
#, python-format
msgid "New Password:"
-msgstr ""
+msgstr "Jaunā parole:"
#. module: web
#. openerp-web
@@ -311,14 +311,14 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1712
#, python-format
msgid "Fields to export"
-msgstr ""
+msgstr "Lauki eksportam"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/view_list.js:1350
#, python-format
msgid "Undefined"
-msgstr ""
+msgstr "Nenoteikts"
#. module: web
#. openerp-web
@@ -332,7 +332,7 @@ msgstr ""
#: code:addons/web/static/src/js/coresetup.js:597
#, python-format
msgid "about a month ago"
-msgstr ""
+msgstr "apmēram mēnesi atpakaļ"
#. module: web
#. openerp-web
@@ -382,7 +382,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:354
#, python-format
msgid "Change Password"
-msgstr ""
+msgstr "Mainīt paroli"
#. module: web
#. openerp-web
@@ -404,7 +404,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_list.js:2204
#, python-format
msgid "Download"
-msgstr ""
+msgstr "Lejupielādēt"
#. module: web
#. openerp-web
@@ -418,7 +418,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_list.js:432
#, python-format
msgid "Group"
-msgstr ""
+msgstr "Grupa"
#. module: web
#. openerp-web
@@ -439,7 +439,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1004
#, python-format
msgid "Selection:"
-msgstr ""
+msgstr "Sekcijas"
#. module: web
#. openerp-web
@@ -452,7 +452,7 @@ msgstr ""
#: code:addons/web/controllers/main.py:890
#, python-format
msgid "Languages"
-msgstr ""
+msgstr "Valodas"
#. module: web
#. openerp-web
@@ -473,7 +473,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1789
#, python-format
msgid "Import"
-msgstr ""
+msgstr "Importēt"
#. module: web
#. openerp-web
@@ -502,14 +502,14 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1493
#, python-format
msgid "Manage Filters"
-msgstr ""
+msgstr "Pārvaldīt filtrus"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/search.js:2042
#, python-format
msgid "contains"
-msgstr ""
+msgstr "satur"
#. module: web
#. openerp-web
@@ -530,7 +530,7 @@ msgstr ""
#: code:addons/web/static/src/js/chrome.js:341
#, python-format
msgid "Loading (%d)"
-msgstr ""
+msgstr "Ieladē (%d)"
#. module: web
#. openerp-web
@@ -558,14 +558,14 @@ msgstr ""
#: code:addons/web/static/src/js/view_form.js:1071
#, python-format
msgid "Set Default"
-msgstr ""
+msgstr "Iestatīt kā noklusējumu"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:1000
#, python-format
msgid "Relation:"
-msgstr ""
+msgstr "Attiecība:"
#. module: web
#. openerp-web
@@ -579,21 +579,21 @@ msgstr ""
#: code:addons/web/static/src/js/view_form.js:2453
#, python-format
msgid "Select a date"
-msgstr ""
+msgstr "Izvēlēties datumu"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:873
#, python-format
msgid "Condition:"
-msgstr ""
+msgstr "Nosacījums:"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/view_form.js:2458
#, python-format
msgid "Time"
-msgstr ""
+msgstr "Laiks"
#. module: web
#. openerp-web
@@ -614,7 +614,7 @@ msgstr ""
#: code:addons/web/static/src/js/chrome.js:571
#, python-format
msgid "Restored"
-msgstr ""
+msgstr "Atjaunots"
#. module: web
#. openerp-web
@@ -628,7 +628,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_form.js:2955
#, python-format
msgid "Create and Edit..."
-msgstr ""
+msgstr "Izveidot un Rediģēt..."
#. module: web
#. openerp-web
@@ -642,35 +642,35 @@ msgstr ""
#: code:addons/web/static/src/js/search.js:2144
#, python-format
msgid "is not"
-msgstr ""
+msgstr "nav"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:572
#, python-format
msgid "Print Workflow"
-msgstr ""
+msgstr "Drukāt darbplūsmu"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/chrome.js:413
#, python-format
msgid "Please confirm your new password"
-msgstr ""
+msgstr "Ludzu apstipriniet jūsu jauno paroli"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:1825
#, python-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:443
#, python-format
msgid "For more information visit"
-msgstr ""
+msgstr "Lai iegūt vairāk informāciju, ejiet uz"
#. module: web
#. openerp-web
@@ -709,7 +709,7 @@ msgstr ""
#: code:addons/web/static/src/js/search.js:2145
#, python-format
msgid "is set"
-msgstr ""
+msgstr "ir iestatīts"
#. module: web
#. openerp-web
@@ -723,7 +723,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_list.js:8
#, python-format
msgid "List"
-msgstr ""
+msgstr "Saraksts"
#. module: web
#. openerp-web
@@ -732,14 +732,14 @@ msgstr ""
#: code:addons/web/static/src/js/search.js:2121
#, python-format
msgid "greater than"
-msgstr ""
+msgstr "lielāks nekā"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/chrome.js:585
#, python-format
msgid "Changed Password"
-msgstr ""
+msgstr "Parole nomainīta"
#. module: web
#. openerp-web
@@ -781,7 +781,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:338
#, python-format
msgid "Old Password:"
-msgstr ""
+msgstr "Veca parole:"
#. module: web
#. openerp-web
@@ -802,7 +802,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1643
#, python-format
msgid "Apply"
-msgstr ""
+msgstr "Pielietot"
#. module: web
#. openerp-web
@@ -824,21 +824,21 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1253
#, python-format
msgid "Save As"
-msgstr ""
+msgstr "Saglabāt kā"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:109
#, python-format
msgid "Create a New Database"
-msgstr ""
+msgstr "Izveidot jaunu datu bāzi"
#. module: web
#. openerp-web
#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
#, python-format
msgid "00:00:00"
-msgstr ""
+msgstr "00:00:00"
#. module: web
#. openerp-web
From a2e0acf7d4d8b4cebd94f5b239edb841d99915be Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 22 Oct 2013 11:17:28 +0200
Subject: [PATCH 30/44] [REV] revert partner.py to revision 9043 (error cf
lp:1219381 comment #11)
bzr revid: mat@openerp.com-20131022091728-hebgvt1m26y9wjot
---
addons/account/partner.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 64896338476..4914a17dd2b 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -116,8 +116,7 @@ class res_partner(osv.osv):
LEFT JOIN account_account a ON (l.account_id=a.id)
WHERE a.type IN ('receivable','payable')
AND l.partner_id IN %s
- AND (l.reconcile_id IS NULL OR
- reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
+ AND l.reconcile_id IS NULL
AND """ + query + """
GROUP BY l.partner_id, a.type
""",
From 752341f0cb0bb4c77591d66aa9570bdaabbd1b4e Mon Sep 17 00:00:00 2001
From: Denis Ledoux
Date: Tue, 22 Oct 2013 18:25:19 +0200
Subject: [PATCH 31/44] [FIX]web: filter name input for custom filters in
search dropdown is now required
bzr revid: dle@openerp.com-20131022162519-u03cn5k5od8jg6ka
---
addons/web/static/src/js/search.js | 5 ++++-
addons/web/static/src/xml/base.xml | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 570c17649c1..78f53506abc 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1733,7 +1733,10 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
var $name = this.$('input:first');
var private_filter = !this.$('#oe_searchview_custom_public').prop('checked');
var set_as_default = this.$('#oe_searchview_custom_default').prop('checked');
-
+ if (_.isEmpty($name.val())){
+ this.do_warn(_t("Error"), _t("Filter name is required."));
+ return false;
+ }
var search = this.view.build_search_data();
instance.web.pyeval.eval_domains_and_contexts({
domains: search.domains,
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c5bc624c2b1..2b8d6fe5efa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1620,8 +1620,8 @@