From d6975ff37ffc4a9a93873ae13b786ace8bb6bb41 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi
Date: Wed, 27 Feb 2013 12:41:34 +0100
Subject: [PATCH 01/38] [FIX] Remove url timestamps in debug mode
The chrome cache bug seems to be gone with newer versions.
Moreover, the cutting edge features of the webkit developper tools
won't work if url changes upon reload.
bzr revid: fme@openerp.com-20130227114134-nlv7g5jjvvd037p2
---
addons/web/controllers/main.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9fe38a9d23a..d3a201010e0 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -300,12 +300,7 @@ def manifest_list(req, extension, mods=None, db=None):
path += '?' + urllib.urlencode({'db': db})
return [path]
files = manifest_glob(req, extension, addons=mods, db=db)
- i_am_diabetic = req.httprequest.environ["QUERY_STRING"].count("no_sugar") >= 1 or \
- req.httprequest.environ.get('HTTP_REFERER', '').count("no_sugar") >= 1
- if i_am_diabetic:
- return [wp for _fp, wp in files]
- else:
- return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in files]
+ return [wp for _fp, wp in files]
def get_last_modified(files):
""" Returns the modification time of the most recently modified
From 0e20990f1e7919d14482ed07358d8a0f3fba819c Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Mon, 4 Mar 2013 11:53:44 +0100
Subject: [PATCH 02/38] [FIX]share wizard: missing an argument in a function
call
bzr revid: csn@openerp.com-20130304105344-f2nnx7udejvelfw9
---
addons/share/wizard/share_wizard.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index aae13f66882..e0a9b5858cd 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -660,7 +660,7 @@ class share_wizard(osv.TransientModel):
self._assert(wizard_data.action_id and wizard_data.access_mode,
_('Action and Access Mode are required to create a shared access.'),
context=context)
- self._assert(self.has_share(cr, uid, context=context),
+ self._assert(self.has_share(cr, uid, wizard_data, context=context),
_('You must be a member of the Share/User group to use the share wizard.'),
context=context)
if wizard_data.user_type == 'emails':
From 2d6cadb7a5895f382d59e4181c697a5fccd3b458 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Mon, 4 Mar 2013 14:18:59 +0100
Subject: [PATCH 03/38] [FIX] project_issue: in kanban view of project, display
only the number of unclosed issues because the number total of issues is
meaningless
bzr revid: qdp-launchpad@openerp.com-20130304131859-4kiyz2lez1ywhkks
---
addons/project_issue/project_issue.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f5a08b37aeb..8639508d66b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -558,12 +558,13 @@ class project(osv.osv):
res = dict.fromkeys(ids, 0)
issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
- res[issue.project_id.id] += 1
+ if issue.state not in ('done', 'cancel'):
+ res[issue.project_id.id] += 1
return res
_columns = {
'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
- 'issue_count': fields.function(_issue_count, type='integer'),
+ 'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues"),
}
def _check_escalation(self, cr, uid, ids, context=None):
From 96a940b589e3b540aba9388b6013d956e92e0bdc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Mon, 4 Mar 2013 18:11:23 +0100
Subject: [PATCH 04/38] [FIX] project_issue: on project.issue, the state
related to the stage 'cancelled' is 'cancelled', not 'cancel'. This bug was
preventing the state to be saved in the record, as it was not available in
the field.selection (given by project.task.type => task states). I made the
state of issues pointing to the right place to prevent any other problems
related to code desynchrnonization
bzr revid: qdp-launchpad@openerp.com-20130304171123-bilpd51kbwiy19gb
---
addons/project_issue/project_issue.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 8639508d66b..9233a95634c 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -20,6 +20,7 @@
##############################################################################
from openerp.addons.base_status.base_stage import base_stage
+from openerp.addons.project.project import _TASK_STATE
from openerp.addons.crm import crm
from datetime import datetime
from openerp.osv import fields,osv
@@ -41,9 +42,6 @@ class project_issue_version(osv.osv):
}
project_issue_version()
-_ISSUE_STATE = [('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'), ('pending', 'Pending')]
-
-
class project_issue(base_stage, osv.osv):
_name = "project.issue"
_description = "Project Issue"
@@ -252,7 +250,7 @@ class project_issue(base_stage, osv.osv):
'company_id': fields.many2one('res.company', 'Company'),
'description': fields.text('Private Note'),
'state': fields.related('stage_id', 'state', type="selection", store=True,
- selection=_ISSUE_STATE, string="Status", readonly=True,
+ selection=_TASK_STATE, string="Status", readonly=True,
help='The status is set to \'Draft\', when a case is created.\
If the case is in progress the status is set to \'Open\'.\
When the case is over, the status is set to \'Done\'.\
@@ -558,7 +556,7 @@ class project(osv.osv):
res = dict.fromkeys(ids, 0)
issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
- if issue.state not in ('done', 'cancel'):
+ if issue.state not in ('done', 'cancelled'):
res[issue.project_id.id] += 1
return res
From dafec39152f9ce38dd5e04767ef992063238663e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Mon, 4 Mar 2013 18:12:45 +0100
Subject: [PATCH 05/38] [FIX] account, usability: removing the group no one
from periods menuitem (in accounting\config), as if someone wants to reopen a
period this is the normal/easy way to access the period in form view (where
the button stands)
bzr revid: qdp-launchpad@openerp.com-20130304171245-lnwxrtp0ejm1lr94
---
addons/account/account_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d378c36fd67..f6b74edeccd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -161,7 +161,7 @@
-
+
From b697596de3fb4f2a1053bab7595aac4cd1b50cb4 Mon Sep 17 00:00:00 2001
From: Josse Colpaert
Date: Tue, 5 Mar 2013 10:21:11 +0100
Subject: [PATCH 06/38] [FIX] Deleting asset also deletes its depreciation
lines
bzr revid: jco@openerp.com-20130305092111-30szqz1hqa55sqz8
---
addons/account_asset/account_asset.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index b335063b758..c1b9327a014 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -369,7 +369,7 @@ class account_asset_depreciation_line(osv.osv):
_columns = {
'name': fields.char('Depreciation Name', size=64, required=True, select=1),
'sequence': fields.integer('Sequence', required=True),
- 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
+ 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True, ondelete='cascade'),
'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
'amount': fields.float('Current Depreciation', digits_compute=dp.get_precision('Account'), required=True),
'remaining_value': fields.float('Next Period Depreciation', digits_compute=dp.get_precision('Account'),required=True),
From 76ca410f821f91e2317f68e7a86e25e2dff33873 Mon Sep 17 00:00:00 2001
From: Josse Colpaert
Date: Tue, 5 Mar 2013 17:20:15 +0100
Subject: [PATCH 07/38] [FIX] _find_partner refactoring for res_partner and
using it in creation of stock account moves
bzr revid: jco@openerp.com-20130305162015-lndgz2f0z4xtd62z
---
addons/account/account_invoice.py | 23 ++++++++++++-----------
addons/account_voucher/invoice.py | 2 +-
addons/stock/stock.py | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 2a4b410de2f..55bb2aa6f4f 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -305,16 +305,7 @@ class account_invoice(osv.osv):
('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
]
- def _find_partner(self, inv):
- '''
- Find the partner for which the accounting entries will be created
- '''
- #if the chosen partner is not a company and has a parent company, use the parent for the journal entries
- #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
- part = inv.partner_id
- if part.parent_id and not part.is_company:
- part = part.parent_id
- return part
+
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
@@ -980,7 +971,7 @@ class account_invoice(osv.osv):
date = inv.date_invoice or time.strftime('%Y-%m-%d')
- part = self._find_partner(inv)
+ part = self.pool.get("res.partner")._find_partner(inv.partner_id)
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part.id, date, context=ctx)),iml)
@@ -1752,6 +1743,16 @@ class res_partner(osv.osv):
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
}
+ def _find_partner(self, part):
+ '''
+ Find the partner for which the accounting entries will be created
+ '''
+ #if the chosen partner is not a company and has a parent company, use the parent for the journal entries
+ #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
+ if part.parent_id and not part.is_company:
+ part = part.parent_id
+ return part
+
def copy(self, cr, uid, id, default=None, context=None):
default = default or {}
default.update({'invoice_ids' : []})
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index bd43694260b..8a529a36492 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -41,7 +41,7 @@ class invoice(osv.osv):
'target': 'new',
'domain': '[]',
'context': {
- 'default_partner_id': self._find_partner(inv).id,
+ 'default_partner_id': self.pool.get('res.partner')._find_partner(inv.partner_id).id,
'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
'default_reference': inv.name,
'close_after_process': True,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7198c89e286..0bf1bd485bf 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2396,7 +2396,7 @@ class stock_move(osv.osv):
processing of the given stock move.
"""
# prepare default values considering that the destination accounts have the reference_currency_id as their main currency
- partner_id = (move.picking_id.partner_id and move.picking_id.partner_id.id and move.picking_id.partner_id.id) or False
+ partner_id = (move.picking_id.partner_id and move.picking_id.partner_id.id and self.pool.get('res.partner')._find_partner(move.picking_id.partner_id).id) or False
debit_line_vals = {
'name': move.name,
'product_id': move.product_id and move.product_id.id or False,
From 7e7a8b44a96db2356c88da3247c49da521474c59 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Wed, 6 Mar 2013 10:57:20 +0100
Subject: [PATCH 08/38] [IMP] deduplicate trans_parse_view code, rename for
clarity
also correctly handle all translatable attributes in a extension tag
bzr revid: xmo@openerp.com-20130306095720-3277aw0rq9pzpsw4
---
openerp/tools/translate.py | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index f1efbc17f2d..70624c25b63 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -533,27 +533,20 @@ def trans_parse_rml(de):
res.extend(trans_parse_rml(n))
return res
-def trans_parse_view(de):
+TRANSLATABLE_VIEW_ATTRS = ['string', 'help', 'sum', 'confirm', 'placeholder']
+def extract_translatable_view_strings(de):
res = []
if not isinstance(de, SKIPPED_ELEMENT_TYPES) and de.text and de.text.strip():
res.append(de.text.strip().encode("utf8"))
if de.tail and de.tail.strip():
res.append(de.tail.strip().encode("utf8"))
- if de.tag == 'attribute' and de.get("name") == 'string':
- if de.text:
- res.append(de.text.encode("utf8"))
- if de.get("string"):
- res.append(de.get('string').encode("utf8"))
- if de.get("help"):
- res.append(de.get('help').encode("utf8"))
- if de.get("sum"):
- res.append(de.get('sum').encode("utf8"))
- if de.get("confirm"):
- res.append(de.get('confirm').encode("utf8"))
- if de.get("placeholder"):
- res.append(de.get('placeholder').encode("utf8"))
+ for attr in TRANSLATABLE_VIEW_ATTRS:
+ if de.get(attr):
+ res.append(de.get(attr).encode('utf8'))
+ if de.tag == 'attribute' and de.get('name') == attr and de.text:
+ res.append(de.text.encode('utf8'))
for n in de:
- res.extend(trans_parse_view(n))
+ res.extend(extract_translatable_view_strings(n))
return res
# tests whether an object is in a list of modules
@@ -673,7 +666,7 @@ def trans_generate(lang, modules, cr):
if model=='ir.ui.view':
d = etree.XML(encode(obj.arch))
- for t in trans_parse_view(d):
+ for t in extract_translatable_view_strings(d):
push_translation(module, 'view', encode(obj.model), 0, t)
elif model=='ir.actions.wizard':
service_name = 'wizard.'+encode(obj.wiz_name)
@@ -710,7 +703,7 @@ def trans_generate(lang, modules, cr):
arch = result['arch']
if arch and not isinstance(arch, UpdateableStr):
d = etree.XML(arch)
- for t in trans_parse_view(d):
+ for t in extract_translatable_view_strings(d):
push_translation(module, 'wizard_view', name, 0, t)
# export button labels
From 2e0270783a55d210a668e2cf41e8ffa444f7e92a Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Wed, 6 Mar 2013 11:21:36 +0100
Subject: [PATCH 09/38] []FIX] disable (broken) inline edition in grouped
editable lists
Because the Add/Create button is global, it's not really possible to
know *where* to create the new record, and the current design can't
really deal with a record being edited outside of all groups.
An option might be to create a dedicated empty group for that, but the
cost/benefit is high and the UI would probably be odd.
lp bug: https://launchpad.net/bugs/1098205 fixed
bzr revid: xmo@openerp.com-20130306102136-2ms7llbt4swka92k
---
addons/web/static/src/js/view_list_editable.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index f1bd7c4325e..4e042b60c5d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -96,7 +96,8 @@ openerp.web.list_editable = function (instance) {
});
},
editable: function () {
- return !this.options.disable_editable_mode
+ return !this.grouped
+ && !this.options.disable_editable_mode
&& (this.fields_view.arch.attrs.editable
|| this._context_editable
|| this.options.editable);
From a1c57605e45aa9c35686e8682f1ed02bd72e5ebb Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Wed, 6 Mar 2013 11:50:38 +0100
Subject: [PATCH 10/38] [FIX] broken kanban sass file
bzr revid: xmo@openerp.com-20130306105038-mtd3tiurvs8ra8gd
---
addons/web_kanban/static/src/css/kanban.sass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 7fef8604c97..2182fb693ea 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -127,11 +127,11 @@
text-overflow: ellipsis
.oe_fold_column
.oe_kanban_group_length
- position: absolute
- top: -1px
- right: -14px
- float: right
- display: block
+ position: absolute
+ top: -1px
+ right: -14px
+ float: right
+ display: block
&.oe_kanban_grouped
.oe_kanban_column, .oe_kanban_group_header
width: 185px
@@ -197,7 +197,7 @@
top: -8px
.oe_kanban_header .oe_dropdown_toggle
top: -2px
- height: 14px;
+ height: 14px
.oe_kanban_card, .oe_dropdown_toggle
cursor: pointer
display: inline-block
From 2ed01c1954d8a116afb1752843969aca73de0f9b Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Wed, 6 Mar 2013 11:51:06 +0100
Subject: [PATCH 11/38] [FIX] various forgotten compilations of sass files into
css
bzr revid: xmo@openerp.com-20130306105106-k66gvdz0vgbn1y3e
---
addons/web/static/src/css/base.css | 10 ++++-----
addons/web_kanban/static/src/css/kanban.css | 24 +++++++++------------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 789205a5121..5bab586ff60 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
@font-face {
font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1263,7 +1263,7 @@
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
- border: 1px solid lightgrey;
+ border: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -1295,7 +1295,7 @@
transform: scale(1.1);
}
.openerp .oe_secondary_submenu .oe_active {
- border-top: 1px solid lightgrey;
+ border-top: 1px solid lightGray;
border-bottom: 1px solid #dedede;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -1806,7 +1806,7 @@
}
.openerp .oe_searchview .oe_searchview_drawer {
position: absolute;
- z-index: 100;
+ z-index: 3;
margin-top: 4px;
top: 100%;
right: -1px;
@@ -2257,7 +2257,7 @@
}
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
font-size: 80%;
- color: darkgreen;
+ color: darkGreen;
vertical-align: top;
position: relative;
top: -4px;
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index eaba760292c..a8ed25694ba 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -7,6 +7,15 @@
background: url(/web/static/src/img/form_sheetbg.png);
width: 100%;
}
+.openerp .oe_kanban_view .oe_kanban_group_length {
+ text-align: center;
+ display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_group_length .oe_tag {
+ position: relative;
+ top: 8px;
+ font-weight: bold;
+}
.openerp .oe_kanban_view .ui-sortable-placeholder {
border: 1px solid rgba(0, 0, 0, 0.1);
visibility: visible !important;
@@ -92,15 +101,6 @@
overflow: hidden;
text-overflow: ellipsis;
}
-.openerp .oe_kanban_view .oe_kanban_group_length {
- text-align: center;
- display: none;
-}
-.openerp .oe_kanban_view .oe_kanban_group_length .oe_tag {
- position: relative;
- top: +8px;
- font-weight: bold;
-}
.openerp .oe_kanban_view .oe_fold_column .oe_kanban_group_length {
position: absolute;
top: -1px;
@@ -108,9 +108,6 @@
float: right;
display: block;
}
-.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
- display: none;
-}
.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
width: 185px;
min-width: 185px;
@@ -150,8 +147,7 @@
.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
display: none;
}
-.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical,
-.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_length {
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_length {
display: block;
}
.openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
From 71ec2c943922b83f6f4986f5fffce740ecaf9077 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Wed, 6 Mar 2013 12:00:51 +0100
Subject: [PATCH 12/38] [FIX] search view field visible through dropdown menu
xmo@openerp.com-20130305093619-s1e5fbl80r7qnk5l added zIndex on wrong
element of search view (view itself instead of just the autocompletion
drop-down) leading to the search view text field being visible over
the "more" section of the menu.
Move zIndex setting to the right place (on the missing
`autocomplete('widget')` indirection, and on open as jquery ui
autocomplete apparently decides to reset the dropdown's z-index each
time it is open)
bzr revid: xmo@openerp.com-20130306110051-1wfhxaylsn71skjp
---
addons/web/static/src/js/search.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 1c834601719..571225458a0 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -324,7 +324,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
e.preventDefault();
break;
}
- }
+ },
+ 'autocompleteopen': function () {
+ this.$el.autocomplete('widget').css('z-index', 3);
+ },
},
/**
* @constructs instance.web.SearchView
@@ -457,7 +460,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
autoFocus: true,
minLength: 1,
delay: 0
- }).css('z-index', 3).data('autocomplete');
+ }).data('autocomplete');
// MonkeyPatch autocomplete instance
_.extend(autocomplete, {
From 70d97d67dbcd897a457fe74ed2137c8030b55f1c Mon Sep 17 00:00:00 2001
From: Vo Minh Thu
Date: Wed, 6 Mar 2013 12:21:59 +0100
Subject: [PATCH 13/38] [FIX] setup.py (windows): add some babel files not
automatically included by py2exe.
lp bug: https://launchpad.net/bugs/1089801 fixed
bzr revid: vmt@openerp.com-20130306112159-9j58mf0se3lf7a0j
---
setup.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 58d23d7a778..1229a6ca9bf 100755
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,15 @@ def data():
r["Microsoft.VC90.CRT"] = glob.glob('C:\Microsoft.VC90.CRT\*.*')
import babel
- r["localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
+ # Add data, but also some .py files py2exe won't include automatically.
+ # TODO This should probably go under `packages`, instead of `data`,
+ # but this will work fine (especially since we don't use the ZIP file
+ # approach).
+ r["babel/localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
+ others = ['global.dat', 'numbers.py', 'support.py']
+ r["babel"] = map(lambda f: os.path.join(os.path.dirname(babel.__file__), f), others)
+ others = ['frontend.py', 'mofile.py']
+ r["babel/messages"] = map(lambda f: os.path.join(os.path.dirname(babel.__file__), "messages", f), others)
import pytz
tzdir = os.path.dirname(pytz.__file__)
From a3c4308952c3c3faf7f0d1c976ff25efb0a6c96d Mon Sep 17 00:00:00 2001
From: Josse Colpaert
Date: Wed, 6 Mar 2013 12:34:47 +0100
Subject: [PATCH 14/38] [FIX] Delivery slip language depends on partner
bzr revid: jco@openerp.com-20130306113447-kz31ed2kiqy0iv5s
---
addons/stock/report/picking.rml | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index ecc682dceda..cfc9964ddb9 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -152,6 +152,7 @@
[[repeatIn(objects,'picking')]]
+ [[picking.type == 'out' and setLang(picking.partner_id and picking.partner_id.lang or user.lang) or setLang(user.lang)]]
From 7f8d7e3518d5ba550268342a22e3658426a2c470 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Wed, 6 Mar 2013 14:25:43 +0100
Subject: [PATCH 15/38] [FIX] account: fixed the duplicate of tax (wasn't
working because of a unique constraint on name field)
bzr revid: qdp-launchpad@openerp.com-20130306132543-4kqiwuvoo61h18qs
---
addons/account/account.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/addons/account/account.py b/addons/account/account.py
index acf27c42392..660976389b3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1850,6 +1850,14 @@ class account_tax(osv.osv):
return result in the context
Ex: result=round(price_unit*0.21,4)
"""
+ def copy(self, cr, uid, id, default=None, context=None):
+ if default is None:
+ default = {}
+ name = self.read(cr, uid, id, ['name'], context=context)['name']
+ default = default.copy()
+ default.update({'name': name + _(' (Copy)')})
+ return super(account_tax, self).copy(cr, uid, id, default=default, context=context)
+
def get_precision_tax():
def change_digit_tax(cr):
From 72bb2598eeebe12240ecb2713307f7288d5fb5d3 Mon Sep 17 00:00:00 2001
From: Josse Colpaert
Date: Wed, 6 Mar 2013 14:58:53 +0100
Subject: [PATCH 16/38] [FIX] Should work better this way
bzr revid: jco@openerp.com-20130306135853-0isxehb6mh41r67t
---
addons/stock/report/picking.rml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index cfc9964ddb9..ead7f0533f4 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -152,7 +152,7 @@
[[repeatIn(objects,'picking')]]
- [[picking.type == 'out' and setLang(picking.partner_id and picking.partner_id.lang or user.lang) or setLang(user.lang)]]
+ [[picking.type == 'out' and setLang(picking.partner_id and picking.partner_id.lang or user.lang) or '']]
From c164cac08c0bdda79ec6f788065bb28599bb55d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 6 Mar 2013 15:01:07 +0100
Subject: [PATCH 17/38] [IMP] crm: logging/schedulign a call now adds the
description in the chatter message.
bzr revid: tde@openerp.com-20130306140107-myvtia1tsham9yuv
---
addons/crm/crm_lead.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 2b7d9a7672d..e5d07b2df42 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -1024,9 +1024,12 @@ class crm_lead(base_stage, format_address, osv.osv):
def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
- if action == 'log': prefix = 'Logged'
- else: prefix = 'Scheduled'
- message = _("%s a call for the %s.") % (prefix, phonecall.date)
+ if action == 'log':
+ prefix = 'Logged'
+ else:
+ prefix = 'Scheduled'
+ suffix = ' %s' % phonecall.description
+ message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
return self.message_post(cr, uid, ids, body=message, context=context)
def onchange_state(self, cr, uid, ids, state_id, context=None):
From 1f4002447e40f4e424dc7cba65c727f41f900894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 6 Mar 2013 15:01:20 +0100
Subject: [PATCH 18/38] [IMP] Chatter: small css cleaning about Send a message
or Log a note.
bzr revid: tde@openerp.com-20130306140120-n6vub0d82gjr6hlh
---
addons/mail/static/src/css/mail.css | 5 ++++-
addons/mail/static/src/xml/mail.xml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e191e881543..1e1142d592c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -227,12 +227,15 @@
height: 24px;
width: 100%;
}
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_sep_word{
+ margin-right: 8px;
+ margin-left: 8px;
+}
.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_compact{
height: 24px;
width: 100%;
padding: 2px 4px;
color: #AAA;
- word-spacing: 3px;
cursor: text;
}
.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_compact_record {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 52c144e7146..bff32be55e6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -53,7 +53,7 @@
Send a message
- or
+ or
Log a note
From aa054ebb744bd07b65d28949adc239ac82cd80a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 6 Mar 2013 15:27:41 +0100
Subject: [PATCH 19/38] [REV] mail: reverted commit 8802. Reason: opt-out will
be used only for marketing campaigns; notification_email_send for emails.
bzr revid: tde@openerp.com-20130306142741-ghazensh58xw3rvu
---
addons/mail/mail_followers.py | 7 +------
addons/mail/wizard/invite.py | 22 +++++-----------------
2 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 2e97bee8a56..ecdd39874e3 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -82,11 +82,6 @@ class mail_notification(osv.Model):
:param list partners_to_notify: optional list of partner ids restricting
the notifications to process
"""
- # TDE FIXME HACK: as notification_email_send is not present on the partner
- # form view, and as opt_out can be used once CRM is installed, we have to
- # perform this ugly columns check to use the parameter
- # Please remove me in 8.0 (hint: remove opt_out -> notification to 'never')
- has_opt_out = self.pool.get('res.partner')._all_columns.get('opt_out')
notify_pids = []
for notification in message.notification_ids:
if notification.read:
@@ -99,7 +94,7 @@ class mail_notification(osv.Model):
if not partner.email:
continue
# Partner does not want to receive any emails or is opt-out
- if partner.notification_email_send == 'none' or (has_opt_out and partner.opt_out):
+ if partner.notification_email_send == 'none':
continue
# Partner wants to receive only emails and comments
if partner.notification_email_send == 'comment' and message.type not in ('email', 'comment'):
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 7e80300b132..091f8c3b569 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -19,7 +19,6 @@
#
##############################################################################
-from openerp import SUPERUSER_ID
from openerp import tools
from openerp.osv import osv
from openerp.osv import fields
@@ -52,19 +51,12 @@ class invite_wizard(osv.osv_memory):
}
def add_followers(self, cr, uid, ids, context=None):
- # TDE FIXME HACK: as notification_email_send is not present on the partner
- # form view, and as opt_out can be used once CRM is installed, we have to
- # perform this ugly columns check to use the parameter
- # Please remove me in 8.0 (hint: remove opt_out -> notification to 'never')
- has_opt_out = self.pool.get('res.partner')._all_columns.get('opt_out')
-
- for wizard in self.browse(cr, SUPERUSER_ID, ids, context=context):
+ for wizard in self.browse(cr, uid, ids, context=context):
model_obj = self.pool.get(wizard.res_model)
document = model_obj.browse(cr, uid, wizard.res_id, context=context)
# filter partner_ids to get the new followers, to avoid sending email to already following partners
- new_followers = [p for p in wizard.partner_ids if p.id not in document.message_follower_ids]
- new_follower_ids = [p.id for p in new_followers]
+ new_follower_ids = [p.id for p in wizard.partner_ids if p.id not in document.message_follower_ids]
model_obj.message_subscribe(cr, uid, [wizard.res_id], new_follower_ids, context=context)
# send an email
@@ -74,12 +66,8 @@ class invite_wizard(osv.osv_memory):
signature = user_id and user_id["signature"] or ''
if signature:
wizard.message = tools.append_content_to_html(wizard.message, signature, plaintext=True, container_tag='div')
- # send mail to new followers, unless it is opt-out
- # FIXME 8.0: use notification_email_send, send a wall message
- # and let mail handle email notification
- for follower in new_followers:
- if has_opt_out and follower.opt_out:
- continue
+ # FIXME 8.0: use notification_email_send, send a wall message and let mail handle email notification + message box
+ for follower_id in new_follower_ids:
mail_mail = self.pool.get('mail.mail')
# the invite wizard should create a private message not related to any object -> no model, no res_id
mail_id = mail_mail.create(cr, uid, {
@@ -89,5 +77,5 @@ class invite_wizard(osv.osv_memory):
'body_html': '%s' % wizard.message,
'auto_delete': True,
}, context=context)
- mail_mail.send(cr, uid, [mail_id], recipient_ids=[follower.id], context=context)
+ mail_mail.send(cr, uid, [mail_id], recipient_ids=[follower_id], context=context)
return {'type': 'ir.actions.act_window_close'}
From cdfdaa455d9e6abf8110ba4b8993894d459149f2 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu
Date: Wed, 6 Mar 2013 15:33:17 +0100
Subject: [PATCH 20/38] [FIX] babel: the babel localedata was put back to its
right place in the previous commit, so the zip-related hack can disappear.
bzr revid: vmt@openerp.com-20130306143317-oo4n6x78v68rqn9i
---
openerp/cli/server.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 7fb252f905f..fdde56bc912 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -218,12 +218,6 @@ def quit_on_signals():
os.unlink(config['pidfile'])
sys.exit(0)
-def configure_babel_localedata_path():
- # Workaround: py2exe and babel.
- if hasattr(sys, 'frozen'):
- import babel
- babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
-
def main(args):
os.environ["TZ"] = "UTC"
@@ -236,8 +230,6 @@ def main(args):
config = openerp.tools.config
- configure_babel_localedata_path()
-
setup_signal_handlers()
if config["test_file"]:
From 8b447b9d15bc67704b4589d982877d4a720ce7aa Mon Sep 17 00:00:00 2001
From: Vo Minh Thu
Date: Wed, 6 Mar 2013 15:34:44 +0100
Subject: [PATCH 21/38] [FIX] setup.nsi: better IfErrors/StrCmp order after
testing the postgres registry keys.
bzr revid: vmt@openerp.com-20130306143444-8qgpa6yj0c00ua0v
---
setup.nsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.nsi b/setup.nsi
index 3f93a5ba755..653a8798bb2 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -292,8 +292,8 @@ Function .onInit
ClearErrors
EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL\Installations" 0
- StrCmp $0 "" DoInstallPostgreSQL
IfErrors DoInstallPostgreSQL 0
+ StrCmp $0 "" DoInstallPostgreSQL
StrCpy $HasPostgreSQL 1
DoInstallPostgreSQL:
From 2084065daa433f31b1531175ae47f6573a3a9cd1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi
Date: Wed, 6 Mar 2013 15:40:24 +0100
Subject: [PATCH 22/38] [FIX] xml2str: Do not keep html void tags opened
bzr revid: fme@openerp.com-20130306144024-gjuyq6fsrvol12x2
---
addons/web/static/src/js/views.js | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 164e87b8b8f..1ba65f7ec18 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1555,12 +1555,17 @@ instance.web.xml_to_str = function(node) {
} else {
throw new Error(_t("Could not serialize XML"));
}
- // Browsers won't deal with self closing tags except br, hr, input, ...
- // http://stackoverflow.com/questions/97522/what-are-all-the-valid-self-closing-elements-in-xhtml-as-implemented-by-the-maj
- //
+ // Browsers won't deal with self closing tags except void elements:
+ // http://www.w3.org/TR/html-markup/syntax.html
+ var void_elements = 'area base br col command embed hr img input keygen link meta param source track wbr'.split(' ');
+
// The following regex is a bit naive but it's ok for the xmlserializer output
str = str.replace(/<([a-z]+)([^<>]*)\s*\/\s*>/g, function(match, tag, attrs) {
- return "<" + tag + attrs + ">" + tag + ">";
+ if (void_elements.indexOf(tag) < 0) {
+ return "<" + tag + attrs + ">" + tag + ">";
+ } else {
+ return match;
+ }
});
return str;
};
From 13ec67e4781b3ca117b193da29a7b66124efbe74 Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Wed, 6 Mar 2013 16:13:06 +0100
Subject: [PATCH 23/38] [FIX] visual problem in some cases in field texts,
solved by switching field texts to simple html output instead of textarea
when in read-only mode
lp bug: https://launchpad.net/bugs/1149640 fixed
bzr revid: nicolas.vanhoren@openerp.com-20130306151306-1qwv04bvw50z81z9
---
addons/web/static/src/css/base.css | 7 +++
addons/web/static/src/css/base.sass | 6 +++
addons/web/static/src/js/view_form.js | 63 +++++++++++++++------------
addons/web/static/src/xml/base.xml | 27 +++++++-----
4 files changed, 63 insertions(+), 40 deletions(-)
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5bab586ff60..b0b0db61be3 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2308,6 +2308,13 @@
.openerp .oe_form .oe_form_field_text {
width: 100%;
}
+.openerp .oe_form .oe_form_field_text .oe_form_text_content {
+ text-overflow: ellipsis;
+ display: inline-block;
+ white-space: pre-wrap;
+ overflow-x: hidden;
+ width: 100%;
+}
.openerp .oe_form .oe_form_field_char input,
.openerp .oe_form .oe_form_field_url input,
.openerp .oe_form .oe_form_field_email input,
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 073926b7c0a..9b8837a511d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1832,6 +1832,12 @@ $sheet-padding: 16px
.oe_form
.oe_form_field_text
width: 100%
+ .oe_form_text_content
+ text-overflow: ellipsis
+ display: inline-block
+ white-space: pre-wrap
+ overflow-x: hidden
+ width: 100%
.oe_form_field_char input,
.oe_form_field_url input,
.oe_form_field_email input,
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bf5b26d92fe..12f7d21ae4c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2559,42 +2559,43 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
},
'change textarea': 'store_dom_value',
},
- init: function (field_manager, node) {
- this._super(field_manager, node);
- },
initialize_content: function() {
var self = this;
- this.$textarea = this.$el.find('textarea');
- this.auto_sized = false;
- this.default_height = this.$textarea.css('height');
- if (this.get("effective_readonly")) {
- this.$textarea.attr('disabled', 'disabled');
+ if (! this.get("effective_readonly")) {
+ this.$textarea = this.$el.find('textarea');
+ this.auto_sized = false;
+ this.default_height = this.$textarea.css('height');
+ if (this.get("effective_readonly")) {
+ this.$textarea.attr('disabled', 'disabled');
+ }
+ this.setupFocus(this.$textarea);
+ } else {
+ this.$textarea = undefined;
}
- this.setupFocus(this.$textarea);
},
commit_value: function () {
this.store_dom_value();
return this._super();
},
store_dom_value: function () {
- if (!this.get('effective_readonly') && this.$('textarea').length) {
- this.internal_set_value(
- instance.web.parse_value(
- this.$textarea.val(),
- this));
- }
+ this.internal_set_value(instance.web.parse_value(this.$textarea.val(), this));
},
render_value: function() {
- var show_value = instance.web.format_value(this.get('value'), this, '');
- if (show_value === '') {
- this.$textarea.css('height', parseInt(this.default_height)+"px");
- }
- this.$textarea.val(show_value);
- if (! this.auto_sized) {
- this.auto_sized = true;
- this.$textarea.autosize();
+ if (! this.get("effective_readonly")) {
+ var show_value = instance.web.format_value(this.get('value'), this, '');
+ if (show_value === '') {
+ this.$textarea.css('height', parseInt(this.default_height)+"px");
+ }
+ this.$textarea.val(show_value);
+ if (! this.auto_sized) {
+ this.auto_sized = true;
+ this.$textarea.autosize();
+ } else {
+ this.$textarea.trigger("autosize");
+ }
} else {
- this.$textarea.trigger("autosize");
+ var txt = this.get("value");
+ this.$(".oe_form_text_content").text(txt);
}
},
is_syntax_valid: function() {
@@ -2612,14 +2613,18 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
return this.get('value') === '' || this._super();
},
focus: function($el) {
- this.$textarea[0].focus();
+ if (!this.get("effective_readonly") && this.$textarea) {
+ this.$textarea[0].focus();
+ }
},
set_dimensions: function (height, width) {
this._super(height, width);
- this.$textarea.css({
- width: width,
- minHeight: height
- });
+ if (!this.get("effective_readonly") && this.$textarea) {
+ this.$textarea.css({
+ width: width,
+ minHeight: height
+ });
+ }
},
});
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f76b888a029..bd4f2f15e1f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1032,17 +1032,22 @@
-
![]()
+
+
+
+
+
+
From d383666364634071c889827aebc8ec04c3295317 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Wed, 6 Mar 2013 16:22:16 +0100
Subject: [PATCH 24/38] [FIX]l10n_fr_hr_payroll: fix a few errors in report
bzr revid: csn@openerp.com-20130306152216-061prm1hkt77iidk
---
addons/l10n_fr_hr_payroll/report/fiche_paye.rml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
index 76c6eb9dedf..2d1a6bff8b2 100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -348,10 +348,10 @@
[[ p.total or '' ]]
- [[ get_employer_line(o, p).rate or '']]
+ [[ get_employer_line(o, p) and get_employer_line(o, p).rate or '']]
|
- [[ get_employer_line(o,p).total or '' ]]
+ [[ get_employer_line(o,p) and get_employer_line(o,p).total or '' ]]
|
From d97916a0630611cd3189fc1a32d7103df9495f7a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Wed, 6 Mar 2013 16:23:28 +0100
Subject: [PATCH 25/38] [IMP] expression.py: added a clue to debug fuzzy
tracebacks related to domain badly written
bzr revid: qdp-launchpad@openerp.com-20130306152328-qdlil19diks4mvkt
---
openerp/osv/expression.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 899279c8015..bf02c12a228 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -199,7 +199,7 @@ def normalize_domain(domain):
expected -= 1
else:
expected += op_arity.get(token, 0) - 1
- assert expected == 0
+ assert expected == 0, 'This domain is syntactically not correct: %s' % (domain)
return result
From 7577488134c4faca90aa05669fa69141891fc67d Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Wed, 6 Mar 2013 16:55:48 +0100
Subject: [PATCH 26/38] [FIX]point of sale: when creating account_move_line,
was passing a false parameter instead of a correct account id
bzr revid: csn@openerp.com-20130306155548-pdeli8m5ao3126aw
---
addons/point_of_sale/point_of_sale.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 792b24b5dfe..6c10fdb9543 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1053,7 +1053,7 @@ class pos_order(osv.osv):
'name': _('Tax') + ' ' + tax.name,
'quantity': line.qty,
'product_id': line.product_id.id,
- 'account_id': key[account_pos],
+ 'account_id': key[account_pos] or income_account,
'credit': ((tax_amount>0) and tax_amount) or 0.0,
'debit': ((tax_amount<0) and -tax_amount) or 0.0,
'tax_code_id': key[tax_code_pos],
From 527e17033cdb771bc93023d15eade8d352149212 Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Wed, 6 Mar 2013 17:24:36 +0100
Subject: [PATCH 27/38] [FIX] typo in previous commit
bzr revid: nicolas.vanhoren@openerp.com-20130306162436-nuitgum452gz6bq9
---
addons/web/static/src/js/view_form.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 12f7d21ae4c..7ba45c865f3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2574,7 +2574,9 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
}
},
commit_value: function () {
- this.store_dom_value();
+ if (! this.get("effective_readonly") && this.$textarea) {
+ this.store_dom_value();
+ }
return this._super();
},
store_dom_value: function () {
From 445c1aa412c64ae81ad4fab900494420dff9b0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 6 Mar 2013 17:28:11 +0100
Subject: [PATCH 28/38] [FIX] mail: added wrapper because of changes introduced
in the API recently.
bzr revid: tde@openerp.com-20130306162811-t4505m08nep2jlz4
---
addons/mail/mail_thread.py | 20 +++++++++++++++++++-
addons/mail/res_users.py | 7 +++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a456e82d466..8a169e6f27c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -931,7 +931,18 @@ class mail_thread(osv.AbstractModel):
body = tools.plaintext2html(body)
# 2: Private message: add recipients (recipients and author of parent message)
- partner_ids = set(kwargs.pop('partner_ids', []))
+ # + legacy-code management (! we manage only 4 and 6 commands)
+ partner_ids = set()
+ kwargs_partner_ids = set(kwargs.pop('partner_ids', []))
+ for partner_id in kwargs_partner_ids:
+ if isinstance(partner_id, (list, tuple)) and partner_id[0] == 4 and len(partner_id) == 2:
+ partner_ids.add(partner_id[1])
+ if isinstance(partner_id, (list, tuple)) and partner_id[0] == 6 and len(partner_id) == 3:
+ partner_ids |= partner_id[2]
+ elif isinstance(partner_id, (int, long)):
+ partner_ids.add(partner_id)
+ else:
+ pass # we do not manage anything else
if parent_id and model == 'mail.thread':
parent_message = mail_message.browse(cr, uid, parent_id, context=context)
partner_ids |= set([partner.id for partner in parent_message.partner_ids])
@@ -1019,6 +1030,13 @@ class mail_thread(osv.AbstractModel):
self.message_subscribe(cr, uid, [thread_id], [message.author_id.id], context=context)
return msg_id
+ def message_post_user_api(self, cr, uid, thread_id, body='', parent_id=False,
+ attachment_ids=None, content_subtype='plaintext',
+ context=None, **kwargs):
+ return self.message_post(cr, uid, thread_id, body=body, parent_id=parent_id,
+ attachment_ids=attachment_ids, content_suibtype=content_subtype,
+ context=context, **kwargs)
+
#------------------------------------------------------
# Followers API
#------------------------------------------------------
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 2eff9e43314..2cd1b8f072c 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -120,6 +120,13 @@ class res_users(osv.Model):
partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
+ def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
+ """ Redirect the posting of message on res.users to the related partner.
+ This is done because when giving the context of Chatter on the
+ various mailboxes, we do not have access to the current partner_id. """
+ partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
+ return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, context=context, **kwargs)
+
def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
for id in ids:
partner_id = self.browse(cr, SUPERUSER_ID, id).partner_id.id
From 96267bdfce9602d3eae44245830c9e36348de06f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Wed, 6 Mar 2013 18:28:56 +0100
Subject: [PATCH 29/38] [FIX] project: when writing on several projects, don't
erase the name of all projects with the last one's name! stupid me.
bzr revid: qdp-launchpad@openerp.com-20130306172856-35dmxn7efydr5xyf
---
addons/project/project.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/addons/project/project.py b/addons/project/project.py
index f89ce8391fc..877c45703b4 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1302,13 +1302,13 @@ class account_analytic_account(osv.osv):
return analytic_account_id
def write(self, cr, uid, ids, vals, context=None):
- name = vals.get('name')
+ vals_for_project = vals.copy()
for account in self.browse(cr, uid, ids, context=context):
- if not name:
- vals['name'] = account.name
+ if not vals.get('name'):
+ vals_for_project['name'] = account.name
if not vals.get('type'):
- vals['type'] = account.type
- self.project_create(cr, uid, account.id, vals, context=context)
+ vals_for_project['type'] = account.type
+ self.project_create(cr, uid, account.id, vals_for_project, context=context)
return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)
def unlink(self, cr, uid, ids, *args, **kwargs):
@@ -1425,3 +1425,4 @@ class project_category(osv.osv):
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
From c65d36bb65f531ea7011cea25d6a72f527ded5ac Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 7 Mar 2013 05:44:34 +0000
Subject: [PATCH 30/38] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130307054408-wu5arb2r3o3o5gmz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130307054431-sed0lo6klnisoyo7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130307054434-qdlzkcum9yy9mkaw
---
addons/account/i18n/fr.po | 10 +-
addons/account_analytic_plans/i18n/fr.po | 10 +-
addons/account_budget/i18n/fr.po | 12 +-
addons/account_followup/i18n/mk.po | 98 ++-
addons/analytic/i18n/fr.po | 16 +-
addons/anonymization/i18n/mk.po | 331 ++++++++
addons/association/i18n/mk.po | 146 ++++
addons/audittrail/i18n/mk.po | 408 +++++++++
addons/auth_crypt/i18n/ar.po | 76 +-
addons/base_import/i18n/mk.po | 157 ++--
addons/base_report_designer/i18n/mk.po | 191 +++++
addons/contacts/i18n/cs.po | 2 +-
addons/document/i18n/mk.po | 768 +++++++++++++++++
addons/marketing_campaign_crm_demo/i18n/mk.po | 169 ++++
addons/membership/i18n/mk.po | 784 ++++++++++++++++++
addons/mrp/i18n/lv.po | 161 ++--
addons/mrp_repair/i18n/tr.po | 2 +-
addons/purchase/i18n/fr.po | 34 +-
addons/warning/i18n/fr.po | 10 +-
addons/web/i18n/ro.po | 16 +-
openerp/addons/base/i18n/ur.po | 15 +-
21 files changed, 3101 insertions(+), 315 deletions(-)
create mode 100644 addons/anonymization/i18n/mk.po
create mode 100644 addons/association/i18n/mk.po
create mode 100644 addons/audittrail/i18n/mk.po
create mode 100644 addons/base_report_designer/i18n/mk.po
create mode 100644 addons/document/i18n/mk.po
create mode 100644 addons/marketing_campaign_crm_demo/i18n/mk.po
create mode 100644 addons/membership/i18n/mk.po
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index dd49740f8af..cea3fa696d2 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-02-22 12:52+0000\n"
-"Last-Translator: Eric Vernichon \n"
+"PO-Revision-Date: 2013-03-06 13:28+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 06:07+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2919,7 +2919,7 @@ msgstr "Taxes"
#: field:account.move.line,analytic_account_id:0
#: field:account.move.line.reconcile.writeoff,analytic_id:0
msgid "Analytic Account"
-msgstr "Centre de coûts"
+msgstr "Compte analytique"
#. module: account
#: field:account.config.settings,default_purchase_tax:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 9f8d44549f0..33455f77b07 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-03-06 10:06+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-18 06:31+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
@@ -223,7 +223,7 @@ msgstr "Identifiant du Compte1"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,max_required:0
msgid "Maximum Allowed (%)"
-msgstr "Maximum permis (%)"
+msgstr "Maximum autorisé (%)"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 9643b4992a9..34ddcc5d392 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-05 15:43+0000\n"
+"PO-Revision-Date: 2013-03-06 15:44+0000\n"
"Last-Translator: Numérigraphe \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-06 06:21+0000\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
"X-Generator: Launchpad (build 16514)\n"
#. module: account_budget
@@ -28,7 +28,7 @@ msgstr "Sélectionnez la Période de Date"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
msgid "Responsible User"
-msgstr "Utilisateur Responsable"
+msgstr "Utilisateur responsable"
#. module: account_budget
#: selection:crossovered.budget,state:0
@@ -54,7 +54,7 @@ msgstr "Confirmer"
#. module: account_budget
#: field:crossovered.budget,validating_user_id:0
msgid "Validate User"
-msgstr "Valider l'utilisateur"
+msgstr "Validé par"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
@@ -161,7 +161,7 @@ msgstr "Remettre en brouillon"
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,planned_amount:0
msgid "Planned Amount"
-msgstr "Montant Plannifié"
+msgstr "Montant prévu"
#. module: account_budget
#: report:account.budget:0
@@ -392,7 +392,7 @@ msgstr ""
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Planned Amt"
-msgstr "Montant planifié"
+msgstr "Montant prévu"
#. module: account_budget
#: view:account.budget.post:0
diff --git a/addons/account_followup/i18n/mk.po b/addons/account_followup/i18n/mk.po
index 1a6cc932083..babd7883ef1 100644
--- a/addons/account_followup/i18n/mk.po
+++ b/addons/account_followup/i18n/mk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-04 15:27+0000\n"
+"PO-Revision-Date: 2013-03-06 13:20+0000\n"
"Last-Translator: Софче Димитријева \n"
"Language-Team: Macedonian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-05 05:38+0000\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
"X-Generator: Launchpad (build 16514)\n"
#. module: account_followup
@@ -506,11 +506,13 @@ msgid ""
"Optionally you can assign a user to this field, which will make him "
"responsible for the action."
msgstr ""
+"Опционо можете да назначите корисник на ова поле, што ќе го направи "
+"одговорен за оваа акција."
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_sending_results
msgid "Results from the sending of the different letters and emails"
-msgstr ""
+msgstr "Резултати од испраќањето на разни писма и е-пошти"
#. module: account_followup
#: constraint:account_followup.followup.line:0
@@ -528,12 +530,12 @@ msgstr ""
#. module: account_followup
#: view:res.partner:0
msgid "Search Partner"
-msgstr ""
+msgstr "Барај партнер"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Испрати писма и е-пошти"
#. module: account_followup
#: view:account_followup.followup:0
@@ -554,7 +556,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.print:0
msgid "or"
-msgstr ""
+msgstr "или"
#. module: account_followup
#: view:res.partner:0
@@ -571,7 +573,7 @@ msgstr ""
#. module: account_followup
#: view:res.partner:0
msgid "Click to mark the action as done."
-msgstr ""
+msgstr "Кликнете за да ја означите акцијата како завршена."
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
@@ -647,7 +649,7 @@ msgstr ""
#. module: account_followup
#: report:account_followup.followup.print:0
msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Документ: Извод од салдо на клиент"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_menu
@@ -689,13 +691,13 @@ msgstr ""
#. module: account_followup
#: view:account_followup.sending.results:0
msgid "Download Letters"
-msgstr ""
+msgstr "Симни писма"
#. module: account_followup
#: field:account_followup.print,company_id:0
#: field:res.partner,unreconciled_aml_ids:0
msgid "unknown"
-msgstr ""
+msgstr "непознато"
#. module: account_followup
#: code:addons/account_followup/account_followup.py:283
@@ -723,7 +725,7 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:171
#, python-format
msgid " email(s) should have been sent, but "
-msgstr ""
+msgstr " е-пошта(и) кои треба да бидат испратени, но "
#. module: account_followup
#: help:account_followup.print,test_print:0
@@ -734,33 +736,33 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_move_line
msgid "Journal Items"
-msgstr ""
+msgstr "Ставки на дневник"
#. module: account_followup
#: report:account_followup.followup.print:0
msgid "Total:"
-msgstr ""
+msgstr "Вкупно:"
#. module: account_followup
#: field:account_followup.followup.line,email_template_id:0
msgid "Email Template"
-msgstr ""
+msgstr "Урнек за е-пошта"
#. module: account_followup
#: field:account_followup.print,summary:0
msgid "Summary"
-msgstr ""
+msgstr "Резиме"
#. module: account_followup
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,send_email:0
msgid "Send an Email"
-msgstr ""
+msgstr "Испрати е-пошта"
#. module: account_followup
#: field:account_followup.stat,credit:0
msgid "Credit"
-msgstr ""
+msgstr "Побарување"
#. module: account_followup
#: field:res.partner,payment_amount_overdue:0
@@ -823,7 +825,7 @@ msgstr ""
#. module: account_followup
#: help:res.partner,payment_note:0
msgid "Payment Note"
-msgstr ""
+msgstr "Белешка за плаќање"
#. module: account_followup
#: view:res.partner:0
@@ -833,7 +835,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "%(company_name)s"
-msgstr ""
+msgstr "%(компанија_име)"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -856,18 +858,18 @@ msgstr ""
#: field:account_followup.stat,date_move_last:0
#: field:account_followup.stat.by.partner,date_move_last:0
msgid "Last move"
-msgstr ""
+msgstr "Последно движење"
#. module: account_followup
#: field:account_followup.stat,period_id:0
msgid "Period"
-msgstr ""
+msgstr "Период"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:228
#, python-format
msgid "%s partners have no credits and as such the action is cleared"
-msgstr ""
+msgstr "%s партнери немаат побарувања и како таква акцијата е избришана"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
@@ -884,17 +886,17 @@ msgstr ""
#. module: account_followup
#: view:account_followup.print:0
msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
#. module: account_followup
#: view:account_followup.sending.results:0
msgid "Close"
-msgstr ""
+msgstr "Затвори"
#. module: account_followup
#: view:account_followup.stat:0
msgid "Litigation"
-msgstr ""
+msgstr "Судски спор"
#. module: account_followup
#: field:account_followup.stat.by.partner,max_followup_id:0
@@ -905,12 +907,12 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:171
#, python-format
msgid " had unknown email address(es)"
-msgstr ""
+msgstr " има непозната адреса(и) на е-пошта"
#. module: account_followup
#: view:res.partner:0
msgid "Responsible"
-msgstr ""
+msgstr "Одговорен"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.menu_finance_followup
@@ -921,7 +923,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": Current Date"
-msgstr ""
+msgstr ": Тековен датум"
#. module: account_followup
#: view:account_followup.print:0
@@ -945,27 +947,27 @@ msgstr ""
#: report:account_followup.followup.print:0
#: field:account_followup.sending.results,description:0
msgid "Description"
-msgstr ""
+msgstr "Опис"
#. module: account_followup
#: view:account_followup.sending.results:0
msgid "Summary of actions"
-msgstr ""
+msgstr "Резиме на акции"
#. module: account_followup
#: report:account_followup.followup.print:0
msgid "Ref"
-msgstr ""
+msgstr "Референца"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "After"
-msgstr ""
+msgstr "После"
#. module: account_followup
#: view:account_followup.stat:0
msgid "This Fiscal year"
-msgstr ""
+msgstr "Оваа фискална година"
#. module: account_followup
#: field:res.partner,latest_followup_level_id_without_lit:0
@@ -980,11 +982,15 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+"Не се пронајдени ставки на дневникот.\n"
+"
\n"
+" "
#. module: account_followup
#: view:account.move.line:0
msgid "Partner entries"
-msgstr ""
+msgstr "Записи на партнер"
#. module: account_followup
#: view:account_followup.stat:0
@@ -1039,7 +1045,7 @@ msgstr ""
#. module: account_followup
#: field:account_followup.followup,name:0
msgid "Name"
-msgstr ""
+msgstr "Име"
#. module: account_followup
#: field:res.partner,latest_followup_level_id:0
@@ -1050,12 +1056,12 @@ msgstr ""
#: field:account_followup.stat,date_move:0
#: field:account_followup.stat.by.partner,date_move:0
msgid "First move"
-msgstr ""
+msgstr "Прво движење"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
msgid "Follow-up Statistics by Partner"
-msgstr ""
+msgstr "Статистики на проследување по партнер"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:172
@@ -1066,7 +1072,7 @@ msgstr ""
#. module: account_followup
#: view:res.partner:0
msgid "Partners with Overdue Credits"
-msgstr ""
+msgstr "Партнери со задоцнети побарувања"
#. module: account_followup
#: view:res.partner:0
@@ -1107,12 +1113,12 @@ msgstr ""
#. module: account_followup
#: view:account.move.line:0
msgid "Total credit"
-msgstr ""
+msgstr "Вкупно побарува"
#. module: account_followup
#: field:account_followup.followup.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Секвенца"
#. module: account_followup
#: view:res.partner:0
@@ -1122,12 +1128,12 @@ msgstr ""
#. module: account_followup
#: report:account_followup.followup.print:0
msgid "Customer Ref :"
-msgstr ""
+msgstr "Реф. на клиент :"
#. module: account_followup
#: report:account_followup.followup.print:0
msgid "Maturity Date"
-msgstr ""
+msgstr "Датум на доспевање"
#. module: account_followup
#: help:account_followup.followup.line,delay:0
@@ -1150,19 +1156,19 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User Name"
-msgstr ""
+msgstr ": Корисничко име"
#. module: account_followup
#: view:res.partner:0
msgid "Accounting"
-msgstr ""
+msgstr "Сметководство"
#. module: account_followup
#: field:account_followup.stat,blocked:0
msgid "Blocked"
-msgstr ""
+msgstr "Блокирано"
#. module: account_followup
#: field:res.partner,payment_note:0
msgid "Customer Payment Promise"
-msgstr ""
+msgstr "Ветување за плаќање на клиент"
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index df0035ac9dd..b2d482efd34 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -8,20 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-22 12:55+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"\n"
+"PO-Revision-Date: 2013-03-06 15:45+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 06:07+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
-msgstr "Comptes fils"
+msgstr "Comptes enfant"
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -151,7 +150,7 @@ msgstr "Messages non lus"
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
+msgstr "Erreur ! Impossible de créer des comptes analytiques récursifs."
#. module: analytic
#: field:account.analytic.account,company_id:0
@@ -382,7 +381,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Type of Account"
-msgstr ""
+msgstr "Type de compte"
#. module: analytic
#: field:account.analytic.account,date_start:0
@@ -393,6 +392,7 @@ msgstr ""
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
msgstr ""
+"Impossible de créer des écritures analytiques dans un compte de type \"vue\"."
#. module: analytic
#: field:account.analytic.account,line_ids:0
diff --git a/addons/anonymization/i18n/mk.po b/addons/anonymization/i18n/mk.po
new file mode 100644
index 00000000000..8fde8b1fe8c
--- /dev/null
+++ b/addons/anonymization/i18n/mk.po
@@ -0,0 +1,331 @@
+# Macedonian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 12:57+0000\n"
+"Last-Translator: Софче Димитријева \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
+msgid "ir.model.fields.anonymization.migration.fix"
+msgstr "ir.model.fields.anonymization.migration.fix"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.migration.fix,target_version:0
+msgid "Target Version"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.migration.fix,query_type:0
+msgid "sql"
+msgstr "sql"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Име на полето"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+#: field:ir.model.fields.anonymization.migration.fix,field_name:0
+msgid "Field"
+msgstr "Поле"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr "Ново"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Увези"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Насока"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "непознато"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Патека на датотеката"
+
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Датум"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Извези"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.migration.fix,query_type:0
+msgid "python"
+msgstr "python"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Полиња"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Исчисти"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Резиме"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "Not Existing"
+msgstr "Не постои"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Име на објект"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.migration.fix,model_name:0
+msgid "Model"
+msgstr "Модел"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
+msgstr "Грешка !"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Име на датотека"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.migration.fix,sequence:0
+msgid "Sequence"
+msgstr "Секвенца"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Започнато"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Завршено"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.migration.fix,query:0
+#: field:ir.model.fields.anonymization.migration.fix,query_type:0
+msgid "Query"
+msgstr "Прашалник"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Порака"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:65
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Не може да имате две полиња со исто име на ист објект!"
diff --git a/addons/association/i18n/mk.po b/addons/association/i18n/mk.po
new file mode 100644
index 00000000000..46bfc9ae812
--- /dev/null
+++ b/addons/association/i18n/mk.po
@@ -0,0 +1,146 @@
+# Macedonian 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2013-03-06 14:35+0000\n"
+"Last-Translator: Софче Димитријева \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Вики"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "Менаџмент на настан"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Getting Things Done"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Овој модул е за да се креира Профил за соработници"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Напредок на Конфигурација"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Овде имате одредени апликации поврзани со профилот на соработникот кој сте "
+"го избрале."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "наслов"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Ви помага да ги менаџирате и организирате вашите настани."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Слика"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Ги следи и менаџира трошоците поврзани со вработените и ви дава можност за "
+"автоматско фактурирање (ре-фактурирање) на клиентите доколку истите трошоци "
+"се поврзани со одреден проект."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD е методологија за ефикасно организирање на вашите задачи. Овој модул "
+"целосно го интегрира GTD принципот со OpenERP проектниот менаџмент."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Менаџмент на ресурси"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Профил на соработник"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Следење на трошоци"
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr "Конфигурација на апликација за соработник"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and between your employees."
+msgstr ""
+"Ви овозможува да креирате вики страници и групи на страници со цел да го "
+"следите вашето бизнис знаење и да го споделите со и помеѓу вашите вработени."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Ви помага да ги управувате вашите проекти и задачи со нивно следење, "
+"планирање итн..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Настани"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Проектен менаџмент"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Конфигурирај"
diff --git a/addons/audittrail/i18n/mk.po b/addons/audittrail/i18n/mk.po
new file mode 100644
index 00000000000..be54db1ac10
--- /dev/null
+++ b/addons/audittrail/i18n/mk.po
@@ -0,0 +1,408 @@
+# Macedonian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 13:33+0000\n"
+"Last-Translator: Софче Димитријева \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr ""
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:76
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Лог"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr "Претплатен"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:260
+#: code:addons/audittrail/audittrail.py:347
+#: code:addons/audittrail/audittrail.py:408
+#, python-format
+msgid "'%s' Model does not exist..."
+msgstr "'%s' Моделот не постои..."
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Subscribed Rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "Audittrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: field:audittrail.rule,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
+#: model:ir.ui.menu,name:audittrail.menu_audit_logs
+msgid "Audit Logs"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Group By..."
+msgstr "Групирај по..."
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "_Subscribe"
+msgstr "_Претплати"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr "Нацрт"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr "Стара вредност"
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
+msgid "View log"
+msgstr "Види лог"
+
+#. module: audittrail
+#: help:audittrail.rule,log_read:0
+msgid ""
+"Select this if you want to keep track of read/open on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr "Метод"
+
+#. module: audittrail
+#: field:audittrail.view.log,from:0
+msgid "Log From"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr "ID на лог"
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr "ID на ресурс"
+
+#. module: audittrail
+#: help:audittrail.rule,user_id:0
+msgid "if User is not added then it will applicable for all users"
+msgstr "доколку не е додаден Корисник ќе се примени на сите корисници"
+
+#. module: audittrail
+#: help:audittrail.rule,log_workflow:0
+msgid ""
+"Select this if you want to keep track of workflow on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Корисници"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr "Ставки на Лог"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr "Објект"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.view.log,to:0
+msgid "Log To"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Search Audittrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
+msgid "Audit Rules"
+msgstr "Правила за ревизија"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr "Стара вредност : "
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Resource Name"
+msgstr "Име на ресурс"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr "Датум"
+
+#. module: audittrail
+#: help:audittrail.rule,log_write:0
+msgid ""
+"Select this if you want to keep track of modification on any record of the "
+"object of this rule"
+msgstr ""
+"Означете доколку сакате да ги следите измените на било кој запис за објектот "
+"на ова правило"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,object_id:0
+msgid "Select object for which you want to generate log."
+msgstr "Изберете објект за кој сакате да генерирате лог."
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_audit
+msgid "Audit"
+msgstr "Ревизија"
+
+#. module: audittrail
+#: field:audittrail.rule,log_workflow:0
+msgid "Log Workflow"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log Reads"
+msgstr ""
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:77
+#, python-format
+msgid "Change audittrail depends -- Setting rule as DRAFT"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr "Ставки на Лог"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr "Полиња"
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
+msgstr "Креирање на лог"
+
+#. module: audittrail
+#: help:audittrail.rule,log_unlink:0
+msgid ""
+"Select this if you want to keep track of deletion on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Корисник"
+
+#. module: audittrail
+#: field:audittrail.rule,action_id:0
+msgid "Action ID"
+msgstr "ID на дејство"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Users (if User is not added then it will applicable for all users)"
+msgstr ""
+"Корисници (доколку корисникот не е додаден, ќе се примени на сите корисници)"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr ""
+
+#. module: audittrail
+#: sql_constraint:audittrail.rule:0
+msgid ""
+"There is already a rule defined on this object\n"
+" You cannot define another: please edit the existing one."
+msgstr ""
+"Веќе има дефинирано правило за овој објект\n"
+"Не може да дефинирате друго: изменете го постојното."
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log Deletes"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Model"
+msgstr "Модел"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr "Опис на поле"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Search Audittrail Log"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log Writes"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Open Logs"
+msgstr "Отвори логови"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr "Име на правило"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr "Нова вредност"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:223
+#, python-format
+msgid "'%s' field does not exist in '%s' model"
+msgstr "'%s' полето не постои во '%s' моделот"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Draft Rule"
+msgstr "Нацрт правило"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "Audittrail Log"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_action:0
+msgid ""
+"Select this if you want to keep track of actions on the object of this rule"
+msgstr ""
+"Означете го ова доколку сакате да ги следите акциите на објектот на ова "
+"правило"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr "Нова вредност : "
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_view_log
+msgid "View Log"
+msgstr "Прегледај лог"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "Log Line"
+msgstr "Ставка на лог"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "or"
+msgstr "или"
+
+#. module: audittrail
+#: field:audittrail.rule,log_action:0
+msgid "Log Action"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_create:0
+msgid ""
+"Select this if you want to keep track of creation on any record of the "
+"object of this rule"
+msgstr ""
diff --git a/addons/auth_crypt/i18n/ar.po b/addons/auth_crypt/i18n/ar.po
index 6790552602e..c895c30de50 100644
--- a/addons/auth_crypt/i18n/ar.po
+++ b/addons/auth_crypt/i18n/ar.po
@@ -1,74 +1,28 @@
# Arabic translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
+# FIRST AUTHOR , 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-01 18:05+0000\n"
-"Last-Translator: gehad shaat \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 14:32+0000\n"
+"Last-Translator: FULL NAME \n"
"Language-Team: Arabic \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr ""
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
msgid "Users"
-msgstr "المستخدمون"
-
-#~ msgid "Base - Password Encryption"
-#~ msgstr "قاعدة - تشفير كلمة المرور"
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "يرجى تحديد كلمة السر!"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "لا يمكن ان يكون هناك اثنين مستخدمين بنفس اسم الدخول!"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموحة لهذا المستخدم"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "خطأ"
-
-#~ msgid "res.users"
-#~ msgstr "مستخدمي المراجع"
-
-#~ msgid ""
-#~ "This module replaces the cleartext password in the database with a password "
-#~ "hash,\n"
-#~ "preventing anyone from reading the original password.\n"
-#~ "For your existing user base, the removal of the cleartext passwords occurs "
-#~ "the first time\n"
-#~ "a user logs into the database, after installing base_crypt.\n"
-#~ "After installing this module it won't be possible to recover a forgotten "
-#~ "password for your\n"
-#~ "users, the only solution is for an admin to set a new password.\n"
-#~ "\n"
-#~ "Note: installing this module does not mean you can ignore basic security "
-#~ "measures,\n"
-#~ "as the password is still transmitted unencrypted on the network (by the "
-#~ "client),\n"
-#~ "unless you are using a secure protocol such as XML-RPCS.\n"
-#~ " "
-#~ msgstr ""
-#~ "يستبدل هذه الوحدة كلمة السر بنص واضح في قاعدة البيانات مع شرطة كلمة السر،\n"
-#~ "منع أي شخص من قراءة كلمة السر الأصلية.\n"
-#~ "لقاعدة المستخدم القائم الخاص بك ، وإزالة كلمات المرور نص واضح يحدث للمرة "
-#~ "الأولى\n"
-#~ "تسجيل دخول المستخدم في قاعدة البيانات، بعد تثبيت base_crypt.\n"
-#~ "بعد تركيب هذه الوحدة لن يكون من الممكن استرجاع كلمة المرور المنسية\n"
-#~ "للمستخدمين، والحل الوحيد هو المسير لتعيين كلمة مرور جديدة.\n"
-#~ "\n"
-#~ "ملاحظة: تركيب هذه الوحدة لا يعني يمكنك تجاهل التدابير الأمنية الأساسية،\n"
-#~ "كما لا تزال تبث كلمة المرور غير مشفرة على شبكة الاتصال (من قبل العميل)،\n"
-#~ "إلا إذا كنت تستخدم بروتوكول آمن مثل XML-محاولات RPCs.\n"
-#~ " "
+msgstr ""
diff --git a/addons/base_import/i18n/mk.po b/addons/base_import/i18n/mk.po
index 2634e273290..6df5ee29661 100644
--- a/addons/base_import/i18n/mk.po
+++ b/addons/base_import/i18n/mk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-02 22:23+0000\n"
-"Last-Translator: Ivica Dimitrijev \n"
+"PO-Revision-Date: 2013-03-06 14:22+0000\n"
+"Last-Translator: Софче Димитријева \n"
"Language-Team: Macedonian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-03 05:22+0000\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
"X-Generator: Launchpad (build 16514)\n"
#. module: base_import
@@ -128,7 +128,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:206
#, python-format
msgid "CSV file for Manufacturer, Retailer"
-msgstr ""
+msgstr "CSV фајл за Производител, Трговец на мало"
#. module: base_import
#. openerp-web
@@ -153,21 +153,21 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:80
#, python-format
msgid "XXX/External ID"
-msgstr ""
+msgstr "XXX/Надворешна ID"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:351
#, python-format
msgid "Don't Import"
-msgstr ""
+msgstr "Не увезувај"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:24
#, python-format
msgid "Select the"
-msgstr ""
+msgstr "Изберете"
#. module: base_import
#. openerp-web
@@ -188,26 +188,26 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:141
#, python-format
msgid "Country: the name or code of the country"
-msgstr ""
+msgstr "Земја: Име или код на земјата"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
msgid "base_import.tests.models.o2m.child"
-msgstr ""
+msgstr "Copy text \t base_import.tests.models.o2m.child"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:239
#, python-format
msgid "Can I import several times the same record?"
-msgstr ""
+msgstr "Дали може да увезам повеќе пати ист запис?"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:15
#, python-format
msgid "Validate"
-msgstr ""
+msgstr "Потврди"
#. module: base_import
#. openerp-web
@@ -234,6 +234,8 @@ msgid ""
"What's the difference between Database ID and \n"
" External ID?"
msgstr ""
+"Која е разликата помеѓу ID на датабаза и\n"
+"Надворешна ID?"
#. module: base_import
#. openerp-web
@@ -251,19 +253,19 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:175
#, python-format
msgid "What can I do if I have multiple matches for a field?"
-msgstr ""
+msgstr "Што може да направам доколку имам повеќе совшаѓања за полето?"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:302
#, python-format
msgid "External ID,Name,Is a Company"
-msgstr ""
+msgstr "Надворешна ID,Име,Компанија"
#. module: base_import
#: field:base_import.tests.models.preview,somevalue:0
msgid "Some Value"
-msgstr ""
+msgstr "Некоја вредност"
#. module: base_import
#. openerp-web
@@ -273,6 +275,8 @@ msgid ""
"The following CSV file shows how to import \n"
" suppliers and their respective contacts"
msgstr ""
+"Следниов CSV фајл покажува како да увезете\n"
+"добавувачи и нивните контакти"
#. module: base_import
#. openerp-web
@@ -322,12 +326,12 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:148
#, python-format
msgid "Country: Belgium"
-msgstr ""
+msgstr "Земја: Белгија"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
msgid "base_import.tests.models.char.stillreadonly"
-msgstr ""
+msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
#. openerp-web
@@ -337,13 +341,15 @@ msgid ""
"External ID,Name,Is a \n"
" Company,Related Company/External ID"
msgstr ""
+"Надворешна ID,Име,\n"
+"Компанија,Поврзана компанија/Надворешна ID"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:233
#, python-format
msgid "Suppliers and their respective contacts"
-msgstr ""
+msgstr "Добавувачи и нивните контакти"
#. module: base_import
#. openerp-web
@@ -391,7 +397,7 @@ msgstr ""
#. module: base_import
#: field:base_import.tests.models.preview,othervalue:0
msgid "Other Variable"
-msgstr ""
+msgstr "Друга варијабла"
#. module: base_import
#. openerp-web
@@ -421,11 +427,13 @@ msgid ""
"Country/Database \n"
" ID: 21"
msgstr ""
+"Земја/Датабаза\n"
+"ID: 21"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
-msgstr ""
+msgstr "base_import.tests.models.char"
#. module: base_import
#: help:base_import.import,file:0
@@ -437,7 +445,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:230
#, python-format
msgid "Purchase orders with their respective purchase order lines"
-msgstr ""
+msgstr "Налози за набавка, со соодветните ставки од налогот за набавка"
#. module: base_import
#. openerp-web
@@ -455,7 +463,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:26
#, python-format
msgid ".CSV"
-msgstr ""
+msgstr ".CSV"
#. module: base_import
#. openerp-web
@@ -469,12 +477,12 @@ msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
msgid "base_import.tests.models.m2o.required"
-msgstr ""
+msgstr "base_import.tests.models.m2o.required"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
msgid "base_import.tests.models.char.noreadonly"
-msgstr ""
+msgstr "base_import.tests.models.char.noreadonly"
#. module: base_import
#. openerp-web
@@ -497,52 +505,52 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:30
#, python-format
msgid "CSV File:"
-msgstr ""
+msgstr "CSV Датотека:"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_preview
msgid "base_import.tests.models.preview"
-msgstr ""
+msgstr "base_import.tests.models.preview"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
msgid "base_import.tests.models.char.required"
-msgstr ""
+msgstr "base_import.tests.models.char.required"
#. module: base_import
#: code:addons/base_import/models.py:112
#, python-format
msgid "Database ID"
-msgstr ""
+msgstr "ID на базата на податоци"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:313
#, python-format
msgid "It will produce the following CSV file:"
-msgstr ""
+msgstr "Ќе го произведе следниов CSV фајл:"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:362
#, python-format
msgid "Here is the start of the file we could not import:"
-msgstr ""
+msgstr "Овде е почетокот на фајлот кој не можеме да го увеземе:"
#. module: base_import
#: field:base_import.import,file_type:0
msgid "File Type"
-msgstr ""
+msgstr "Тип на датотека"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
-msgstr ""
+msgstr "base_import.import"
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
msgid "base_import.tests.models.o2m"
-msgstr ""
+msgstr "base_import.tests.models.o2m"
#. module: base_import
#. openerp-web
@@ -572,7 +580,7 @@ msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
msgid "base_import.tests.models.char.readonly"
-msgstr ""
+msgstr "base_import.tests.models.char.readonly"
#. module: base_import
#. openerp-web
@@ -607,14 +615,14 @@ msgstr ""
#: code:addons/base_import/models.py:264
#, python-format
msgid "You must configure at least one field to import"
-msgstr ""
+msgstr "Мора да конфигурирате барем едно поле за увезување"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:304
#, python-format
msgid "company_2,Organi,True"
-msgstr ""
+msgstr "company_2,Organi,True"
#. module: base_import
#. openerp-web
@@ -628,14 +636,14 @@ msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
msgid "base_import.tests.models.char.states"
-msgstr ""
+msgstr "base_import.tests.models.char.states"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:7
#, python-format
msgid "Import a CSV File"
-msgstr ""
+msgstr "Увези CSV фајл"
#. module: base_import
#. openerp-web
@@ -647,14 +655,14 @@ msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
msgid "base_import.tests.models.m2o.required.related"
-msgstr ""
+msgstr "base_import.tests.models.m2o.required.related"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:293
#, python-format
msgid ")."
-msgstr ""
+msgstr ")."
#. module: base_import
#. openerp-web
@@ -662,14 +670,14 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:396
#, python-format
msgid "Import"
-msgstr ""
+msgstr "Увези"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/js/import.js:407
#, python-format
msgid "Here are the possible values:"
-msgstr ""
+msgstr "Еве ги можните вредности:"
#. module: base_import
#. openerp-web
@@ -699,7 +707,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:301
#, python-format
msgid "This SQL command will create the following CSV file:"
-msgstr ""
+msgstr "SQL командата ќе го креира следниов CSV фајл:"
#. module: base_import
#. openerp-web
@@ -709,6 +717,8 @@ msgid ""
"The following CSV file shows how to import purchase \n"
" orders with their respective purchase order lines:"
msgstr ""
+"Следниов CSV фајл покажува како да ги импортирате налозите за набавка\n"
+"со соодветните ставки од налогот за набавка:"
#. module: base_import
#. openerp-web
@@ -718,6 +728,8 @@ msgid ""
"What can I do when the Import preview table isn't \n"
" displayed correctly?"
msgstr ""
+"Што можам да направам кога табелата за преглед на увезување \n"
+"не е прикажана правилно?"
#. module: base_import
#: field:base_import.tests.models.char,value:0
@@ -734,21 +746,21 @@ msgstr ""
#: field:base_import.tests.models.o2m.child,parent_id:0
#: field:base_import.tests.models.o2m.child,value:0
msgid "unknown"
-msgstr ""
+msgstr "непознато"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:317
#, python-format
msgid "person_2,Laurence,False,company_1"
-msgstr ""
+msgstr "person_2,Laurence,False,company_1"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:149
#, python-format
msgid "Country/External ID: base.be"
-msgstr ""
+msgstr "Земја/Надворешна Id: base.be"
#. module: base_import
#. openerp-web
@@ -776,14 +788,14 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:227
#, python-format
msgid "File for some Quotations"
-msgstr ""
+msgstr "Пополнете за некои понуди"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/js/import.js:72
#, python-format
msgid "Encoding:"
-msgstr ""
+msgstr "Кодирање:"
#. module: base_import
#. openerp-web
@@ -813,6 +825,8 @@ msgid ""
" \"External ID\". In PSQL, write the following "
"command:"
msgstr ""
+"Најпрвин ќе ги извеземе сите компании и нивните\n"
+"\"Надворешна ID\". Во PSQL, напиши ја следнава команда:"
#. module: base_import
#. openerp-web
@@ -828,7 +842,7 @@ msgstr ""
#: code:addons/base_import/static/src/js/import.js:373
#, python-format
msgid "Everything seems valid."
-msgstr ""
+msgstr "Изгледа се е валидно."
#. module: base_import
#. openerp-web
@@ -847,7 +861,7 @@ msgstr ""
#: code:addons/base_import/static/src/js/import.js:390
#, python-format
msgid "at row %d"
-msgstr ""
+msgstr "на ред %d"
#. module: base_import
#. openerp-web
@@ -863,7 +877,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:80
#, python-format
msgid "XXX/ID"
-msgstr ""
+msgstr "XXX/ID"
#. module: base_import
#. openerp-web
@@ -897,7 +911,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:319
#, python-format
msgid "person_4,Ramsy,False,company_3"
-msgstr ""
+msgstr "person_4,Ramsy,False,company_3"
#. module: base_import
#. openerp-web
@@ -919,7 +933,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:20
#, python-format
msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
#. module: base_import
#. openerp-web
@@ -929,20 +943,22 @@ msgid ""
"What happens if I do not provide a value for a \n"
" specific field?"
msgstr ""
+"Што се случува доколку не доставам вредност за\n"
+"одредено поле?"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:68
#, python-format
msgid "Frequently Asked Questions"
-msgstr ""
+msgstr "Често Поставувани Прашања"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:305
#, python-format
msgid "company_3,Boum,True"
-msgstr ""
+msgstr "company_3,Boum,True"
#. module: base_import
#. openerp-web
@@ -966,6 +982,9 @@ msgid ""
" import an other record that links to the first\n"
" one, use"
msgstr ""
+"колона во OpenERP. Кога\n"
+" увезувате друг запис кој е поврзан со првиот\n"
+" употребете"
#. module: base_import
#. openerp-web
@@ -992,14 +1011,14 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:169
#, python-format
msgid "CSV file for categories"
-msgstr ""
+msgstr "CSV датотека за категории"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/js/import.js:309
#, python-format
msgid "Normal Fields"
-msgstr ""
+msgstr "Полиња Нормално"
#. module: base_import
#. openerp-web
@@ -1017,7 +1036,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:170
#, python-format
msgid "CSV file for Products"
-msgstr ""
+msgstr "CSV датотека за производи"
#. module: base_import
#. openerp-web
@@ -1041,12 +1060,12 @@ msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
msgid "base_import.tests.models.m2o.related"
-msgstr ""
+msgstr "base_import.tests.models.m2o.related"
#. module: base_import
#: field:base_import.tests.models.preview,name:0
msgid "Name"
-msgstr ""
+msgstr "Име"
#. module: base_import
#. openerp-web
@@ -1060,12 +1079,12 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:318
#, python-format
msgid "person_3,Eric,False,company_2"
-msgstr ""
+msgstr "person_3,Eric,False,company_2"
#. module: base_import
#: field:base_import.import,res_model:0
msgid "Model"
-msgstr ""
+msgstr "Модел"
#. module: base_import
#. openerp-web
@@ -1073,7 +1092,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:82
#, python-format
msgid "ID"
-msgstr ""
+msgstr "ID"
#. module: base_import
#. openerp-web
@@ -1108,12 +1127,12 @@ msgstr ""
#: code:addons/base_import/static/src/js/import.js:73
#, python-format
msgid "Separator:"
-msgstr ""
+msgstr "Одделувач:"
#. module: base_import
#: field:base_import.import,file_name:0
msgid "File Name"
-msgstr ""
+msgstr "Име на датотека"
#. module: base_import
#. openerp-web
@@ -1123,28 +1142,28 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:82
#, python-format
msgid "External ID"
-msgstr ""
+msgstr "Надворешна ID"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:39
#, python-format
msgid "File Format Options…"
-msgstr ""
+msgstr "Опции за формат на датотека..."
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/js/import.js:392
#, python-format
msgid "between rows %d and %d"
-msgstr ""
+msgstr "помеѓу редови %d и %d"
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/import.xml:19
#, python-format
msgid "or"
-msgstr ""
+msgstr "или"
#. module: base_import
#. openerp-web
@@ -1162,4 +1181,4 @@ msgstr ""
#. module: base_import
#: field:base_import.import,file:0
msgid "File"
-msgstr ""
+msgstr "Датотека"
diff --git a/addons/base_report_designer/i18n/mk.po b/addons/base_report_designer/i18n/mk.po
new file mode 100644
index 00000000000..13faba4f044
--- /dev/null
+++ b/addons/base_report_designer/i18n/mk.po
@@ -0,0 +1,191 @@
+# Macedonian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 13:46+0000\n"
+"Last-Translator: Софче Димитријева \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "base.report.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "Конфигурација за дизајнирање на OpenERP извештај"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Upload the modified report"
+msgstr "Качи изменет извештај"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr "The .SXW извештај"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "Copy text \t base_report_designer.installer"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "base.report.rml.save"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Конфигурирај"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "наслов"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Извештај"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML Report"
+msgstr "The RML Извештај"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Дизајнер на извештај"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Име на датотеката"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr "Дизајнер на OpenERP извештај"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Продолжи"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Зачувај како"
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "Зачувај RML фајл"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr "Вашиот .SXW фајл"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Чекори за инсталација и конфигурација"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Опис"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"Ова е урнек за бараниот извештај.\n"
+"Зачувајте го како .SXW фајл и отворете го со OpenOffice.\n"
+"Не заборавајте да го инсталирате OpenERP SA OpenOffice пакетот за да го "
+"измените.\n"
+"Откако е изменет, качете го повторно во OpenERP со користење на овој "
+"волшебник."
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "base.report.file.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "Инсталација на Дизајнер за OpenERP извештај"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "or"
+msgstr "или"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Селектирајте го вашиот извештај"
diff --git a/addons/contacts/i18n/cs.po b/addons/contacts/i18n/cs.po
index f68fb2f5894..e0f7d2393e3 100644
--- a/addons/contacts/i18n/cs.po
+++ b/addons/contacts/i18n/cs.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-03-06 06:21+0000\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
"X-Generator: Launchpad (build 16514)\n"
#. module: contacts
diff --git a/addons/document/i18n/mk.po b/addons/document/i18n/mk.po
new file mode 100644
index 00000000000..2477ecb7dae
--- /dev/null
+++ b/addons/document/i18n/mk.po
@@ -0,0 +1,768 @@
+# Macedonian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 15:08+0000\n"
+"Last-Translator: Софче Димитријева \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr "Директориум Родител"
+
+#. module: document
+#: code:addons/document/document.py:336
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "Името на директориумот содржи специјални карактери!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr "Пребарај директориум на документ"
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Group By..."
+msgstr "Групирај по..."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Измена"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr "Ресурси"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "Датотеки"
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr "Mime-тип"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr "Израз"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Содржина на директориум"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Мој документ(и)"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "Менаџмент на документ"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
+msgstr ""
+
+#. module: document
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr "Име на полето."
+
+#. module: document
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "Името на директориумот мора да биде уникатно!"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr "Филтар на моите документи"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr ""
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+"Доколку е точно, сите прилози кои се совпаѓаат со овој ресурс ќе бидат "
+"лоцирани. Доколку е грешка, само оние кои го имаат ова како родител."
+
+#. module: document
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Директориуми"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Детали за датотеки по корисници"
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr "Пронајди ги сите ресурси"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr "Папки по ресурс"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Суфикс"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "Изменет датум"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Конфигурација за апликација на знаење"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr "Поврзани документи"
+
+#. module: document
+#: model:ir.actions.act_window,help:document.action_document_file_form
+msgid ""
+"\n"
+" Click to create a new document. \n"
+"
\n"
+" The Documents repository gives you access to all attachments, "
+"such\n"
+" as mails, project documents, invoices etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr "Документи"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr "Модел на ресурс"
+
+#. module: document
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+msgid "File Size"
+msgstr "Големина на датотеката"
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Тип на содржина"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+msgid "Type"
+msgstr "Тип"
+
+#. module: document
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr "Името на датотеката мора да биде уникатно во директориумот !"
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (копија)"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr ""
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+"Употребете домен доколку сакате да примените автоматски филтер на видливи "
+"ресурси."
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You cannot create recursive directories."
+msgstr "Грешка! Не може да креирате рекурсивни директориуми."
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr "Име на поле"
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr "Тип на директориум"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Извештај"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "July"
+msgstr "Јули"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Проширување"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Виртуелни полиња"
+
+#. module: document
+#: code:addons/document/document.py:562
+#, python-format
+msgid "Error at doc write!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr "Генерирани полиња"
+
+#. module: document
+#: view:document.configuration:0
+msgid ""
+"When executing this wizard, it will configure your directories automatically "
+"according to modules installed."
+msgstr ""
+"Кога го користите овој волшебник, тој ќе ги конфигурира автоматски вашите "
+"директориуми според инсталраните модули."
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "Директориум"
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+msgstr "Безбедност"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Корисник на последна измена"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
+#: view:report.document.user:0
+msgid "Files by User"
+msgstr "Датотеки по корисник"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "on"
+msgstr "на"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Домен"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Изменет датум"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Детали за датотеки по директориум"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr "Датотеки на сите корисници"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Големина на датотека по месец"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "December"
+msgstr "Декември"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr "Статичко"
+
+#. module: document
+#: field:report.document.user,user:0
+msgid "unknown"
+msgstr "непознато"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+msgid "Owner"
+msgstr "Сопственик"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "PDF Извештај"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Содржини"
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr "Креирање на датум"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Configure Directories"
+msgstr "Конфигурирај директориуми"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Вклучи име на запис"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "ID на модел"
+
+#. module: document
+#: help:document.directory,ressource_tree:0
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_id:0
+msgid ""
+"Along with Parent Model, this ID attaches this folder to a specific record "
+"of Parent Model."
+msgstr ""
+
+#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:6
+#, python-format
+msgid "Attachment(s)"
+msgstr "Прилог(зи)"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Директориумот не може да биде родител сам на себе!"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "June"
+msgstr "Јуни"
+
+#. module: document
+#: field:document.directory,group_ids:0
+msgid "Groups"
+msgstr "Групи"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr "Активно"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "November"
+msgstr "Ноември"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Дефиниција"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "October"
+msgstr "Октомври"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Секвенца"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Датотеки на сите корисници"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "January"
+msgstr "Јануари"
+
+#. module: document
+#: view:document.directory:0
+msgid "Document Directory"
+msgstr "Директориум на документ"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Името на директориумот мора да биде уникатно !"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachments"
+msgstr "Прилози"
+
+#. module: document
+#: field:document.directory,create_uid:0
+msgid "Creator"
+msgstr "Креатор"
+
+#. module: document
+#: view:document.configuration:0
+msgid ""
+"OpenERP's Document Management System supports mapping virtual folders with "
+"documents. The virtual folder of a document can be used to manage the files "
+"attached to the document, or to print and download any report. This tool "
+"will create directories automatically according to modules installed."
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Датотеки по месец"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "September"
+msgstr "Септември"
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr "Префикс"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Деца"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID на ресурс"
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr "Поле"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Модел Родител"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
+"Овие групи, не се применуваат на директориумите деца, кои мора да си "
+"дефинираат свои сопствени групи."
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "May"
+msgstr "Мај"
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr "За секој внес овде, во оваа папка ќе се појавата виртуелни датотеки."
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Users File"
+msgstr "Датотека на корисник"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Directory Configuration"
+msgstr "Конфигурација на директориум"
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "February"
+msgstr "Февруари"
+
+#. module: document
+#: field:document.directory,name:0
+msgid "Name"
+msgstr "Име"
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr "Полиња"
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "April"
+msgstr "Април"
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+msgid "# of Files"
+msgstr "# од полиња"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Тип на содржина на директориум"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
+"Само членовите на овие групи ќе имаат пристап до овој директориум и неговите "
+"датотеки."
+
+#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:17
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Секвенца"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Име на содржина"
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "Име на датотека"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Структура на дрво"
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr "Структура на директориум"
+
+#. module: document
+#: field:report.document.user,name:0
+msgid "Year"
+msgstr "Година"
+
+#. module: document
+#: model:ir.model,name:document.model_document_storage
+msgid "Storage Media"
+msgstr "Медиум за складирање"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Тип документ"
diff --git a/addons/marketing_campaign_crm_demo/i18n/mk.po b/addons/marketing_campaign_crm_demo/i18n/mk.po
new file mode 100644
index 00000000000..52dbe1a6ff9
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/mk.po
@@ -0,0 +1,169 @@
+# Macedonian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 08:50+0000\n"
+"Last-Translator: Ivica Dimitrijev \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello,
\n"
+" Thanks for showing interest and for subscribing to technical "
+"training.
\n"
+" If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,
\n"
+" Thanks for showing interest and for subscribing to the "
+"OpenERP Discovery Day.
\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Компанија:"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello,
\n"
+" We have very good offer that might suit you.\n"
+" For our silver partners,We are paid technical training on "
+"june,2010.
\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,
\n"
+" We have very good offer that might suit you.\n"
+" We suggest you subscribe to the OpenERP Discovery Day on May "
+"2010.
\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello,
\n"
+" We have very good offer that might suit you.\n"
+" For our gold partners,We are arranging free technical training "
+"on june,2010.
\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,
\n"
+" Thanks for showing interest and buying the OpenERP book.
\n"
+" If any further information required kindly revert back.\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello,
\n"
+" We have very good offer that might suit you.\n"
+" For our silver partners, we are offering Gold partnership.
\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,
\n"
+" Thanks for the genuine interest you have shown in "
+"OpenERP.
\n"
+" If any further information is required, do not hesitate to "
+"reply to this message.
\n"
+" Regards,OpenERP Team,
"
+msgstr ""
diff --git a/addons/membership/i18n/mk.po b/addons/membership/i18n/mk.po
new file mode 100644
index 00000000000..01e170b5d87
--- /dev/null
+++ b/addons/membership/i18n/mk.po
@@ -0,0 +1,784 @@
+# Macedonian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-03-06 13:39+0000\n"
+"Last-Translator: Софче Димитријева \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr ""
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "This will display waiting, invoiced and total pending columns"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: view:res.partner:0
+msgid "Group By..."
+msgstr "Групирај по..."
+
+#. module: membership
+#: field:report.membership,num_paid:0
+msgid "# Paid"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,tot_earned:0
+msgid "Earned Amount"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_membership
+msgid "Membership Analysis"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,company_id:0
+#: view:report.membership:0
+#: field:report.membership,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: field:res.partner,free_member:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Ending Date Of Membership"
+msgstr ""
+
+#. module: membership
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+#: field:res.partner,membership_stop:0
+msgid "Membership End Date"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "This will display paid, old and total earned columns"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Taxes"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All Members"
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_1_product_template
+msgid "Silver Membership"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr ""
+
+#. module: membership
+#: field:report.membership,tot_pending:0
+msgid "Pending Amount"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_report_membership_tree
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "End Membership Date"
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:414
+#, python-format
+msgid "Partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_res_partner
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr ""
+
+#. module: membership
+#: help:report.membership,date_from:0
+msgid "Start membership date"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel Membership Date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,num_waiting:0
+msgid "# Waiting"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+#: model:ir.ui.menu,name:membership.menu_membership
+#: view:res.partner:0
+msgid "Members"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Invoiced/Paid/Free"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "July"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_0_product_template
+msgid "Golden Membership"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,associate_member:0
+msgid ""
+"A member with whom you want to associate your membership.It will consider "
+"the membership state of the associated member."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+#: view:report.membership:0
+#: field:report.membership,membership_id:0
+msgid "Membership Product"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership_date_to:0
+#: help:res.partner,membership_stop:0
+msgid "Date until which membership remains active."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership products"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_state:0
+msgid "Current Membership Status"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid " Membership State"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Memberships"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "September"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,month:0
+msgid "Month"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Group by..."
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:411
+#, python-format
+msgid "Partner is a free Member."
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Buy Membership"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,associate_member_id:0
+#: view:res.partner:0
+#: field:res.partner,associate_member:0
+msgid "Associate Member"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership_date_from:0
+#: help:res.partner,membership_start:0
+msgid "Date from which membership becomes active."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_invoice
+#: view:membership.invoice:0
+msgid "Membership Invoice"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Category"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Contacts"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Forecast"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,partner_id:0
+msgid "Member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Date From"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,date:0
+msgid "Date on which member has joined the membership"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "Membership Status"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "August"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership Products"
+msgstr ""
+
+#. module: membership
+#: sql_constraint:product.product:0
+msgid "Error ! Ending Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "June"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Check if the product is eligible for membership."
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr ""
+
+#. module: membership
+#: field:membership.invoice,product_id:0
+#: field:membership.membership_line,membership_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_from:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "November"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "October"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+" -Non Member: A partner who has not applied for any "
+"membership.\n"
+" -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+" -Old Member: A member whose membership date has "
+"expired.\n"
+" -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+" -Invoiced Member: A member whose invoice has been "
+"created.\n"
+" -Paying member: A member who has paid the membership fee."
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "January"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Membership Partners"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,member_price:0
+#: view:product.product:0
+msgid "Membership Fee"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negotiated by the partner"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_2_product_template
+msgid "Basic Membership"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "None/Canceled/Old/Waiting"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,membership_state:0
+msgid "Current Membership State"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership status.\n"
+" -Non Member: A member who has not applied for any "
+"membership.\n"
+" -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+" -Old Member: A member whose membership date has "
+"expired.\n"
+" -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+" -Invoiced Member: A member whose invoice has been "
+"created.\n"
+" -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Inactive"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All non Members"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr ""
+
+#. module: membership
+#: field:membership.invoice,member_price:0
+msgid "Member Price"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership Duration"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "May"
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+#: field:res.partner,membership_start:0
+msgid "Membership Start Date"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give free membership."
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership Amount"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_to:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "February"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "April"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Starting Date Of Membership"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_cancel:0
+msgid "Date on which membership has been cancelled"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_invoice_view
+#: view:membership.invoice:0
+msgid "Invoice Membership"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+msgid "Membership product"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,member_price:0
+msgid "Amount for the membership"
+msgstr ""
+
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Cancelled Member"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,year:0
+msgid "Year"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Revenue Done"
+msgstr ""
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
index 4a7f2ee8fd0..8480fb3026d 100644
--- a/addons/mrp/i18n/lv.po
+++ b/addons/mrp/i18n/lv.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-03-06 15:34+0000\n"
+"Last-Translator: Normunds (Alistek) \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-01-18 06:54+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: mrp
#: help:mrp.config.settings,module_mrp_repair:0
@@ -33,29 +33,29 @@ msgstr ""
#. module: mrp
#: report:mrp.production.order:0
msgid "No. Of Cycles"
-msgstr ""
+msgstr "Ciklu skaits"
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
-msgstr ""
+msgstr "Vieta, kur sistēma meklēs izejvielas."
#. module: mrp
#: field:mrp.production,workcenter_lines:0
msgid "Work Centers Utilisation"
-msgstr ""
+msgstr "Resursu utilizācija"
#. module: mrp
#: view:mrp.routing.workcenter:0
msgid "Routing Work Centers"
-msgstr ""
+msgstr "Resursu maršrutēšana"
#. module: mrp
#: field:mrp.production.workcenter.line,cycle:0
#: field:mrp.routing.workcenter,cycle_nbr:0
#: field:report.workcenter.load,cycle:0
msgid "Number of Cycles"
-msgstr ""
+msgstr "Ciklu skaits"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -63,38 +63,40 @@ msgid ""
"The 'Minimum stock rule' allows the system to create procurement orders "
"automatically as soon as the minimum stock is reached."
msgstr ""
+"\"Minimālo atlikumu nosacījumi\" ļauj sistēmai veidot iepirkumu pasūtījumus "
+"automātiski, tiklīdz tiek sasniegts preču minimālais atlikums."
#. module: mrp
#: code:addons/mrp/report/price.py:130
#, python-format
msgid "Hourly Cost"
-msgstr ""
+msgstr "Stundas izmaksas"
#. module: mrp
#: view:mrp.production:0
msgid "Scrap Products"
-msgstr ""
+msgstr "Norakstīt preces"
#. module: mrp
#: view:mrp.workcenter:0
msgid "Mrp Workcenter"
-msgstr ""
+msgstr "Ražošanas resurss"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_routing_action
#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
msgid "Routings"
-msgstr ""
+msgstr "Maršrutēšanas"
#. module: mrp
#: view:mrp.bom:0
msgid "Search Bill Of Material"
-msgstr ""
+msgstr "Meklēt recepti"
#. module: mrp
#: model:process.node,note:mrp.process_node_stockproduct1
msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Noliktavas precēm un palīgmateriāliem"
#. module: mrp
#: help:mrp.bom,message_unread:0
@@ -120,17 +122,17 @@ msgstr ""
#: field:mrp.bom,code:0
#: field:mrp.production,name:0
msgid "Reference"
-msgstr ""
+msgstr "Atsauce"
#. module: mrp
#: view:mrp.production:0
msgid "Finished Products"
-msgstr ""
+msgstr "Gatavie ražojumi"
#. module: mrp
#: view:mrp.production:0
msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Ražošanas orderi, kas tiek izpildīti."
#. module: mrp
#: help:mrp.bom,message_summary:0
@@ -145,7 +147,7 @@ msgstr ""
#: model:process.transition,name:mrp.process_transition_servicerfq0
#: model:process.transition,name:mrp.process_transition_stockrfq0
msgid "To Buy"
-msgstr ""
+msgstr "Iegādāties"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -160,12 +162,12 @@ msgstr ""
#. module: mrp
#: selection:mrp.bom,method:0
msgid "Set / Pack"
-msgstr ""
+msgstr "Komplekts / Iepakojums"
#. module: mrp
#: field:mrp.workcenter,costs_hour:0
msgid "Cost per hour"
-msgstr ""
+msgstr "Izmaksas stundā"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -173,42 +175,43 @@ msgid ""
"In case the Supply method of the product is Produce, the system creates a "
"production order."
msgstr ""
+"Ja preču piegādes metode ir Ražošana, sistēma veido ražošanas orderi."
#. module: mrp
#: field:change.production.qty,product_qty:0
msgid "Product Qty"
-msgstr ""
+msgstr "Prece skaits"
#. module: mrp
#: view:mrp.production:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Mērvienība"
#. module: mrp
#: model:process.node,note:mrp.process_node_purchaseprocure0
msgid "For purchased material"
-msgstr ""
+msgstr "Attiecībā uz iegādātajiem materiāliem"
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
msgid "Order Planning"
-msgstr ""
+msgstr "Ražošanas orderu plānošana"
#. module: mrp
#: field:mrp.config.settings,module_mrp_operations:0
msgid "Allow detailed planning of work order"
-msgstr ""
+msgstr "Atļaut detalizētu izpildes orderu plānošanu"
#. module: mrp
#: code:addons/mrp/mrp.py:633
#, python-format
msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Nav iespējams atcelt ražošanas orderi!"
#. module: mrp
#: field:mrp.workcenter,costs_cycle_account_id:0
msgid "Cycle Account"
-msgstr ""
+msgstr "Cikla konts"
#. module: mrp
#: code:addons/mrp/report/price.py:130
@@ -219,17 +222,17 @@ msgstr ""
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
msgid "Procurement of services"
-msgstr ""
+msgstr "Pakalpojumu iepirkums"
#. module: mrp
#: view:mrp.workcenter:0
msgid "Capacity Information"
-msgstr ""
+msgstr "Informācija par kapacitāti"
#. module: mrp
#: field:mrp.routing,workcenter_lines:0
msgid "Work Centers"
-msgstr ""
+msgstr "Resursi"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_routing_action
@@ -250,22 +253,22 @@ msgstr ""
#: view:mrp.production:0
#: field:mrp.production,move_created_ids2:0
msgid "Produced Products"
-msgstr ""
+msgstr "Izpildītie ražojumi"
#. module: mrp
#: report:mrp.production.order:0
msgid "Destination Location"
-msgstr ""
+msgstr "Piegādes vieta"
#. module: mrp
#: view:mrp.config.settings:0
msgid "Master Data"
-msgstr ""
+msgstr "Pamatdati"
#. module: mrp
#: field:mrp.config.settings,module_mrp_byproduct:0
msgid "Produce several products from one manufacturing order"
-msgstr ""
+msgstr "Ražot vairākus produktus no viena ražošanas ordera"
#. module: mrp
#: help:mrp.config.settings,group_mrp_properties:0
@@ -285,28 +288,28 @@ msgstr ""
#. module: mrp
#: report:mrp.production.order:0
msgid "Partner Ref"
-msgstr ""
+msgstr "Partnera atsauce"
#. module: mrp
#: selection:mrp.workcenter.load,measure_unit:0
msgid "Amount in hours"
-msgstr ""
+msgstr "Apjoms stundās"
#. module: mrp
#: field:mrp.production,product_lines:0
msgid "Scheduled goods"
-msgstr ""
+msgstr "Ieplānotās preces"
#. module: mrp
#: selection:mrp.bom,type:0
msgid "Sets / Phantom"
-msgstr ""
+msgstr "Komplekti / Fantoms"
#. module: mrp
#: view:mrp.production:0
#: field:mrp.production,state:0
msgid "Status"
-msgstr ""
+msgstr "Statuss"
#. module: mrp
#: help:mrp.bom,position:0
@@ -316,7 +319,7 @@ msgstr ""
#. module: mrp
#: model:res.groups,name:mrp.group_mrp_routings
msgid "Manage Routings"
-msgstr ""
+msgstr "Pārvaldīt maršrutus"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_product_produce
@@ -326,17 +329,17 @@ msgstr ""
#. module: mrp
#: constraint:mrp.bom:0
msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Kļūda! Jūs nevarat veidot rekursīvu recepti."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing_workcenter
msgid "Work Center Usage"
-msgstr ""
+msgstr "Resursu lietojums"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Noliktavas produktu iepirkums"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -359,7 +362,7 @@ msgstr ""
#. module: mrp
#: sql_constraint:mrp.production:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Atsaucei jābūt unikālai katram uzņēmumam!"
#. module: mrp
#: code:addons/mrp/report/price.py:139
@@ -370,24 +373,24 @@ msgstr ""
#: report:mrp.production.order:0
#, python-format
msgid "Quantity"
-msgstr ""
+msgstr "Daudzums"
#. module: mrp
#: help:mrp.workcenter,product_id:0
msgid ""
"Fill this product to easily track your production costs in the analytic "
"accounting."
-msgstr ""
+msgstr "Aizpildiet lai uzskaitītu ražošanas izmaksas analītiskajā kontā."
#. module: mrp
#: field:mrp.workcenter,product_id:0
msgid "Work Center Product"
-msgstr ""
+msgstr "Resursu uzskaites produkts"
#. module: mrp
#: view:mrp.production:0
msgid "Confirm Production"
-msgstr ""
+msgstr "Apstiprināt ražošanu"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_stockproduct0
@@ -395,6 +398,8 @@ msgid ""
"The system creates an order (production or purchased) depending on the sold "
"quantity and the products parameters."
msgstr ""
+"Sistēma izveido orderi (ražošanas vai iepirkumu) pamatojoties uz pārdoto "
+"daudzumu un produkta iestatījumiem."
#. module: mrp
#: model:process.transition,note:mrp.process_transition_servicemts0
@@ -408,7 +413,7 @@ msgstr ""
#: field:mrp.production,product_qty:0
#: field:mrp.production.product.line,product_qty:0
msgid "Product Quantity"
-msgstr ""
+msgstr "Produkta daudzums"
#. module: mrp
#: help:mrp.production,picking_id:0
@@ -420,7 +425,7 @@ msgstr ""
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
msgid "Working Time"
-msgstr ""
+msgstr "Darba laiks"
#. module: mrp
#: help:mrp.production,state:0
@@ -440,7 +445,7 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
msgid "Weekly Stock Value Variation"
-msgstr ""
+msgstr "Iknedēļas krājumu vērtības izmaiņas"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -468,19 +473,19 @@ msgstr ""
#: field:mrp.production,date_planned:0
#: report:mrp.production.order:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "Ieplānotais datums"
#. module: mrp
#: code:addons/mrp/procurement.py:124
#, python-format
msgid "Manufacturing Order %s created."
-msgstr ""
+msgstr "Ražošanas orderis %s izveidots."
#. module: mrp
#: view:mrp.bom:0
#: report:mrp.production.order:0
msgid "Bill Of Material"
-msgstr ""
+msgstr "Recepte"
#. module: mrp
#: help:mrp.routing,location_id:0
@@ -493,38 +498,38 @@ msgstr ""
#. module: mrp
#: view:board.board:0
msgid "Stock Value Variation"
-msgstr ""
+msgstr "Krājumu vērtības izmaiņas"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action2
msgid "Bill of Materials Structure"
-msgstr ""
+msgstr "Receptes struktūra"
#. module: mrp
#: model:process.node,note:mrp.process_node_serviceproduct0
msgid "Product type is service"
-msgstr ""
+msgstr "Produkta tips ir pakalpojums"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "Norādiet resursa viena cikla izmaksu."
#. module: mrp
#: model:process.transition,name:mrp.process_transition_bom0
msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Ražošanas sadalīšana"
#. module: mrp
#: model:process.node,note:mrp.process_node_serviceproduct1
msgid "For Services."
-msgstr ""
+msgstr "Pakalpojumiem."
#. module: mrp
#: model:process.node,note:mrp.process_node_orderrfq0
#: model:process.node,note:mrp.process_node_rfq0
msgid "Request for Quotation."
-msgstr ""
+msgstr "Piedāvājuma pieprasījums."
#. module: mrp
#: view:change.production.qty:0
@@ -533,7 +538,7 @@ msgstr ""
#: view:mrp.product_price:0
#: view:mrp.workcenter.load:0
msgid "or"
-msgstr ""
+msgstr "vai"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -546,38 +551,38 @@ msgstr ""
#: view:mrp.production:0
#: field:mrp.production,move_created_ids:0
msgid "Products to Produce"
-msgstr ""
+msgstr "Ražojumi izpildei"
#. module: mrp
#: view:mrp.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Apstiprināt"
#. module: mrp
#: view:mrp.routing:0
#: field:mrp.routing,location_id:0
msgid "Production Location"
-msgstr ""
+msgstr "Ražošanas vieta"
#. module: mrp
#: view:mrp.production:0
msgid "Force Reservation"
-msgstr ""
+msgstr "Izlaist rezervēšanu"
#. module: mrp
#: field:report.mrp.inout,value:0
msgid "Stock value"
-msgstr ""
+msgstr "Krājuma vērtība"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
msgid "Product BoM Structure"
-msgstr ""
+msgstr "Produkta receptes struktūra"
#. module: mrp
#: view:mrp.production:0
msgid "Search Production"
-msgstr ""
+msgstr "Meklēt ražošanu"
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
@@ -588,12 +593,12 @@ msgstr ""
#. module: mrp
#: field:mrp.bom,child_complete_ids:0
msgid "BoM Hierarchy"
-msgstr ""
+msgstr "Receptes hierarhija"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_stockproduction0
msgid "To Produce"
-msgstr ""
+msgstr "Ražot"
#. module: mrp
#: help:mrp.config.settings,module_stock_no_autopicking:0
@@ -612,17 +617,17 @@ msgstr ""
#. module: mrp
#: selection:mrp.production,state:0
msgid "Picking Exception"
-msgstr ""
+msgstr "Kustības izņēmums"
#. module: mrp
#: field:mrp.bom,bom_lines:0
msgid "BoM Lines"
-msgstr ""
+msgstr "Recepšu rindas"
#. module: mrp
#: field:mrp.workcenter,time_start:0
msgid "Time before prod."
-msgstr ""
+msgstr "Laiks pirms ražošanas uzsākšanas"
#. module: mrp
#: help:mrp.routing,active:0
@@ -634,21 +639,21 @@ msgstr ""
#. module: mrp
#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
msgid "Material Routing"
-msgstr ""
+msgstr "Materiālu maršrutēšana"
#. module: mrp
#: view:mrp.production:0
#: field:mrp.production,move_lines2:0
#: report:mrp.production.order:0
msgid "Consumed Products"
-msgstr ""
+msgstr "Patēriņa produkti"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
#: model:ir.model,name:mrp.model_mrp_workcenter_load
#: model:ir.model,name:mrp.model_report_workcenter_load
msgid "Work Center Load"
-msgstr ""
+msgstr "Resursa noslodze"
#. module: mrp
#: code:addons/mrp/procurement.py:50
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index aa16f5c7122..f0ceb22ac7d 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.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-03-06 06:22+0000\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
"X-Generator: Launchpad (build 16514)\n"
#. module: mrp_repair
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index e7e6bff3e58..2b3543bba65 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-01-08 10:35+0000\n"
-"Last-Translator: WANTELLET Sylvain \n"
+"PO-Revision-Date: 2013-03-06 15:52+0000\n"
+"Last-Translator: Thibaud-Cogitae \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-18 07:03+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -167,7 +167,7 @@ msgstr "Les bons de commande qui sont en état d'exception"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
msgid "Merge Purchase orders"
-msgstr "Fusionner les ordres d'achat"
+msgstr "Fusionner les commandes d'achat"
#. module: purchase
#: view:purchase.report:0
@@ -567,7 +567,7 @@ msgstr "Adresse client"
#. module: purchase
#: selection:purchase.order,state:0
msgid "RFQ Sent"
-msgstr ""
+msgstr "Demande de prix envoyée"
#. module: purchase
#: view:purchase.order:0
@@ -587,7 +587,7 @@ msgstr "Fournisseur"
#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Définir le compte de dépenses pour cette société: \"%s\" (id:%d)."
#. module: purchase
#: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -619,12 +619,12 @@ msgstr "Bon de commande qui sont en état de brouillon"
#. module: purchase
#: view:product.product:0
msgid "Suppliers"
-msgstr ""
+msgstr "Fournisseurs"
#. module: purchase
#: view:product.product:0
msgid "To Purchase"
-msgstr ""
+msgstr "À acheter"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -646,7 +646,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order.line:0
msgid "Invoices and Receptions"
-msgstr ""
+msgstr "Factures et réceptions"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -670,7 +670,7 @@ msgstr "Définir le compte de dépense pour cet article : \"%s\" (id. : %d)."
#. module: purchase
#: view:purchase.order:0
msgid "(update)"
-msgstr ""
+msgstr "(mise à jour)"
#. module: purchase
#: view:purchase.order:0
@@ -687,7 +687,7 @@ msgstr "Indique qu'une réception de marchandise a été effectuée."
#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
-msgstr ""
+msgstr "Impossible d'annuler ce bon de commande d'achat"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -720,6 +720,8 @@ msgid ""
"Unique number of the purchase order, computed automatically when the "
"purchase order is created."
msgstr ""
+"Identifiant unique du bon de commande d'achat, calculé automatiquement lors "
+"de sa création."
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
@@ -747,7 +749,7 @@ msgstr "Liste de prix"
#. module: purchase
#: selection:purchase.order,state:0
msgid "Draft PO"
-msgstr ""
+msgstr "Bon de commande d'achat brouillon"
#. module: purchase
#: code:addons/purchase/purchase.py:941
@@ -756,7 +758,7 @@ msgstr ""
#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Attention !"
#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -1074,7 +1076,7 @@ msgstr ""
#: field:account.config.settings,group_analytic_account_for_purchases:0
#: field:purchase.config.settings,group_analytic_account_for_purchases:0
msgid "Analytic accounting for purchases"
-msgstr ""
+msgstr "Comptabilité analytique pour les achats"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1583,7 +1585,7 @@ msgstr "Fusionner les commandes"
#. module: purchase
#: field:purchase.config.settings,module_purchase_analytic_plans:0
msgid "Use multiple analytic accounts on purchase orders"
-msgstr ""
+msgstr "Utiliser plusieurs comptes analytiques sur les commandes d'achat"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 03ab0df55ed..3476c3d4f52 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-08 09:43+0000\n"
-"Last-Translator: WANTELLET Sylvain \n"
+"PO-Revision-Date: 2013-03-06 10:06+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-18 07:10+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: warning
#: model:ir.model,name:warning.model_purchase_order_line
#: field:product.product,purchase_line_warn:0
msgid "Purchase Order Line"
-msgstr "Ligne de bon de commande"
+msgstr "Ligne de commande d'achat"
#. module: warning
#: model:ir.model,name:warning.model_stock_picking_in
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index fb2a766414b..2de7afa596e 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-02-02 14:33+0000\n"
+"PO-Revision-Date: 2013-03-06 18:07+0000\n"
"Last-Translator: Dorin \n"
"Language-Team: Romanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16462)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: web
#. openerp-web
@@ -36,7 +36,7 @@ msgstr "acum %d minute"
#: code:addons/web/static/src/js/coresetup.js:630
#, python-format
msgid "Still loading...
Please be patient."
-msgstr "Inca se incarca...
Va rugam sa aveti rabdare."
+msgstr ""
#. module: web
#. openerp-web
@@ -433,7 +433,7 @@ msgstr "Baza de date nu a putut fi restabilita"
#: code:addons/web/static/src/js/view_form.js:4851
#, python-format
msgid "File upload"
-msgstr "Incarcare fisier"
+msgstr "Încărcare fișier"
#. module: web
#. openerp-web
@@ -476,7 +476,7 @@ msgstr "Activeaza modulul programare"
#: code:addons/web/static/src/js/chrome.js:324
#, python-format
msgid "Loading (%d)"
-msgstr "Se incarca (%d)"
+msgstr "Se încarcă (%d)"
#. module: web
#. openerp-web
@@ -1149,7 +1149,7 @@ msgstr "Anuleaza"
#: code:addons/web/static/src/xml/base.xml:9
#, python-format
msgid "Loading..."
-msgstr "Se incarca..."
+msgstr "Se încarcă..."
#. module: web
#. openerp-web
@@ -1320,7 +1320,7 @@ msgstr "Trebuie sa selectati cel putin o inregistrare."
#: code:addons/web/static/src/js/coresetup.js:631
#, python-format
msgid "Don't leave yet,
it's still loading..."
-msgstr "Nu plecati,
inca se incarca..."
+msgstr "Nu plecați,
încă se încarcă..."
#. module: web
#. openerp-web
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index c8f669c9ff1..ebcfdb0a52f 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-21 23:09+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-03-06 14:22+0000\n"
+"Last-Translator: Aamir Riaz \n"
"Language-Team: Urdu \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:52+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-03-07 05:44+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -25,16 +25,19 @@ msgid ""
"================================================\n"
" "
msgstr ""
+"\n"
+"چیک لکھنے اور چیک چھپائی کے لئے ماڈیول ہے.\n"
+" "
#. module: base
#: model:res.country,name:base.sh
msgid "Saint Helena"
-msgstr ""
+msgstr "سینٹ ھیلینا"
#. module: base
#: view:ir.actions.report.xml:0
msgid "Other Configuration"
-msgstr ""
+msgstr "دیگر ترتیب"
#. module: base
#: selection:ir.property,type:0
From e57ffc48363263f1169a9ecc4171818eb8526f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Thu, 7 Mar 2013 08:52:16 +0100
Subject: [PATCH 31/38] [FIX] mail: added wrapper for
message_Create_patners_from_emails in mail_thread and res_users; cleaned
message_post signature to match the pre-merge signature. Also fixed a wrong
argument name in message_post_user_api.
bzr revid: tde@openerp.com-20130307075216-kk0m304405ohm7ua
---
addons/mail/mail_thread.py | 16 ++++++++++++----
addons/mail/res_users.py | 15 +++++++++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8a169e6f27c..301ce4c54cb 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -883,9 +883,9 @@ class mail_thread(osv.AbstractModel):
mail_message_obj.write(cr, SUPERUSER_ID, message_ids, {'author_id': ids[0]}, context=context)
return result
- def message_post(self, cr, uid, thread_id, body='', subject=None,
- content_subtype='html', type='notification', subtype=None,
- parent_id=False, attachments=None, context=None, **kwargs):
+ def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+ subtype=None, parent_id=False, attachments=None, context=None,
+ content_subtype='html', **kwargs):
""" Post a new message in an existing thread, returning the new
mail.message ID.
@@ -1030,11 +1030,19 @@ class mail_thread(osv.AbstractModel):
self.message_subscribe(cr, uid, [thread_id], [message.author_id.id], context=context)
return msg_id
+ #------------------------------------------------------
+ # Compatibility methods: do not use
+ # TDE TODO: remove me in 8.0
+ #------------------------------------------------------
+
+ def message_create_partners_from_emails(self, cr, uid, emails, context=None):
+ return {'partner_ids': [], 'new_partner_ids': []}
+
def message_post_user_api(self, cr, uid, thread_id, body='', parent_id=False,
attachment_ids=None, content_subtype='plaintext',
context=None, **kwargs):
return self.message_post(cr, uid, thread_id, body=body, parent_id=parent_id,
- attachment_ids=attachment_ids, content_suibtype=content_subtype,
+ attachment_ids=attachment_ids, content_subtype=content_subtype,
context=context, **kwargs)
#------------------------------------------------------
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 2cd1b8f072c..ed254500f5b 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -148,6 +148,21 @@ class res_users(osv.Model):
partner_ids.append(self.browse(cr, SUPERUSER_ID, id).partner_id.id)
return self.pool.get('res.partner').message_get_suggested_recipients(cr, uid, partner_ids, context=context)
+ #------------------------------------------------------
+ # Compatibility methods: do not use
+ # TDE TODO: remove me in 8.0
+ #------------------------------------------------------
+
+ def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
+ """ Redirect the posting of message on res.users to the related partner.
+ This is done because when giving the context of Chatter on the
+ various mailboxes, we do not have access to the current partner_id. """
+ partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
+ return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, context=context, **kwargs)
+
+ def message_create_partners_from_emails(self, cr, uid, emails, context=None):
+ return self.pool.get('res.partner').message_create_partners_from_emails(cr, uid, emails, context=context)
+
class res_users_mail_group(osv.Model):
""" Update of res.users class
From a7003b68ab0f51ed89e9f8b367c48b1bedfcb5ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Thu, 7 Mar 2013 08:58:09 +0100
Subject: [PATCH 32/38] [FIX] Chatter: typo (send -> sent) + removed an extra
space in 'Send a message'
bzr revid: tde@openerp.com-20130307075809-krc3j6ca3460qac2
---
addons/mail/static/src/xml/mail.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bff32be55e6..b2ad1f1a186 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -49,10 +49,8 @@
@@ -151,7 +149,7 @@
- Attach a note that will not be send to the followers
+ Attach a note that will not be sent to the followers
From 4d4935d551a65bf81746530aec7a3a26437a6536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Thu, 7 Mar 2013 09:06:16 +0100
Subject: [PATCH 33/38] [REM] removed duplicate method.
bzr revid: tde@openerp.com-20130307080616-63nuzq15jg0ijkr6
---
addons/mail/res_users.py | 7 -------
1 file changed, 7 deletions(-)
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index ed254500f5b..f7c91939b98 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -120,13 +120,6 @@ class res_users(osv.Model):
partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
- def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
- """ Redirect the posting of message on res.users to the related partner.
- This is done because when giving the context of Chatter on the
- various mailboxes, we do not have access to the current partner_id. """
- partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
- return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, context=context, **kwargs)
-
def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
for id in ids:
partner_id = self.browse(cr, SUPERUSER_ID, id).partner_id.id
From 26f0b6bfac92af596b9048be1907cc030bd0bdf7 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Thu, 7 Mar 2013 09:42:26 +0100
Subject: [PATCH 34/38] [FIX]lunch: in order to see lunch menu, put root user
as lunch manager by default even if no demo data
bzr revid: csn@openerp.com-20130307084226-o02po2v301x5vgbe
---
addons/lunch/lunch_demo.xml | 3 ---
addons/lunch/security/lunch_security.xml | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 7488208fd42..7e5e2f3ac8f 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -2,9 +2,6 @@
-
-
-
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 654f844c876..e01fab71ea2 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -14,6 +14,7 @@
Manager
+
From 2a8d7548f78795d1fd807aa924cf1e9646c33a0a Mon Sep 17 00:00:00 2001
From: Chris Biersbach
Date: Thu, 7 Mar 2013 09:55:05 +0100
Subject: [PATCH 35/38] [FIX] Document: Does no longer generate an error when
trying to send a quotation by email when pdftotext is not available. This
case is handled more gracefully (a warning in the log). Also changes the
default return when generating the index using antiword to be more
consistent.
lp bug: https://launchpad.net/bugs/1094423 fixed
bzr revid: cbi@openerp.com-20130307085505-v9vwo788ios8244u
---
addons/document/content_index.py | 4 ++--
addons/document/std_index.py | 13 +++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 399541e1f59..cde05987f25 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -181,11 +181,11 @@ class contentIndex(object):
res = (mime, fobj.indexContent(content,filename,fname or realfname) )
else:
_logger.debug("Have no object, return (%s, None).", mime)
- res = (mime, None )
+ res = (mime, '')
except Exception:
_logger.exception("Cannot index file %s (%s).",
filename, fname or realfname)
- res = None
+ res = (mime, '')
# If we created a tmp file, unlink it now
if not realfname and fname:
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index b20874e72f8..dda776b1ec3 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -105,7 +105,7 @@ class DocIndex(indexer):
_logger.warning("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
_logger.debug("Trace of the failed file indexing attempt.", exc_info=True)
- return False
+ return u''
cntIndex.register(DocIndex())
@@ -166,9 +166,14 @@ class PdfIndex(indexer):
return ['.pdf']
def _doIndexFile(self, fname):
- pop = Popen(['pdftotext', '-enc', 'UTF-8', '-nopgbrk', fname, '-'], shell=False, stdout=PIPE)
- (data, _) = pop.communicate()
- return _to_unicode(data)
+ try:
+ pop = Popen(['pdftotext', '-enc', 'UTF-8', '-nopgbrk', fname, '-'], shell=False, stdout=PIPE)
+ (data, _) = pop.communicate()
+ return _to_unicode(data)
+ except OSError:
+ _logger.warning("Failed attempt to execute pdftotext. This program is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
+ _logger.debug("Trace of the failed file indexing attempt.", exc_info=True)
+ return u''
cntIndex.register(PdfIndex())
From 1bed52ec672c5d045f9c6fe91e455389f2dcdb7f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Thu, 7 Mar 2013 10:04:08 +0100
Subject: [PATCH 36/38] [FIX] account, duplicate of account.tax: better fix for
problem fixed in revision 8807.
fixed the duplicate of tax (wasn't working because of a unique constraint on name field). The previous fix was working only for taxes that doesn't have any child. The reason is that copy() is never called for one2many fields, only copy_data() is called (and give the same results for other fields)
bzr revid: qdp-launchpad@openerp.com-20130307090408-cxb1qcfz4n9ksrg5
---
addons/account/account.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/account/account.py b/addons/account/account.py
index 660976389b3..0631bbfff7d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1850,13 +1850,13 @@ class account_tax(osv.osv):
return result in the context
Ex: result=round(price_unit*0.21,4)
"""
- def copy(self, cr, uid, id, default=None, context=None):
+ def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
name = self.read(cr, uid, id, ['name'], context=context)['name']
default = default.copy()
default.update({'name': name + _(' (Copy)')})
- return super(account_tax, self).copy(cr, uid, id, default=default, context=context)
+ return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)
def get_precision_tax():
From 000042ac68449af069964eef2505490ab7ae9938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Thu, 7 Mar 2013 10:31:15 +0100
Subject: [PATCH 37/38] [FIX] mail_thread: fixed set that should not be a set.
bzr revid: tde@openerp.com-20130307093115-9jmflmnf420iiz21
---
addons/mail/mail_thread.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 301ce4c54cb..c8a863d9e44 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -933,7 +933,7 @@ class mail_thread(osv.AbstractModel):
# 2: Private message: add recipients (recipients and author of parent message)
# + legacy-code management (! we manage only 4 and 6 commands)
partner_ids = set()
- kwargs_partner_ids = set(kwargs.pop('partner_ids', []))
+ kwargs_partner_ids = kwargs.pop('partner_ids', [])
for partner_id in kwargs_partner_ids:
if isinstance(partner_id, (list, tuple)) and partner_id[0] == 4 and len(partner_id) == 2:
partner_ids.add(partner_id[1])
From 5e59420989e99072d195b0be38b114e3a27ec27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Thu, 7 Mar 2013 10:34:14 +0100
Subject: [PATCH 38/38] [FIX] mail_thread: fixed a list that should be a set.
This has nothing to do with the previous commit. Seriously.
bzr revid: tde@openerp.com-20130307093414-wcdakf017sskj35l
---
addons/mail/mail_thread.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c8a863d9e44..af21109b89e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -938,7 +938,7 @@ class mail_thread(osv.AbstractModel):
if isinstance(partner_id, (list, tuple)) and partner_id[0] == 4 and len(partner_id) == 2:
partner_ids.add(partner_id[1])
if isinstance(partner_id, (list, tuple)) and partner_id[0] == 6 and len(partner_id) == 3:
- partner_ids |= partner_id[2]
+ partner_ids |= set(partner_id[2])
elif isinstance(partner_id, (int, long)):
partner_ids.add(partner_id)
else: