diff --git a/addons/account/account.py b/addons/account/account.py
index 470282fadcd..f79e36c7681 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -204,7 +204,7 @@ class account_account(osv.osv):
args[pos] = ('id', 'in', ids1)
pos += 1
- if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
+ if context and context.has_key('consolidate_children'): #add consolidated children of accounts
ids = super(account_account, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
@@ -285,6 +285,7 @@ class account_account(osv.osv):
children_and_consolidated.reverse()
brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
sums = {}
+ currency_obj = self.pool.get('res.currency')
while brs:
current = brs[0]
# can_compute = True
@@ -299,8 +300,11 @@ class account_account(osv.osv):
brs.pop(0)
for fn in field_names:
sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
- if current.child_id:
- sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
+ for child in current.child_id:
+ if child.company_id.currency_id.id == current.company_id.currency_id.id:
+ sums[current.id][fn] += sums[child.id][fn]
+ else:
+ sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
res = {}
null_result = dict((fn, 0.0) for fn in field_names)
for id in ids:
@@ -607,8 +611,8 @@ class account_journal(osv.osv):
}
_defaults = {
- 'user_id': lambda self,cr,uid,context: uid,
- 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+ 'user_id': lambda self, cr, uid, context: uid,
+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
_sql_constraints = [
('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),
@@ -708,7 +712,6 @@ class account_journal(osv.osv):
return self.name_get(cr, user, ids, context=context)
-
def onchange_type(self, cr, uid, ids, type, currency, context=None):
obj_data = self.pool.get('ir.model.data')
user_pool = self.pool.get('res.users')
@@ -1278,6 +1281,8 @@ class account_move(osv.osv):
return super(account_move, self).copy(cr, uid, id, default, context)
def unlink(self, cr, uid, ids, context=None, check=True):
+ if context is None:
+ context = {}
toremove = []
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context=context):
@@ -1916,7 +1921,7 @@ class account_tax(osv.osv):
RETURN:
[ tax ]
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
- one tax for each tax id in IDS and their childs
+ one tax for each tax id in IDS and their children
"""
res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
total = 0.0
@@ -2011,7 +2016,7 @@ class account_tax(osv.osv):
RETURN:
[ tax ]
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
- one tax for each tax id in IDS and their childs
+ one tax for each tax id in IDS and their children
"""
res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
total = 0.0
@@ -2611,11 +2616,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
- if unconfigured_cmp:
- cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
- for field in res['fields']:
- if field == 'company_id':
- res['fields'][field]['domain'] = unconfigured_cmp
+ for field in res['fields']:
+ if field == 'company_id':
+ res['fields'][field]['domain'] = unconfigured_cmp
+ res['fields'][field]['selection'] = [('', '')]
+ if unconfigured_cmp:
+ cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
return res
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index e24e763ff56..b59df303170 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -50,11 +50,10 @@ class account_analytic_line(osv.osv):
if context is None:
context = {}
if context.get('from_date',False):
- args.append(['date', '>=',context['from_date']])
+ args.append(['date', '>=', context['from_date']])
if context.get('to_date',False):
- args.append(['date','<=',context['to_date']])
-
+ args.append(['date','<=', context['to_date']])
return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
@@ -158,4 +157,4 @@ class res_partner(osv.osv):
res_partner()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index 5f4ed44adfe..650bffc58e9 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -14,7 +14,7 @@
action="action_account_period_tree"
id="menu_action_account_period_close_tree"
parent="account.menu_account_end_year_treatments"
- sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
+ sequence="0" groups="base.group_extended"/>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 22ab46a1775..7b7e6b308b1 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -26,14 +26,19 @@
-
-
+
+
-
-
+
+
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 02b8be3a8c1..2522e53b2a0 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -309,7 +309,7 @@ class account_move_line(osv.osv):
context = {}
c = context.copy()
c['initital_bal'] = True
- sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
+ sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
FROM account_move_line l1, account_move_line l2
WHERE l2.account_id = l1.account_id
AND l1.id <= l2.id
@@ -318,8 +318,7 @@ class account_move_line(osv.osv):
" GROUP BY l2.id"
cr.execute(sql, [tuple(ids)])
- res = dict(cr.fetchall())
- return res
+ return dict(cr.fetchall())
def _invoice(self, cursor, user, ids, name, arg, context=None):
invoice_obj = self.pool.get('account.invoice')
@@ -887,7 +886,7 @@ class account_move_line(osv.osv):
fld = []
fields = {}
flds = []
- title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
+ title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
xml = '''\n\n\t''' % (title)
ids = journal_pool.search(cr, uid, [])
@@ -906,8 +905,8 @@ class account_move_line(osv.osv):
else:
fields.get(field.field).append(journal.id)
common_fields[field.field] = common_fields[field.field] + 1
- fld.append(('period_id', 3, 'Period'))
- fld.append(('journal_id', 10, 'Journal'))
+ fld.append(('period_id', 3, _('Period')))
+ fld.append(('journal_id', 10, _('Journal')))
flds.append('period_id')
flds.append('journal_id')
fields['period_id'] = all_journal
@@ -927,10 +926,10 @@ class account_move_line(osv.osv):
# state = 'colors="red:state==\'draft\'"'
attrs = []
if field == 'debit':
- attrs.append('sum = "Total debit"')
+ attrs.append('sum = "%s"' % _("Total debit"))
elif field == 'credit':
- attrs.append('sum = "Total credit"')
+ attrs.append('sum = "%s"' % _("Total credit"))
elif field == 'move_id':
attrs.append('required = "False"')
@@ -1284,4 +1283,4 @@ class account_move_line(osv.osv):
account_move_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a8b3f5ad31d..db2984b5593 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -276,6 +276,7 @@
+
@@ -762,7 +763,7 @@
An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.
-
+
@@ -1227,7 +1228,7 @@
id="menu_action_account_moves_all"
parent="account.menu_finance_entries"
sequence="1"
- groups="group_account_user,group_account_manager"
+ groups="group_account_user"
/>
@@ -1475,7 +1476,7 @@
action="action_move_journal_line"
id="menu_action_move_journal_line_form"
parent="account.menu_finance_entries"
- groups="group_account_user,group_account_manager"
+ groups="group_account_user"
sequence="5"/>
@@ -1742,7 +1743,7 @@
+ parent="account.menu_configuration_misc" groups="base.group_extended"/>
-
- Leads Analysis
- crm.lead.report
- form
- {'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}
- tree,graph
- [('type', '=', 'lead')]
- Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.
-
-
+
+ Leads Analysis
+ crm.lead.report
+ form
+ {'search_default_filter_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}
+ tree,graph
+ []
+ Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.
+
tree
-
graph
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 3f5620d9751..cbe3ec94c20 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -92,7 +92,8 @@
icon="terp-partner"
name="%(action_crm_phonecall2partner)d"
type="action"
- attrs="{'invisible':[('partner_id','!=',False)]}" />
+ attrs="{'invisible':[('partner_id','!=',False)]}"
+ groups="base.group_partner_manager" />
diff --git a/addons/crm/scripts/php/xmlrpc.inc b/addons/crm/scripts/php/xmlrpc.inc
old mode 100755
new mode 100644
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 6da8a168b21..b9f7dad6c07 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index d0e04576b3b..fa3a9fc4335 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -21,11 +21,11 @@
{
- 'name': 'Extened Module to Add CalDav future on Meeting',
+ 'name': 'Extended Module to Add CalDav feature on Meeting',
'version': '1.1',
'category': 'Generic Modules/CRM & SRM',
'description': """
- New Futures in Meeting:
+ New Features in Meeting:
* Share meeting with other calendar clients like sunbird
""",
'author': 'OpenERP SA',
diff --git a/addons/crm_caldav/i18n/es.po b/addons/crm_caldav/i18n/es.po
index 6c7a1dd88d2..d5a6c61d8c4 100644
--- a/addons/crm_caldav/i18n/es.po
+++ b/addons/crm_caldav/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:25+0000\n"
+"PO-Revision-Date: 2010-12-27 08:42+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_caldav
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
index 7c3f0759018..6606934e772 100644
--- a/addons/crm_caldav/i18n/it.po
+++ b/addons/crm_caldav/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-21 07:57+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 12:40+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_caldav
@@ -34,6 +34,9 @@ msgid ""
" New Futures in Meeting:\n"
" * Share meeting with other calendar clients like sunbird\n"
msgstr ""
+"\n"
+" Nuove caratteristiche nei Meeting:\n"
+" * Condivisione meeting con altri client calendario, come Sunbird\n"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index 1da0750547c..1112c09ae82 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:36+0000\n"
+"PO-Revision-Date: 2010-12-27 09:09+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_claim
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index 5cea2f96092..e9b908290de 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-08 08:23+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 21:02+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_claim
@@ -31,7 +31,7 @@ msgstr "Ragguppato per..."
#. module: crm_claim
#: view:crm.claim:0
msgid "Responsibilities"
-msgstr ""
+msgstr "Responsabilità"
#. module: crm_claim
#: field:crm.claim,date_action_next:0
@@ -51,7 +51,7 @@ msgstr "Ritardo per Chiusura"
#. module: crm_claim
#: field:crm.claim,resolution:0
msgid "Resolution"
-msgstr ""
+msgstr "Risoluzione"
#. module: crm_claim
#: field:crm.claim,company_id:0
@@ -63,7 +63,7 @@ msgstr "Compagnia"
#. module: crm_claim
#: field:crm.claim,email_cc:0
msgid "Watchers Emails"
-msgstr ""
+msgstr "Email osservatori"
#. module: crm_claim
#: view:crm.claim.report:0
@@ -93,7 +93,7 @@ msgstr "Giorno"
#. module: crm_claim
#: view:crm.claim:0
msgid "Add Internal Note"
-msgstr ""
+msgstr "Aggiungi nota interna"
#. module: crm_claim
#: help:crm.claim,section_id:0
@@ -168,7 +168,7 @@ msgstr "Reimposta come Bozza"
#: field:crm.claim,date_deadline:0
#: field:crm.claim.report,date_deadline:0
msgid "Deadline"
-msgstr ""
+msgstr "Scadenza"
#. module: crm_claim
#: view:crm.claim:0
@@ -182,7 +182,7 @@ msgstr "Partner"
#: selection:crm.claim,type_action:0
#: selection:crm.claim.report,type_action:0
msgid "Preventive Action"
-msgstr ""
+msgstr "Azione preventiva"
#. module: crm_claim
#: field:crm.claim.report,section_id:0
@@ -204,17 +204,17 @@ msgstr ""
#: view:crm.claim.report:0
#: field:crm.claim.report,priority:0
msgid "Priority"
-msgstr ""
+msgstr "Priorità"
#. module: crm_claim
#: view:crm.claim:0
msgid "Send New Email"
-msgstr ""
+msgstr "Invia nuova E-mail"
#. module: crm_claim
#: field:crm.claim.report,delay_expected:0
msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Scadenza superata"
#. module: crm_claim
#: view:crm.claim:0
@@ -225,18 +225,18 @@ msgstr ""
#. module: crm_claim
#: field:crm.claim,email_from:0
msgid "Email"
-msgstr ""
+msgstr "Email"
#. module: crm_claim
#: selection:crm.claim,priority:0
#: selection:crm.claim.report,priority:0
msgid "Lowest"
-msgstr ""
+msgstr "Minore"
#. module: crm_claim
#: field:crm.claim,create_date:0
msgid "Creation Date"
-msgstr ""
+msgstr "Data creazione"
#. module: crm_claim
#: field:crm.claim,name:0
@@ -253,7 +253,7 @@ msgstr ""
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "July"
-msgstr ""
+msgstr "Luglio"
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
@@ -263,7 +263,7 @@ msgstr "Fasi reclamo"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
msgid "Categories"
-msgstr ""
+msgstr "Categorie"
#. module: crm_claim
#: view:crm.claim:0
@@ -281,22 +281,22 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim:0
msgid "Dates"
-msgstr ""
+msgstr "Date"
#. module: crm_claim
#: view:crm.claim.report:0
msgid " Month-1 "
-msgstr ""
+msgstr " Mese - 1 "
#. module: crm_claim
#: view:crm.claim:0
msgid "Contact"
-msgstr ""
+msgstr "Contatto"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
msgid "Stages"
-msgstr ""
+msgstr "Fasi"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
@@ -306,7 +306,7 @@ msgstr "Analisi reclami"
#. module: crm_claim
#: help:crm.claim.report,delay_close:0
msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Numero di giorni per chiudere il caso"
#. module: crm_claim
#: model:ir.model,name:crm_claim.model_crm_claim_report
@@ -326,24 +326,24 @@ msgstr ""
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "September"
-msgstr ""
+msgstr "Settembre"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "December"
-msgstr ""
+msgstr "Dicembre"
#. module: crm_claim
#: view:crm.claim.report:0
#: field:crm.claim.report,month:0
msgid "Month"
-msgstr ""
+msgstr "Mese"
#. module: crm_claim
#: field:crm.claim,type_action:0
#: field:crm.claim.report,type_action:0
msgid "Action Type"
-msgstr ""
+msgstr "Tipo azione"
#. module: crm_claim
#: field:crm.claim,write_date:0
@@ -353,14 +353,14 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Salesman"
-msgstr ""
+msgstr "Commerciale"
#. module: crm_claim
#: field:crm.claim,categ_id:0
#: view:crm.claim.report:0
#: field:crm.claim.report,categ_id:0
msgid "Category"
-msgstr ""
+msgstr "Categoria"
#. module: crm_claim
#: model:crm.case.categ,name:crm_claim.categ_claim2
@@ -370,7 +370,7 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim.report:0
msgid " Year "
-msgstr ""
+msgstr " Anno "
#. module: crm_claim
#: help:crm.claim,email_cc:0
@@ -385,7 +385,7 @@ msgstr ""
#: view:crm.claim.report:0
#: selection:crm.claim.report,state:0
msgid "Draft"
-msgstr ""
+msgstr "Bozza"
#. module: crm_claim
#: selection:crm.claim,priority:0
@@ -411,7 +411,7 @@ msgstr ""
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "August"
-msgstr ""
+msgstr "Agosto"
#. module: crm_claim
#: selection:crm.claim,priority:0
@@ -422,27 +422,27 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim:0
msgid "Global CC"
-msgstr ""
+msgstr "CC globale"
#. module: crm_claim
#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Gestione delle relazioni con Clienti e Fornitori"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "June"
-msgstr ""
+msgstr "Giugno"
#. module: crm_claim
#: field:crm.claim,partner_phone:0
msgid "Phone"
-msgstr ""
+msgstr "Telefono"
#. module: crm_claim
#: field:crm.claim.report,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utente"
#. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim5
@@ -457,12 +457,12 @@ msgstr "Categorie reclami"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "November"
-msgstr ""
+msgstr "Novembre"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtri estesi..."
#. module: crm_claim
#: view:crm.claim:0
@@ -472,12 +472,12 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Search"
-msgstr ""
+msgstr "Ricerca"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "October"
-msgstr ""
+msgstr "Ottobre"
#. module: crm_claim
#: model:ir.module.module,description:crm_claim.module_meta_information
@@ -493,7 +493,7 @@ msgstr ""
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "January"
-msgstr ""
+msgstr "Gennaio"
#. module: crm_claim
#: view:crm.claim:0
@@ -540,7 +540,7 @@ msgstr "Reclamo"
#. module: crm_claim
#: view:crm.claim:0
msgid "Attachments"
-msgstr ""
+msgstr "Allegati"
#. module: crm_claim
#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -558,7 +558,7 @@ msgstr ""
#: view:crm.claim.report:0
#: field:crm.claim.report,state:0
msgid "State"
-msgstr ""
+msgstr "Stato"
#. module: crm_claim
#: view:crm.claim:0
diff --git a/addons/crm_fundraising/i18n/es.po b/addons/crm_fundraising/i18n/es.po
index b36466fe4fe..c3772351001 100644
--- a/addons/crm_fundraising/i18n/es.po
+++ b/addons/crm_fundraising/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:26+0000\n"
+"PO-Revision-Date: 2010-12-27 09:19+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_fundraising
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index c403cc81bc7..99d5ee0a0bd 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:26+0000\n"
+"PO-Revision-Date: 2010-12-27 09:03+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_helpdesk
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index da8510d7b2d..d203c1f2fc7 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:27+0000\n"
+"PO-Revision-Date: 2010-12-27 09:22+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_partner_assign
diff --git a/addons/decimal_precision/i18n/es_EC.po b/addons/decimal_precision/i18n/es_EC.po
new file mode 100644
index 00000000000..472ef3eea7b
--- /dev/null
+++ b/addons/decimal_precision/i18n/es_EC.po
@@ -0,0 +1,70 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 16:31+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) \n"
+"Language-Team: Spanish (Ecuador) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Dígitos"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Precisión decimal"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Definiciones de Precisión decimal"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Este modulo permite configurar la precisión de decimales que requiere en "
+"cada tipo de modelo: contabilidad, ventas, compras,...\n"
+"\n"
+"La precisión de decimales se configura por compañía.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Uso"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "¡Sólo se puede definir un valor para cada uso dado!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Configuración precisión decimal"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "Precisión Decimal"
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 94f0495f1b6..6d9ea99df2e 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:07+0000\n"
+"PO-Revision-Date: 2010-12-27 09:23+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 0e5b243ea29..c0cae6aca28 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-20 07:56+0000\n"
+"PO-Revision-Date: 2010-12-27 18:13+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -39,7 +39,7 @@ msgstr "Вес нетто"
#. module: delivery
#: view:stock.picking:0
msgid "Delivery Order"
-msgstr ""
+msgstr "Заказ на доставку"
#. module: delivery
#: code:addons/delivery/delivery.py:0
@@ -170,7 +170,7 @@ msgstr "Партнёр"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Заказ на продажу"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid
@@ -291,7 +291,7 @@ msgstr "Партия"
#. module: delivery
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
#. module: delivery
#: field:delivery.carrier,active:0
@@ -325,7 +325,7 @@ msgstr ""
#. module: delivery
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -381,7 +381,7 @@ msgstr ""
#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
-msgstr ""
+msgstr "<="
#. module: delivery
#: field:delivery.grid.line,standard_price:0
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index df5e78894fd..cff66049d3b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -311,13 +311,14 @@
search
+
+ base.group_extended
+
-
+
-
+
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 65b17a52c51..7580a8831cf 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -386,7 +386,7 @@ class abstracted_fs(object):
def rename(self, src, datacr):
""" Renaming operation, the effect depends on the src:
* A file: read, create and remove
- * A directory: change the parent and reassign childs to ressource
+ * A directory: change the parent and reassign children to ressource
"""
cr = datacr[0]
try:
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index ebdc1fd95c3..00b41791bbb 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:06+0000\n"
+"PO-Revision-Date: 2010-12-27 09:21+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ftp
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index d84d8e889b9..4eb311b838b 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:55+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index dd46d8959ae..7db6ce49d98 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -376,9 +376,9 @@ class openerp_dav_handler(dav_interface):
cr.close()
return self.db_name_list
- def get_childs(self, uri, filters=None):
+ def get_children(self,uri, filters=None):
""" return the child objects as self.baseuris for the given URI """
- self.parent.log_message('get childs: %s' % uri)
+ self.parent.log_message('get children: %s' % uri)
cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
if not dbname:
@@ -395,7 +395,7 @@ class openerp_dav_handler(dav_interface):
fp = node.full_path()
if fp and len(fp):
fp = '/'.join(fp)
- self.parent.log_message('childs for: %s' % fp)
+ self.parent.log_message('children for: %s' % fp)
else:
fp = None
domain = None
@@ -433,7 +433,7 @@ class openerp_dav_handler(dav_interface):
except DAV_Error:
raise
except Exception, e:
- self.parent.log_error("cannot get_childs: "+ str(e))
+ self.parent.log_error("cannot get_children: "+ str(e))
raise
finally:
if cr: cr.close()
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
new file mode 100644
index 00000000000..29a50798fd1
--- /dev/null
+++ b/addons/document_webdav/i18n/pl.po
@@ -0,0 +1,158 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 14:21+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"Language-Team: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych katalogów."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+msgid "Namespace"
+msgstr "Przestrzeń nazw"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "Właściwiości DAV"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Te właściwości zostaną dodane do zgłoszeń WebDAV"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "Błąd importu PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+" You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+" After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+" Server Configuration Parameter:\n"
+" [webdav]\n"
+" ; enable = True ; Serve webdav over the http(s) servers\n"
+" ; vdir = webdav ; the directory that webdav will be served at\n"
+" ; this default val means that webdav will be\n"
+" ; on \"http://localhost:8069/webdav/\n"
+" ; verbose = True ; Turn on the verbose messages of webdav\n"
+" ; debug = True ; Turn on the debugging messages of webdav\n"
+" ; since the messages are routed to the python logging, with\n"
+" ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+" ; these options on\n"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Katalog nie może być nadrzędny dla samego siebie !"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamiczny kontekst"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "Właściwości WebDAV"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Nazwa katalogu musi być unikalna !"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr "Właściwości DAV dla katalogów"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+msgid "Properties"
+msgstr "Właściwości"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+msgid "Name"
+msgstr "Nazwa"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+msgid "Value"
+msgstr "Wartość"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Katalog"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Kat"
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "Serwer WebDAV do Zarządzania dokumentami"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Katalog musi mieć katalog nadrzędny lub nazwę napędu."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Search Document storage"
+msgstr "Przeszukaj przestrzeń dokumentów"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+msgid "Substitute"
+msgstr "Subsytut"
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7c400ecf40e..103b0534349 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -221,7 +221,7 @@ class hr_department(osv.osv):
_inherit = 'hr.department'
_columns = {
'manager_id': fields.many2one('hr.employee', 'Manager'),
- 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
+ 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
}
hr_department()
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index d0d08d8ec04..c63d0eb4755 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:17+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 166c14c1f83..e2ab58e92b6 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:12+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 3ad44ef3065..7ed2d16d6b7 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -114,6 +114,18 @@ class hr_contract(osv.osv):
'date_start': lambda *a: time.strftime("%Y-%m-%d"),
}
+ def _check_dates(self, cr, uid, ids, context=None):
+ for contract in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
+ if contract['date_start'] and contract['date_end'] and contract['date_start'] > contract['date_end']:
+ return False
+ return True
+
+ _constraints = [
+ (_check_dates, 'Error! contract start-date must be lower then contract end-date.', ['date_start', 'date_end'])
+ ]
+
+
+
hr_contract()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index e976edae71c..b6ef3a0a7b0 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:13+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_contract
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d00f69bc0de..160105a69ad 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -199,15 +199,15 @@ class hr_evaluation(osv.osv):
for evaluation in self.browse(cr, uid, ids, context=context):
wait = False
for phase in evaluation.plan_id.phase_ids:
- childs = []
+ children = []
if phase.action == "bottom-up":
- childs = evaluation.employee_id.child_ids
+ children = evaluation.employee_id.child_ids
elif phase.action in ("top-down", "final"):
if evaluation.employee_id.parent_id:
- childs = [evaluation.employee_id.parent_id]
+ children = [evaluation.employee_id.parent_id]
elif phase.action == "self":
- childs = [evaluation.employee_id]
- for child in childs:
+ children = [evaluation.employee_id]
+ for child in children:
# if not child.user_id:
# continue
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1fc39982da4..17e0dd09bf9 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -28,11 +28,11 @@
+
-
-
+
@@ -175,7 +175,8 @@
form
{"search_default_user_id":uid}
- The OpenERP expenses management module allows you to track the full flow. Every month, employees record their expenses. At the end of the month, the manager concerned validates the Expense Sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.
+
+ The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 55d7ebacdde..29e8ce87c4f 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:30+0000\n"
+"PO-Revision-Date: 2010-12-27 16:24+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
@@ -318,12 +318,12 @@ msgstr "Mis gastos"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Creation Date"
-msgstr "Fecha de creación"
+msgstr "Fecha creación"
#. module: hr_expense
#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
msgid "HR expenses"
-msgstr "Gastos RH"
+msgstr "Gastos RRHH"
#. module: hr_expense
#: field:hr.expense.expense,id:0
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 657cfd6d748..40a23a0de10 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:18+0000\n"
+"PO-Revision-Date: 2010-12-27 09:09+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 0725e34f0f9..b305e6bf92b 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -55,9 +55,9 @@
'wizard/hr_payroll_year_salary.xml',
],
'test': [
-# 'test/payslip.yml',
-# 'test/payment_advice.yml',
-# 'test/payroll_register.yml',
+ 'test/payslip.yml',
+ 'test/payment_advice.yml',
+ 'test/payroll_register.yml',
# 'test/hr_payroll_report.yml',
],
'demo_xml': [
diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index bd3ffad3065..f8571c9dc46 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -27,6 +27,7 @@ from datetime import timedelta
import netsvc
from osv import fields, osv
+import tools
from tools.translate import _
import decimal_precision as dp
@@ -1058,7 +1059,7 @@ class hr_payslip(osv.osv):
update.update({
'basic': round(0.0),
'basic_before_leaves': round(0.0),
- 'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')),
+ 'name':'Salary Slip of %s for %s' % (slip.employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))),
'state':'draft',
'contract_id':False,
'company_id':slip.employee_id.company_id.id
@@ -1181,7 +1182,7 @@ class hr_payslip(osv.osv):
'number':number,
'basic': round(basic),
'basic_before_leaves': round(basic),
- 'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')),
+ 'name':'Salary Slip of %s for %s' % (slip.employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))),
'state':'draft',
'contract_id':contract.id,
'company_id':slip.employee_id.company_id.id
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index 2d9fb8465c5..c10ada27c56 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -19,19 +19,14 @@
type_id: hr_contract.hr_contract_type_emp
country_id: base.in
department_id: hr.dep_it
- employee_account: account.a_recv
gender: male
marital: hr.hr_employee_marital_status_single
name: Richie
- pg_joining: '2009-12-01'
- property_bank_account: account.cash
- salary_account: account.a_recv
vehicle_distance: 0.0
-
I create a new payment advice record
-
!record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}:
- account_id: account.cash
line_ids:
- amount: 5500.0
bysal: 5000.0
@@ -56,7 +51,7 @@
-
Print Payroll Advice
--
+-
!python {model: hr.payroll.advice}: |
import netsvc, tools, os
(data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('hr_payroll_advice_advice0')], {}, {})
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index 7327688d22a..8bc346a34e1 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -18,25 +18,17 @@
type_id: hr_contract.hr_contract_type_emp
country_id: base.in
department_id: hr.dep_it
- employee_account: account.a_recv
gender: male
marital: hr.hr_employee_marital_status_single
name: Keith
- pg_joining: '2009-12-01'
- property_bank_account: account.cash
- salary_account: account.a_recv
vehicle_distance: 0.0
-
I create a payroll register record.
-
!record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
- bank_journal_id: account.bank_journal
date: '2010-07-02'
- journal_id: account.expenses_journal
line_ids:
- employee_id: hr_payroll.hr_employee_keith0
- bank_journal_id: account.bank_journal
- journal_id: account.expenses_journal
name: payroll1
-
I click on Compute button.
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index ca204a62241..aa739d2c9a1 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -29,14 +29,10 @@
type_id: hr_contract.hr_contract_type_emp
country_id: base.in
department_id: hr.dep_it
- employee_account: account.a_recv
gender: male
marital: hr.hr_employee_marital_status_single
name: Richard
- pg_joining: '2009-12-01'
- property_bank_account: account.cash
bank_account_id: res_partner_bank_0
- salary_account: account.a_recv
vehicle_distance: 0.0
-
I create a new payroll structure for software developer
@@ -44,8 +40,7 @@
!record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}:
code: SD
line_ids:
- - account_id: account.a_expense
- amount: 0.40000000000000002
+ - amount: 0.40000000000000002
amount_type: per
category_id: hr_payroll.HRA
code: HRA
@@ -54,8 +49,7 @@
sequence: 5
total: 0.0
type: allowance
- - account_id: account.a_expense
- amount: 10000.0
+ - amount: 10000.0
amount_type: fix
category_id: hr_payroll.CA
code: CA
@@ -64,8 +58,7 @@
sequence: 10
total: 0.0
type: allowance
- - account_id: account.a_pay
- amount: 10000.0
+ - amount: 10000.0
amount_type: fix
category_id: hr_payroll.PT
code: PT
@@ -74,8 +67,7 @@
sequence: 15
total: 0.0
type: deduction
- - account_id: account.a_pay
- amount: 0.125
+ - amount: 0.125
amount_type: per
category_id: hr_payroll.PF
code: PF
@@ -89,9 +81,8 @@
I create a employee payslip record
-
!record {model: hr.payslip, id: hr_payslip_0}:
- bank_journal_id: account.bank_journal
employee_id: hr_payroll.hr_employee_richard0
- journal_id: account.expenses_journal
+
-
I click on 'Compute Sheet' button
-
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
old mode 100755
new mode 100644
diff --git a/addons/hr_payroll_account/hr_payroll_demo.xml b/addons/hr_payroll_account/hr_payroll_demo.xml
index c1d31e0664c..2875c2c03c5 100644
--- a/addons/hr_payroll_account/hr_payroll_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_demo.xml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -26,7 +26,7 @@
-
+
+
+
+ X110041
+ Bank Current Account
+
+ liquidity
+
+
+
+
+ X21122
+ Salary Expenses
+
+ other
+
+
+
+
+ X21102
+ Expenses
+
+ other
+
+
+
+
+
+ property_bank_account
+
+
+
+
+
+
+ salary_account
+
+
+
+
+
+
+ employee_account
+
+
+
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7a1d418b51b..e3955002c26 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,6 +42,7 @@
+
@@ -98,7 +99,7 @@
+ icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 16a5bf2b162..b7a815bf87c 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 08:26+0000\n"
-"Last-Translator: Borja López Soilán \n"
+"PO-Revision-Date: 2010-12-27 18:27+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_recruitment
@@ -718,12 +719,12 @@ msgstr "Histórico"
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "Attachments"
-msgstr "Documentos adjuntos"
+msgstr "Adjuntos"
#. module: hr_recruitment
#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
msgid "Contract Proposed"
-msgstr ""
+msgstr "Contrato propuesto"
#. module: hr_recruitment
#: view:hr.applicant:0
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 23e30d76113..1a779fba1f9 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -14,7 +14,7 @@
-
+
@@ -30,4 +30,4 @@
-
\ No newline at end of file
+
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 558aa4ce717..5b718dc88bc 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 20:06+0000\n"
+"PO-Revision-Date: 2010-12-27 08:06+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 404876b029d..4d1d5f428cf 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -35,10 +35,10 @@ def lengthmonth(year, month):
class report_custom(report_rml):
- def get_month_name(self, cr, uid, month):
+ def get_month_name(self, cr, uid, month, context=None):
_months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
return _months[month]
- def get_weekday_name(self, cr, uid, weekday):
+ def get_weekday_name(self, cr, uid, weekday, context=None):
_weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
return _weekdays[weekday]
@@ -54,8 +54,8 @@ class report_custom(report_rml):
som = datetime.date(data['form']['year'], data['form']['month'], 1)
eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
- date_xml = ['' % (self.get_month_name(cr, uid, som.month), som.year), '']
- date_xml += ['' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
+ date_xml = ['' % (self.get_month_name(cr, uid, som.month, context=context), som.year), '']
+ date_xml += ['' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1, context=context), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
date_xml.append('')
date_xml.append('2.5cm%s,2cm\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index f7f78d72fd7..e6b366d627a 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -68,11 +68,11 @@ def emp_create_xml(cr, id, som, eom, emp):
class report_custom(report_rml):
- def get_month_name(self, cr, uid, month):
+ def get_month_name(self, cr, uid, month, context=None):
_months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
return _months[month]
- def get_weekday_name(self, cr, uid, weekday):
+ def get_weekday_name(self, cr, uid, weekday, context=None):
_weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
return _weekdays[weekday]
@@ -81,8 +81,8 @@ class report_custom(report_rml):
# Computing the dates (start of month: som, and end of month: eom)
som = datetime.date(data['form']['year'], data['form']['month'], 1)
eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
- date_xml = ['' % (self.get_month_name(cr, uid, som.month), som.year), '']
- date_xml += ['' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
+ date_xml = ['' % (self.get_month_name(cr, uid, som.month, context=context), som.year), '']
+ date_xml += ['' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1, context=context), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
date_xml.append('')
date_xml.append('2.5cm%s,2cm\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 54d82ed2c79..fc9226551e3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,6 +77,19 @@ class account_analytic_account(osv.osv):
_defaults = {
'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
}
+
+ def set_close(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'close'}, context=context)
+
+ def set_cancel(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+
+ def set_open(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'open'}, context=context)
+
+ def set_pending(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+
account_analytic_account()
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4b4d36bd448..df23aaae3b8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -14,8 +14,14 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index ff66e1a2014..a64735df2e3 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 19:48+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 07:47+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \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: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
@@ -54,6 +54,8 @@ msgid ""
"This lists show you every task work you can invoice to the customer. Select "
"the lines in order to generate the invoices automatically."
msgstr ""
+"Questo elenco vi mostra tutte le attività lavorative che sono fatturabili al "
+"cliente. Selezionare le linee in modo da generare automaticamente le fatture."
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -95,6 +97,8 @@ msgid ""
"The product to invoice is defined on the employee form, the price will be "
"deduced by this pricelist on the product."
msgstr ""
+"Il prodotto da fatturare è definito nella scheda dell'impiegato, il prezzo "
+"verrà, di conseguenza, dedotto dal listino del prodotto."
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
@@ -211,6 +215,11 @@ msgid ""
"customer. From this menu, you can create additional default types of "
"invoicing that will speed up your invoicing."
msgstr ""
+"OpenERP vi permette di creare tipi di fatture default. Vi può servire nel "
+"caso creiate regolermente scontistiche basandovi su contratti specifici "
+"oppure da accordi con il cliente. Da questo menù, è possibile creare "
+"ulteriori tipi di fattura default per velocizzare ulteriormente la vostra "
+"fatturazione."
#. module: hr_timesheet_invoice
#: view:random.timesheet.lines:0
@@ -233,7 +242,7 @@ msgstr "Orari di Lavoro giornalieri da Contabilità"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create.final:0
msgid "Final invoice for analytic account"
-msgstr ""
+msgstr "Fattura finale per conto analitico"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 50cc631ec1a..eed26ff1256 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 20:04+0000\n"
+"PO-Revision-Date: 2010-12-27 09:13+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index aee75447059..9effdd1cb3e 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 14:29+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 12:13+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \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: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
@@ -169,6 +169,8 @@ msgstr "Rifiuta"
msgid ""
"You cannot enter an attendance date outside the current timesheet dates!"
msgstr ""
+"Non è possibile inserire una data di presenza che sta al di fuori del range "
+"di date per l'attuale timesheet!"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -185,7 +187,7 @@ msgstr ""
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
#, python-format
msgid "You can not sign in from an other date than today"
-msgstr ""
+msgstr "Non è possibile registrare una entrata in un giorno diverso da oggi"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -207,7 +209,7 @@ msgstr "Attenzione !"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Voce del timesheet impiegato"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -334,7 +336,7 @@ msgstr "Non è possibile duplicare un timesheet!"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
msgid "My Total Attendances By Week"
-msgstr ""
+msgstr "La mia presenza totale per settimana"
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -362,7 +364,7 @@ msgstr "Ore"
#: view:timesheet.report:0
#: field:timesheet.report,cost:0
msgid "#Cost"
-msgstr ""
+msgstr "# Costo"
#. module: hr_timesheet_sheet
#: constraint:hr.attendance:0
@@ -385,7 +387,7 @@ msgstr "Azione non valida!"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Il Manager di progetto convalita i timesheet."
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -411,7 +413,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
msgid "Work on Task"
-msgstr ""
+msgstr "Lavoro sull'attività"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -433,7 +435,7 @@ msgstr "Orari di Lavoro Totali"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Available Attendance"
-msgstr ""
+msgstr "Presenza media"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -509,6 +511,8 @@ msgid ""
"The timesheet line represents the time spent by the employee on a specific "
"service provided."
msgstr ""
+"La linea del timesheet rappresenta il tempo speso dall'impiegato su di uno "
+"specifico servizio fornito."
#. module: hr_timesheet_sheet
#: constraint:hr_timesheet_sheet.sheet:0
@@ -639,7 +643,7 @@ msgstr "Righe Orari di Lavoro"
#. module: hr_timesheet_sheet
#: view:board.board:0
msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "La mia presenza totale per settimana"
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -674,7 +678,7 @@ msgstr "Quantità"
#: view:timesheet.report:0
#: field:timesheet.report,general_account_id:0
msgid "General Account"
-msgstr ""
+msgstr "Contabilità Generale"
#. module: hr_timesheet_sheet
#: help:res.company,timesheet_max_difference:0
@@ -785,6 +789,8 @@ msgid ""
"The timesheet cannot be validated as it does not contain equal no. of sign "
"ins and sign outs!"
msgstr ""
+"Il timesheet non può essere convalidato perchè non contiene un egual numero "
+"di entrate ed uscite!"
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -827,7 +833,7 @@ msgstr "Maggio"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Definisce un riepilogo lavoro sull'attività"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -882,7 +888,7 @@ msgstr "Impiegati"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Informazione del tempo speso su di un servizio"
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -919,13 +925,13 @@ msgstr "Contabilità Analitica"
#: view:timesheet.report:0
#: field:timesheet.report,to_invoice:0
msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo di fatturazione"
#. module: hr_timesheet_sheet
#: view:timesheet.report:0
#: field:timesheet.report,total_attendance:0
msgid "#Total Attendance"
-msgstr ""
+msgstr "# Presenza totale"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
diff --git a/addons/html_view/i18n/es.po b/addons/html_view/i18n/es.po
index 2dbf6a90771..804d9585856 100644
--- a/addons/html_view/i18n/es.po
+++ b/addons/html_view/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:20+0000\n"
+"PO-Revision-Date: 2010-12-27 09:12+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: html_view
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index 89d3e6bfe09..ecbea70b860 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:51+0000\n"
+"PO-Revision-Date: 2010-12-27 08:08+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index 04bf6cf08f8..ed4285f37f5 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:44+0000\n"
+"PO-Revision-Date: 2010-12-27 08:12+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: knowledge
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index f6cffce6b12..40075d5bc12 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-10-30 09:26+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 11:03+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_be
@@ -26,7 +25,7 @@ msgstr "Niveles - Recibible"
#: field:l1on_be.vat.declaration,tax_code_id:0
#: field:partner.vat.intra,tax_code_id:0
msgid "Tax Code"
-msgstr ""
+msgstr "Código impuesto"
#. module: l10n_be
#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3
@@ -54,7 +53,7 @@ msgstr "Inmovilización"
#: view:l1on_be.vat.declaration:0
#: view:partner.vat.intra:0
msgid "Company"
-msgstr ""
+msgstr "Compañía"
#. module: l10n_be
#: model:account.account.type,name:l10n_be.user_type_tiers_payable
@@ -69,7 +68,7 @@ msgstr ""
#. module: l10n_be
#: field:vat.listing.clients,amount:0
msgid "Amount"
-msgstr ""
+msgstr "Cantidad"
#. module: l10n_be
#: view:l1on_be.vat.declaration:0
@@ -92,7 +91,7 @@ msgstr ""
#. module: l10n_be
#: field:vat.listing.clients,vat:0
msgid "VAT"
-msgstr ""
+msgstr "IVA"
#. module: l10n_be
#: field:vat.listing.clients,turnover:0
@@ -155,7 +154,7 @@ msgstr "Régimen Nacional"
#. module: l10n_be
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
#. module: l10n_be
#: help:partner.vat,test_xml:0
@@ -180,7 +179,7 @@ msgstr ""
#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
#, python-format
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#. module: l10n_be
#: view:partner.vat.intra:0
@@ -227,7 +226,7 @@ msgstr ""
#: view:partner.vat.list:0
#: field:partner.vat.list,partner_ids:0
msgid "Clients"
-msgstr ""
+msgstr "Clientes"
#. module: l10n_be
#: field:partner.vat,test_xml:0
@@ -307,7 +306,7 @@ msgstr "Cantidad límite"
#. module: l10n_be
#: model:ir.model,name:l10n_be.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Compañías"
#. module: l10n_be
#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
@@ -356,7 +355,7 @@ msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
msgid "Periods"
-msgstr ""
+msgstr "Periodos"
#. module: l10n_be
#: view:partner.vat:0
@@ -368,7 +367,7 @@ msgstr "Cancelar"
#: view:partner.vat.intra:0
#: view:partner.vat.list:0
msgid "Close"
-msgstr ""
+msgstr "Cerrar"
#. module: l10n_be
#: field:partner.vat.intra,period_ids:0
@@ -460,7 +459,7 @@ msgstr ""
#. module: l10n_be
#: field:vat.listing.clients,country:0
msgid "Country"
-msgstr ""
+msgstr "País"
#. module: l10n_be
#: field:partner.vat,fyear:0
@@ -500,7 +499,7 @@ msgstr ""
#: field:partner.vat.intra,name:0
#: field:partner.vat.list,name:0
msgid "File Name"
-msgstr ""
+msgstr "Nombre de archivo"
#. module: l10n_be
#: field:partner.vat.intra,period_code:0
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index de2c3f15547..0343f29f43a 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1,4 +1 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_be_vat_declaration_manager","l1on.be.vat.declaration manager","model_l1on_be_vat_declaration","account.group_account_manager",1,1,1,1
-"access_partner_vat_intra_manager","partner.vat.intra manager","model_partner_vat_intra","account.group_account_manager",1,1,1,1
-"access_partner_vat_manager","partner.vat manager","model_partner_vat","account.group_account_manager",1,1,1,1
diff --git a/addons/l10n_ca/__init__.py b/addons/l10n_ca/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_ca/i18n/es.po b/addons/l10n_ca/i18n/es.po
new file mode 100644
index 00000000000..677d680fc62
--- /dev/null
+++ b/addons/l10n_ca/i18n/es.po
@@ -0,0 +1,129 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2010-12-27 11:00+0000\n"
+"Last-Translator: Borja López Soilán \n"
+"Language-Team: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.module.module,description:l10n_ca.module_meta_information
+msgid ""
+"This is the module to manage the canadian accounting chart in OpenERP."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr "Caja"
+
+#. module: l10n_ca
+#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_ca
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index 5c0b4408955..2132e9db54f 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:15+0000\n"
-"PO-Revision-Date: 2010-10-30 11:21+0000\n"
-"Last-Translator: Jonay \n"
+"PO-Revision-Date: 2010-12-27 11:05+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_account_tax_code
msgid "Tax Code"
-msgstr ""
+msgstr "Código impuesto"
#. module: l10n_ch
#: view:bvr.invoices.report:0
@@ -131,7 +131,7 @@ msgstr ""
#. module: l10n_ch
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_bvr_report
@@ -178,6 +178,8 @@ msgstr ""
msgid ""
"You can not create move line on receivable/payable account without partner"
msgstr ""
+"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
+"una empresa."
#. module: l10n_ch
#: code:addons/l10n_ch/wizard/bvr_import.py:0
@@ -188,7 +190,7 @@ msgstr "¡Registro total diferente del calculado!"
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_res_partner
msgid "Partner"
-msgstr ""
+msgstr "Empresa"
#. module: l10n_ch
#: code:addons/l10n_ch/wizard/bvr_report.py:0
@@ -229,7 +231,7 @@ msgstr ""
#. module: l10n_ch
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
#. module: l10n_ch
#: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -241,7 +243,7 @@ msgstr "Sin IBAN en la cuenta bancaria de la compañía."
#: view:bvr.invoices.report:0
#: view:bvr.report:0
msgid "Print"
-msgstr ""
+msgstr "Imprimir"
#. module: l10n_ch
#: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -424,7 +426,7 @@ msgstr "Importar"
#. module: l10n_ch
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR inválido (checksum erróneo)."
#. module: l10n_ch
#: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
@@ -473,12 +475,12 @@ msgstr ""
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_account_move_line
msgid "Journal Items"
-msgstr ""
+msgstr "Apuntes"
#. module: l10n_ch
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
#. module: l10n_ch
#: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -508,7 +510,7 @@ msgstr "Parte ordenante DTA"
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Compañías"
#. module: l10n_ch
#: model:res.partner.title,name:l10n_ch.res_c_partner_title_madame
@@ -562,7 +564,7 @@ msgstr "Localización Suiza corregida por Camptocamp"
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_res_partner_bank
msgid "Bank Accounts"
-msgstr ""
+msgstr "Cuentas bancarias"
#. module: l10n_ch
#: view:create.dta.wizard:0
@@ -611,7 +613,7 @@ msgstr "post_number"
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_payment_order
msgid "Payment Order"
-msgstr ""
+msgstr "Orden de pago"
#. module: l10n_ch
#: model:account.account.type,name:l10n_ch.account_type_report_result
@@ -656,7 +658,7 @@ msgstr ""
#. module: l10n_ch
#: model:ir.model,name:l10n_ch.model_res_bank
msgid "Bank"
-msgstr ""
+msgstr "Banco"
#. module: l10n_ch
#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mme_m
@@ -673,7 +675,7 @@ msgstr "DTA-BVRBANK"
#: field:bvr.invoices.report,name:0
#: field:bvr.report,name:0
msgid "Name"
-msgstr ""
+msgstr "Nombre"
#. module: l10n_ch
#: model:account.account.type,name:l10n_ch.account_type_consolidation
@@ -779,7 +781,7 @@ msgstr ""
#. module: l10n_ch
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
#~ msgid "The VAT doesn't seem to be correct."
#~ msgstr "El CIF/NIF no parece estar correcto."
diff --git a/addons/l10n_ch/readme.txt b/addons/l10n_ch/readme.txt
old mode 100755
new mode 100644
diff --git a/addons/l10n_ch/report/bvr_invoice_report.rml b/addons/l10n_ch/report/bvr_invoice_report.rml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ch/report/bvr_report.rml b/addons/l10n_ch/report/bvr_report.rml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ch/report/normalized_oo2rml.xsl b/addons/l10n_ch/report/normalized_oo2rml.xsl
old mode 100755
new mode 100644
diff --git a/addons/l10n_ch/report/ocrbb.ttf b/addons/l10n_ch/report/ocrbb.ttf
old mode 100755
new mode 100644
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
index 1267465ab0d..8bff7f516f0 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-12-26 23:04+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 10:57+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch_chart_c2c_pcg
@@ -98,7 +97,7 @@ msgstr "Autre: Otro"
#. module: l10n_ch_chart_c2c_pcg
#: field:account.tax.template.todo,progress:0
msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso de la configuración"
#. module: l10n_ch_chart_c2c_pcg
#: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_prov_reserve
@@ -224,7 +223,7 @@ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
#. module: l10n_ch_chart_c2c_pcg
#: field:account.tax.template.todo,config_logo:0
msgid "Image"
-msgstr ""
+msgstr "Imagen"
#. module: l10n_ch_chart_c2c_pcg
#: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_lt_liability
diff --git a/addons/l10n_chart_uk_minimal/i18n/es.po b/addons/l10n_chart_uk_minimal/i18n/es.po
index 3c495187726..132b59af30d 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es.po
+++ b/addons/l10n_chart_uk_minimal/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 10:03+0000\n"
+"PO-Revision-Date: 2010-12-27 10:58+0000\n"
"Last-Translator: Borja López Soilán \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: 2010-12-24 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
@@ -71,7 +71,7 @@ msgstr "Efectivo"
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_liability
msgid "Liability"
-msgstr ""
+msgstr "Pasivo"
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
diff --git a/addons/l10n_de/__init__.py b/addons/l10n_de/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_tax_fiscal_position_skr03.xml b/addons/l10n_de/account_tax_fiscal_position_skr03.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_tax_fiscal_position_skr04.xml b/addons/l10n_de/account_tax_fiscal_position_skr04.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_tax_skr03.xml b/addons/l10n_de/account_tax_skr03.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_tax_skr04.xml b/addons/l10n_de/account_tax_skr04.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/ar_AR.po b/addons/l10n_de/i18n/ar_AR.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/be_BE.po b/addons/l10n_de/i18n/be_BE.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/bg_BG.po b/addons/l10n_de/i18n/bg_BG.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/bs_BS.po b/addons/l10n_de/i18n/bs_BS.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/ca_ES.po b/addons/l10n_de/i18n/ca_ES.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/cs_CZ.po b/addons/l10n_de/i18n/cs_CZ.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/es_AR.po b/addons/l10n_de/i18n/es_AR.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/es_ES.po b/addons/l10n_de/i18n/es_ES.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/et_EE.po b/addons/l10n_de/i18n/et_EE.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/fi_FI.po b/addons/l10n_de/i18n/fi_FI.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/fr_FR.po b/addons/l10n_de/i18n/fr_FR.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/hr_HR.po b/addons/l10n_de/i18n/hr_HR.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/hu_HU.po b/addons/l10n_de/i18n/hu_HU.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/id_ID.po b/addons/l10n_de/i18n/id_ID.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/it_IT.po b/addons/l10n_de/i18n/it_IT.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/ko_KO.po b/addons/l10n_de/i18n/ko_KO.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/lt_LT.po b/addons/l10n_de/i18n/lt_LT.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/nl_BE.po b/addons/l10n_de/i18n/nl_BE.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/nl_NL.po b/addons/l10n_de/i18n/nl_NL.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/pl_PL.po b/addons/l10n_de/i18n/pl_PL.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/pt_PT.po b/addons/l10n_de/i18n/pt_PT.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/ro_RO.po b/addons/l10n_de/i18n/ro_RO.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/ru_RU.po b/addons/l10n_de/i18n/ru_RU.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/sl_SL.po b/addons/l10n_de/i18n/sl_SL.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/sq_AL.po b/addons/l10n_de/i18n/sq_AL.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/sv_SE.po b/addons/l10n_de/i18n/sv_SE.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/tr_TR.po b/addons/l10n_de/i18n/tr_TR.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/uk_UA.po b/addons/l10n_de/i18n/uk_UA.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/vi_VN.po b/addons/l10n_de/i18n/vi_VN.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/znd_ZND.po b/addons/l10n_de/i18n/znd_ZND.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index ed95f34902d..a8368296c5b 100644
--- a/addons/l10n_es/i18n/es.po
+++ b/addons/l10n_es/i18n/es.po
@@ -7,113 +7,112 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-15 12:26+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 10:16+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_extra
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
msgid "Régimen Extracomunitario"
-msgstr ""
+msgstr "Régimen Extracomunitario"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf15
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf15
msgid "Retención IRPF 15%"
-msgstr ""
+msgstr "Retención IRPF 15%"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.stock
msgid "Existencias"
-msgstr ""
+msgstr "Existencias"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
msgid "Recargo de Equivalencia"
-msgstr ""
+msgstr "Recargo de Equivalencia"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.terceros - rec
msgid "Terceros - A Cobrar"
-msgstr ""
+msgstr "Terceros - A Cobrar"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.capital
msgid "Capital"
-msgstr ""
+msgstr "Capital"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.terceros
msgid "Terceros"
-msgstr ""
+msgstr "Terceros"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf1
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf1
msgid "Retención IRPF 1%"
-msgstr ""
+msgstr "Retención IRPF 1%"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.terceros - pay
msgid "Terceros - A Pagar"
-msgstr ""
+msgstr "Terceros - A Pagar"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.gastos_neto
msgid "Gastos patrimonio neto"
-msgstr ""
+msgstr "Gastos patrimonio neto"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.tax
msgid "Impuestos"
-msgstr ""
+msgstr "Impuestos"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
msgid "Retención IRPF 7%"
-msgstr ""
+msgstr "Retención IRPF 7%"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
msgid "Régimen Nacional"
-msgstr ""
+msgstr "Régimen Nacional"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.inmo
msgid "Inmobilizado"
-msgstr ""
+msgstr "Inmobilizado"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
msgid "Retención IRPF 18%"
-msgstr ""
+msgstr "Retención IRPF 18%"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.ingresos
msgid "Ingresos"
-msgstr ""
+msgstr "Ingresos"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.view
msgid "View"
-msgstr ""
+msgstr "Vista"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_intra
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
msgid "Régimen Intracomunitario"
-msgstr ""
+msgstr "Régimen Intracomunitario"
#. module: l10n_es
#: model:ir.module.module,description:l10n_es.module_meta_information
@@ -130,38 +129,49 @@ msgid ""
"Note: You should install the l10n_ES_account_balance_report module\n"
"for yearly account reporting (balance, profit & losses).\n"
msgstr ""
+"Plan General Contable Español (PGCE 2008)\n"
+"\n"
+"* Define las siguientes plantillas de planes de cuentas:\n"
+" * Plan General Contable Español 2008.\n"
+" * Plan General Contable Español 2008 para pequeñas y medianas "
+"empresas (PYMES).\n"
+"* Define plantillas de impuestos de ventas y compras.\n"
+"* Define plantillas de códigos de impuesto.\n"
+"\n"
+"Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
+"para reportes de cuentas anuales (balance, perdidas y ganancias)\n"
#. module: l10n_es
#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr ""
+msgstr "Plan Contable Español (PGCE 2008)"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.ingresos_neto
msgid "Ingresos patrimonio neto"
-msgstr ""
+msgstr "Ingresos patrimonio neto"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.financieras
msgid "Financieras"
-msgstr ""
+msgstr "Financieras"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf19
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf19
msgid "Retención IRPF 19%"
-msgstr ""
+msgstr "Retención IRPF 19%"
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf2
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf2
msgid "Retención IRPF 2%"
-msgstr ""
+msgstr "Retención IRPF 2%"
#. module: l10n_es
#: model:account.account.type,name:l10n_es.gastos
msgid "Gastos"
-msgstr ""
+msgstr "Gastos"
#~ msgid "Error ! You can not create recursive account templates."
#~ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index bbb19811cfb..512976833d3 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 08:57+0000\n"
+"PO-Revision-Date: 2010-12-27 10:47+0000\n"
"Last-Translator: Borja López Soilán \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: 2010-12-24 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
@@ -67,7 +67,7 @@ msgstr "Imprimir"
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_account_bilan_report
msgid "Account Bilan Report"
-msgstr ""
+msgstr "Estado de situación patrimonial"
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_l10n_fr_report
diff --git a/addons/l10n_gr/account_chart.xml b/addons/l10n_gr/account_chart.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_gr/i18n/es.po b/addons/l10n_gr/i18n/es.po
new file mode 100644
index 00000000000..2a1fe5325c2
--- /dev/null
+++ b/addons/l10n_gr/i18n/es.po
@@ -0,0 +1,98 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 10:51+0000\n"
+"Last-Translator: Borja López Soilán \n"
+"Language-Team: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr "Este es el módulo base para gestionar el plan contable para Grecia."
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr "Grecia - mínimo"
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_cash
+msgid "Cash"
+msgstr "Caja"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_other
+msgid "Other"
+msgstr "Otro"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_in/i18n/es.po b/addons/l10n_in/i18n/es.po
new file mode 100644
index 00000000000..51aa548307d
--- /dev/null
+++ b/addons/l10n_in/i18n/es.po
@@ -0,0 +1,96 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2010-12-27 11:00+0000\n"
+"Last-Translator: Borja López Soilán \n"
+"Language-Team: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid ""
+"\n"
+" Indian Accounting : chart of Account\n"
+" "
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr "Pasivo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf
old mode 100755
new mode 100644
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_ma/i18n/es.po b/addons/l10n_ma/i18n/es.po
new file mode 100644
index 00000000000..c79984c7171
--- /dev/null
+++ b/addons/l10n_ma/i18n/es.po
@@ -0,0 +1,159 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 11:04+0000\n"
+"Last-Translator: Borja López Soilán \n"
+"Language-Team: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet "
+"de générer les états comptables aux normes marocaines (Bilan, CPC (comptes "
+"de produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_imm
+msgid "Immobilisations"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_ach
+msgid "Charges Achats"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_tpl
+msgid "Titres de placement"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_vue
+msgid "Vue"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_dct
+msgid "Dettes à court terme"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_stk
+msgid "Stocks"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr "Nombre variable"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_dlt
+msgid "Dettes à long terme"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_tax
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr ""
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr "¡El nombre de la variable debe ser único!"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_per
+msgid "Charges Personnel"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_liq
+msgid "Liquidité"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_pdt
+msgid "Produits"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_reg
+msgid "Régularisation"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_cp
+msgid "Capitaux Propres"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_cre
+msgid "Créances"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_aut
+msgid "Charges Autres"
+msgstr ""
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_uk/i18n/es.po b/addons/l10n_uk/i18n/es.po
index fb94ba40c88..5379ec01688 100644
--- a/addons/l10n_uk/i18n/es.po
+++ b/addons/l10n_uk/i18n/es.po
@@ -1,38 +1,39 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * l10n_chart_uk_minimal
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 10:03+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 10:50+0000\n"
"Last-Translator: Borja López Soilán \n"
-"Language-Team: \n"
+"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_receivable
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_receivable
msgid "Receivable"
-msgstr "A recibir"
+msgstr "A cobrar"
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_asset_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_asset_view
msgid "Asset View"
msgstr ""
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_expense_view
-msgid "Expense View"
-msgstr ""
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
-#. module: l10n_chart_uk_minimal
-#: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
+#. module: l10n_uk
+#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
msgid ""
"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
"the name of the company, the chart template to follow, the no. of digits to "
@@ -43,99 +44,69 @@ msgid ""
"Chart of Accounts from a Chart Template."
msgstr ""
-#. module: l10n_chart_uk_minimal
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
-
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_income_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_income_view
msgid "Income View"
msgstr ""
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_income
msgid "Income"
msgstr "Ingreso"
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_tax
msgid "Tax"
msgstr "Impuesto"
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_cash
msgid "Cash"
-msgstr "Efectivo"
+msgstr "Caja"
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_liability
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_liability
msgid "Liability"
-msgstr ""
+msgstr "Pasivo"
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_payable
msgid "Payable"
-msgstr "A cancelar"
+msgstr "A pagar"
-#. module: l10n_chart_uk_minimal
-#: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
+#. module: l10n_uk
+#: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
msgid "United Kingdom - minimal"
-msgstr "Reino Unido - redudido"
+msgstr "Reino Unido - mínimo"
-#. module: l10n_chart_uk_minimal
-#: model:ir.module.module,description:l10n_chart_uk_minimal.module_meta_information
+#. module: l10n_uk
+#: model:ir.module.module,description:l10n_uk.module_meta_information
msgid ""
"This is the base module to manage the accounting chart for United Kingdom in "
"OpenERP."
msgstr ""
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_equity
msgid "Equity"
msgstr "Patrimonio"
-#. module: l10n_chart_uk_minimal
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuesto recursivos."
-
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_liability_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_liability_view
msgid "Liability View"
msgstr ""
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_expense
-msgid "Expense"
-msgstr "Gasto"
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_expense_view
+msgid "Expense View"
+msgstr ""
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_view
msgid "View"
msgstr "Vista"
-
-#~ msgid ""
-#~ "This is the base module to manage the accounting chart for United Kingdom in "
-#~ "Open ERP."
-#~ msgstr ""
-#~ "Esta es la base del módulo para gestionar el Plan Contable para el Reino "
-#~ "Unido en el Open de ERP."
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-#~ "pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-#~ "el número de dígitos para generar el código de las cuentas y de la cuenta "
-#~ "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-#~ "exacta de la plantilla de plan contable.\n"
-#~ "\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-#~ "Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-#~ "plan contable a partir de una plantilla de plan contable."
diff --git a/addons/mail_gateway/i18n/pl.po b/addons/mail_gateway/i18n/pl.po
new file mode 100644
index 00000000000..baf531f2a04
--- /dev/null
+++ b/addons/mail_gateway/i18n/pl.po
@@ -0,0 +1,358 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 14:33+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"Language-Team: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID zasobu"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metoda nie zaimplementowana"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Otwórz załączniki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Szczegóły wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID odnośnika"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Historia bramki pocztowej"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Note"
+msgstr "Notatka"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+"Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID wiadomości w Emailu"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Odbiorcy wiadomości"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Szczegóły"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Historia bramki pocztowej"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Narzędzia serwera pocztowego"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " wrote on "
+msgstr " napisano "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Do"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Odnośniki."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Odbiorcy kopii wiadomości"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "System bramki pocztowej"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nazwa obiektu"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nazwa partnera"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Wątki bramki pocztowej"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Opportunity"
+msgstr "Szansa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emaile"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Stage"
+msgstr "Etap"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " added note on "
+msgstr " dodano uwagę do "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Wiadomość od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Wątek"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Wiadomość Mailgateway"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Użytkownik odpowiedzialny"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Skonwertowano do szansy"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Ukryta kopia"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Istnieje historia?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Odbiorcy ukrytych kopii wiadomości"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Odnośniki"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Wątek bramki pocztowej"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Załączniki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Otwórz dokument"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Szczegóły wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Kopia"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Przeszukaj wiadomości"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+" * History for Emails\n"
+" * Easy Integration with any Module"
+msgstr ""
+"Podstawowy system bramki pocztowej do wysyłania odbierania wiadomości\n"
+" * Historia wiadomości\n"
+" * Łatwa integracja z dowolnym modułem"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Changed Status to: "
+msgstr "Zmieniono stan na: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Wyświetla tekst"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Właściciel"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Zmieniono etap na: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Wiadomość"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Temat"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID wiadomości w serwerze pocztowym"
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
old mode 100755
new mode 100644
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index 982a4f502e9..b0ba14437fd 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:44+0000\n"
+"PO-Revision-Date: 2010-12-27 08:26+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 6b059d0c1e5..f37c21c3020 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 08:04+0000\n"
+"PO-Revision-Date: 2010-12-27 22:57+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing_campaign
@@ -204,7 +204,7 @@ msgstr "Reiniciar"
#. module: marketing_campaign
#: help:marketing.campaign,object_id:0
msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Escoja el recurso sobre el que desea lanzar esta campaña"
#. module: marketing_campaign
#: field:marketing.campaign.segment,sync_last_date:0
@@ -689,6 +689,31 @@ msgid ""
"application as it depends on CRM Leads.\n"
" "
msgstr ""
+"\n"
+"Este módulo provee automatización de iniciativas (clientes potenciales) a "
+"través de campañas de marketing (campañas que, en realidad, pueden ser "
+"definidas sobre cualquier recurso, no sólo contactos del CRM).\n"
+" Las campañas son dinámicas y multicanal. El proceso es el "
+"siguiente:\n"
+" * Diseñe las campañas de marketing como flujos de trabajo, "
+"incluyendo plantillas de correo electrónico a enviar, informes a imprimir y "
+"enviar por correo, acciones personalizadas, etc.\n"
+" * Defina los segmentos de entrada que seleccionarán los elementos "
+"a introducir en la campaña (por ejemplo iniciativas de ciertos países, "
+"etc.)\n"
+" * Lance su campaña en modo simulación para probarla en tiempo real "
+"o acelerada, y ajústela.\n"
+" * Tambien puede iniciar la campaña real en modo manual, donde cada "
+"acción necesita validación manual.\n"
+" * Finalmente lance su campaña en vivo, y observe las estadísticas "
+"mientras la campaña hace todo de forma completamente automatizada.\n"
+" Por supuesto, mientras se ejecuta la campaña puede continuar "
+"ajustando los parámetros, segmentos de entrada, flujo, etc.\n"
+" \n"
+" Nota: Si necesita datos de prueba, puede instalar el módulo "
+"marketing_campaign_crm_demo, pero esto también instalará la aplicación de "
+"CRM dado que depende de las iniciativas del CRM.\n"
+" "
#. module: marketing_campaign
#: selection:campaign.analysis,month:0
@@ -973,7 +998,7 @@ msgstr "Mayo"
#: view:marketing.campaign.segment:0
#: selection:marketing.campaign.segment,state:0
msgid "Running"
-msgstr "En ejecucion"
+msgstr "En progreso"
#. module: marketing_campaign
#: code:addons/marketing_campaign/marketing_campaign.py:0
@@ -989,7 +1014,7 @@ msgstr "Campaña de marketing"
#. module: marketing_campaign
#: field:marketing.campaign.segment,date_done:0
msgid "End Date"
-msgstr "Fecha fin"
+msgstr "Fecha final"
#. module: marketing_campaign
#: selection:campaign.analysis,month:0
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 75b2379d414..9c7a66d3057 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -37,11 +37,9 @@
+ action="open_board_manufacturing" icon="terp-graph"
+ id="menu_board_manufacturing" parent="menus_dash_mrp"
+ sequence="1"/>
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index af46ba9b0c7..a911033e9b3 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:16+0000\n"
+"PO-Revision-Date: 2010-12-27 17:45+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -105,7 +105,7 @@ msgstr "Procesos productivos"
#. module: mrp
#: field:mrp.workcenter,product_id:0
msgid "Work Center Product"
-msgstr ""
+msgstr "Producto centro de producción"
#. module: mrp
#: view:mrp.bom:0
@@ -128,6 +128,8 @@ msgid ""
"Number of iterations this work center has to do in the specified operation "
"of the routing."
msgstr ""
+"Número de iteraciones que debe realizar este centro de producción en la "
+"operación indicada de la ruta."
#. module: mrp
#: view:mrp.bom:0
@@ -244,6 +246,8 @@ msgid ""
"Fill this product to track easily your production costs in the analytic "
"accounting."
msgstr ""
+"Introduzca este producto para realizar fácilmente un seguimiento de sus "
+"costes de producción en la contabilidad analítica."
#. module: mrp
#: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -520,7 +524,7 @@ msgid ""
"centers."
msgstr ""
"La lista de materiales está vinculada a una ruta, es decir, la sucesión de "
-"centros de trabajo."
+"centros de producción."
#. module: mrp
#: constraint:product.product:0
@@ -530,7 +534,7 @@ msgstr "Error: Código EAN no válido"
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
msgid "Specify Cost of Workcenter per hour."
-msgstr "Indica coste del centro de trabajo por hora."
+msgstr "Indica el coste del centro de producción por hora."
#. module: mrp
#: view:mrp.routing:0
@@ -582,7 +586,7 @@ msgstr "Marzo"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
msgid "Specify Cost of Workcenter per cycle."
-msgstr "Especifique el coste por centro de prodcción"
+msgstr "Indica el coste del centro de producción por ciclo."
#. module: mrp
#: field:mrp.bom,child_complete_ids:0
@@ -780,6 +784,8 @@ msgid ""
"Add more functionalities to the core Manufacturing Application with the "
"following addons."
msgstr ""
+"Añada más funcionalidades en el núcleo de la aplicación de fabricación con "
+"los siguientes módulos."
#. module: mrp
#: report:mrp.production.order:0
@@ -833,7 +839,7 @@ msgstr "Urgente"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing_workcenter
msgid "Workcenter Usage"
-msgstr "Uso centro de trabajo"
+msgstr "Uso centro de producción"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production
@@ -862,6 +868,8 @@ msgid ""
"Time in hours for this work center to achieve the operation of the specified "
"routing."
msgstr ""
+"Tiempo en horas para este centro de producción para realizar la operación de "
+"la ruta indicada."
#. module: mrp
#: view:mrp.production:0
@@ -949,7 +957,7 @@ msgstr "Producto almacenable"
#: code:addons/mrp/report/price.py:0
#, python-format
msgid "Work Center name"
-msgstr "Nombre del centro de producción"
+msgstr ""
#. module: mrp
#: field:mrp.routing,code:0
@@ -1093,7 +1101,7 @@ msgstr "Nombre"
#. module: mrp
#: view:mrp.installer:0
msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Configuración aplicación MRP"
#. module: mrp
#: help:mrp.installer,mrp_jit:0
@@ -1128,7 +1136,7 @@ msgid ""
"Gives the sequence order when displaying a list of routing workcenters."
msgstr ""
"Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
-"de trabajo."
+"de producción."
#. module: mrp
#: constraint:mrp.production:0
@@ -1173,6 +1181,43 @@ msgid ""
" * List of procurement in exception\n"
" "
msgstr ""
+"\n"
+" Este es el módulo base para gestionar el proceso de fabricación en "
+"OpenERP.\n"
+"\n"
+" Características:\n"
+" * Obtener para stock / Obtener bajo pedido (por línea)\n"
+" * Listas de materiales (LdM) multi-nivel, sin límite\n"
+" * Rutas multi-nivel, sin límite\n"
+" * Rutas y centro de producción integrado con contabilidad analítica\n"
+" * Cálculo de la planificación periódica / Módulo Just In Time\n"
+" * Multi-TPV, multi-almacén\n"
+" * Distintas políticas de volver a pedir\n"
+" * Método de coste por producto: precio estándar, precio promedio\n"
+" * Fácil análisis de problemas o necesidades\n"
+" * Muy flexible\n"
+" * Permite mostrar Listas de Materiales en una estructura completa\n"
+" que incluye LdMs hijas y fantasmas\n"
+" Soporta la integración y planificación completa de productos "
+"almacenables,\n"
+" consumibles o servicios. Los servicios están completamente integrados "
+"con el resto\n"
+" de la aplicación. Por ejemplo, puede configurar un servicio de sub-"
+"contratación\n"
+" en una LdM para automáticamente comprar bajo pedido el montaje de su "
+"producción.\n"
+"\n"
+" Informes que proporciona este módulo:\n"
+" * Estructura y componentes de la Lista de Material\n"
+" * Previsión de carga en los centros de producción\n"
+" * Imprimir una orden de producción\n"
+" * Previsiones de stock\n"
+" Tableros que proporciona este módulo:\n"
+" * Lista de las próximas órdenes de producción\n"
+" * Lista de envíos (albaranes de salida)\n"
+" * Gráfico de la carga del centro de producción\n"
+" * Lista de abastecimientos en excepción\n"
+" "
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1355,6 +1400,7 @@ msgstr "Revisiones"
#: view:mrp.installer:0
msgid "Configure Your Manufacturing Resource Planning Application"
msgstr ""
+"Configure su aplicación de planificación de recursos de fabricación (MRP)"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -1469,9 +1515,9 @@ msgid ""
"of one or several people and/or machines that can be considered as a unit "
"for capacity and planning forecasting."
msgstr ""
-"Los centros de trabajo permiten crear y manejar unidades de fabricación "
+"Los centros de producción permiten crear y manejar unidades de fabricación "
"compuestas por una o varias personas y/o máquinas que pueden ser "
-"consideradas como una unidad a efectos de capacidad y prevision de "
+"consideradas como una unidad a efectos de capacidad y previsión de "
"planificación."
#. module: mrp
@@ -1483,7 +1529,7 @@ msgstr "ID activo no se encuentra"
#. module: mrp
#: view:mrp.workcenter:0
msgid "Search for mrp workcenter"
-msgstr "Buscar por centro de trabajo mrp"
+msgstr "Buscar por centro de producción mrp"
#. module: mrp
#: view:mrp.bom:0
@@ -1525,7 +1571,7 @@ msgstr "Abastecer productos"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
msgid "Work Center Loads"
-msgstr "Cargas centro de trabajo"
+msgstr "Cargas centro de producción"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1726,7 +1772,7 @@ msgstr "Análisis de producción"
#: code:addons/mrp/mrp.py:0
#, python-format
msgid "Copy"
-msgstr ""
+msgstr "Copiar"
#. module: mrp
#: view:mrp.production.lot.line:0
@@ -1828,7 +1874,7 @@ msgstr ""
#: view:mrp.production:0
#: report:mrp.production.order:0
msgid "Work Orders"
-msgstr "Órdenes de producción"
+msgstr "Órdenes de trabajo"
#. module: mrp
#: field:mrp.workcenter,costs_cycle:0
@@ -1903,11 +1949,11 @@ msgid ""
"operations and to plan future loads on workcenters based on production "
"plannification."
msgstr ""
-"La lista de las operaciones (lista de los centros de trabajo) para producir "
-"el producto terminado. La ruta se utiliza principalmente para calcular los "
-"costes del centro de trabajo durante las operaciones y para planificar las "
-"futuras cargas en centros de trabajo basado en planificación de la "
-"producción."
+"La lista de las operaciones (lista de los centros de producción) para "
+"producir el producto terminado. La ruta se utiliza principalmente para "
+"calcular los costes del centro de producción durante las operaciones y para "
+"planificar las futuras cargas en centros de producción basado en "
+"planificación de la producción."
#. module: mrp
#: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -2015,7 +2061,7 @@ msgstr "Redondeo del producto"
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
#: field:mrp.production.workcenter.line,name:0
msgid "Work Order"
-msgstr "Orden de entrega"
+msgstr "Orden de trabajo"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -2135,7 +2181,7 @@ msgstr "Proceso productivo padre"
#. module: mrp
#: view:mrp.installer:0
msgid "Configure"
-msgstr ""
+msgstr "Configurar"
#. module: mrp
#: help:mrp.workcenter,time_start:0
@@ -2280,9 +2326,9 @@ msgid ""
"Routing is indicated then,the third tab of a production order (workcenters) "
"will be automatically pre-completed."
msgstr ""
-"La ruta indica todos los centros de trabajo utilizados, por cuánto tiempo "
+"La ruta indica todos los centros de producción utilizados, por cuánto tiempo "
"y/o ciclos. Si se indica la ruta, entonces la tercera pestaña de una orden "
-"de producción (Centros de trabajo) será automáticamente pre-completada."
+"de producción (centros de producción) será automáticamente pre-completada."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_bom_revision
@@ -2413,11 +2459,11 @@ msgid ""
"operations and to plan future loads on workcenters based on production "
"planning."
msgstr ""
-"La lista de las operaciones (lista de los centros de trabajo) para producir "
-"el producto terminado. La ruta se utiliza principalmente para calcular los "
-"costes del centro de trabajo durante las operaciones y para planificar las "
-"futuras cargas en los centros de trabajo basado en la planificación de la "
-"producción."
+"La lista de las operaciones (lista de los centros de producción) para "
+"producir el producto terminado. La ruta se utiliza principalmente para "
+"calcular los costes del centro de producción durante las operaciones y para "
+"planificar las futuras cargas en los centros de producción basado en la "
+"planificación de la producción."
#. module: mrp
#: view:board.board:0
@@ -2436,9 +2482,9 @@ msgid ""
"specified period. It is expressed in number of hours and machine related "
"cycles."
msgstr ""
-"\"Carga de los centros de trabajo\" muestra un pronóstico de la carga de los "
-"centros de trabajo respecto a un periodo específico. Está expresado en "
-"número de horas y ciclos de máquina relacionados."
+"Las cargas de los centros de producción muestran un pronóstico de la carga "
+"de los centros de producción respecto a un periodo determinado. Está "
+"expresado en número de horas y ciclos de máquina relacionados."
#. module: mrp
#: model:process.node,note:mrp.process_node_procureproducts0
@@ -2518,6 +2564,8 @@ msgid ""
"Specify quantity of products to produce or buy. Report of Cost structure "
"will be displayed base on this quantity."
msgstr ""
+"Indique la cantidad de productos a producir o comprar. El informe de la "
+"estructura de costes se muestra basándose en esta cantidad."
#. module: mrp
#: selection:mrp.bom,method:0
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 5a8aca33fe2..7a591e6e6bd 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-27 12:37+0000\n"
-"Last-Translator: qdp (OpenERP) \n"
+"PO-Revision-Date: 2010-12-27 15:12+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -917,7 +917,7 @@ msgstr ""
#: model:process.node,name:mrp.process_node_stockproduct1
#: model:process.process,name:mrp.process_process_stockableproductprocess0
msgid "Stockable Product"
-msgstr "Produkt rejestrowany"
+msgstr "Rejestrowany"
#. module: mrp
#: code:addons/mrp/report/price.py:0
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 10594219041..9bbb6a97cee 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -11,10 +11,9 @@
+ id="menu_mrp_bom"
+ parent="base.menu_mrp_root"
+ sequence="5" />
@@ -939,12 +937,11 @@
-
+ parent="base.menu_mrp_root" sequence="2"
+ groups="base.group_extended"/>
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 496462b390c..b001c722fef 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,8 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
+"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
"access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
"access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
+"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
"access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
"access_mrp_production_salesman","mrp.production salesman","model_mrp_production","base.group_sale_salesman",1,1,1,0
@@ -12,7 +12,7 @@
"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
@@ -23,7 +23,7 @@
"access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0
"access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0
"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
+"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
@@ -32,23 +32,23 @@
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
+"access_product_product_manager","product.product manager","product.model_product_product","mrp.group_mrp_manager",1,0,0,0
"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
"access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
-"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,0,0,0
+"access_product_product_user","product.product user","product.model_product_product","mrp.group_mrp_user",1,0,0,0
"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,0,0,0
-"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,1,1,1
+"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,0,0,0
"access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1
-"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,1,1,1
+"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,0,0,0
"access_stock_tracking","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_user",1,1,1,0
-"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,1,1,0
+"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,0,0,0
"access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
"access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
"access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
-"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
-"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
-"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
+"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,0,0,0
+"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,0,0,0
+"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,0,0,0
"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
"access_product_template_manager","product.template mgr","product.model_product_template","mrp.group_mrp_manager",1,0,0,0
"access_product_uom_manager","product.uom user","product.model_product_uom","mrp.group_mrp_manager",1,0,0,0
@@ -62,7 +62,7 @@
"access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
"access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
"access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
+"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
@@ -71,3 +71,26 @@
"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
+"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
+"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
+"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
+"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
+"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
+"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
+"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
+"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
+"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
+"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
+"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
+"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
+"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
+"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
+"access_sale_order_manufacturing_user","sale.order manufacturing.user","sale.model_sale_order","mrp.group_mrp_user",1,1,0,0
+"access_sale_order_line_manufacturing_user","sale.order.line manufacturing.user","sale.model_sale_order_line","mrp.group_mrp_user",1,1,0,0
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index ffbed9c7cf4..e3071e46506 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-19 08:58+0000\n"
-"Last-Translator: Carlos @ smile.fr \n"
+"PO-Revision-Date: 2010-12-27 12:46+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_jit
@@ -46,6 +46,27 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Este módulo permite el cálculo sobre la marcha (just in time) de las "
+"órdenes de abastecimiento.\n"
+"\n"
+" Si instala este módulo, no tendrá que ejecutar el planificador de "
+"abastecimientos\n"
+" nunca más (pero todavía tendrá que ejecutar el planificador de pedidos "
+"por reglas\n"
+" de stock mínimo, o por ejemplo dejar que se ejecute diariamente.)\n"
+" Todos las órdenes de abastecimiento se procesarán inmediatamente, lo que "
+"en\n"
+" algunos casos puede conllevar un pequeño impacto en el rendimiento.\n"
+"\n"
+" También podría incrementar su stock porque los productos se reservan\n"
+" tan pronto posible, y el rango de tiempo del planificador no se tiene "
+"más en cuenta.\n"
+" En ese caso, ya no podrá usar prioridades en las diferentes entregas "
+"(albaranes).\n"
+" \n"
+" \n"
+" "
#~ msgid "The name of the module must be unique !"
#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 577aa83d2c2..913209db02c 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 08:57+0000\n"
-"Last-Translator: Borja López Soilán \n"
+"PO-Revision-Date: 2010-12-27 17:44+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\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: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
@@ -23,7 +24,7 @@ msgstr ""
#: view:mrp.production.workcenter.line:0
#: view:mrp.workorder:0
msgid "Work Orders"
-msgstr "Órdenes de producción"
+msgstr "Órdenes de trabajo"
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -61,7 +62,7 @@ msgstr "Marzo"
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
msgid "Work Centers"
-msgstr "Centros de trabajo"
+msgstr "Centros de producción"
#. module: mrp_operations
#: view:mrp.production:0
@@ -134,7 +135,7 @@ msgstr "Centro de producción"
#. module: mrp_operations
#: model:process.transition,note:mrp_operations.process_transition_productionstart0
msgid "The work orders are created on the basis of the production order."
-msgstr "Las órdenes de trabajo son creadas en base a la orden de producción"
+msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
#. module: mrp_operations
#: code:addons/mrp_operations/mrp_operations.py:0
@@ -152,7 +153,7 @@ msgstr "Cancelada"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
msgid "Confirmed Work Orders"
-msgstr "Órdenes de producción confirmadas"
+msgstr "Órdenes de trabajo confirmadas"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -203,7 +204,7 @@ msgid ""
"There is 1 work order per work center. The information about the number of "
"cycles or the cycle time."
msgstr ""
-"Hay una orden de trabajo por centro de trabajo. La información sobre el "
+"Hay una orden de trabajo por centro de producción. La información sobre el "
"número de ciclos o duración del ciclo."
#. module: mrp_operations
@@ -269,7 +270,7 @@ msgstr "Fecha orden"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
msgid "Future Work Orders"
-msgstr "Órdenes de producción futuras"
+msgstr "Órdenes de trabajo futuras"
#. module: mrp_operations
#: code:addons/mrp_operations/mrp_operations.py:0
@@ -466,7 +467,7 @@ msgstr "Hijo se mueve"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
msgid "Work Orders Planning"
-msgstr "Planeación de Ordenes de Trabajo"
+msgstr "Planificación de órdenes de trabajo"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
@@ -483,6 +484,8 @@ msgstr "Noviembre"
#: help:mrp.production.workcenter.line,delay:0
msgid "This is lead time between operation start and stop in this workcenter"
msgstr ""
+"Este es el plazo de ejecución entre las operaciones de inicio y parada en "
+"este centro de producción."
#. module: mrp_operations
#: view:mrp.workorder:0
@@ -547,11 +550,16 @@ msgid ""
"operations will have different impacts on the costs of manufacture and "
"planning depending on the available workload."
msgstr ""
+"Para fabricar o ensamblar productos, así como usar materias primas y el "
+"producto terminado, debe gestionar operaciones de producción. Las "
+"operaciones de producción a menudo se llaman órdenes de trabajo. Las "
+"distintas operaciones tienen diferentes efectos sobre los costes de "
+"fabricación y la planificación depende de la carga de trabajo disponible."
#. module: mrp_operations
#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "Flujo de inicio-final de la producción en los centros de producción"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
@@ -595,6 +603,11 @@ msgid ""
"latest operation of a manufacturing order, the MO is automatically done and "
"the related products are produced."
msgstr ""
+"Las órdenes de trabajo es la lista de operaciones que se realizarán para "
+"cada orden de producción. Una vez que se inicia el primer trabajo de una "
+"orden de producción, esta se marca automáticamente como iniciada. Una vez "
+"que termine la última operación de una orden de producción, esta se realiza "
+"automáticamente y los productos relacionados son producidos."
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -609,7 +622,7 @@ msgstr "Información"
#. module: mrp_operations
#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
msgid "Work Centers Barcode"
-msgstr "Códigos de barra de centros de trabajo"
+msgstr "Códigos de barra de centros de producción"
#. module: mrp_operations
#: constraint:stock.move:0
@@ -637,13 +650,13 @@ msgstr "Producción"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Search Work Orders"
-msgstr "Buscar Órdenes de Trabajo"
+msgstr "Buscar órdenes de trabajo"
#. module: mrp_operations
#: field:mrp_operations.operation,workcenter_id:0
#: model:process.node,name:mrp_operations.process_node_workorder0
msgid "Work Center"
-msgstr "Centro de trabajo"
+msgstr "Centro de producción"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
@@ -685,7 +698,7 @@ msgstr ")"
#. module: mrp_operations
#: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
msgid "Work Order Analysis"
-msgstr "Análisisde órdenes de trabajo"
+msgstr "Análisis de órdenes de trabajo"
#. module: mrp_operations
#: view:mrp.production:0
@@ -703,7 +716,7 @@ msgstr "UdM"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Hours by Work Center"
-msgstr "Horas por centro de trabajo"
+msgstr "Horas por centro de producción"
#. module: mrp_operations
#: field:mrp.production.workcenter.line,delay:0
@@ -753,6 +766,8 @@ msgid ""
"When the operation is finished, the operator updates the system by finishing "
"the work order."
msgstr ""
+"Cuando se finaliza la operación, el operador actualiza el sistema "
+"finalizando la orden de trabajo."
#. module: mrp_operations
#: selection:mrp.workorder,month:0
@@ -773,7 +788,7 @@ msgstr "Estado producción"
#: view:mrp.workorder:0
#: field:mrp.workorder,year:0
msgid "Year"
-msgstr ""
+msgstr "Año"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
old mode 100755
new mode 100644
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
old mode 100755
new mode 100644
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
old mode 100755
new mode 100644
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index 534b367be5b..9f90b152daa 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:56+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 12:06+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_subproduct
@@ -84,6 +83,15 @@ msgid ""
" A + B + C -> D + E\n"
" "
msgstr ""
+"\n"
+"Este módulo le permite producir varios productos desde una orden de "
+"producción.\n"
+"Puede configurar los sub-productos en la lista de materiales.\n"
+"Sin este módulo:\n"
+" A + B + C -> D\n"
+"Con este módulo:\n"
+" A + B + C -> D + E\n"
+" "
#. module: mrp_subproduct
#: field:mrp.subproduct,product_uom:0
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 2d7c761da90..130411987c1 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -60,7 +60,6 @@ class mrp_bom(osv.osv):
mrp_bom()
class mrp_production(osv.osv):
- _name = 'mrp.production'
_description = 'Production'
_inherit= 'mrp.production'
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 8f6b87afd2d..f30a95cbc83 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:44+0000\n"
-"Last-Translator: Carlos-smile \n"
+"PO-Revision-Date: 2010-12-27 12:13+0000\n"
+"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: multi_company
@@ -106,6 +106,10 @@ msgid ""
" This module is the base module for other multicompany modules.\n"
" "
msgstr ""
+"\n"
+" El módulo de multicompañía permite gestionar un entorno multicompañía.\n"
+" Este módulo sirve de base a los otros módulos multicompañía.\n"
+" "
#~ msgid "Default Company"
#~ msgstr "Compañía por defecto"
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
index da30de13d4f..102c5e311c8 100644
--- a/addons/outlook/i18n/es.po
+++ b/addons/outlook/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 09:31+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) \n"
+"PO-Revision-Date: 2010-12-27 18:48+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: outlook
@@ -79,6 +80,18 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" Este módulo provee el conector (plug-in) de Outlook. \n"
+"\n"
+" El conector de Outlook le permite seleccionar un objeto que desearía "
+"adjuntar\n"
+" a su correo y sus adjuntos desde MS Outlook. Puede seleccionar una "
+"empresa, una tarea,\n"
+" un proyecto, una cuenta analítica, o cualquier otro objeto, y archivar "
+"el correo seleccionado\n"
+" en mensajes de correo con adjuntos.\n"
+"\n"
+" "
#. module: outlook
#: help:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/pl.po b/addons/outlook/i18n/pl.po
new file mode 100644
index 00000000000..2861404831d
--- /dev/null
+++ b/addons/outlook/i18n/pl.po
@@ -0,0 +1,144 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 14:11+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"Language-Team: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Wtyczka Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Podręcznik instalacji"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Konfiguruj"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Wtyczka Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr ""
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interfejs Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nazwa pliku"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Wtyczka Outlook "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+" This module provide the Outlook plug-in. \n"
+"\n"
+" Outlook plug-in allows you to select an object that you’d like to add\n"
+" to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+" a project, an analytical account, or any other object and Archived "
+"selected\n"
+" mail in mailgate.messages with attachments.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Plik dokumentacji: jak instalować wtyczkę Outlook"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Konfiguracja wtyczki Outlook"
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Pomiń"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Zamknij"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Kroki instalacji i konfiguracji"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Obraz"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Plik wtyczki outlooka. Zapisz jako ten plik i instaluj tę wtyczkę w outlooku."
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Postęp konfiguracji"
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
old mode 100644
new mode 100755
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
old mode 100644
new mode 100755
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 2ef966b2a43..c57c5287692 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 16:04+0000\n"
-"Last-Translator: Carlos-smile \n"
+"PO-Revision-Date: 2010-12-27 23:05+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\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: 2010-12-24 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
@@ -29,7 +30,7 @@ msgstr "Ventas por día"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_confirm
msgid "Point of Sale Confirm"
-msgstr "Punto de venta Confirmar"
+msgstr "Punto de venta. Confirmar"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -50,7 +51,7 @@ msgstr "Nº de producto"
#. module: point_of_sale
#: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
msgid "Point Of Sale"
-msgstr "Terminal punto de venta (TPV)"
+msgstr "Punto de Venta"
#. module: point_of_sale
#: view:report.pos.order:0
@@ -129,7 +130,7 @@ msgstr "Caja cerrada"
#. module: point_of_sale
#: report:pos.sales.user.today.current.user:0
msgid "Today's Sales By Current User"
-msgstr "Ventas de hoy del usuario actual"
+msgstr "Ventas de hoy por usuario actual"
#. module: point_of_sale
#: report:account.statement:0
@@ -253,7 +254,7 @@ msgstr "Informe de ventas"
#: code:addons/point_of_sale/wizard/pos_discount.py:0
#, python-format
msgid "No Order Lines"
-msgstr ""
+msgstr "Nº líneas pedido"
#. module: point_of_sale
#: view:pos.order:0
@@ -325,6 +326,8 @@ msgid ""
"You can not open a Cashbox for \"%s\".\n"
"Please close its related cash register."
msgstr ""
+"No puede abrir una caja registradora para \"%s\".\n"
+"Cierre el registro de caja relacionado."
#. module: point_of_sale
#: help:pos.order,user_salesman_id:0
@@ -334,7 +337,7 @@ msgstr "Usuario conectado al sistema"
#. module: point_of_sale
#: field:product.product,income_pdt:0
msgid "Product for Input"
-msgstr ""
+msgstr "Producto para entrada"
#. module: point_of_sale
#: report:pos.details:0
@@ -531,7 +534,7 @@ msgstr "Saldo final"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
msgid "Products for Output Operations"
-msgstr ""
+msgstr "Producto para operaciones de salida"
#. module: point_of_sale
#: view:pos.payment.report.date:0
@@ -545,6 +548,8 @@ msgid ""
"Cannot delete a point of sale which is closed or contains confirmed "
"cashboxes!"
msgstr ""
+"¡No se puede eliminar un punto de venta que esté cerrado o contenga cajas "
+"registradoras confirmadas!"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
@@ -634,7 +639,7 @@ msgstr "Ref. empresa"
#: model:ir.model,name:point_of_sale.model_pos_close_statement
#: view:pos.close.statement:0
msgid "Close Statements"
-msgstr ""
+msgstr "Cerrar extractos"
#. module: point_of_sale
#: view:account.journal:0
@@ -673,6 +678,8 @@ msgstr "Ventas aceptadas"
msgid ""
"This field authorize Validation of Cashbox without checking ending details"
msgstr ""
+"Este campo autoriza la validación de la caja registradora sin comprobar los "
+"detalles finales"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
@@ -707,7 +714,7 @@ msgstr "Fecha creación"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
msgid "Today's Sales"
-msgstr "Vetas de hoy"
+msgstr "Ventas de hoy"
#. module: point_of_sale
#: view:report.sales.by.margin.pos:0
@@ -764,7 +771,7 @@ msgstr "Nº de ctdad"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_return
msgid "Point of sale return"
-msgstr ""
+msgstr "Punto de venta. Devolución"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
@@ -783,7 +790,7 @@ msgstr "Fecha pedido"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Caja registradora cerrada hoy"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -796,11 +803,13 @@ msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
msgstr ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
#. module: point_of_sale
#: field:product.product,expense_pdt:0
msgid "Product for expenses"
-msgstr ""
+msgstr "Producto para gastos"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
@@ -886,7 +895,7 @@ msgstr "ErrorUsuario "
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_box_entries
msgid "Pos Box Entries"
-msgstr ""
+msgstr "Entradas caja TPV"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
@@ -941,7 +950,7 @@ msgstr "Operaciones de entrada"
#: model:ir.model,name:point_of_sale.model_report_cash_register
#: view:report.cash.register:0
msgid "Point of Sale Cash Register Analysis"
-msgstr ""
+msgstr "Punto de venta. Análisis registro caja"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
@@ -951,7 +960,7 @@ msgstr "Ventas por usuarios"
#. module: point_of_sale
#: report:pos.payment.report:0
msgid "Payment For Sale"
-msgstr ""
+msgstr "Pago por venta"
#. module: point_of_sale
#: field:pos.order,first_name:0
@@ -1034,7 +1043,7 @@ msgstr "Nombre"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
msgid "Open Cash Registers"
-msgstr ""
+msgstr "Abrir registros de caja"
#. module: point_of_sale
#: report:pos.details:0
@@ -1077,7 +1086,7 @@ msgstr "Ventas TPV"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
msgid "All Closed CashBox"
-msgstr ""
+msgstr "Todas cajas registradoras cerradas"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:0
@@ -1153,17 +1162,17 @@ msgstr "Productos"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Informe de pago para venta"
#. module: point_of_sale
#: field:account.journal,special_journal:0
msgid "Special Journal"
-msgstr ""
+msgstr "Diario especial"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
msgid "All closed cashbox of the day"
-msgstr ""
+msgstr "Todas cajas registradoras cerradas del día"
#. module: point_of_sale
#: view:pos.order:0
@@ -1195,6 +1204,17 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"Características principales:\n"
+" - Rápida codificación de la venta.\n"
+" - Permite seleccionar un modo de pago (la forma más rápida) o dividir el "
+"pago entre varios modos de pago.\n"
+" - Cálculo de la cantidad de dinero a devolver.\n"
+" - Crea y confirma el albarán automáticamente.\n"
+" - Permite al usuario crear factura de forma automática.\n"
+" - Permite la devolución de ventas anteriores.\n"
+"\n"
+" "
#. module: point_of_sale
#: field:pos.order,price_type:0
@@ -1285,7 +1305,7 @@ msgstr "Número de copias"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_make_payment
msgid "Point of Sale Payment"
-msgstr "Pago punto de venta"
+msgstr "Punto de venta. Pago"
#. module: point_of_sale
#: report:pos.details:0
@@ -1330,7 +1350,7 @@ msgstr "Ventas TPV"
#. module: point_of_sale
#: report:account.statement:0
msgid "Statement Name"
-msgstr ""
+msgstr "Nombre extracto"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1349,23 +1369,23 @@ msgstr "Fecha de inicio"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_receipt
msgid "Point of sale receipt"
-msgstr ""
+msgstr "Punto de venta. Recibo"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_payment.py:0
#, python-format
msgid "No order lines defined for this sale "
-msgstr ""
+msgstr "Nº de líneas del pedido definido en esta venta "
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Ventas por margen diario del usuario"
#. module: point_of_sale
#: field:pos.order,note_2:0
msgid "Customer Note"
-msgstr ""
+msgstr "Nota cliente"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:0
@@ -1376,7 +1396,7 @@ msgstr "No se han añadido líneas en esta venta."
#. module: point_of_sale
#: field:report.cash.register,balance_start:0
msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo de apertura"
#. module: point_of_sale
#: field:pos.order,amount_paid:0
@@ -1389,13 +1409,13 @@ msgstr "Pagado"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
msgid "All sales lines"
-msgstr ""
+msgstr "Todas las líneas de venta"
#. module: point_of_sale
#: selection:pos.order,state:0
#: selection:report.cash.register,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Presupuesto"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
@@ -1409,17 +1429,17 @@ msgstr "Total:"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
msgid "Sales by margin"
-msgstr ""
+msgstr "Ventas por margen"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_config_journal
msgid "Journal Configuration"
-msgstr ""
+msgstr "Configuración diario"
#. module: point_of_sale
#: view:pos.order:0
msgid "Statement lines"
-msgstr ""
+msgstr "Líneas extracto"
#. module: point_of_sale
#: help:pos.order,user_id:0
@@ -1427,11 +1447,13 @@ msgid ""
"Person who uses the the cash register. It could be a reliever, a student or "
"an interim employee."
msgstr ""
+"Persona que usa la caja registradora. Podría ser un sustituto, un estudiante "
+"o un empleado provisional."
#. module: point_of_sale
#: field:report.transaction.pos,invoice_id:0
msgid "Nbr Invoice"
-msgstr ""
+msgstr "Nº factura"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
@@ -1460,13 +1482,13 @@ msgstr "Factura"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_get_sale
msgid "Get From Sale"
-msgstr ""
+msgstr "Obtener desde venta"
#. module: point_of_sale
#: view:account.bank.statement:0
#: selection:report.cash.register,state:0
msgid "Open"
-msgstr ""
+msgstr "Abierto"
#. module: point_of_sale
#: field:pos.order.line,order_id:0
@@ -1477,18 +1499,18 @@ msgstr "Ref. venta"
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
#: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
msgid "Sales lines Report"
-msgstr ""
+msgstr "Informe líneas ventas"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
#: view:pos.box.entries:0
msgid "Box Entries"
-msgstr ""
+msgstr "Asientos caja"
#. module: point_of_sale
#: selection:pos.order,price_type:0
msgid "Tax excluded"
-msgstr ""
+msgstr "Impuesto excluido"
#. module: point_of_sale
#: field:report.sales.by.margin.pos,net_margin_per_qty:0
@@ -1500,7 +1522,7 @@ msgstr "Margen neto por ctdad"
#: view:report.sales.by.margin.pos:0
#: view:report.sales.by.margin.pos.month:0
msgid "Sales by User Margin"
-msgstr ""
+msgstr "Ventas por margen usuario"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -1510,7 +1532,7 @@ msgstr "Impuestos:"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_pos_order
msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Punto de venta. Estadísticas pedidos"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_product_product
@@ -1535,7 +1557,7 @@ msgstr "Líneas TPV"
#. module: point_of_sale
#: field:product.product,disc_controle:0
msgid "Discount Control"
-msgstr ""
+msgstr "Control descuento"
#. module: point_of_sale
#: field:report.cash.register,balance_end_real:0
@@ -1551,7 +1573,7 @@ msgstr "Detalles de ventas"
#. module: point_of_sale
#: field:pos.payment.report.date,date_end:0
msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
#. module: point_of_sale
#: field:pos.order,date_order:0
@@ -1562,25 +1584,26 @@ msgstr "Fecha venta"
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
msgid "Sales lines by Users"
-msgstr ""
+msgstr "Líneas de ventas por usuarios"
#. module: point_of_sale
#: field:res.company,max_diff:0
msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "Máxima diferencia para cajas registradoras"
#. module: point_of_sale
#: view:pos.close.statement:0
#: view:pos.confirm:0
#: view:pos.open.statement:0
msgid "Yes"
-msgstr ""
+msgstr "Sí"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:0
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
#. module: point_of_sale
#: view:pos.make.payment:0
@@ -1602,7 +1625,7 @@ msgstr "Descripción del producto"
#: field:pos.details,date_start:0
#: field:pos.sale.user,date_start:0
msgid "Date Start"
-msgstr ""
+msgstr "Fecha inicial"
#. module: point_of_sale
#: field:pos.order,amount_total:0
@@ -1623,13 +1646,13 @@ msgstr "Ventas por usuario"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
msgid "Open Cash Register"
-msgstr ""
+msgstr "Abrir registro de caja"
#. module: point_of_sale
#: report:account.statement:0
#: model:ir.actions.report.xml,name:point_of_sale.account_statement
msgid "Statement"
-msgstr ""
+msgstr "Extracto"
#. module: point_of_sale
#: field:pos.order,name:0
@@ -1639,7 +1662,7 @@ msgstr "Ref. venta"
#. module: point_of_sale
#: field:pos.make.payment,num_sale:0
msgid "Num.File"
-msgstr ""
+msgstr "Núm. fichero"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
@@ -1647,12 +1670,12 @@ msgstr ""
#: model:ir.model,name:point_of_sale.model_pos_payment_report
#: view:pos.payment.report:0
msgid "Payment Report"
-msgstr ""
+msgstr "Informe pago"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
msgid "Return lines"
-msgstr ""
+msgstr "Líneas de devolución"
#. module: point_of_sale
#: report:account.statement:0
@@ -1685,16 +1708,19 @@ msgid ""
"Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
msgstr ""
+"No se ha encontrado una línea de tarifa que concuerde con este producto y "
+"cantidad.\n"
+"Debe cambiar el producto, la cantidad o la tarifa."
#. module: point_of_sale
#: field:pos.order.line,serial_number:0
msgid "Serial Number"
-msgstr ""
+msgstr "Número de serie"
#. module: point_of_sale
#: view:pos.order:0
msgid "Reprint"
-msgstr ""
+msgstr "Reimprimir"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:0
@@ -1719,7 +1745,7 @@ msgstr "Venta TPV"
#: code:addons/point_of_sale/wizard/pos_payment.py:0
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
#. module: point_of_sale
#: report:pos.lines:0
@@ -1750,24 +1776,24 @@ msgstr "Último albarán de salida"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
msgid "Bank Statement Line"
-msgstr ""
+msgstr "Línea extracto bancario"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_account_bank_statement
msgid "Bank Statement"
-msgstr ""
+msgstr "Extracto bancario"
#. module: point_of_sale
#: report:pos.user.product:0
msgid "Ending Date"
-msgstr ""
+msgstr "Fecha final"
#. module: point_of_sale
#: view:report.sales.by.user.pos:0
#: view:report.sales.by.user.pos.month:0
#: view:report.transaction.pos:0
msgid "POS Report"
-msgstr ""
+msgstr "Informe TPV"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_discount
@@ -1793,27 +1819,27 @@ msgstr "Escanear código de barras"
#: field:pos.box.entries,product_id:0
#: field:pos.box.out,product_id:0
msgid "Operation"
-msgstr ""
+msgstr "Operación"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
#. module: point_of_sale
#: field:pos.order,journal_entry:0
msgid "Journal Entry"
-msgstr ""
+msgstr "Asiento contable"
#. module: point_of_sale
#: selection:report.cash.register,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
#. module: point_of_sale
#: report:pos.invoice:0
msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancelada"
#. module: point_of_sale
#: view:account.bank.statement:0
@@ -1825,12 +1851,12 @@ msgstr "Confirmar"
#. module: point_of_sale
#: report:pos.payment.report.date:0
msgid "Sales Lines"
-msgstr ""
+msgstr "Líneas ventas"
#. module: point_of_sale
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
#. module: point_of_sale
#: field:pos.discount,discount:0
@@ -1861,17 +1887,17 @@ msgstr "Informe"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
msgid "Products for Input Operations"
-msgstr ""
+msgstr "Productos para operaciones de entrada"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "Ventas de hoy por usuario actual"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_box_out
msgid "Pos Box Out"
-msgstr ""
+msgstr "TPV. Caja salida"
#. module: point_of_sale
#: sql_constraint:account.journal:0
@@ -1886,7 +1912,7 @@ msgstr "Configuración"
#. module: point_of_sale
#: report:pos.user.product:0
msgid "Starting Date"
-msgstr ""
+msgstr "Fecha inicial"
#. module: point_of_sale
#: field:pos.order,date_validation:0
@@ -1903,13 +1929,13 @@ msgstr "¡No tiene suficientes permisos para validar esta venta!"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
msgid "Invoices"
-msgstr ""
+msgstr "Facturas"
#. module: point_of_sale
#: selection:report.cash.register,month:0
#: selection:report.pos.order,month:0
msgid "December"
-msgstr ""
+msgstr "Diciembre"
#. module: point_of_sale
#: view:report.pos.order:0
@@ -1920,7 +1946,7 @@ msgstr "Descuento total"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Take Money"
-msgstr ""
+msgstr "Coger dinero"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_details
@@ -1931,14 +1957,14 @@ msgstr "Detalles de ventas"
#. module: point_of_sale
#: field:product.product,am_out:0
msgid "Control for Output Operations"
-msgstr ""
+msgstr "Control de las operaciones de salida"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
#, python-format
msgid "Message"
-msgstr ""
+msgstr "Mensaje"
#. module: point_of_sale
#: view:account.journal:0
@@ -1973,14 +1999,14 @@ msgstr "Facturado"
#. module: point_of_sale
#: report:pos.invoice:0
msgid "Must be after setLang()"
-msgstr ""
+msgstr "Debe estar después de setLang()"
#. module: point_of_sale
#: view:pos.close.statement:0
#: view:pos.confirm:0
#: view:pos.open.statement:0
msgid "No"
-msgstr ""
+msgstr "No"
#. module: point_of_sale
#: field:pos.order.line,notice:0
@@ -2006,12 +2032,12 @@ msgstr "Línea de venta TPV"
#. module: point_of_sale
#: view:pos.open.statement:0
msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "¿Seguro que desea abrir los extractos?"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_payment_report_date
msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "TPV. Informe de pago según la fecha"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -2065,7 +2091,7 @@ msgstr "Ventas por usuario"
#: selection:report.cash.register,month:0
#: selection:report.pos.order,month:0
msgid "November"
-msgstr ""
+msgstr "Noviembre"
#. module: point_of_sale
#: view:pos.receipt:0
@@ -2076,12 +2102,12 @@ msgstr "Imprimir recibo"
#: selection:report.cash.register,month:0
#: selection:report.pos.order,month:0
msgid "January"
-msgstr ""
+msgstr "Enero"
#. module: point_of_sale
#: view:pos.order.line:0
msgid "POS Orders lines"
-msgstr ""
+msgstr "TPV Líneas pedido"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:0
@@ -2092,7 +2118,7 @@ msgstr "Error"
#. module: point_of_sale
#: field:report.transaction.pos,journal_id:0
msgid "Sales Journal"
-msgstr ""
+msgstr "Diario de ventas"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -2110,12 +2136,12 @@ msgstr "Por favor, cree una factura para esta venta."
#: report:pos.sales.user.today:0
#: field:report.pos.order,date:0
msgid "Date Order"
-msgstr ""
+msgstr "Fecha pedido"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
msgid "Close Cash Registers"
-msgstr ""
+msgstr "Cerrar registros de caja"
#. module: point_of_sale
#: report:pos.details:0
@@ -2151,7 +2177,7 @@ msgstr "Subtotal neto"
#. module: point_of_sale
#: view:pos.order:0
msgid "Add product"
-msgstr ""
+msgstr "Añadir producto"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
@@ -2161,29 +2187,29 @@ msgstr "Informe de pagos"
#. module: point_of_sale
#: field:report.transaction.pos,jl_id:0
msgid "Cash Journals"
-msgstr ""
+msgstr "Diarios de caja"
#. module: point_of_sale
#: view:pos.details:0
msgid "POS Details :"
-msgstr ""
+msgstr "Detalles TPV:"
#. module: point_of_sale
#: report:pos.sales.user.today:0
msgid "Today's Sales By User"
-msgstr ""
+msgstr "Ventas de hoy por usuario"
#. module: point_of_sale
#: view:pos.box.entries:0
#: view:pos.box.out:0
msgid "Please fill these fields for entries to the box:"
-msgstr ""
+msgstr "Introduzca estos campos para asientos de la caja:"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_box_out.py:0
#, python-format
msgid "please check that account is set to %s"
-msgstr ""
+msgstr "Compruebe que la cuenta esté establecida a %s"
#. module: point_of_sale
#: field:pos.box.entries,name:0
@@ -2198,17 +2224,17 @@ msgstr "Descripción"
#: selection:report.cash.register,month:0
#: selection:report.pos.order,month:0
msgid "May"
-msgstr ""
+msgstr "Mayo"
#. module: point_of_sale
#: report:pos.lines:0
msgid "Sales lines"
-msgstr ""
+msgstr "Líneas ventas"
#. module: point_of_sale
#: field:pos.order,note:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Notas internas"
#. module: point_of_sale
#: view:pos.add.product:0
@@ -2218,19 +2244,19 @@ msgstr "Guardar y Cerrar"
#. module: point_of_sale
#: view:pos.order:0
msgid "Running"
-msgstr ""
+msgstr "En progreso"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
msgid "All Cashboxes Of the day"
-msgstr ""
+msgstr "Todas las cajas registradoras del día"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
#: view:report.pos.order:0
msgid "Point of Sale Analysis"
-msgstr ""
+msgstr "Análisis punto de venta"
#. module: point_of_sale
#: field:pos.make.payment,partner_id:0
@@ -2238,7 +2264,7 @@ msgstr ""
#: field:pos.order,partner_id:0
#: view:report.pos.order:0
msgid "Customer"
-msgstr ""
+msgstr "Cliente"
#. module: point_of_sale
#: field:pos.make.payment,is_acc:0
@@ -2252,7 +2278,7 @@ msgstr "Adelanto"
#: selection:report.cash.register,month:0
#: selection:report.pos.order,month:0
msgid "February"
-msgstr ""
+msgstr "Febrero"
#. module: point_of_sale
#: view:report.cash.register:0
@@ -2272,18 +2298,18 @@ msgstr ""
#. module: point_of_sale
#: field:pos.order,remboursed:0
msgid "Remboursed"
-msgstr ""
+msgstr "Reembolsado"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
msgid "Opened Sales"
-msgstr ""
+msgstr "Ventas abiertas"
#. module: point_of_sale
#: selection:report.cash.register,month:0
#: selection:report.pos.order,month:0
msgid "April"
-msgstr ""
+msgstr "Abril"
#. module: point_of_sale
#: field:pos.order,statement_ids:0
@@ -2312,7 +2338,7 @@ msgstr "Ventas por margen mensual de usuario"
#. module: point_of_sale
#: view:pos.order:0
msgid "Search Sales Order"
-msgstr ""
+msgstr "Buscar pedido de venta"
#. module: point_of_sale
#: field:pos.order,account_move:0
@@ -2326,13 +2352,13 @@ msgstr "Asiento contable"
#: view:pos.order:0
#, python-format
msgid "Make Payment"
-msgstr ""
+msgstr "Realizar pago"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
#: view:pos.sales.user.today:0
msgid "Sales User Today"
-msgstr ""
+msgstr "Ventas usuario de hoy"
#. module: point_of_sale
#: view:report.cash.register:0
@@ -2340,7 +2366,7 @@ msgstr ""
#: view:report.pos.order:0
#: field:report.pos.order,year:0
msgid "Year"
-msgstr ""
+msgstr "Año"
#~ msgid ","
#~ msgstr ","
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index c75a1aee4d5..0476fb03b31 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -647,7 +647,6 @@ class pos_order(osv.osv):
line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
inv_line['price_unit'] = line.price_unit
inv_line['discount'] = line.discount
- inv_line['account_id'] = acc
inv_line['name'] = inv_name
inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
and [(6, 0, inv_line['invoice_line_tax_id'])] or []
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index f13f274ac5c..b21ace7968f 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:58+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 12:08+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
@@ -233,6 +232,16 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" Este módulo muestra los procesos básicos en los\n"
+" que intervienen los módulos seleccionados, y\n"
+" la secuencia en la que ocurren.\n"
+"\n"
+" Note: Esto es aplicable a los módulos conteniendo "
+"nombredelmodulo_process_xml\n"
+" por ejemplo product/process/product_process_xml\n"
+"\n"
+" "
#. module: process
#: field:process.condition,model_states:0
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index 09865b3aa14..d544181a6e8 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -27,7 +27,7 @@ class company(osv.osv):
'schedule_range': fields.float('Scheduler Range Days', required=True,
help="This is the time frame analysed by the scheduler when "\
"computing procurements. All procurements that are not between "\
- "today and today+range are skipped for futur computation."),
+ "today and today+range are skipped for future computation."),
}
_defaults = {
'schedule_range': 80.0,
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index 5763582098b..c125550766e 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:15+0000\n"
-"Last-Translator: Carlos-smile \n"
+"PO-Revision-Date: 2010-12-27 18:12+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: procurement
@@ -47,6 +48,8 @@ msgstr "Agrupar por..."
#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
msgid "Draft procurement of the product and location of that orderpoint"
msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo"
#. module: procurement
#: code:addons/procurement/procurement.py:0
@@ -198,7 +201,7 @@ msgstr "Preparado"
#. module: procurement
#: field:procurement.order.compute.all,automatic:0
msgid "Automatic orderpoint"
-msgstr "Pedido automático"
+msgstr "Regla de stock mínimo automática"
#. module: procurement
#: field:mrp.property,composition:0
@@ -238,7 +241,7 @@ msgstr ""
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Órdenes de abastecimiento a procesar"
#. module: procurement
#: constraint:res.company:0
@@ -446,11 +449,14 @@ msgid ""
" This is the module for computing Procurements.\n"
" "
msgstr ""
+"\n"
+" Este es el módulo para calcular abastecimientos.\n"
+" "
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Órdenes de abastecimiento relacionadas"
#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -483,8 +489,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the "
"orderpoint without removing it."
msgstr ""
-"Si el campo activo es falso, le permitirá ocultar el punto de pedido sin "
-"eliminarlo."
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
#. module: procurement
#: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -554,6 +560,17 @@ msgid ""
"others require manual intervention (those are identified by a specific error "
"message)"
msgstr ""
+"Las órdenes de abastecimiento representan la necesidad de una determinada "
+"cantidad de productos, en un momento dado, en una ubicación determinada. Los "
+"pedidos de venta son una fuente típica de las órdenes de abastecimiento "
+"(pero estos son documentos distintos). Dependiendo de los parámetros de "
+"abastecimiento y la configuración de productos, el motor de abastecimientos "
+"tratará de satisfacer la necesidad de reservar los productos del stock, u "
+"ordenar productos de un proveedor, o crear una orden de producción, etc. Se "
+"produce una excepción de abastecimiento cuando el sistema no puede encontrar "
+"una manera de cumplir un abastecimiento. Algunas excepciones se resolverán "
+"de forma automática, pero otras requieren intervención manual (las que se "
+"identifican con un mensaje de error específico)."
#. module: procurement
#: view:procurement.order:0
@@ -610,7 +627,7 @@ msgstr "Ord. abastecimiento automática: %s"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
msgid "Automatic Order Point"
-msgstr "Orden automática"
+msgstr "Regla de stock mínimo automática"
#. module: procurement
#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
@@ -930,7 +947,7 @@ msgstr "Muy urgente"
#. module: procurement
#: field:procurement.orderpoint.compute,automatic:0
msgid "Automatic Orderpoint"
-msgstr "Punto de pedido automático"
+msgstr "Regla de stock mínimo automática"
#. module: procurement
#: view:procurement.order:0
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 34b1577ceba..8bb9d5c7897 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 08:19+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 06:22+0000\n"
+"Last-Translator: Phong Nguyen \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: procurement
@@ -628,7 +628,7 @@ msgstr ""
#: code:addons/procurement/procurement.py:0
#, python-format
msgid "Data Insufficient !"
-msgstr ""
+msgstr "Dữ liệu không đầy đủ !"
#. module: procurement
#: model:ir.model,name:procurement.model_mrp_property_group
@@ -640,12 +640,12 @@ msgstr ""
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Misc"
-msgstr ""
+msgstr "Các thứ khác"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Locations"
-msgstr ""
+msgstr "Các địa điểm"
#. module: procurement
#: selection:procurement.order,procure_method:0
@@ -655,7 +655,7 @@ msgstr ""
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "General Information"
-msgstr ""
+msgstr "Thông tin chung"
#. module: procurement
#: view:procurement.order:0
@@ -665,7 +665,7 @@ msgstr ""
#. module: procurement
#: selection:procurement.order,state:0
msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
#. module: procurement
#: help:stock.warehouse.orderpoint,qty_multiple:0
@@ -680,7 +680,7 @@ msgstr ""
#: view:procurement.order.compute.all:0
#: view:procurement.orderpoint.compute:0
msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
#. module: procurement
#: field:stock.warehouse.orderpoint,logic:0
@@ -690,12 +690,12 @@ msgstr ""
#. module: procurement
#: field:procurement.order,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Tài liệu gốc"
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Not urgent"
-msgstr ""
+msgstr "Không gấp"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order_compute_all
@@ -705,7 +705,7 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
msgid "Current"
-msgstr ""
+msgstr "Hiện tại"
#. module: procurement
#: view:board.board:0
@@ -715,7 +715,7 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
msgid "Details"
-msgstr ""
+msgstr "Các chi tiết"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.procurement_action5
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c25301b6603..37c300e03ab 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -245,9 +245,10 @@
+ name="Minimum Stock Rules"
+ res_model="stock.warehouse.orderpoint"
+ src_model="stock.warehouse"
+ groups="stock.group_stock_user"/>
+ src_model="product.product"
+ groups="stock.group_stock_user"/>
+ src_model="procurement.order"
+ groups="stock.group_stock_user"/>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 2e9b44edb63..5bbfa01266b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -34,8 +34,7 @@
view_mode="form"
target="new"
key2="client_action_multi"
- id="act_make_procurement"
- groups="base.group_extended"/>
+ id="act_make_procurement"/>
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 6570f6e0e04..2e8c50ffe89 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 21:09+0000\n"
+"PO-Revision-Date: 2010-12-27 18:02+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -156,6 +156,8 @@ msgid ""
"The minimal quantity to trigger this rule, expressed in the supplier UoM if "
"any or in the default UoM of the product otherrwise."
msgstr ""
+"La cantidad mínima para disparar esta regla, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
#. module: product
#: model:product.template,name:product.product_product_24_product_template
@@ -490,6 +492,8 @@ msgid ""
"Choose here the Unit of Measure in which the prices and quantities are "
"expressed below."
msgstr ""
+"Seleccione aquí la unidad de medida en que se expresarán los precios y las "
+"cantidades listadas."
#. module: product
#: field:product.price_list,qty4:0
@@ -707,6 +711,8 @@ msgid ""
"Product UoM if not empty, in the default unit of measure of the product "
"otherwise."
msgstr ""
+"La cantidad mínima a comprar a este proveedor, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
#. module: product
#: view:product.pricelist.item:0
@@ -719,6 +725,8 @@ msgid ""
"This price will be considered as a price for the supplier UoM if any or the "
"default Unit of Measure of the product otherwise"
msgstr ""
+"Este precio se considerará como el precio para la UdM del proveedor si "
+"existe o en la UdM por defecto del producto en caso contrario."
#. module: product
#: model:product.category,name:product.product_category_accessories
@@ -1219,6 +1227,25 @@ msgid ""
" Print product labels with barcode.\n"
" "
msgstr ""
+"\n"
+" Este es el módulo base para gestionar productos y tarifas en OpenERP.\n"
+"\n"
+" Los productos soportan variantes, distintos métodos de precios, "
+"información\n"
+" de proveedor, obtener para stock/pedido, distintas unidades de medida,\n"
+" empaquetado y propiedades.\n"
+"\n"
+" Soporte de tarifas:\n"
+" * Múltiple-nivel de descuento (por producto, categoría, cantidades)\n"
+" * Cálculo del precio basado en distintos criterios:\n"
+" * Otra tarifa,\n"
+" * Precio coste,\n"
+" * Precio lista,\n"
+" * Precio proveedor, ...\n"
+" Preferencias de tarifas por producto y/o empresas.\n"
+"\n"
+" Imprimir etiquetas de productos con códigos de barras.\n"
+" "
#. module: product
#: help:product.template,seller_delay:0
@@ -1371,6 +1398,9 @@ msgid ""
"gives highest priority to lowest sequence and stops as soon as a matching "
"item is found."
msgstr ""
+"Indica el orden en que los elementos de la tarifa serán comprobados. En la "
+"evaluación se da máxima prioridad a la secuencia más baja y se detiene tan "
+"pronto como se encuentra un elemento coincidente."
#. module: product
#: selection:product.template,type:0
@@ -1810,7 +1840,7 @@ msgstr "Nombre de este tipo de precio."
#. module: product
#: field:product.supplierinfo,product_uom:0
msgid "Supplier UoM"
-msgstr ""
+msgstr "UdM proveedor"
#. module: product
#: help:product.pricelist.version,date_start:0
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 2ddf87d94c9..f4fd3c04ac0 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-29 07:38+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 15:15+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -1338,7 +1338,7 @@ msgstr ""
#. module: product
#: selection:product.template,type:0
msgid "Consumable"
-msgstr "Materiał pomocniczy"
+msgstr "Pomocniczy"
#. module: product
#: help:product.price.type,currency_id:0
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 36644321589..4d36296ab2c 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -2116,6 +2116,6 @@ msgstr ""
#. module: product
#: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
msgstr ""
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 1468cd45200..ad11edff47c 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -541,7 +541,7 @@ class product_pricelist_item(osv.osv):
'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
'product_tmpl_id': fields.many2one('product.template', 'Product Template', ondelete='cascade', help="Set a template if this rule only apply to a template of product. Keep empty for all products"),
'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
- 'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"),
+ 'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
diff --git a/addons/product/product.py b/addons/product/product.py
index 372919f6212..c55105a1b16 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -805,5 +805,4 @@ class res_users(osv.osv):
_defaults = {
'groups_id': _get_group,
}
-
res_users()
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 563dad08f8d..642ef43caf9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -196,8 +196,8 @@
You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on.
-
-
+
+
Products
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 2e4e598fdfe..f80032c6f9a 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -1,18 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_uom_categ_manager","product.uom.categ manager","model_product_uom_categ","product.group_product_manager",1,1,1,1
-"access_product_uom_manager","product.uom manager","model_product_uom","product.group_product_manager",1,1,1,1
-"access_product_ul_manager","product.ul manager","model_product_ul","product.group_product_manager",1,1,1,1
-"access_product_category_manager","product.category manager","model_product_category","product.group_product_manager",1,1,1,1
-"access_product_template_manager","product.template manager","model_product_template","product.group_product_manager",1,1,1,1
-"access_product_product_manager","product.product manager","model_product_product","product.group_product_manager",1,1,1,1
-"access_product_packaging_manager","product.packaging manager","model_product_packaging","product.group_product_manager",1,1,1,1
-"access_product_supplierinfo_manager","product.supplierinfo manager","model_product_supplierinfo","product.group_product_manager",1,1,1,1
-"access_pricelist_partnerinfo_manager","pricelist.partnerinfo manager","model_pricelist_partnerinfo","product.group_product_manager",1,1,1,1
-"access_product_price_type_manager","product.price.type manager","model_product_price_type","product.group_product_manager",1,1,1,1
-"access_product_pricelist_type_manager","product.pricelist.type manager","model_product_pricelist_type","product.group_product_manager",1,1,1,1
-"access_product_pricelist_manager","product.pricelist manager","model_product_pricelist","product.group_product_manager",1,1,1,1
-"access_product_pricelist_version_manager","product.pricelist.version manager","model_product_pricelist_version","product.group_product_manager",1,1,1,1
-"access_product_pricelist_item_manager","product.pricelist.item manager","model_product_pricelist_item","product.group_product_manager",1,1,1,1
"access_product_uom_categ_user","product.uom.categ.user","model_product_uom_categ","base.group_user",1,0,0,0
"access_product_uom_user","product.uom.user","model_product_uom","base.group_user",1,0,0,0
"access_product_ul_user","product.ul.user","model_product_ul","base.group_user",1,0,0,0
@@ -28,6 +14,4 @@
"access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
"access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
"access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property","product.group_product_manager",1,1,1,1
-"access_product_group_res_partner","res_partner group_product_manager","base.model_res_partner","product.group_product_manager",1,1,1,1
"access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index ce33f8f6eec..fb015d860e1 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -5,9 +5,6 @@
Useability / Product UoS View
-
- Product Manager
-
Sales / Manager
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index 6f07fb1dc94..c12946db678 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,3 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,0,0,0
-"access_product_manufacturer_attribute_manager","product.manufacturer.attribute","model_product_manufacturer_attribute","product.group_product_manager",1,1,1,1
+"access_product_manufacturer_attribute sale_manager","product.manufacturer.attribute","model_product_manufacturer_attribute","base.group_sale_manager",1,1,1,1
+"access_product_manufacturer_attribute_purchasemanager","product.manufacturer.attribute purchasemanager","model_product_manufacturer_attribute","purchase.group_purchase_manager",1,1,1,1
+"access_product_manufacturer_attribute_stockmanager","product.manufacturer.attribute stockmanager","model_product_manufacturer_attribute","stock.group_stock_manager",1,1,1,1
+"access_product_manufacturer_attribute_mrpmanager","product.manufacturer.attribute mrpmanager","model_product_manufacturer_attribute","mrp.group_mrp_manager",1,1,1,1
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index a4d55aa1c22..74c15809aa3 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:50+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 12:10+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
@@ -107,6 +106,11 @@ msgid ""
"and other interesting indicators based on invoices. The wizard to launch\n"
"the report has several options to help you get the data you need.\n"
msgstr ""
+"\n"
+"Añade un menú de informes en los productos, que calcula ventas, compras,\n"
+"márgenes y otros indicadores interesantes en base a las facturas.\n"
+"El asistente ofrece varias opciones para ayudarle a obtener los datos que "
+"necesita.\n"
#. module: product_margin
#: view:product.product:0
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index cde2d514560..00ec98ab1e0 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
-
+
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index cb9cf4fcf6b..148bb2b611d 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-23 09:42+0000\n"
+"PO-Revision-Date: 2010-12-27 18:13+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_visible_discount
@@ -94,7 +94,7 @@ msgstr "¡Primero debe definir una tarifa para el proveedor!"
#. module: product_visible_discount
#: model:ir.model,name:product_visible_discount.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML no válido para la definición de la vista!"
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index ad73ca8bf3e..9c21d0bcd0e 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:44+0000\n"
+"PO-Revision-Date: 2010-12-27 18:15+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_tools
@@ -50,6 +50,8 @@ msgstr ""
#: help:misc_tools.installer,lunch:0
msgid "A simple module to help you to manage Lunch orders."
msgstr ""
+"Un módulo simple que le permite gestionar las órdenes de comida (pizzas, "
+"menús, ...)."
#. module: profile_tools
#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index c727123e2cc..aa67fd89b25 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:11+0000\n"
+"PO-Revision-Date: 2010-12-27 18:22+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
@@ -360,7 +360,7 @@ msgstr "Cabecera correo"
#. module: project
#: view:project.installer:0
msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Configure su aplicación de gestión de proyectos"
#. module: project
#: model:process.node,name:project.process_node_donetask0
@@ -790,7 +790,7 @@ msgstr "Nuevo título de la tarea delegada al usuario."
#. module: project
#: view:report.project.task.user:0
msgid " Month-1 "
-msgstr ""
+msgstr " Mes-1 "
#. module: project
#: view:project.installer:0
@@ -798,6 +798,8 @@ msgid ""
"Various OpenERP applications are available to manage your projects with "
"different level of control and flexibility."
msgstr ""
+"Están disponibles varias aplicaciones OpenERP para gestionar sus proyectos "
+"con varios niveles de control y flexibilidad."
#. module: project
#: view:project.vs.hours:0
@@ -1016,6 +1018,16 @@ msgid ""
"Project application in order to invoice the time spent on a task, you can "
"choose to invoice or not one project in the billing section."
msgstr ""
+"Un proyecto contiene un conjunto de tareas o actividades que se llevarán a "
+"cabo por el personal asignado. Un proyecto puede ser puesto en una "
+"jerarquía, como un hijo de un proyecto padre. Esto le permite diseñar la "
+"estructura de grandes proyectos con las distintas fases repartidas en el "
+"ciclo de duración del proyecto. Cada usuario puede configurar su proyecto "
+"por defecto en sus propias preferencias, con el fin de filtrar de forma "
+"automática las tareas o actividades en las que normalmente trabaja. Si ha "
+"personalizado la aplicación de proyectos con el fin de facturar el tiempo "
+"dedicado a una tarea, puede elegir si facturar o no un proyecto en la "
+"sección de facturación."
#. module: project
#: view:report.project.task.user:0
@@ -1132,7 +1144,7 @@ msgstr "Etapas"
#. module: project
#: view:project.installer:0
msgid "Configure"
-msgstr ""
+msgstr "Configurar"
#. module: project
#: view:project.project:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 34a47aba91b..f4c837e5d21 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,7 +41,8 @@
-
+
+
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 86f79857104..77dce617c7f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -2,7 +2,9 @@
-
+
report.project.task.user.tree
@@ -10,7 +12,7 @@
tree
-
+
@@ -43,13 +45,13 @@
report.project.task.user
graph
-
-
-
-
-
-
-
+
+
+
+
+
+
+
report.project.task.user.search
@@ -57,52 +59,52 @@
search
-
-
+
-
-
+
+
-
-
-
-
-
+ help="Previous Month"/>
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -149,7 +151,7 @@
This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.
-
+
@@ -187,7 +189,7 @@
-
+
tree
@@ -275,7 +277,7 @@
-
+
tree
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index fb237e88769..659948bc4d0 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -6,7 +6,7 @@
"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
"access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
"access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
@@ -21,3 +21,4 @@
"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
+"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","project.group_project_manager",1,1,1,1
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index acd3def4c24..2fe7bb2b0b9 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:28+0000\n"
+"PO-Revision-Date: 2010-12-27 18:23+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_caldav
@@ -333,7 +333,7 @@ msgstr "Recordar"
#. module: project_caldav
#: model:ir.module.module,description:project_caldav.module_meta_information
msgid " Synchronize between Project task and Caldav Vtodo."
-msgstr ""
+msgstr " Sincroniza entre tareas de proyecto y Caldav Vtodo."
#. module: project_caldav
#: view:project.task:0
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c4bee877127..4ca0fbf2279 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -174,9 +174,8 @@
-
-
-
+
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
old mode 100755
new mode 100644
index f5602f5ae4b..177533462a0
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,14 +1,11 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
-"access_project_issue","project.issue","model_project_issue","project_issue.group_project_supporter",1,1,1,1
"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
-"access_project_issue_report","project.issue.report","model_project_issue_report","project_issue.group_project_supporter",1,1,1,1
"access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
-"access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
-"access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
+"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
"access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
+"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index d0aeabafc05..c3119073a75 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -1,8 +1,5 @@
-
- Project / Support Manager
-
-
+
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index b26ed7044e3..2574ee627f0 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 20:03+0000\n"
+"PO-Revision-Date: 2010-12-27 18:26+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue_sheet
@@ -26,6 +26,10 @@ msgid ""
"Issues/Bugs Management in Project\n"
" "
msgstr ""
+"\n"
+" Este módulo añade el soporte de hojas de servicios para "
+"la gestión de incidencias/errores en proyectos\n"
+" "
#. module: project_issue_sheet
#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index b217445f938..d85ac14e12c 100644
--- a/addons/project_mailgate/i18n/es.po
+++ b/addons/project_mailgate/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:09+0000\n"
+"PO-Revision-Date: 2010-12-27 18:26+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mailgate
@@ -50,7 +50,7 @@ msgstr ""
#. module: project_mailgate
#: view:project.task:0
msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
#. module: project_mailgate
#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
diff --git a/addons/project_messages/i18n/es.po b/addons/project_messages/i18n/es.po
index 627b8e427ea..fc6b0a3f9b2 100644
--- a/addons/project_messages/i18n/es.po
+++ b/addons/project_messages/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:02+0000\n"
+"PO-Revision-Date: 2010-12-27 18:29+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_messages
@@ -37,7 +37,7 @@ msgstr "De"
#: model:ir.actions.act_window,name:project_messages.messages_form
#: model:ir.ui.menu,name:project_messages.menu_messages_form
msgid "Communication Messages"
-msgstr ""
+msgstr "Mensajes de comunicación"
#. module: project_messages
#: help:project.messages,to_id:0
@@ -97,6 +97,13 @@ msgid ""
" it to all the users.\n"
" "
msgstr ""
+"\n"
+" Este módulo proporciona la funcionalidad de enviar mensajes en un "
+"proyecto.\n"
+" Un usuario puede enviar mensajes individualmente a otro usuario. También "
+"puede enviarlos\n"
+" a todos los usuarios del proyecto.\n"
+" "
#. module: project_messages
#: view:project.messages:0
diff --git a/addons/project_planning/i18n/es.po b/addons/project_planning/i18n/es.po
index 128cc1e6bd9..9f382cc3b37 100644
--- a/addons/project_planning/i18n/es.po
+++ b/addons/project_planning/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-08 21:23+0000\n"
+"PO-Revision-Date: 2010-12-27 18:38+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_planning
@@ -423,6 +423,23 @@ msgid ""
"At the end of the month, the planning manager can also check if the encoded "
"timesheets are respecting the planned time on each analytic account.\n"
msgstr ""
+"\n"
+"Este módulo le permite gestionar sus planificaciones.\n"
+"\n"
+"Este módulo se basa en la contabilidad analítica y está totalmente integrado "
+"con\n"
+"* la codificación de hojas de servicios\n"
+"* las gestión de las vacaciones/fiestas\n"
+"* la gestión de proyectos\n"
+"\n"
+"De esta forma, cada responsable de departamento puede saber si alguien en su "
+"equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
+"en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
+"tareas.\n"
+"\n"
+"Al final del mes, el responsable de planificación también puede comprobar si "
+"las hojas de servicios codificadas están respetando el tiempo planificado en "
+"cada cuenta analítica.\n"
#. module: project_planning
#: model:ir.model,name:project_planning.model_res_company
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index dc89bcd4d31..46cc225153e 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -64,12 +64,12 @@ class report_account_analytic_planning(osv.osv):
ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
if ids_dept:
data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
- childs = map(lambda x: x['member_ids'], data_dept)
- childs = tools.flatten(childs)
- childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
- if user_id in childs:
- childs.remove(user_id)
- child_ids.extend(tools.flatten(childs))
+ children = map(lambda x: x['member_ids'], data_dept)
+ children = tools.flatten(children)
+ children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context)
+ if user_id in children:
+ children.remove(user_id)
+ child_ids.extend(tools.flatten(children))
set = {}
map(set.__setitem__, child_ids, [])
child_ids = set.keys()
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index aabf66e63f9..1cb56aa94a4 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:41+0000\n"
+"PO-Revision-Date: 2010-12-27 18:32+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
@@ -35,6 +35,10 @@ msgid ""
" then the deadline date and start date for all the tasks will "
"change accordingly "
msgstr ""
+"\n"
+" - Si la fecha de finalización del proyecto se cambia,\n"
+" la fecha límite y la fecha de inicio de todas las tares se "
+"cambiarán en consecuencia "
#. module: project_retro_planning
#: constraint:project.project:0
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index f14ccc27de6..92b3f6d7042 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-05-25 15:04+0000\n"
+"PO-Revision-Date: 2010-12-27 14:37+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
@@ -21,6 +21,7 @@ msgstr ""
#, python-format
msgid "No employee defined for user \"%s\". You must create one."
msgstr ""
+"Nie zdefiniowano pracownika dla użytkownika \"%s\". Musisz go utworzyć."
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
@@ -29,16 +30,18 @@ msgid ""
"No journal defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
msgstr ""
+"Nie zdefiniowano dziennika dla pracownika.\n"
+"Wprowadź w formularzu pracownika w zakładce karta pracy."
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_timesheettask0
msgid "Timesheet task"
-msgstr ""
+msgstr "Zadanie karty pracy"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Przeszukaj pozycje analityczne"
#. module: project_timesheet
#: field:project.task.work,hr_analytic_timesheet_id:0
@@ -48,49 +51,49 @@ msgstr "ID związanej karty czasu pracy"
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task_work
msgid "Project Task Work"
-msgstr ""
+msgstr "Praca w zadaniu"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "February"
-msgstr ""
+msgstr "Luty"
#. module: project_timesheet
#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Twórz faktury z pozycji zamówienia sprzedaży"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "October"
-msgstr ""
+msgstr "Październik"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,year:0
msgid "Year"
-msgstr ""
+msgstr "Rok"
#. module: project_timesheet
#: field:report.timesheet.task.user,task_hrs:0
msgid "Task Hours"
-msgstr ""
+msgstr "Godziny zadania"
#. module: project_timesheet
#: constraint:project.project:0
msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Błąd ! data początkowa projektu musi być mniejsza od daty końcowej."
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid " Year "
-msgstr ""
+msgstr " Rok "
#. module: project_timesheet
#: view:account.analytic.line:0
@@ -100,99 +103,99 @@ msgstr ""
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "March"
-msgstr ""
+msgstr "Marzec"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "August"
-msgstr ""
+msgstr "Sierpień"
#. module: project_timesheet
#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
msgid "Task invoice"
-msgstr ""
+msgstr "Faktura zadania"
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_taskwork0
msgid "Task Work"
-msgstr ""
+msgstr "Przebieg zadania"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "May"
-msgstr ""
+msgstr "Maj"
#. module: project_timesheet
#: constraint:project.task:0
msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "June"
-msgstr ""
+msgstr "Czerwiec"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "My Entries"
-msgstr ""
+msgstr "Moje zapisy"
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task
msgid "Task"
-msgstr ""
+msgstr "Zadanie"
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
#. module: project_timesheet
#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,user_id:0
msgid "User"
-msgstr ""
+msgstr "Użytkownik"
#. module: project_timesheet
#: constraint:project.project:0
msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Błąd! Nie możesz wiązać przedziału do tego samego projektu!"
#. module: project_timesheet
#: field:report.timesheet.task.user,name:0
msgid "Date"
-msgstr ""
+msgstr "Data"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "July"
-msgstr ""
+msgstr "Lipiec"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_timesheettask0
msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Uzupełnij swją kartę pracy"
#. module: project_timesheet
#: view:project.project:0
msgid "Invoiceable"
-msgstr ""
+msgstr "Do fakturowania"
#. module: project_timesheet
#: view:project.project:0
msgid "Customer"
-msgstr ""
+msgstr "Klient"
#. module: project_timesheet
#: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -209,47 +212,47 @@ msgstr ""
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Account"
-msgstr ""
+msgstr "Konto"
#. module: project_timesheet
#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
#. module: project_timesheet
#: field:report.timesheet.task.user,timesheet_hrs:0
msgid "Timesheet Hours"
-msgstr ""
+msgstr "Godziny karty czasu pracy"
#. module: project_timesheet
#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
msgid "Task encoding"
-msgstr ""
+msgstr "Zapis zadania"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Podsumowanie zadania wchodzi do pozycji karty czasu pracy"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "January"
-msgstr ""
+msgstr "Styczeń"
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
msgid "Trigger Invoice"
-msgstr ""
+msgstr "Wyzwól fakturę"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "November"
-msgstr ""
+msgstr "Listopad"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid "Tasks by User"
-msgstr ""
+msgstr "Zadania wg użytkowników"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
@@ -258,73 +261,75 @@ msgid ""
"No product defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
msgstr ""
+"Nie zdefiniowano produktu dla użytkownika.\n"
+"Uzupełnij zakładkę karty czasu pracy na formularzu pracownika."
#. module: project_timesheet
#: view:account.analytic.line:0
#: model:ir.model,name:project_timesheet.model_project_project
msgid "Project"
-msgstr ""
+msgstr "Projekt"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "April"
-msgstr ""
+msgstr "Kwiecień"
#. module: project_timesheet
#: view:project.project:0
msgid "Invoicing Data"
-msgstr ""
+msgstr "Dane fakturowane"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Fin.Account"
-msgstr ""
+msgstr "Konto fin."
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid " Month "
-msgstr ""
+msgstr " Miesiąc "
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Raport godzin karty czasu pracy/zadania na miesiąc"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
#, python-format
msgid "Bad Configuration !"
-msgstr ""
+msgstr "Błędna konfiguracja !"
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
msgid "Invoicing"
-msgstr ""
+msgstr "Fakturowanie"
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_taskwork0
msgid "Work on task"
-msgstr ""
+msgstr "Przebieg zadania"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid " Month-1 "
-msgstr ""
+msgstr " Miesiąc-1 "
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "September"
-msgstr ""
+msgstr "Wrzesień"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "December"
-msgstr ""
+msgstr "Grudzień"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Kiedy zadanie jest wypełnione, utwórz do niego fakturę."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
@@ -335,7 +340,7 @@ msgstr ""
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,month:0
msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
#. module: project_timesheet
#: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -345,12 +350,12 @@ msgstr "Karta czasu pracy projektu"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Zapisz czas spędzony na zadaniu"
#. module: project_timesheet
#: view:project.project:0
msgid "Invoice Task Work"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
@@ -360,18 +365,20 @@ msgid ""
"employee.\n"
"Fill in the timesheet tab of the employee form."
msgstr ""
+"Nie zdefiniowano produktu ani kategorii produktu dla pracownika.\n"
+"Uzupełnij zakładkę karty czasu pracy na formularzu pracownika."
#. module: project_timesheet
#: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
#: view:report.timesheet.task.user:0
msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Godziny zadania na miesiąc"
#. module: project_timesheet
#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
msgid "Fill Timesheet"
-msgstr ""
+msgstr "Wypełnij kartę czasu pracy"
#. module: project_timesheet
#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -379,3 +386,5 @@ msgid ""
"This lists show you every task work you can invoice to the customer. Select "
"the lines in order to generate the invoices automatically."
msgstr ""
+"Ta lista pokazuje ci wszystkie zadania, które można zafakturować na klienta. "
+"Wybierz pozycje, aby automatycznie utworzyć fakturę."
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f66d769891a..cf3c9ea2e45 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 14:12+0000\n"
-"Last-Translator: Carlos-smile \n"
+"PO-Revision-Date: 2010-12-27 22:30+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\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: 2010-12-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -94,7 +95,7 @@ msgstr "¿Desea generar las facturas de proveedor?"
#: code:addons/purchase/purchase.py:0
#, python-format
msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "El proveedor seleccionado sólo vende este producto por %s"
#. module: purchase
#: code:addons/purchase/wizard/purchase_line_invoice.py:0
@@ -596,7 +597,7 @@ msgstr "Para facturar"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
msgid "Pricelists"
-msgstr ""
+msgstr "Tarifas"
#. module: purchase
#: field:purchase.report,partner_address_id:0
@@ -623,7 +624,7 @@ msgstr ""
#. module: purchase
#: help:purchase.order,invoice_ids:0
msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Facturas generadas para un pedido de compra"
#. module: purchase
#: code:addons/purchase/purchase.py:0
@@ -854,7 +855,7 @@ msgstr "Abastecimiento"
#: view:purchase.order:0
#: field:purchase.order,invoice_ids:0
msgid "Invoices"
-msgstr ""
+msgstr "Facturas"
#. module: purchase
#: model:process.node,note:purchase.process_node_purchaseorder0
@@ -1017,6 +1018,9 @@ msgid ""
"the buyer. Depending on the Invoicing control of the purchase order, the "
"invoice is based on received or on ordered quantities."
msgstr ""
+"Un pedido de compra genera una factura de proveedor, tan pronto como la "
+"confirme el comprador. En función del control de facturación del pedido de "
+"compra, la factura se basa en las cantidades recibidas u ordenadas."
#. module: purchase
#: field:purchase.order,amount_untaxed:0
@@ -1119,6 +1123,10 @@ msgid ""
"your receptions. Once you receive a supplier invoice, you can control it "
"according to the draft of invoice and validate it."
msgstr ""
+"Utilice este menú para controlar las facturas que se reciban de su "
+"proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de "
+"compra o de sus recepciones. Una vez que reciba una factura de proveedor, "
+"puede compararla con la factura borrador y validarla."
#. module: purchase
#: code:addons/purchase/wizard/purchase_order_group.py:0
@@ -1168,6 +1176,8 @@ msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
"less."
msgstr ""
+"El proveedor seleccionado tiene establecida una cantidad mínima a %s, no "
+"puede comprar menos."
#. module: purchase
#: selection:purchase.report,month:0
@@ -1456,6 +1466,11 @@ msgid ""
"Purchase Order and generate the next steps: draft reception of the products, "
"invoice to control."
msgstr ""
+"Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de "
+"presupuesto, revisar las existentes y confirmarlas una vez la oferta del "
+"proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, "
+"OpenERP lo convertirá en un pedido de compra y generará los siguientes "
+"pasos: recepción en borrador de los productos, factura de control."
#. module: purchase
#: field:purchase.order.line,date_planned:0
@@ -1709,7 +1724,7 @@ msgstr "Total"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
msgid "Pricelist Versions"
-msgstr ""
+msgstr "Versiones de tarifa"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1760,6 +1775,9 @@ msgid ""
"order is 'On order'. The invoice can also be generated manually by the "
"accountant (Invoice control = Manual)."
msgstr ""
+"Se crea automáticamente la factura si el control de facturación del pedido "
+"de compra es 'Desde pedido'. La factura también puede ser generada "
+"manualmente por el contable (control facturación = Manual)."
#. module: purchase
#: view:purchase.report:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3a768a4c218..0de19189fc3 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -220,6 +220,9 @@ class purchase_order(osv.osv):
'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
}
+ _sql_constraints = [
+ ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+ ]
_name = "purchase.order"
_description = "Purchase Order"
_order = "name desc"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d08f602d158..c2a01c5b846 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -259,7 +259,7 @@
With the Requests for Quotation menu you can create new requests for quotations, review existing ones or turn them into a purchase order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, draft invoice to control.
+ sequence="6"/>
Purchase Orders
@@ -407,6 +407,7 @@
context="{'search_default_partner_id': [active_id]}"
id="act_res_partner_2_purchase_order"
name="Purchase Orders"
+ groups="purchase.group_purchase_user"
res_model="purchase.order"
src_model="res.partner"/>
@@ -416,7 +417,7 @@
name="Purchases"
res_model="purchase.order.line"
src_model="product.product"
- groups="base.group_extended"/>
+ groups="purchase.group_purchase_user"/>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index f30d65d8f28..8c5510852ca 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -52,7 +52,7 @@ class purchase_report(osv.osv):
'date_approve':fields.date('Date Approved', readonly=True),
'expected_date':fields.date('Expected Date', readonly=True),
'validator' : fields.many2one('res.users', 'Validated By', readonly=True),
- 'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True),
+ 'product_uom' : fields.many2one('product.uom', 'Reference UoM', required=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
'delay':fields.float('Days to Validate', digits=(16,2), readonly=True),
@@ -92,16 +92,20 @@ class purchase_report(osv.osv):
s.company_id as company_id,
l.product_id,
t.categ_id as category_id,
- l.product_uom as product_uom,
+ (case when u.uom_type not in ('reference') then
+ (select id from product_uom where uom_type='reference' and category_id = 1)
+ else
+ u.id
+ end) as product_uom,
s.location_id as location_id,
- sum(l.product_qty*u.factor) as quantity,
+ sum(l.product_qty/u.factor) as quantity,
extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
count(*) as nbr,
(l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
avg(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))::decimal(16,2) as negociation,
sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
- (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
+ (sum(l.product_qty*l.price_unit)/sum(l.product_qty/u.factor))::decimal(16,2) as price_average
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
left join product_product p on (l.product_id=p.id)
@@ -131,7 +135,10 @@ class purchase_report(osv.osv):
to_char(s.date_order, 'MM'),
to_char(s.date_order, 'YYYY-MM-DD'),
s.state,
- s.warehouse_id
+ s.warehouse_id,
+ u.uom_type,
+ u.category_id,
+ u.id
)
""")
purchase_report()
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 8bf381b4d41..7f52ca73cf0 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -101,7 +101,7 @@
-
+
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 7857fa4586d..95f433247c5 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -7,10 +7,10 @@
"access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","group_purchase_user",1,0,0,0
"access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","group_purchase_user",1,1,1,1
"access_stock_move_purchase_user","stock.move","stock.model_stock_move","group_purchase_user",1,1,1,1
-"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,1,1,0
-"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,1,0
+"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0
+"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
"access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0
-"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,1,1,1
+"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,0,0,0
"access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0
"access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","group_purchase_manager",1,1,1,1
"access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","group_purchase_manager",1,0,0,0
@@ -36,11 +36,32 @@
"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0
"access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
-"access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1
+"access_account_move","account.move","account.model_account_move","group_purchase_user",1,0,0,0
"access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,0,0,0
"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,0,0,0
"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,0,0,0
-"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,1,1,1
+"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,0,0,0
"access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,0,1,0
-"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,0,1,0
+"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,1,1,0
+"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,1,1,0
+"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,1
+"access_product_uom_categ_purchase_manager","product.uom.categ purchase_manager","product.model_product_uom_categ","purchase.group_purchase_manager",1,1,1,1
+"access_product_uom_purchase_manager","product.uom purchase_manager","product.model_product_uom","purchase.group_purchase_manager",1,1,1,1
+"access_product_ul_purchase_manager","product.ul purchase_manager","product.model_product_ul","purchase.group_purchase_manager",1,1,1,1
+"access_product_category_purchase_manager","product.category purchase_manager","product.model_product_category","purchase.group_purchase_manager",1,1,1,1
+"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","purchase.group_purchase_manager",1,1,1,1
+"access_product_product_purchase_manager","product.product purchase_manager","product.model_product_product","purchase.group_purchase_manager",1,1,1,1
+"access_product_packaging_purchase_manager","product.packaging purchase_manager","product.model_product_packaging","purchase.group_purchase_manager",1,1,1,1
+"access_product_supplierinfo_purchase_manager","product.supplierinfo purchase_manager","product.model_product_supplierinfo","purchase.group_purchase_manager",1,1,1,1
+"access_pricelist_partnerinfo_purchase_manager","pricelist.partnerinfo purchase_manager","product.model_pricelist_partnerinfo","purchase.group_purchase_manager",1,1,1,1
+"access_product_price_type_purchase_manager","product.price.type purchase_manager","product.model_product_price_type","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_type_purchase_manager","product.pricelist.type purchase_manager","product.model_product_pricelist_type","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_purchase_manager","product.pricelist purchase_manager","product.model_product_pricelist","purchase.group_purchase_manager",1,1,1,1
+"access_ir_property_group_purchase_manager","ir_property group_purchase_manager","base.model_ir_property","purchase.group_purchase_manager",1,1,1,1
+"access_product_group_res_partner_purchase_manager","res_partner group_purchase_manager","base.model_res_partner","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_version_purchase_manager","product.pricelist.version purchase_manager","product.model_product_pricelist_version","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_item_purchase_manager","product.pricelist.item purchase_manager","product.model_product_pricelist_item","purchase.group_purchase_manager",1,1,1,1
+"access_account_account_purchase_manager","account.account purchase manager","account.model_account_account","purchase.group_purchase_manager",1,0,0,0
+"access_account_journal_purchase_manager","account.journal purchase manager","account.model_account_journal","purchase.group_purchase_manager",1,0,0,0
+"access_stock_tracking_purchase_user","stock.tracking purchase.user","stock.model_stock_tracking","purchase.group_purchase_user",1,1,1,0
+"access_stock_location_purchase_manager","stock.location purchase manager","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index f2f94bf2341..d50d57ec562 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:47+0000\n"
+"PO-Revision-Date: 2010-12-27 18:53+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase_analytic_plans
@@ -39,6 +39,10 @@ msgid ""
" The base module to manage analytic distribution and purchase orders.\n"
" "
msgstr ""
+"\n"
+" El módulo base para gestionar distribuciones analíticas y pedidos de "
+"compra.\n"
+" "
#. module: purchase_analytic_plans
#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
index 823e73c7400..1bff501da60 100644
--- a/addons/report_designer/i18n/es.po
+++ b/addons/report_designer/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:24+0000\n"
+"PO-Revision-Date: 2010-12-27 18:58+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_designer
@@ -32,7 +32,7 @@ msgstr "Constructor de consultas"
#. module: report_designer
#: view:report_designer.installer:0
msgid "Configure"
-msgstr ""
+msgstr "Configurar"
#. module: report_designer
#: view:report_designer.installer:0
@@ -65,11 +65,13 @@ msgid ""
"OpenERP's built-in reporting abilities can be improved even further with "
"some of the following applications"
msgstr ""
+"Las capacidades de generación de informes incorporadas en OpenERP pueden ser "
+"mejoradas aún más con algunas de las siguientes aplicaciones"
#. module: report_designer
#: view:report_designer.installer:0
msgid "Configure Reporting Tools"
-msgstr ""
+msgstr "Configure las herramientas de informes"
#. module: report_designer
#: help:report_designer.installer,base_report_creator:0
@@ -87,6 +89,9 @@ msgid ""
"OpenOffice.Once you have modified it you can upload the report using the "
"same wizard."
msgstr ""
+"Añade asistentes para importar/exportar informes .SXW que puede modificar en "
+"OpenOffice. Una vez que lo haya modificado, puede subir el informe con el "
+"mismo asistente."
#. module: report_designer
#: model:ir.module.module,description:report_designer.module_meta_information
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 354a0255c5b..c8aead6e999 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:01+0000\n"
+"PO-Revision-Date: 2010-12-27 18:59+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
@@ -197,6 +197,10 @@ msgid ""
" This module gives the details of the goods traded between the countries "
"of European Union "
msgstr ""
+"\n"
+" Un módulo que añade informes intrastat.\n"
+" Este módulo proporciona información de las mercancías comercializadas "
+"entre los países de la Unión Europea. "
#. module: report_intrastat
#: model:ir.model,name:report_intrastat.model_res_country
diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index 55218658330..f1a72c60072 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,4 +1,7 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1
"access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0
-"access_report_intrastat_code_product_manager","report.intrastat.code product manager","model_report_intrastat_code","product.group_product_manager",1,1,1,1
+"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
+"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
+"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
+"access_report_intrastat_code_mrp_manager","report.intrastat.code mrp manager","model_report_intrastat_code","mrp.group_mrp_manager",1,1,1,1
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
new file mode 100644
index 00000000000..c2ad43f223c
--- /dev/null
+++ b/addons/report_webkit/i18n/pl.po
@@ -0,0 +1,562 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-27 14:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"Language-Team: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "WebKit Header"
+msgstr "Nagłówek Webkit"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Szablon Webkit (stosowany nie znaleziono pliku raportu)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Header IMG"
+msgstr ""
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "Ścieżka plików wykonywalnych Webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger 28 431.8 x 279.4 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Typ obrazu (png,gif,jpeg)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4 7.5 x 10 inches, 190.5 x 254 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7 21 88 x 125 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit render"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27 210 x 330 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+" ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+" ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+" ' path to the executable on the Company form."
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Nazwa obrazu"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+" 'Given path is not executable or path is "
+"wrong"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit raise an error"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal 3 8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Header HTML"
+msgstr "Nagłówek HTML"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4 0 210 x 297 mm, 8.26 x 11.69 inches"
+msgstr ""
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2 17 500 x 707 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr ""
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0 5 841 x 1189 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24 163 x 229 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:0
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Połączenia z akcjami klienta"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "Dostępne obrazy"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1 15 707 x 1000 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1 6 594 x 841 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "Nagłówek związany z raportem"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.module.module,description:report_webkit.module_meta_information
+msgid ""
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"The module allows:\n"
+" -HTML report definition\n"
+" -Multi header support \n"
+" -Multi logo\n"
+" -Multi company support\n"
+" -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+" -JavaScript support \n"
+" -Raw HTML debugger\n"
+" -Book printing capabilities\n"
+" -Margins definition \n"
+" -Paper size definition\n"
+"and much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company\n"
+"\n"
+"The library to install can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you "
+"need to set the\n"
+"path to the wkthtmltopdf executable file on the Company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+" http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"\n"
+"TODO :\n"
+"JavaScript support activation deactivation\n"
+"Collated and book format support\n"
+"Zip return for separated PDF\n"
+"Web client WYSIWYG\n"
+" "
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Wybierz rozmiar papieru"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5 1 176 x 250 mm, 6.93 x 9.84 inches"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Content and styling"
+msgstr "Zawartość i styl"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7 11 74 x 105 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6 10 105 x 148 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr ""
+"Ten szablon będzie zastosowany, jeśli nie będzie pliku głównego raportu"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Górny margines (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "Ustaw nagłówek w ustawieniach firmy"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr ""
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+"Zaznacz to, aby dodać akcję Drukuj w prawym panelu odpowiednich typów "
+"dokumentów."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3 18 353 x 500 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "Włącz debugger silnika webkit"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Obraz"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Dostępny html"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+"Zaznacz to, aby zobaczyć dodane akcje drukowania po ich utworzeniu (podgląd "
+"techniczny) "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Obrazy"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Pionowo"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Poziomo"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "page setup"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8 22 62 x 88 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2 7 420 x 594 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Dodaj przycisk drukowania"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9 13 37 x 52 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "Dolny margines (mm)"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "Akcje Webkit"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "Otwórz dodaną akcję"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Prawy margines (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orientacja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6 20 125 x 176 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "Ustaw nagłówek raportu webkit"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Rozmiar papieru"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10 16 31 x 44 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "Nagłówek CSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4 19 250 x 353 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3 8 297 x 420 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid ""
+"'))\n"
+" header = report_xml.webkit_header.html\n"
+" footer = report_xml.webkit_header.footer_html\n"
+" if not header and report_xml.header:\n"
+" raise except_osv(\n"
+" _('No header defined for this Webkit report!"
+msgstr ""
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid "Complete (Absolute) path to the wkhtmltopdf executable."
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "Stopka webkit"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0 14 1000 x 1414 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Szablon Webkit"
+
+#. module: report_webkit
+#: model:ir.module.module,shortdesc:report_webkit.module_meta_information
+msgid "Webkit Report Engine"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Nazwa"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5 9 148 x 210 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8 12 52 x 74 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "Dodaj przyciski drukowania"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25 105 x 241 mm, U.S. Common 10 Envelope"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "Nie znaleziono szablonu raportu webkit"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Lewy margines (mm)"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Nagłówki"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "Ustaw stopkę raportu webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9 23 33 x 62 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 8e0c8c91ef0..258183634a2 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-16 18:07+0000\n"
-"Last-Translator: Carlos-smile \n"
+"PO-Revision-Date: 2010-12-27 19:04+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: resource
@@ -212,6 +213,15 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" Módulo para la gestión de recursos\n"
+" Un recurso representa algo que puede ser programado en un calendario\n"
+" (un desarrollador en una tarea o un centro de producción en órdenes de "
+"producción).\n"
+" Este módulo gestiona un recurso calendario asociado a cada recurso.\n"
+" También gestiona las ausencias de cada recurso.\n"
+"\n"
+" "
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 18ba8bb037b..576ee965121 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -4,3 +4,5 @@
"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,0,0,0
"access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
"access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
+
+
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 82fdc3d1d3b..7c2ae788bf7 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -17,9 +17,9 @@
-
-
-
+
+
+
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 1a72359a164..97aaecbc18e 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-20 14:38+0000\n"
+"PO-Revision-Date: 2010-12-27 13:49+0000\n"
"Last-Translator: Dimitris Andavoglou \n"
"Language-Team: Greek \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -215,6 +215,8 @@ msgid ""
"The invoice is created automatically if the shipping policy is 'Invoice from "
"pick' or 'Invoice on order after delivery'."
msgstr ""
+"Το τιμολόγιο δημιουργείται αυτόματα εάν η πολιτική αποστολής είναι "
+"'Τιμολόγιο από παραλαβή' ή 'Τιμολόγιο με παραγγελία μετά την παραλαβή'."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
@@ -254,7 +256,7 @@ msgstr "Συσκευασία"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
msgid "From a sales order"
-msgstr ""
+msgstr "Από παραγγελία πώλησης"
#. module: sale
#: field:sale.shop,name:0
@@ -308,7 +310,7 @@ msgstr ""
#. module: sale
#: view:sale.installer:0
msgid "Configure"
-msgstr ""
+msgstr "Παραμετροποίηση"
#. module: sale
#: constraint:stock.move:0
@@ -330,7 +332,7 @@ msgstr "Ιούνιος"
#: code:addons/sale/sale.py:0
#, python-format
msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Δεν μπορεί να κυρωθεί αυτή η παραγγελία πώλησης !"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
@@ -340,7 +342,7 @@ msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Ο αναλυτικός λογαριασμός που σχετίζεται με την παραγγελία πώλησης"
#. module: sale
#: selection:sale.report,month:0
@@ -350,12 +352,12 @@ msgstr "Οκτώβριος"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Διέυθυνση αποστολής για την τρέχουσα παραγγελία πώλησης."
#. module: sale
#: help:sale.order,pricelist_id:0
msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
#. module: sale
#: selection:sale.config.picking_policy,step:0
@@ -1485,7 +1487,7 @@ msgstr ""
#. module: sale
#: help:sale.order,date_confirm:0
msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Ημερομηνία στην οποία η παραγγελία πώλησης επιβεβαιώνεται."
#. module: sale
#: field:sale.order,company_id:0
@@ -1517,6 +1519,8 @@ msgstr "Εξαίρεση Τιμολογίου"
msgid ""
"This is a list of picking that has been generated for this sales order."
msgstr ""
+"Αυτή είναι μια λίστα παραλαβών που δημιουργήθηκε γι' αυτήν την παραγγελία "
+"πώλησης."
#. module: sale
#: help:sale.installer,sale_margin:0
@@ -1555,12 +1559,12 @@ msgstr " Μήνας "
#: view:sale.report:0
#: field:sale.report,uom_name:0
msgid "Default UoM"
-msgstr ""
+msgstr "Προεπιλεγμένη ΜΜ"
#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
-msgstr ""
+msgstr "Ημερομηνία Επιβεβαίωσης"
#. module: sale
#: code:addons/sale/wizard/sale_line_invoice.py:0
@@ -1812,7 +1816,7 @@ msgstr "Απευθείας Παράδοση"
#. module: sale
#: field:sale.installer,sale_journal:0
msgid "Invoicing journals"
-msgstr ""
+msgstr "Ημερολόγια Τιμολόγησης"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
@@ -1836,6 +1840,8 @@ msgstr "Το Τιμολόγιό σας δημιουργήθηκε επιτυχώ
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
+"Πρέπει πρώτα να ακυρώσεις όλα τα τιμολόγια που συνδέονται με αυτήν την "
+"παραγγελία πώλησης."
#. module: sale
#: selection:sale.report,month:0
@@ -1889,7 +1895,7 @@ msgstr "Ημερομηνία Παραγγελίας"
#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Επιβεβαιωμένη παραγγελία πώλησης για τιμολόγηση."
#. module: sale
#: code:addons/sale/sale.py:0
@@ -1901,7 +1907,7 @@ msgstr ""
#: code:addons/sale/sale.py:0
#, python-format
msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "Η παραγγελία πώλησης '%s' είναι σε κατάσταση πρόχειρη."
#. module: sale
#: selection:sale.order.line,type:0
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index c61cf4c3d2a..f0df9f0f627 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-26 07:49+0000\n"
+"PO-Revision-Date: 2010-12-27 23:16+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -66,7 +66,7 @@ msgstr "Configurar logística pedidos de venta"
#: code:addons/sale/sale.py:0
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
#. module: sale
#: selection:sale.order,order_policy:0
@@ -87,7 +87,7 @@ msgstr "IVA"
#. module: sale
#: model:process.node,note:sale.process_node_saleorderprocurement0
msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
#. module: sale
#: selection:sale.config.picking_policy,picking_policy:0
@@ -230,7 +230,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Ventas. Realizar factura"
#. module: sale
#: view:sale.order:0
@@ -265,7 +265,7 @@ msgstr "Empaquetado"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
msgid "From a sales order"
-msgstr ""
+msgstr "Desde un pedido de venta"
#. module: sale
#: field:sale.shop,name:0
@@ -344,7 +344,7 @@ msgstr "Junio"
#: code:addons/sale/sale.py:0
#, python-format
msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "¡No se puede cancelar este pedido de venta!"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
@@ -354,7 +354,7 @@ msgstr "Estadísticas pedidos de venta"
#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "La cuenta analítica relacionada con un pedido de venta."
#. module: sale
#: selection:sale.report,month:0
@@ -364,12 +364,12 @@ msgstr "Octubre"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Dirección de envío para el pedido de venta actual."
#. module: sale
#: help:sale.order,pricelist_id:0
msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Tarifa para el pedido de venta actual."
#. module: sale
#: selection:sale.config.picking_policy,step:0
@@ -423,12 +423,16 @@ msgid ""
"The salesman confirms the quotation. The state of the sales order becomes "
"'In progress' or 'Manual in progress'."
msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
#. module: sale
#: code:addons/sale/sale.py:0
@@ -458,6 +462,8 @@ msgid ""
"You cannot make an advance on a sales order "
"that is defined as 'Automatic Invoice after delivery'."
msgstr ""
+"No puede realizar un anticipo de un pedido de venta que está definido como "
+"'Factura automática después envío'."
#. module: sale
#: view:sale.order:0
@@ -470,7 +476,7 @@ msgstr "Notas"
#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Dirección de facturación para el pedido de venta actual."
#. module: sale
#: view:sale.installer:0
@@ -506,7 +512,7 @@ msgstr "Marzo"
#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
-msgstr ""
+msgstr "El importe total."
#. module: sale
#: field:sale.order.line,price_subtotal:0
@@ -524,6 +530,8 @@ msgid ""
"For every sales order line, a procurement order is created to supply the "
"sold product."
msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
#. module: sale
#: view:board.board:0
@@ -536,6 +544,8 @@ msgid ""
"Incoterm which stands for 'International Commercial terms' implies its a "
"series of sales terms which are used in the commercial transaction."
msgstr ""
+"Incoterm que significa 'Términos de Comercio Internacional \"implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -561,13 +571,13 @@ msgstr "# de líneas"
#. module: sale
#: model:ir.model,name:sale.model_sale_open_invoice
msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Ventas. Abrir factura"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
#. module: sale
#: view:sale.config.picking_policy:0
@@ -663,7 +673,7 @@ msgstr "Todos los presupuestos"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Facturar pedido después de envío"
#. module: sale
#: selection:sale.report,month:0
@@ -712,7 +722,7 @@ msgstr "Ventas por mes"
#: code:addons/sale/sale.py:0
#, python-format
msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "¡No se puede cancelar línea pedido de venta!"
#. module: sale
#: field:res.company,security_lead:0
@@ -740,6 +750,8 @@ msgid ""
"It indicates that the sales order has been delivered. This field is updated "
"only after the scheduler(s) have been launched."
msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
#. module: sale
#: view:sale.report:0
@@ -777,7 +789,7 @@ msgstr ""
#: model:ir.model,name:sale.model_sale_shop
#: view:sale.shop:0
msgid "Sales Shop"
-msgstr ""
+msgstr "Tienda ventas"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -838,6 +850,7 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sales order line that has already been invoiced !"
msgstr ""
+"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
#. module: sale
#: view:sale.order:0
@@ -956,7 +969,7 @@ msgstr "Dirección de envío :"
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
-msgstr ""
+msgstr "Estado borrador del pedido de venta"
#. module: sale
#: model:process.transition,name:sale.process_transition_deliver0
@@ -997,6 +1010,7 @@ msgstr "Confirmar presupuesto"
#: help:sale.order,origin:0
msgid "Reference of the document that generated this sales order request."
msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
#. module: sale
#: view:sale.order:0
@@ -1077,6 +1091,9 @@ msgid ""
"The same sales order may have been invoiced in several times (by line for "
"example)."
msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
#. module: sale
#: field:sale.order,order_policy:0
@@ -1086,7 +1103,7 @@ msgstr "Política de facturación"
#. module: sale
#: help:sale.order,create_date:0
msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Fecha en que se crea el pedido de venta."
#. module: sale
#: model:ir.model,name:sale.model_stock_move
@@ -1145,7 +1162,7 @@ msgstr "¡Error!"
#: code:addons/sale/sale.py:0
#, python-format
msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "¡No se puede cancelar el pedido de venta!"
#. module: sale
#: selection:sale.report,month:0
@@ -1193,7 +1210,7 @@ msgstr "Ventas"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Factura desde el albarán"
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1314,6 +1331,8 @@ msgid ""
"You have to select a customer in the sales form !\n"
"Please set one customer before choosing a product."
msgstr ""
+"¡Debe seleccionar un cliente en el formulario de ventas!\n"
+"Introduzca un cliente antes de seleccionar un producto."
#. module: sale
#: selection:sale.config.picking_policy,step:0
@@ -1323,7 +1342,7 @@ msgstr "Albarán y Orden de entrega"
#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Documento origen"
#. module: sale
#: view:sale.order.line:0
@@ -1343,18 +1362,20 @@ msgstr "Documento del movimiento al cliente."
#. module: sale
#: help:sale.order,amount_untaxed:0
msgid "The amount without tax."
-msgstr ""
+msgstr "El importe sin impuestos."
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
+"Debe primero cancelar todos los albaranes relacionados con este pedido de "
+"venta."
#. module: sale
#: model:ir.model,name:sale.model_sale_advance_payment_inv
msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Ventas. Anticipo pago factura"
#. module: sale
#: field:sale.order,incoterm:0
@@ -1488,6 +1509,7 @@ msgstr "Total"
#, python-format
msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1504,7 +1526,7 @@ msgstr ""
#: code:addons/sale/sale.py:0
#, python-format
msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1522,7 +1544,7 @@ msgstr "Para facturar"
#. module: sale
#: help:sale.order,date_confirm:0
msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Fecha en la que se confirma el pedido de venta."
#. module: sale
#: field:sale.order,company_id:0
@@ -1554,6 +1576,8 @@ msgstr "Excepción de factura"
msgid ""
"This is a list of picking that has been generated for this sales order."
msgstr ""
+"Esta es la lista de albaranes que han sido generados para este pedido de "
+"venta."
#. module: sale
#: help:sale.installer,sale_margin:0
@@ -1797,7 +1821,7 @@ msgstr "Avanzar factura"
#: code:addons/sale/sale.py:0
#, python-format
msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "El pedido de venta '%s' ha sido cancelado."
#. module: sale
#: selection:sale.order.line,state:0
@@ -1821,12 +1845,12 @@ msgstr ""
#. module: sale
#: help:sale.order,amount_tax:0
msgid "The tax amount."
-msgstr ""
+msgstr "El importe de los impuestos."
#. module: sale
#: view:sale.order:0
msgid "Packings"
-msgstr ""
+msgstr "Albaranes"
#. module: sale
#: field:sale.config.picking_policy,progress:0
@@ -1883,6 +1907,8 @@ msgstr "¡La factura ha sido creada correctamente!"
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
+"Primero debe cancelar todas las facturas relacionadas con este pedido de "
+"venta."
#. module: sale
#: selection:sale.report,month:0
@@ -1922,6 +1948,8 @@ msgid ""
"One Procurement order for each sales order line and for each of the "
"components."
msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1936,19 +1964,19 @@ msgstr "Fecha pedido"
#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Pedido de venta confirmado a factura."
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
#. module: sale
#: selection:sale.order.line,type:0
@@ -1984,12 +2012,12 @@ msgstr "Debe asignar un lote de producción para este producto"
#. module: sale
#: field:sale.order.line,sequence:0
msgid "Layout Sequence"
-msgstr ""
+msgstr "Secuencia plantilla"
#. module: sale
#: help:sale.order,invoiced:0
msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Indica que una factura ha sido pagada."
#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
@@ -2056,7 +2084,7 @@ msgstr "Contabilidad"
#. module: sale
#: field:sale.config.picking_policy,step:0
msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Pasos para entregar un pedido de venta"
#. module: sale
#: view:sale.order:0
@@ -2067,7 +2095,7 @@ msgstr "Buscar pedido de venta"
#. module: sale
#: model:process.node,name:sale.process_node_saleorderprocurement0
msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Solicitud pedido de venta"
#. module: sale
#: report:sale.order:0
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 75c37ff9416..546e88ce37a 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -38,7 +38,7 @@ class sale_report(osv.osv):
('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True),
- 'uom_name': fields.char('Default UoM', size=128, readonly=True),
+ 'uom_name': fields.char('Reference UoM', size=128, readonly=True),
'product_uom_qty': fields.float('# of Qty', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
@@ -47,7 +47,6 @@ class sale_report(osv.osv):
'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
'price_total': fields.float('Total Price', readonly=True),
'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
- 'price_average': fields.float('Average Price', readonly=True,group_operator="avg"),
'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
'nbr': fields.integer('# of Lines', readonly=True),
'state': fields.selection([
@@ -90,24 +89,27 @@ class sale_report(osv.osv):
sale_order s,
(
select l.id as id,
- l.product_id as product_id,
- u.name as uom_name,
- sum(l.product_uom_qty * u.factor) as product_uom_qty,
- sum(l.product_uom_qty*l.price_unit) as price_total,
- (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average,
- pt.categ_id, l.order_id
+ l.product_id as product_id,
+ (case when u.uom_type not in ('reference') then
+ (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+ else
+ u.name
+ end) as uom_name,
+ sum(l.product_uom_qty/u.factor) as product_uom_qty,
+ sum(l.product_uom_qty*l.price_unit) as price_total,
+ pt.categ_id, l.order_id
from
- sale_order_line l
- left join product_uom u on (u.id=l.product_uom)
- left join product_template pt on (pt.id=l.product_id)
- group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el
+ sale_order_line l ,product_uom u, product_product p, product_template pt
+ where u.id = l.product_uom
+ and pt.id = p.product_tmpl_id
+ and p.id = l.product_id
+ group by l.id, l.order_id, l.product_id, u.name, pt.categ_id, u.uom_type, u.category_id) el
where s.id = el.order_id
group by el.id,
el.product_id,
el.uom_name,
el.product_uom_qty,
el.price_total,
- el.price_average,
el.categ_id,
el.order_id,
s.date_order,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index a47ab2e73a9..41cdecee0ea 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -23,7 +23,6 @@
-
@@ -100,7 +99,7 @@
-
+
@@ -111,7 +110,7 @@
-
+
@@ -146,11 +145,11 @@
- Sales by Partner
+ Sales per Customer in last 90 days
sale.report
form
graph,tree
- [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]
+ [('state','=','done'),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]
{'search_default_Customer':1}
@@ -168,7 +167,7 @@
- Sales by Salesman
+ Sales by Salesman in last 90 days
sale.report
form
graph,tree
@@ -190,7 +189,7 @@
- Sales by Product's Category
+ Sales by Product's Category in last 90 days
sale.report
form
graph,tree
@@ -208,6 +207,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -217,7 +227,7 @@
form
tree,graph
[('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))]
- {'group_by_no_leaf':1,'group_by':['month','product_id']}
+ {'search_default_order_month':1,'group_by_no_leaf':0,'group_by':['month', 'product_id']}
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a789ad287f3..add21f48cb3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -185,7 +185,7 @@ class sale_order(osv.osv):
for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
result[line.order_id.id] = True
return result.keys()
-
+
_columns = {
'name': fields.char('Order Reference', size=64, required=True,
readonly=True, states={'draft': [('readonly', False)]}, select=True),
@@ -274,6 +274,9 @@ class sale_order(osv.osv):
'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
}
+ _sql_constraints = [
+ ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+ ]
_order = 'name desc'
# Form filling
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c282b38a14b..3d1a14edd53 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -81,7 +81,7 @@
tree
2
-
+
@@ -514,6 +514,7 @@
context="{'search_default_partner_id': [active_id]}"
id="act_res_partner_2_sale_order"
name="Sales"
+ groups="base.group_sale_salesman"
res_model="sale.order"
src_model="res.partner"/>
@@ -523,7 +524,7 @@
name="Product sales"
res_model="sale.order.line"
src_model="product.product"
- groups="base.group_extended"/>
+ groups="base.group_sale_salesman"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 923c91fb3aa..a89e1c4578d 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -2,6 +2,7 @@
"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
+"access_sale_order_line_accountant","sale.order.line accountant","model_sale_order_line","account.group_account_user",1,1,0,0
"access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
"access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
@@ -16,13 +17,14 @@
"access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
"access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
"access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,1,1,1
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
+"access_sale_order_accountant","sale.order.accountant","model_sale_order","account.group_account_user",1,1,0,0
+"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1
"access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0
"access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
"access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0
+"access_res_partner_sale_manager","res.partner.sale.manager","base.model_res_partner","base.group_sale_manager",1,1,1,1
"access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
"access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
@@ -53,3 +55,18 @@
"access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,0,0,0
"access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
+"access_product_uom_categ_sale_manager","product.uom.categ salemanager","product.model_product_uom_categ","base.group_sale_manager",1,1,1,1
+"access_product_uom_sale_manager","product.uom salemanager","product.model_product_uom","base.group_sale_manager",1,1,1,1
+"access_product_ul_sale_manager","product.ul salemanager","product.model_product_ul","base.group_sale_manager",1,1,1,1
+"access_product_category_sale_manager","product.category salemanager","product.model_product_category","base.group_sale_manager",1,1,1,1
+"access_product_template_sale_manager","product.template salemanager","product.model_product_template","base.group_sale_manager",1,1,1,1
+"access_product_product_sale_manager","product.product salemanager","product.model_product_product","base.group_sale_manager",1,1,1,1
+"access_product_packaging_sale_manager","product.packaging salemanager","product.model_product_packaging","base.group_sale_manager",1,1,1,1
+"access_product_supplierinfo_sale_manager","product.supplierinfo salemanager","product.model_product_supplierinfo","base.group_sale_manager",1,1,1,1
+"access_pricelist_partnerinfo_sale_manager","pricelist.partnerinfo salemanager","product.model_pricelist_partnerinfo","base.group_sale_manager",1,1,1,1
+"access_product_price_type_sale_manager","product.price.type salemanager","product.model_product_price_type","base.group_sale_manager",1,1,1,1
+"access_product_pricelist_type_sale_manager","product.pricelist.type salemanager","product.model_product_pricelist_type","base.group_sale_manager",1,1,1,1
+"access_product_pricelist_sale_manager","product.pricelist salemanager","product.model_product_pricelist","base.group_sale_manager",1,1,1,1
+"access_ir_property_group_sale_manager","ir_property group_sale_manager","base.model_ir_property","base.group_sale_manager",1,1,1,1
+"access_product_group_res_partner_sale_manager","res_partner group_sale_manager","base.model_res_partner","base.group_sale_manager",1,1,1,1
+"access_product_pricelist_version_sale_manager","product.pricelist.version sale_manager","product.model_product_pricelist_version","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index ac4f7573c5a..786b5d2a7ff 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -8,6 +8,9 @@
Sales / User
+
+ Sales / User - See All Leads
+
+
+
Sale Order multi-company
['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]
-
Sale Order Line multi-company
['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]
+
+ Sale Shop multi-company
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+
+
Personal Orders
@@ -37,6 +49,13 @@
['|',('user_id','=',user.id),('user_id','=',False)]
+
+ All Orders
+
+ [(1,'=',1)]
+
+
+
Personal Order Lines
@@ -45,11 +64,11 @@
-
- Sale Shop multi-company
-
-
- ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]
+
+ All Orders Lines
+
+ [(1,'=',1)]
+
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 14a8c34932e..46241731c70 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:44+0000\n"
+"PO-Revision-Date: 2010-12-27 19:06+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_analytic_plans
@@ -34,11 +34,15 @@ msgid ""
" The base module to manage analytic distribution and sales orders.\n"
" "
msgstr ""
+"\n"
+" El módulo base para gestionar distribuciones analíticas y pedidos de "
+"venta.\n"
+" "
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 585f4feb2dd..cbf406fd5f0 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-22 08:03+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) \n"
+"PO-Revision-Date: 2010-12-27 19:44+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\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: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_crm
@@ -65,6 +66,19 @@ msgid ""
"crm modules.\n"
" "
msgstr ""
+"\n"
+"Este módulo añade un acceso directo a uno o varios casos de oportunidades en "
+"el CRM.\n"
+"Este acceso directo le permite generar un pedido de venta a partir del caso "
+"seleccionado.\n"
+"Si están abiertos distintos casos (una lista), genera un pedido de venta "
+"por\n"
+"caso.\n"
+"El caso se cierra y es enlazado al pedido ventas generado.\n"
+"\n"
+"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y "
+"crm.\n"
+" "
#. module: sale_crm
#: view:crm.make.sale:0
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index 97f2efd23c0..a7db87a8960 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-08-03 06:19+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-12-27 14:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_crm
@@ -24,30 +24,30 @@ msgstr "Klient"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "Convert to Quotation"
-msgstr ""
+msgstr "Konwertuj do oferty"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
msgid "is converted to Quotation."
-msgstr ""
+msgstr "skonwertowano do oferty."
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
msgid "Data Insufficient!"
-msgstr ""
+msgstr "Zbyt mało danych!"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Nie zdefiniowano adresu klienta!"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_make_sale
msgid "Make sales"
-msgstr ""
+msgstr "Wykonaj sprzedaż"
#. module: sale_crm
#: model:ir.module.module,description:sale_crm.module_meta_information
@@ -65,17 +65,28 @@ msgid ""
"crm modules.\n"
" "
msgstr ""
+"\n"
+"Ten moduł dodaje skrót na jednym lub wielu szansach CRM.\n"
+"Ten skrót pozwala generować zamówienie sprzedaży na \n"
+"podstawie wybranych spraw. Jeśli różne sprawy zostały \n"
+"otwarte (lista), to generowane jest jedno zamówienie sprzedaży \n"
+"za każdą sprawę. Sprawa jest zamykana i łączona z \n"
+"wygenerowanym zamówieniem sprzedaży.\n"
+"\n"
+"Sugerujemy zainstalowanie tego modułu, jeśli zainstalowałeś \n"
+"Sprzedaż i CRM.\n"
+" "
#. module: sale_crm
#: view:crm.make.sale:0
msgid "_Create"
-msgstr ""
+msgstr "_Utwórz"
#. module: sale_crm
#: help:crm.make.sale,close:0
msgid ""
"Check this to close the opportunity after having created the sale order."
-msgstr ""
+msgstr "Zaznacz to, aby zamknąć szansę po utworzeniu zamówienia."
#. module: sale_crm
#: view:crm.lead:0
@@ -86,35 +97,35 @@ msgstr "Konwertuj do oferty"
#: view:account.invoice.report:0
#: view:board.board:0
msgid "Monthly Turnover"
-msgstr ""
+msgstr "Miesięczny obrót"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Skonwertowano do oferty(id: %s)."
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
msgid "Opportunity "
-msgstr ""
+msgstr "Szansa "
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
msgid "Opportunity: %s"
-msgstr ""
+msgstr "Szansa: %s"
#. module: sale_crm
#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Tworzy zamówienie sprzedaży z Szansy"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
msgid "Quotations"
-msgstr ""
+msgstr "Oferty"
#. module: sale_crm
#: field:crm.make.sale,shop_id:0
@@ -124,23 +135,23 @@ msgstr "Sklep"
#. module: sale_crm
#: view:board.board:0
msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Szanse wg etapów"
#. module: sale_crm
#: view:board.board:0
msgid "My Quotations"
-msgstr ""
+msgstr "Moje oferty"
#. module: sale_crm
#: field:crm.make.sale,close:0
msgid "Close Opportunity"
-msgstr ""
+msgstr "Zamknij szansę"
#. module: sale_crm
#: view:sale.order:0
#: field:sale.order,section_id:0
msgid "Sales Team"
-msgstr ""
+msgstr "Zespół sprzedaży"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -155,7 +166,7 @@ msgstr "Anuluj"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Zamówienie sprzedaży"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index b6c0da123f4..978a563cc5a 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:50+0000\n"
+"PO-Revision-Date: 2010-12-27 19:14+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
@@ -30,7 +30,7 @@ msgstr "El tipo de diario utilizado para ventas y albaranes."
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
#. module: sale_journal
#: view:res.partner:0
diff --git a/addons/sale_layout/__init__.py b/addons/sale_layout/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index 298210c9e48..206513e6ce0 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 15:08+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) \n"
+"PO-Revision-Date: 2010-12-27 19:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_layout
@@ -35,6 +36,16 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" Este módulo proporciona funcionalidades para mejorar la plantilla del "
+"pedido de ventas.\n"
+"\n"
+" Proporciona la posibilidad de\n"
+" * ordenar todas las líneas de un pedido de ventas\n"
+" * añadir títulos, líneas de comentario, líneas con subtotales\n"
+" * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+" "
#. module: sale_layout
#: selection:sale.order.line,layout_type:0
@@ -264,7 +275,7 @@ msgstr "Fax:"
#. module: sale_layout
#: model:ir.model,name:sale_layout.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
#. module: sale_layout
#: view:sale.order:0
@@ -279,7 +290,7 @@ msgstr "Precio"
#. module: sale_layout
#: model:ir.model,name:sale_layout.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
#. module: sale_layout
#: view:sale.order:0
diff --git a/addons/sale_layout/i18n/fr_BE.po b/addons/sale_layout/i18n/fr_BE.po
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/i18n/fr_FR.po b/addons/sale_layout/i18n/fr_FR.po
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/report/__init__.py b/addons/sale_layout/report/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/sale_layout_report.xml b/addons/sale_layout/sale_layout_report.xml
old mode 100755
new mode 100644
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
old mode 100755
new mode 100644
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index 040b2336991..8156057fcc7 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:26+0000\n"
+"PO-Revision-Date: 2010-12-27 19:35+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_margin
@@ -63,6 +63,11 @@ msgid ""
"Unit Price and Cost Price\n"
" "
msgstr ""
+" \n"
+" Este módulo añade el 'Margen' en el pedido de venta,\n"
+" que proporciona la rentabilidad calculando la diferencia entre el precio "
+"unidad y el precio de coste\n"
+" "
#. module: sale_margin
#: view:report.account.invoice.product:0
@@ -86,6 +91,8 @@ msgid ""
"It gives profitability by calculating the difference between the Unit Price "
"and Cost Price."
msgstr ""
+"Proporciona la rentabilidad calculando la diferencia entre el precio unidad "
+"y el precio de coste."
#. module: sale_margin
#: field:report.account.invoice.product,type:0
@@ -321,7 +328,7 @@ msgstr "Empresa"
#. module: sale_margin
#: model:ir.model,name:sale_margin.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
#. module: sale_margin
#: selection:report.account.invoice.product,state:0
@@ -336,7 +343,7 @@ msgstr "Análisis de facturas"
#. module: sale_margin
#: model:ir.model,name:sale_margin.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 97fd3b29cef..f7bbf41e5d3 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -29,9 +29,12 @@ class sale_order_line(osv.osv):
res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty,
uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag)
+ frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+ to_cur = self.pool.get('res.partner').browse(cr, uid, partner_id).property_product_pricelist.currency_id.id
if product:
purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
- res['value'].update({'purchase_price': purchase_price})
+ price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False)
+ res['value'].update({'purchase_price': price})
return res
def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index ceda6215846..3c47c3ad034 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -8,25 +8,25 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:39+0000\n"
+"PO-Revision-Date: 2010-12-27 19:32+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_mrp
#: help:mrp.production,sale_ref:0
msgid "Indicate the Customer Reference from sales order."
-msgstr ""
+msgstr "Indica la referencia del cliente del pedido de venta."
#. module: sale_mrp
#: field:mrp.production,sale_ref:0
msgid "Sales Reference"
-msgstr ""
+msgstr "Referencia venta"
#. module: sale_mrp
#: model:ir.model,name:sale_mrp.model_mrp_production
@@ -45,11 +45,19 @@ msgid ""
" It adds sales name and sales Reference on production order\n"
" "
msgstr ""
+"\n"
+" Este módulo proporciona facilidades al usuario para instalar los módulos "
+"mrp y sale\n"
+" a la vez. Se utiliza básicamente cuando queremos hacer un seguimiento de "
+"las\n"
+" órdenes de producción generadas a partir del pedido de cliente.\n"
+" Añade el nombre y la referencia de la venta en la orden de producción.\n"
+" "
#. module: sale_mrp
#: field:mrp.production,sale_name:0
msgid "Sales Name"
-msgstr ""
+msgstr "Nombre venta"
#. module: sale_mrp
#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -64,7 +72,7 @@ msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
#. module: sale_mrp
#: help:mrp.production,sale_name:0
msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "Indica el nombre del pedido de venta."
#~ msgid "Indicate the name of sale order."
#~ msgstr "Indica el nombre del pedido de venta."
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 94efe403fa9..78022a6897a 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/i18n/pl.po
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-08-03 03:52+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-12-27 13:55+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_mrp
#: help:mrp.production,sale_ref:0
msgid "Indicate the Customer Reference from sales order."
-msgstr ""
+msgstr "Wskazuje odnośnik klienta z zamówienia sprzedaży."
#. module: sale_mrp
#: field:mrp.production,sale_ref:0
msgid "Sales Reference"
-msgstr ""
+msgstr "Odnośnik sprzedaży"
#. module: sale_mrp
#: model:ir.model,name:sale_mrp.model_mrp_production
@@ -44,11 +44,18 @@ msgid ""
" It adds sales name and sales Reference on production order\n"
" "
msgstr ""
+"\n"
+" Ten moduł wzbogaca instalację modułu mrp i sprzedaży.\n"
+" Jest stosowany, kiedy chcesz śledzić zamówienia produkcji\n"
+" powstałe z zamówienia sprzedaży.\n"
+" Moduł dodaje nazwę i odnośnik sprzedaży na zamówieniu \n"
+" produkcji.\n"
+" "
#. module: sale_mrp
#: field:mrp.production,sale_name:0
msgid "Sales Name"
-msgstr ""
+msgstr "Nazwa sprzedaży"
#. module: sale_mrp
#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -58,12 +65,12 @@ msgstr "Zarządzanie sprzedażą i MRP"
#. module: sale_mrp
#: constraint:mrp.production:0
msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Zamawiana ilośc nie może być ujemna lub zerowa !"
#. module: sale_mrp
#: help:mrp.production,sale_name:0
msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "Wskazuje nazwę zamówienia sprzedaży."
#~ msgid "Indicate the name of sale order."
#~ msgstr "Określ nazwę zamówienia sprzedaży"
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 581b033f126..92f12265cbc 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/i18n/es.po
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
+"PO-Revision-Date: 2010-12-27 19:18+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_order_dates
#: help:sale.order,requested_date:0
msgid "Date on which customer has requested for sales."
-msgstr ""
+msgstr "Fecha en que el cliente ha solicitado la venta."
#. module: sale_order_dates
#: field:sale.order,commitment_date:0
@@ -36,12 +36,12 @@ msgstr "Fecha efectiva"
#. module: sale_order_dates
#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
msgid "Sales Order Dates"
-msgstr ""
+msgstr "Fechas en pedidos de venta"
#. module: sale_order_dates
#: help:sale.order,effective_date:0
msgid "Date on which picking is created."
-msgstr ""
+msgstr "Fecha en que el albarán ha sido creado."
#. module: sale_order_dates
#: field:sale.order,requested_date:0
@@ -51,7 +51,7 @@ msgstr "Fecha solicitud"
#. module: sale_order_dates
#: model:ir.model,name:sale_order_dates.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
#. module: sale_order_dates
#: model:ir.module.module,description:sale_order_dates.module_meta_information
@@ -59,11 +59,14 @@ msgid ""
"\n"
"Add commitment, requested and effective dates on the sales order.\n"
msgstr ""
+"\n"
+"Añade las fechas de compromiso, solicitada y efectiva en el pedido de "
+"venta.\n"
#. module: sale_order_dates
#: help:sale.order,commitment_date:0
msgid "Date on which delivery of products is to be made."
-msgstr ""
+msgstr "Fecha en que la entrega de productos se va a realizar."
#~ msgid "Sale Order"
#~ msgstr "Pedido venta"
diff --git a/addons/sale_order_dates/i18n/pl.po b/addons/sale_order_dates/i18n/pl.po
new file mode 100644
index 00000000000..3b48d0222e4
--- /dev/null
+++ b/addons/sale_order_dates/i18n/pl.po
@@ -0,0 +1,67 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-27 13:58+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"Language-Team: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Data, na którą klient zamówił produkty."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Data dostawy"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Data realizacji"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Daty zamówienia sprzedaży"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Data utworzenia dostawy"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Spodziewana data"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Dodaje daty dostawy, spodziewaną i realizacji na zamówieniu sprzedaży.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Data, w której dostawa powinna zostać dokonana."
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 6c8f923af24..a98a070e63f 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:09+0000\n"
+"PO-Revision-Date: 2010-12-27 19:51+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#~ msgid "Stock Management"
@@ -826,7 +826,7 @@ msgstr "Ubicación de tránsito para transferencias inter-compañías"
#: model:ir.model,name:stock.model_stock_change_product_qty
#: view:stock.change.product.qty:0
msgid "Change Product Quantity"
-msgstr ""
+msgstr "Cambiar cantidad producto"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory_merge
@@ -1395,7 +1395,7 @@ msgstr "Proveedores TI genéricos"
#. module: stock
#: report:stock.picking.list:0
msgid "Picking List:"
-msgstr ""
+msgstr "Albarán:"
#. module: stock
#: field:stock.inventory,date:0
@@ -2104,7 +2104,7 @@ msgstr "Gestión de almacenes"
#. module: stock
#: selection:stock.picking,move_type:0
msgid "Partial Delivery"
-msgstr ""
+msgstr "Entrega parcial"
#. module: stock
#: selection:stock.location,chained_auto_packing:0
@@ -2679,6 +2679,7 @@ msgstr ""
#, python-format
msgid "Can not consume a move with negative or zero quantity !"
msgstr ""
+"¡No se puede consumir un movimiento con una cantidad negativa o cero!"
#. module: stock
#: field:stock.location,stock_real:0
@@ -2742,6 +2743,8 @@ msgstr "Cantidad (UdV)"
msgid ""
"You are moving %.2f %s products but only %.2f %s available in this lot."
msgstr ""
+"Está moviendo %.2f %s productos pero sólo está disponible %.2f %s en este "
+"lote."
#. module: stock
#: view:stock.move:0
@@ -3224,7 +3227,7 @@ msgstr "Motivo"
#. module: stock
#: report:stock.picking.list:0
msgid "Delivery Order:"
-msgstr ""
+msgstr "Orden de entrega:"
#. module: stock
#: field:stock.location,icon:0
@@ -3378,12 +3381,12 @@ msgstr "Fusionar inventarios"
#. module: stock
#: help:stock.change.product.qty,new_quantity:0
msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
#. module: stock
#: report:stock.picking.list:0
msgid "Reception:"
-msgstr ""
+msgstr "Recepción:"
#. module: stock
#: help:stock.location,scrap_location:0
@@ -3827,7 +3830,7 @@ msgstr "Fichero XML"
#. module: stock
#: view:stock.change.product.qty:0
msgid "Select Quantity"
-msgstr ""
+msgstr "Seleccionar cantidad"
#. module: stock
#: code:addons/stock/wizard/stock_partial_picking.py:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 9717f646664..4d4de633411 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-29 07:27+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-27 17:10+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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: 2010-12-24 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -30,7 +30,7 @@ msgstr ""
#: code:addons/stock/product.py:0
#, python-format
msgid "Variation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Nie zdefiniowano konta wyceny dla kategorii produktu: %s"
#. module: stock
#: field:stock.location,chained_location_id:0
@@ -866,7 +866,7 @@ msgstr "Zaplanowana data"
#. module: stock
#: view:stock.tracking:0
msgid "Pack Search"
-msgstr "Wyzzukiwanie pobrań"
+msgstr "Wyszukiwanie pobrań"
#. module: stock
#: selection:stock.move,priority:0
@@ -1202,6 +1202,10 @@ msgid ""
"worker/team that should perform the operation. Examples of stock journals "
"may be: quality control, pick lists, packing, etc."
msgstr ""
+"Dzienniki magazynowe pozwalają powiązać każda operację magazynową do "
+"konkretnego dziennika w zależności od typu operacji lub osób wykonujących "
+"operację. Przykłady dzienników magazynowych, to kontrola jakości, listy "
+"pobrań, pakowanie itp."
#. module: stock
#: help:product.template,property_stock_production:0
@@ -1577,7 +1581,7 @@ msgstr "Przesunięcia zapasów"
#: selection:stock.location,chained_picking_type:0
#: selection:stock.picking,type:0
msgid "Sending Goods"
-msgstr "Wysyłanie towarów"
+msgstr "Wydania zewnętrzne"
#. module: stock
#: view:stock.picking:0
@@ -1631,7 +1635,7 @@ msgstr "Raport zapasów wg partii magazynowych"
#: code:addons/stock/product.py:0
#, python-format
msgid "Delivered Qty"
-msgstr "Ilość dostarczona"
+msgstr "Ilość bieżąca"
#. module: stock
#: model:ir.actions.act_window,name:stock.track_line
@@ -1872,7 +1876,7 @@ msgstr "Brak konta przyjęć dla produktu lub jego kategorii: \"%s\" (id: %d)"
#: code:addons/stock/product.py:0
#, python-format
msgid "Received Qty"
-msgstr "Otrzymana ilość"
+msgstr "Ilość bieżąca"
#. module: stock
#: field:stock.production.lot,ref:0
@@ -1959,7 +1963,7 @@ msgstr ""
#. module: stock
#: help:stock.move,tracking_id:0
msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "Logistyczna jednostka magazynowa: paleta, kontener, karton..."
#. module: stock
#: view:stock.change.product.qty:0
@@ -2189,12 +2193,12 @@ msgstr "Konsola magazynu"
#: code:addons/stock/product.py:0
#, python-format
msgid "Future Qty"
-msgstr "Przyszła ilość"
+msgstr "Ilość planowana"
#. module: stock
#: field:product.category,property_stock_variation:0
msgid "Stock Variation Account"
-msgstr "Konto odchyleń zapasów"
+msgstr "Konto wyceny zapasów"
#. module: stock
#: field:stock.move,note:0
@@ -2289,7 +2293,7 @@ msgstr "Spodziewana data wykonania pobrania"
#: code:addons/stock/product.py:0
#, python-format
msgid "P&L Qty"
-msgstr "Ilość Zysk/Strata"
+msgstr "Ilość bieżąca"
#. module: stock
#: view:stock.production.lot:0
@@ -2311,6 +2315,11 @@ msgid ""
"current inventory value, and the stock input and stock output account will "
"hold the counterpart moves for incoming and outgoing products."
msgstr ""
+"Jeśli bieżąca wycena jest włączona dla produktu, to system będzie "
+"automatycznie dokonywał zapisów księgowych dla przesunięć zapasów. Konto "
+"wyceny zapasów ustawiane w kategorii produktów reprezentuje bieżącą wartość, "
+"a konta zapasów wchodzących i wychodzących są kontami przeciwstawnymi dla "
+"niego."
#. module: stock
#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2523,6 +2532,8 @@ msgstr "Data wykonania"
msgid ""
"By unchecking the active field, you may hide a pack without deleting it."
msgstr ""
+"Odznaczając pole aktywności możesz ukryć pobranie bez konieczności usuwania "
+"go."
#. module: stock
#: view:stock.inventory.merge:0
@@ -3016,7 +3027,7 @@ msgstr "Partie"
#: view:stock.move:0
#: view:stock.picking:0
msgid "New pack"
-msgstr ""
+msgstr "Nowe pobranie"
#. module: stock
#: view:stock.move:0
@@ -3067,7 +3078,7 @@ msgstr "Suma przyjmowanych ilości"
#. module: stock
#: field:report.stock.move,product_qty_out:0
msgid "Out Qty"
-msgstr ""
+msgstr "Ilość wydawana"
#. module: stock
#: field:stock.production.lot,move_ids:0
@@ -3084,7 +3095,7 @@ msgstr "Wiadomość !"
#: view:stock.move:0
#: view:stock.picking:0
msgid "Put in current pack"
-msgstr ""
+msgstr "Wstaw do bieżącego pobrania"
#. module: stock
#: view:stock.inventory:0
@@ -3142,7 +3153,7 @@ msgstr "Błąd!"
msgid ""
"There is no inventory variation account defined on the product category: "
"\"%s\" (id: %d)"
-msgstr ""
+msgstr "Brak definicji konta wyceny dla kategorii produktu: \"%s\" (id: %d)"
#. module: stock
#: view:stock.inventory.merge:0
@@ -3167,6 +3178,7 @@ msgstr "Typ związanej strefy"
#: help:stock.picking,move_type:0
msgid "It specifies goods to be delivered all at once or by direct delivery"
msgstr ""
+"To określa, że produkty mają być wydawane wszystkie naraz lub bezpośrednio."
#. module: stock
#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
@@ -3179,7 +3191,7 @@ msgstr ""
#: selection:stock.location,chained_picking_type:0
#: selection:stock.picking,type:0
msgid "Getting Goods"
-msgstr "Przyjęcie towarów"
+msgstr "Przyjęcia zewnętrzne"
#. module: stock
#: help:stock.location,chained_location_type:0
@@ -3260,6 +3272,8 @@ msgstr ""
msgid ""
"Check this box to allow using this location to put scrapped/damaged goods."
msgstr ""
+"Zaznacz tę opcję, aby ta strefa mogła zawierać uszkodzone/wybrakowane "
+"produkty."
#. module: stock
#: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3312,7 +3326,7 @@ msgstr ""
#. module: stock
#: view:stock.split.into:0
msgid "Quantity to leave in the current pack"
-msgstr ""
+msgstr "Ilość do zostawienia w bieżącym pobraniu"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3327,6 +3341,8 @@ msgid ""
"get the up-stream or down-stream traceability of the products contained in "
"the pack."
msgstr ""
+"To jest lista pobrań. Wybierając pobranie możesz sprawdzić przepływ "
+"produktów z pobrania wstecz i wprzód."
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3354,6 +3370,11 @@ msgid ""
"If cost price is decreased, stock variation account will be creadited and "
"stock input account will be debited."
msgstr ""
+"jeśli cena kosztowa zostanie zwiększona, to konto wyceny będzie zapisane po "
+"stronie Winien, a konto zapasów wychodzących po stronie Ma wartością = "
+"(różnica wartości * ilość bieżąca).\n"
+"Jeśli cena kosztowa jest zmniejszana, to konto wyceny będzie zapisane po "
+"stronie Ma a konto zapasów wchodzących po stronie Winien."
#. module: stock
#: field:stock.location,chained_journal_id:0
@@ -3609,7 +3630,7 @@ msgstr "Nie zdefiniowano dziennika w kategorii produktu: \"%s\" (id: %d)"
#: code:addons/stock/product.py:0
#, python-format
msgid "Unplanned Qty"
-msgstr "Ilość nieplanowana"
+msgstr "Ilość bieżąca"
#. module: stock
#: code:addons/stock/stock.py:0
@@ -3742,7 +3763,7 @@ msgstr "Strefa docelowa"
#: help:stock.move,product_packaging:0
msgid ""
"It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr ""
+msgstr "To określa atrybuty pakowania jak typ, ilość w paczce itp."
#. module: stock
#: code:addons/stock/stock.py:0
@@ -3836,7 +3857,7 @@ msgstr ""
#: code:addons/stock/product.py:0
#, python-format
msgid "Produced Qty"
-msgstr "Ilość wyprodukowana"
+msgstr "Ilość bieżąca"
#. module: stock
#: field:product.category,property_stock_account_output_categ:0
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 05b2f83c15b..dca180baeec 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -106,7 +106,7 @@
+ type="action" icon="gtk-execute" groups = "stock.group_stock_manager,base.group_sale_manager,purchase.group_purchase_manager,stock.group_stock_manager,mrp.group_mrp_manager"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 094b6d43e57..25abf4d7333 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -243,7 +243,9 @@
{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}
Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities.
-
+
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
old mode 100755
new mode 100644
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
old mode 100755
new mode 100644
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a2234521218..8c7c53ed8ba 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -9,6 +9,7 @@
"access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
"access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
"access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
+"access_stock_tracking_sales_user","stock.tracking sales.user","model_stock_tracking","base.group_sale_salesman",1,1,1,0
"access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,1,0,0
"access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
@@ -21,7 +22,8 @@
"access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
"access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
-"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
+"access_stock_location_sale_manager","stock.location sale manager","model_stock_location","base.group_sale_manager",1,0,0,0
+"access_stock_location_stock_manager","stock.location stock manager","model_stock_location","stock.group_stock_manager",1,0,0,0
"access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
"access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
"access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
@@ -38,3 +40,22 @@
"access_account_invoice_tax_user","account.invoice.tax stock user","account.model_account_invoice_tax","stock.group_stock_user",1,1,1,0
"access_account_journal_user","account.journal stock user","account.model_account_journal","stock.group_stock_user",1,0,0,0
"access_account_fiscalyear","account.fiscalyear stock user","account.model_account_fiscalyear","stock.group_stock_user",1,0,0,0
+"access_product_pricelist_item_sale_manager","product.pricelist.item salemanager","product.model_product_pricelist_item","base.group_sale_manager",1,1,1,1
+"access_product_uom_categ_stock_manager","product.uom.categ stock_manager","product.model_product_uom_categ","stock.group_stock_manager",1,1,1,1
+"access_product_uom_stock_manager","product.uom stock_manager","product.model_product_uom","stock.group_stock_manager",1,1,1,1
+"access_product_ul_stock_manager","product.ul stock_manager","product.model_product_ul","stock.group_stock_manager",1,1,1,1
+"access_product_category_stock_manager","product.category stock_manager","product.model_product_category","stock.group_stock_manager",1,1,1,1
+"access_product_template_stock_manager","product.template stock_manager","product.model_product_template","stock.group_stock_manager",1,1,1,1
+"access_product_product_stock_manager","product.product stock_manager","product.model_product_product","stock.group_stock_manager",1,1,1,1
+"access_product_packaging_stock_manager","product.packaging stock_manager","product.model_product_packaging","stock.group_stock_manager",1,1,1,1
+"access_product_supplierinfo_stock_manager","product.supplierinfo stock_manager","product.model_product_supplierinfo","stock.group_stock_manager",1,1,1,1
+"access_pricelist_partnerinfo_stock_manager","pricelist.partnerinfo stock_manager","product.model_pricelist_partnerinfo","stock.group_stock_manager",1,1,1,1
+"access_product_price_type_stock_manager","product.price.type stock_manager","product.model_product_price_type","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_type_stock_manager","product.pricelist.type stock_manager","product.model_product_pricelist_type","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_stock_manager","product.pricelist stock_manager","product.model_product_pricelist","stock.group_stock_manager",1,1,1,1
+"access_ir_property_group_stock_manager","ir_property group_stock_manager","base.model_ir_property","stock.group_stock_manager",1,1,1,1
+"access_product_group_res_partner_stock_manager","res_partner group_stock_manager","base.model_res_partner","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_version_stock_manager","product.pricelist.version stock_manager","product.model_product_pricelist_version","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_item_stock_manager","product.pricelist.item stock_manager","product.model_product_pricelist_item","stock.group_stock_manager",1,1,1,1
+"access_account_account_stock_manager","account.account stock manager","account.model_account_account","stock.group_stock_manager",1,0,0,0
+"access_account_journal_stock_manager","account.journal stock manager","account.model_account_journal","stock.group_stock_manager",1,0,0,0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ececf425e66..8c08041678c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -11,7 +11,7 @@
-
+
@@ -231,7 +231,7 @@
@@ -389,7 +389,7 @@
{'full':'1',"search_default_available":1}
This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot.
-
+
#
# Lot composition (history)
@@ -529,7 +529,7 @@
{'full':1, 'search_default_in_location':1}
Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations.
-
+
stock.location.tree
@@ -551,7 +551,10 @@
This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children.
-
+
stock.warehouse
@@ -591,7 +594,7 @@
Create and manage your warehouses and assign them a location from here
-
+
stock.picking.calendar
@@ -620,7 +623,7 @@
-
+
@@ -746,7 +749,7 @@
-
+
@@ -1443,7 +1446,7 @@
-
+
@@ -1451,7 +1454,7 @@
-
+
@@ -1642,7 +1645,7 @@
-
+
@@ -1677,7 +1680,7 @@
-
+
@@ -1898,7 +1901,7 @@
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index f6bcd60ad5e..41acade696a 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,5 +1,5 @@
-
- In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
+ In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(children) report
-
!python {model: stock.location}: |
import netsvc, tools, os
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index b6acc233195..85499a40376 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:23+0000\n"
+"PO-Revision-Date: 2010-12-27 18:51+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_invoice_directly
@@ -30,6 +30,11 @@ msgid ""
" the invoicing wizard if the delivery is to be invoiced.\n"
" "
msgstr ""
+"\n"
+" Cuando envía o entrega mercancías, este módulo automáticamente "
+"lanza\n"
+" el asistente de facturación si el albarán debe ser facturado.\n"
+" "
#. module: stock_invoice_directly
#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 69b34bc2b99..951927bf874 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 08:48+0000\n"
+"PO-Revision-Date: 2010-12-27 18:49+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\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: 2010-12-24 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_location
@@ -186,7 +186,7 @@ msgstr "Compañía"
#. module: stock_location
#: view:product.product:0
msgid "Logistics Flows"
-msgstr ""
+msgstr "Flujos de logística"
#. module: stock_location
#: help:stock.move,cancel_cascade:0
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index f1e7bd33a84..a50f18a493c 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -1,12 +1,19 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_product_pulled_flow_user","product_pulled_flow user","model_product_pulled_flow","stock.group_stock_user",1,0,0,0
"access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_product_pulled_flow_partner_manager","product_pulled_flow partner manager","model_product_pulled_flow","product.group_product_manager",1,1,1,1
+"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
+"access_product_pulled_flow_purchase_manager","product_pulled_flow purchase manager","model_product_pulled_flow","purchase.group_purchase_manager",1,1,1,1
+"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
+"access_product_pulled_flow_mrp_manager","product_pulled_flow mrp manager","model_product_pulled_flow","mrp.group_mrp_manager",1,1,1,1
"access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
"access_stock_location_path_internal_user","stock location path internal user","model_stock_location_path","base.group_user",1,0,0,0
"access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1
+"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
+"access_stock_location_path_purchase_manager","stock.location.path purchase manager","model_stock_location_path","purchase.group_purchase_manager",1,1,1,1
+"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
+"access_stock_location_path_mrp_manager","stock.location.path mrp manager","model_stock_location_path","mrp.group_mrp_manager",1,1,1,1
"access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1
"access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0
"access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0
"access_product_pulled_flow_internal","product.pulled.flow internal","model_product_pulled_flow","base.group_user",1,0,0,0
+
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index a89de0de4cb..26cd1c4b618 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:55+0000\n"
+"PO-Revision-Date: 2010-12-27 20:14+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: survey
@@ -397,6 +397,8 @@ msgstr "Texto"
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
#. module: survey
#: selection:survey.print,paper_size:0
@@ -440,7 +442,7 @@ msgstr "Retrasado"
#. module: survey
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
#. module: survey
#: field:survey.send.invitation,mail_from:0
@@ -781,13 +783,13 @@ msgstr ""
#. module: survey
#: field:survey.answer,response:0
msgid "#Answer"
-msgstr ""
+msgstr "#Respuesta"
#. module: survey
#: field:survey.print,without_pagebreak:0
#: field:survey.print.answer,without_pagebreak:0
msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Imprimir sin saltos de página"
#. module: survey
#: view:survey:0
@@ -795,6 +797,8 @@ msgstr ""
#: view:survey.question:0
msgid "When the comment is an invalid format, display this error message"
msgstr ""
+"Mostrar este mensaje de error cuando el comentario esté en un formato no "
+"válido"
#. module: survey
#: code:addons/survey/wizard/survey_selection.py:0
@@ -803,6 +807,8 @@ msgid ""
"You can not give more response. Please contact the author of this survey for "
"further assistance."
msgstr ""
+"No puede dar más respuestas. Póngase en contacto con el autor de esta "
+"encuesta para obtener más ayuda."
#. module: survey
#: model:ir.actions.act_window,name:survey.act_survey_page_question
@@ -813,7 +819,7 @@ msgstr "Preguntas"
#. module: survey
#: help:survey,response_user:0
msgid "Set to one if you require only one Answer per user"
-msgstr ""
+msgstr "Establecer en uno si requiere solo una Respuesta por usuario"
#. module: survey
#: field:survey,users:0
@@ -871,6 +877,8 @@ msgstr "Registro (Log)"
#: view:survey.question:0
msgid "When the choices do not add up correctly, display this error message"
msgstr ""
+"Mostrar este mensaje de error cuando las selecciones no totalicen "
+"correctamente"
#. module: survey
#: field:survey,date_close:0
@@ -925,7 +933,7 @@ msgstr "Cerrada"
#. module: survey
#: selection:survey.question,type:0
msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "Matriz de menús desplegables"
#. module: survey
#: view:survey:0
@@ -1006,7 +1014,7 @@ msgstr "Imprimir respuesta"
#. module: survey
#: selection:survey.question,type:0
msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Cuadros de texto múltiples"
#. module: survey
#: selection:survey.print,orientation:0
@@ -1033,7 +1041,7 @@ msgstr ""
#. module: survey
#: view:survey.question.column.heading:0
msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "Opciones de menú (cada opción en líneas separadas)"
#. module: survey
#: field:survey.response,response_type:0
@@ -1056,7 +1064,7 @@ msgstr "Esperando respuesta"
#: selection:survey.question,comment_valid_type:0
#: selection:survey.question,validation_type:0
msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "Debe ser un número decimal"
#. module: survey
#: field:res.users,survey_id:0
@@ -1095,7 +1103,7 @@ msgstr ""
#. module: survey
#: selection:survey.response.line,state:0
msgid "Skiped"
-msgstr ""
+msgstr "Omitido"
#. module: survey
#: field:survey.print,paper_size:0
@@ -1123,7 +1131,7 @@ msgstr ""
#: code:addons/survey/wizard/survey_selection.py:0
#, python-format
msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "No puede responder esta encuesta más de %s veces"
#. module: survey
#: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1171,6 +1179,8 @@ msgstr "Historial"
msgid ""
"If this field is empty, all answers of the selected survey will be print."
msgstr ""
+"Si este campo está vacío, se imprimirán todas las respuestas de la encuesta "
+"seleccionada."
#. module: survey
#: field:survey.type,code:0
@@ -1308,7 +1318,7 @@ msgstr ""
#. module: survey
#: selection:survey.question,type:0
msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "Matriz de opciones (Múltiples respuestas por fila)"
#. module: survey
#: model:ir.actions.act_window,name:survey.action_view_survey_name
@@ -1339,7 +1349,7 @@ msgstr ""
#. module: survey
#: selection:survey.question,type:0
msgid "Comment/Essay Box"
-msgstr ""
+msgstr "Caja de comentarios/redacción"
#. module: survey
#: field:survey.answer,type:0
@@ -1493,7 +1503,7 @@ msgstr "Nombre"
#. module: survey
#: view:survey.page:0
msgid "#Questions"
-msgstr ""
+msgstr "#Preguntas"
#. module: survey
#: model:ir.model,name:survey.model_survey_response
@@ -1537,7 +1547,7 @@ msgstr ""
#. module: survey
#: field:survey.answer,menu_choice:0
msgid "Menu Choices"
-msgstr ""
+msgstr "Opciones de menú"
#. module: survey
#: field:survey,page_ids:0
@@ -1588,7 +1598,7 @@ msgstr ""
#. module: survey
#: view:survey.answer:0
msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Opciones de menú (cada opción en líneas separadas)"
#. module: survey
#: selection:survey.answer,type:0
@@ -1644,13 +1654,13 @@ msgstr "Suma de todas las elecciones"
#: selection:survey.question,type:0
#: view:survey.response.line:0
msgid "Table"
-msgstr ""
+msgstr "Tabla"
#. module: survey
#: code:addons/survey/survey.py:0
#, python-format
msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "¡No puede duplicar el recurso!"
#. module: survey
#: field:survey.question,comment_minimum_date:0
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 288f3ceae71..1abc6106ffa 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-20 05:49+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) \n"
+"PO-Revision-Date: 2010-12-27 18:48+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: thunderbird
@@ -87,6 +88,22 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" Este módulo es necesario para que el conector (plug-in) de "
+"Thunderbird\n"
+" funcione correctamente.\n"
+" El conector permite guardar un correo y sus adjuntos en los objetos "
+"OpenERP\n"
+" seleccionados. Puede seleccionar una empresa, una tarea, un proyecto, "
+"una cuenta\n"
+" analítica, o cualquier otro objeto, y adjuntar el correo seleccionado "
+"como un fichero .eml\n"
+" en los adjuntos del registro seleccionado. Puede crear documentos "
+"desde iniciativas CRM,\n"
+" aplicación RRHH y incidencias de proyectos desde los correos "
+"seleccionados.\n"
+"\n"
+" "
#. module: thunderbird
#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
@@ -144,7 +161,7 @@ msgstr "Configuración conector Thunderbird"
#. module: thunderbird
#: model:ir.model,name:thunderbird.model_thunderbird_partner
msgid "Thunderbid Plugin Tools"
-msgstr ""
+msgstr "Herramientas conector de Thunderbird"
#. module: thunderbird
#: view:thunderbird.installer:0
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
old mode 100755
new mode 100644
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
old mode 100755
new mode 100644
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
old mode 100755
new mode 100644
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.js b/addons/thunderbird/plugin/openerp_plugin/install.js
old mode 100755
new mode 100644
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.rdf b/addons/thunderbird/plugin/openerp_plugin/install.rdf
old mode 100755
new mode 100644
diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
old mode 100755
new mode 100644
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
index eba0be9e10a..6ff40a09221 100644
--- a/addons/users_ldap/i18n/es.po
+++ b/addons/users_ldap/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 10:32+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 10:46+0000\n"
+"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: users_ldap
@@ -93,7 +92,7 @@ msgstr "res.compañía.ldap"
#. module: users_ldap
#: model:ir.module.module,description:users_ldap.module_meta_information
msgid "Adds support for authentication by ldap server"
-msgstr ""
+msgstr "Añade soporte para autenticación contra un servidor ldap"
#. module: users_ldap
#: field:res.company.ldap,sequence:0
diff --git a/addons/users_ldap/i18n/pl.po b/addons/users_ldap/i18n/pl.po
new file mode 100644
index 00000000000..efb8d94455c
--- /dev/null
+++ b/addons/users_ldap/i18n/pl.po
@@ -0,0 +1,128 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-27 14:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"Language-Team: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parametry LDAP"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Konfiguracja LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Utwórz użytkownika, jeśli nie ma w bazie"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model stosowany do tworzenia użytkownika"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adres serwera LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port serwera LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Baza LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Hasło LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.module.module,description:users_ldap.module_meta_information
+msgid "Adds support for authentication by ldap server"
+msgstr "Dodaje obsługę autentykacji przez serwer LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nie możesz mieć dwóch użytkowników z tym samym loginem !"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentykuj użytkowników serwerem LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Model użytkownika"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtr LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Utwórz użytkownika"
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index b8bfd32e9d4..2ef3562f3c7 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-16 17:20+0000\n"
-"Last-Translator: Carlos-smile \n"
+"PO-Revision-Date: 2010-12-27 18:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\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: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: warning
@@ -163,7 +164,7 @@ msgstr ""
#: code:addons/warning/warning.py:0
#, python-format
msgid "Alert for %s !"
-msgstr ""
+msgstr "¡Alerta para %s!"
#. module: warning
#: field:res.partner,invoice_warn_msg:0
@@ -214,12 +215,12 @@ msgstr "Empresa"
#. module: warning
#: model:ir.model,name:warning.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
#. module: warning
#: model:ir.model,name:warning.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 5c34b2b279f..0a85f4c097a 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-26 06:51+0000\n"
+"PO-Revision-Date: 2010-12-27 09:18+0000\n"
"Last-Translator: Quentin THEURET \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: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: warning
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index c4f223ccb7e..eab4b0cf288 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 10:43+0000\n"
+"Last-Translator: Borja López Soilán \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: 2010-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki
@@ -269,6 +268,11 @@ msgid ""
"keep track for the wiki groups, pages, and history\n"
" "
msgstr ""
+"\n"
+"El módulo base para gestionar documentos (wiki)\n"
+"\n"
+"gestione los grupos, páginas e historial del wiki\n"
+" "
#. module: wiki
#: view:wiki.groups:0
diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml
old mode 100755
new mode 100644
diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/wiki/web/widgets/rss/feedparser.py
old mode 100755
new mode 100644
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index f3503936c78..2236f1f69ce 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -86,7 +86,7 @@ class wiki_group(osv.osv):
value['view_type'] = 'form'
value['view_mode'] = 'tree,form'
elif group.method == 'tree':
- view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+ view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
value['view_id'] = view_id
value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
value['view_type'] = 'tree'
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a8b56db8534..a8f53a5c3a5 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -85,8 +85,8 @@
-
- wiki.wiki.tree.childs
+
+ wiki.wiki.tree.children
wiki.wiki
tree
child_ids
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index f95c1e2dffd..e337fc9fdff 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -72,7 +72,7 @@ class wiki_create_menu(osv.osv_memory):
value['view_type'] = 'form'
value['view_mode'] = 'tree,form'
elif group.method == 'tree':
- view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+ view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
value['view_id'] = view_id
value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
value['view_type'] = 'tree'
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 1fe4f8acc49..d2458c796ff 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -54,7 +54,7 @@ class wiki_wiki_page_open(osv.osv_memory):
value['view_type'] = 'form'
value['view_mode'] = 'tree,form'
elif group.method == 'tree':
- view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+ view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
value['view_id'] = view_id
value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
value['view_type'] = 'tree'
diff --git a/addons/wiki_faq/i18n/es.po b/addons/wiki_faq/i18n/es.po
index ce3e59f945d..c05f2f4f4e7 100644
--- a/addons/wiki_faq/i18n/es.po
+++ b/addons/wiki_faq/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:51+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 10:44+0000\n"
+"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_faq
@@ -30,7 +29,7 @@ msgstr ""
#. module: wiki_faq
#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
msgid "Document Management - Wiki - FAQ"
-msgstr ""
+msgstr "Gestion documental - Wiki - Preguntas frecuentes"
#~ msgid "The certificate ID of the module must be unique !"
#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/wiki_quality_manual/i18n/es.po b/addons/wiki_quality_manual/i18n/es.po
index 53b2a988d6b..b0bed5c7fe2 100644
--- a/addons/wiki_quality_manual/i18n/es.po
+++ b/addons/wiki_quality_manual/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2010-12-27 10:44+0000\n"
+"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_quality_manual
@@ -30,7 +29,7 @@ msgstr ""
#. module: wiki_quality_manual
#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
+msgstr "Gestió documental - Wiki - Manual de calidad"
#~ msgid "The certificate ID of the module must be unique !"
#~ msgstr "¡El ID del certificado del módulo debe ser único!"