[MERGE] Latest trunk
bzr revid: mat@openerp.com-20130422071658-747t7yokuydr5a74
This commit is contained in:
@@ -1001,8 +1001,7 @@ class account_period(osv.osv):
|
||||
def find(self, cr, uid, dt=None, context=None):
|
||||
if context is None: context = {}
|
||||
if not dt:
|
||||
dt = fields.date.context_today(self,cr,uid,context=context)
|
||||
#CHECKME: shouldn't we check the state of the period?
|
||||
dt = fields.date.context_today(self, cr, uid, context=context)
|
||||
args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
|
||||
if context.get('company_id', False):
|
||||
args.append(('company_id', '=', context['company_id']))
|
||||
@@ -1010,7 +1009,7 @@ class account_period(osv.osv):
|
||||
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
|
||||
args.append(('company_id', '=', company_id))
|
||||
result = []
|
||||
if context.get('account_period_prefer_normal'):
|
||||
if context.get('account_period_prefer_normal', True):
|
||||
# look for non-special periods first, and fallback to all if no result is found
|
||||
result = self.search(cr, uid, args + [('special', '=', False)], context=context)
|
||||
if not result:
|
||||
@@ -1214,7 +1213,7 @@ class account_move(osv.osv):
|
||||
return res
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
ctx = dict(context or {}, account_period_prefer_normal=True)
|
||||
ctx = dict(context or {})
|
||||
period_ids = self.pool.get('account.period').find(cr, uid, context=ctx)
|
||||
return period_ids[0]
|
||||
|
||||
@@ -1786,7 +1785,7 @@ class account_tax_code(osv.osv):
|
||||
if context.get('period_id', False):
|
||||
period_id = context['period_id']
|
||||
else:
|
||||
period_id = self.pool.get('account.period').find(cr, uid)
|
||||
period_id = self.pool.get('account.period').find(cr, uid, context=context)
|
||||
if not period_id:
|
||||
return dict.fromkeys(ids, 0.0)
|
||||
period_id = period_id[0]
|
||||
|
||||
@@ -61,7 +61,7 @@ class account_bank_statement(osv.osv):
|
||||
return res
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
periods = self.pool.get('account.period').find(cr, uid,context=context)
|
||||
periods = self.pool.get('account.period').find(cr, uid, context=context)
|
||||
if periods:
|
||||
return periods[0]
|
||||
return False
|
||||
|
||||
@@ -985,8 +985,7 @@ class account_invoice(osv.osv):
|
||||
'narration':inv.comment
|
||||
}
|
||||
period_id = inv.period_id and inv.period_id.id or False
|
||||
ctx.update(company_id=inv.company_id.id,
|
||||
account_period_prefer_normal=True)
|
||||
ctx.update(company_id=inv.company_id.id)
|
||||
if not period_id:
|
||||
period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
|
||||
period_id = period_ids and period_ids[0] or False
|
||||
|
||||
@@ -622,8 +622,6 @@
|
||||
</record>
|
||||
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
|
||||
|
||||
<act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
|
||||
|
||||
<act_window
|
||||
id="act_account_journal_2_account_invoice_opened"
|
||||
name="Unpaid Invoices"
|
||||
|
||||
@@ -986,8 +986,7 @@ class account_move_line(osv.osv):
|
||||
if context is None:
|
||||
context = {}
|
||||
period_pool = self.pool.get('account.period')
|
||||
ctx = dict(context, account_period_prefer_normal=True)
|
||||
pids = period_pool.find(cr, user, date, context=ctx)
|
||||
pids = period_pool.find(cr, user, date, context=context)
|
||||
if pids:
|
||||
res.update({
|
||||
'period_id':pids[0]
|
||||
|
||||
@@ -1194,7 +1194,12 @@
|
||||
sequence="1"
|
||||
groups="group_account_user"
|
||||
/>
|
||||
|
||||
<record id="action_account_moves_all_tree" model="ir.actions.act_window">
|
||||
<field name="name">Journal Items</field>
|
||||
<field name="res_model">account.move.line</field>
|
||||
<field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
|
||||
<field name="view_id" ref="view_move_line_tree"/>
|
||||
</record>
|
||||
<record id="view_move_line_tree_reconcile" model="ir.ui.view">
|
||||
<field name="model">account.move.line</field>
|
||||
<field eval="24" name="priority"/>
|
||||
@@ -1771,23 +1776,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- res.partner links -->
|
||||
<act_window
|
||||
context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
|
||||
domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
|
||||
id="act_account_partner_account_move_all"
|
||||
name="Receivables & Payables"
|
||||
res_model="account.move.line"
|
||||
src_model="res.partner"/>
|
||||
|
||||
<act_window
|
||||
context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
|
||||
id="act_account_partner_account_move"
|
||||
name="Journal Items"
|
||||
res_model="account.move.line"
|
||||
src_model="res.partner"
|
||||
groups="account.group_account_user"/>
|
||||
|
||||
<!-- Account Templates -->
|
||||
<menuitem
|
||||
id="account_template_folder"
|
||||
|
||||
@@ -7,15 +7,14 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2012-12-22 23:17+0000\n"
|
||||
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
|
||||
"<webmaster@guaru.net>\n"
|
||||
"PO-Revision-Date: 2013-04-18 17:44+0000\n"
|
||||
"Last-Translator: Thiago Tognoli <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:19+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
|
||||
"X-Generator: Launchpad (build 16567)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
@@ -431,7 +430,7 @@ msgstr "Data de criação"
|
||||
#. module: account
|
||||
#: selection:account.journal,type:0
|
||||
msgid "Purchase Refund"
|
||||
msgstr "Devolução da Venda"
|
||||
msgstr "Devolução de Compra"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,type:0
|
||||
@@ -12678,13 +12677,6 @@ msgstr ""
|
||||
#~ msgid "This period is already closed !"
|
||||
#~ msgstr "Este período já está fechado"
|
||||
|
||||
#, python-format
|
||||
#~ msgid ""
|
||||
#~ "Selected Move lines does not have any account move enties in draft state"
|
||||
#~ msgstr ""
|
||||
#~ "As linhas do movimento selecionado nao tem nenhuma conta a ser movida para o "
|
||||
#~ "estado de esboço"
|
||||
|
||||
#~ msgid "Unpaid Customer Refunds"
|
||||
#~ msgstr "Reembolsos a clientes não pagos"
|
||||
|
||||
@@ -13232,6 +13224,13 @@ msgstr ""
|
||||
#~ msgid "Can not %s draft/proforma/cancel invoice."
|
||||
#~ msgstr "Não pode %s provisório/proforma/cancelar fatura."
|
||||
|
||||
#, python-format
|
||||
#~ msgid ""
|
||||
#~ "Selected Move lines does not have any account move enties in draft state"
|
||||
#~ msgstr ""
|
||||
#~ "As linhas de movimento selecionadas não tem nenhum movimento nesta conta no "
|
||||
#~ "modo provisório"
|
||||
|
||||
#, python-format
|
||||
#~ msgid "Can not pay draft/proforma/cancel invoice."
|
||||
#~ msgstr "Não se pode pagar uma fatura provisória/proforma/cancelada"
|
||||
|
||||
+39
-19
@@ -23,10 +23,16 @@ import datetime
|
||||
from dateutil.relativedelta import relativedelta
|
||||
import logging
|
||||
from operator import itemgetter
|
||||
from os.path import join as opj
|
||||
import time
|
||||
import urllib2
|
||||
import urlparse
|
||||
|
||||
from openerp import tools
|
||||
try:
|
||||
import simplejson as json
|
||||
except ImportError:
|
||||
import json # noqa
|
||||
|
||||
from openerp.release import serie
|
||||
from openerp.tools.translate import _
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
@@ -38,13 +44,28 @@ class account_installer(osv.osv_memory):
|
||||
|
||||
def _get_charts(self, cr, uid, context=None):
|
||||
modules = self.pool.get('ir.module.module')
|
||||
|
||||
# try get the list on apps server
|
||||
try:
|
||||
apps_server = self.pool.get('ir.config_parameter').get_param(cr, uid, 'apps.server', 'https://apps.openerp.com')
|
||||
|
||||
up = urlparse.urlparse(apps_server)
|
||||
url = '{0.scheme}://{0.netloc}/apps/charts?serie={1}'.format(up, serie)
|
||||
|
||||
j = urllib2.urlopen(url, timeout=3).read()
|
||||
apps_charts = json.loads(j)
|
||||
|
||||
charts = dict(apps_charts)
|
||||
except Exception:
|
||||
charts = dict()
|
||||
|
||||
# Looking for the module with the 'Account Charts' category
|
||||
category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts')
|
||||
ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context)
|
||||
charts = list(
|
||||
sorted(((m.name, m.shortdesc)
|
||||
for m in modules.browse(cr, uid, ids, context=context)),
|
||||
key=itemgetter(1)))
|
||||
if ids:
|
||||
charts.update((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context))
|
||||
|
||||
charts = sorted(charts.items(), key=itemgetter(1))
|
||||
charts.insert(0, ('configurable', _('Custom')))
|
||||
return charts
|
||||
|
||||
@@ -57,9 +78,9 @@ class account_installer(osv.osv_memory):
|
||||
"country."),
|
||||
'date_start': fields.date('Start Date', required=True),
|
||||
'date_stop': fields.date('End Date', required=True),
|
||||
'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
|
||||
'period': fields.selection([('month', 'Monthly'), ('3months', '3 Monthly')], 'Periods', required=True),
|
||||
'company_id': fields.many2one('res.company', 'Company', required=True),
|
||||
'has_default_company' : fields.boolean('Has Default Company', readonly=True),
|
||||
'has_default_company': fields.boolean('Has Default Company', readonly=True),
|
||||
}
|
||||
|
||||
def _default_company(self, cr, uid, context=None):
|
||||
@@ -78,30 +99,29 @@ class account_installer(osv.osv_memory):
|
||||
'has_default_company': _default_has_default_company,
|
||||
'charts': 'configurable'
|
||||
}
|
||||
|
||||
|
||||
def get_unconfigured_cmp(self, cr, uid, context=None):
|
||||
""" get the list of companies that have not been configured yet
|
||||
but don't care about the demo chart of accounts """
|
||||
cmp_select = []
|
||||
company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
|
||||
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()]
|
||||
return list(set(company_ids)-set(configured_cmp))
|
||||
|
||||
|
||||
def check_unconfigured_cmp(self, cr, uid, context=None):
|
||||
""" check if there are still unconfigured companies """
|
||||
if not self.get_unconfigured_cmp(cr, uid, context=context):
|
||||
raise osv.except_osv(_('No unconfigured company !'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
|
||||
|
||||
|
||||
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
||||
if context is None:context = {}
|
||||
res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
|
||||
if context is None: context = {}
|
||||
res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
|
||||
cmp_select = []
|
||||
# display in the widget selection only the companies that haven't been configured yet
|
||||
unconfigured_cmp = self.get_unconfigured_cmp(cr, uid, context=context)
|
||||
for field in res['fields']:
|
||||
if field == 'company_id':
|
||||
res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
|
||||
res['fields'][field]['domain'] = [('id', 'in', 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)]
|
||||
@@ -117,7 +137,7 @@ class account_installer(osv.osv_memory):
|
||||
|
||||
def execute(self, cr, uid, ids, context=None):
|
||||
self.execute_simple(cr, uid, ids, context)
|
||||
super(account_installer, self).execute(cr, uid, ids, context=context)
|
||||
return super(account_installer, self).execute(cr, uid, ids, context=context)
|
||||
|
||||
def execute_simple(self, cr, uid, ids, context=None):
|
||||
if context is None:
|
||||
@@ -129,8 +149,8 @@ class account_installer(osv.osv_memory):
|
||||
if not f_ids:
|
||||
name = code = res['date_start'][:4]
|
||||
if int(name) != int(res['date_stop'][:4]):
|
||||
name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
|
||||
code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
|
||||
name = res['date_start'][:4] + '-' + res['date_stop'][:4]
|
||||
code = res['date_start'][2:4] + '-' + res['date_stop'][2:4]
|
||||
vals = {
|
||||
'name': name,
|
||||
'code': code,
|
||||
@@ -150,7 +170,7 @@ class account_installer(osv.osv_memory):
|
||||
chart = self.read(cr, uid, ids, ['charts'],
|
||||
context=context)[0]['charts']
|
||||
_logger.debug('Installing chart of accounts %s', chart)
|
||||
return modules | set([chart])
|
||||
return (modules | set([chart])) - set(['has_default_company', 'configurable'])
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -50,6 +50,29 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_account_analytic_account_form" model="ir.actions.act_window">
|
||||
<field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
|
||||
<field name="name">Contracts/Analytic Accounts</field>
|
||||
<field name="res_model">account.analytic.account</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="partner_view_buttons">
|
||||
<field name="name">partner.view.buttons</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form" />
|
||||
<field name="priority" eval="10"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button type="action" string="Invoices"
|
||||
name="%(account.action_invoice_tree)d"
|
||||
context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice"/>
|
||||
<button type="action" string="Journal Items" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user"/>
|
||||
<button type="action" string="Contracts/Analytic Accounts" name="%(account.action_account_analytic_account_form)d"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_account_fiscal_position_form" model="ir.actions.act_window">
|
||||
<field name="name">Fiscal Positions</field>
|
||||
<field name="res_model">account.fiscal.position</field>
|
||||
@@ -106,17 +129,5 @@
|
||||
</page>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Partners info tab view-->
|
||||
|
||||
<act_window
|
||||
id="action_analytic_open"
|
||||
name="Contracts/Analytic Accounts"
|
||||
res_model="account.analytic.account"
|
||||
context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
|
||||
src_model="res.partner"
|
||||
view_type="form"
|
||||
view_mode="tree,form"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
@@ -81,7 +81,7 @@ class account_entries_report(osv.osv):
|
||||
period_obj = self.pool.get('account.period')
|
||||
for arg in args:
|
||||
if arg[0] == 'period_id' and arg[2] == 'current_period':
|
||||
current_period = period_obj.find(cr, uid)[0]
|
||||
current_period = period_obj.find(cr, uid, context=context)[0]
|
||||
args.append(['period_id','in',[current_period]])
|
||||
break
|
||||
elif arg[0] == 'period_id' and arg[2] == 'current_year':
|
||||
@@ -100,7 +100,7 @@ class account_entries_report(osv.osv):
|
||||
fiscalyear_obj = self.pool.get('account.fiscalyear')
|
||||
period_obj = self.pool.get('account.period')
|
||||
if context.get('period', False) == 'current_period':
|
||||
current_period = period_obj.find(cr, uid)[0]
|
||||
current_period = period_obj.find(cr, uid, context=context)[0]
|
||||
domain.append(['period_id','in',[current_period]])
|
||||
elif context.get('year', False) == 'current_year':
|
||||
current_year = fiscalyear_obj.find(cr, uid)
|
||||
|
||||
@@ -148,7 +148,6 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
|
||||
context['analytic_id'] = data['analytic_id'][0]
|
||||
if context['date_p']:
|
||||
date = context['date_p']
|
||||
|
||||
ids = period_obj.find(cr, uid, dt=date, context=context)
|
||||
if ids:
|
||||
period_id = ids[0]
|
||||
|
||||
@@ -38,7 +38,7 @@ class account_tax_chart(osv.osv_memory):
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
"""Return default period value"""
|
||||
period_ids = self.pool.get('account.period').find(cr, uid)
|
||||
period_ids = self.pool.get('account.period').find(cr, uid, context=context)
|
||||
return period_ids and period_ids[0] or False
|
||||
|
||||
def account_tax_chart_open_window(self, cr, uid, ids, context=None):
|
||||
|
||||
@@ -82,7 +82,7 @@ class account_asset_asset(osv.osv):
|
||||
return super(account_asset_asset, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
periods = self.pool.get('account.period').find(cr, uid)
|
||||
periods = self.pool.get('account.period').find(cr, uid, context=context)
|
||||
if periods:
|
||||
return periods[0]
|
||||
else:
|
||||
|
||||
@@ -30,7 +30,7 @@ class asset_depreciation_confirmation_wizard(osv.osv_memory):
|
||||
}
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
periods = self.pool.get('account.period').find(cr, uid)
|
||||
periods = self.pool.get('account.period').find(cr, uid, context=context)
|
||||
if periods:
|
||||
return periods[0]
|
||||
return False
|
||||
|
||||
@@ -84,7 +84,7 @@ class account_voucher(osv.osv):
|
||||
if context is None: context = {}
|
||||
if context.get('period_id', False):
|
||||
return context.get('period_id')
|
||||
periods = self.pool.get('account.period').find(cr, uid)
|
||||
periods = self.pool.get('account.period').find(cr, uid, context=context)
|
||||
return periods and periods[0] or False
|
||||
|
||||
def _make_journal_search(self, cr, uid, ttype, context=None):
|
||||
|
||||
@@ -200,6 +200,9 @@ class res_users(osv.Model):
|
||||
'partner_id': partner.id,
|
||||
'email': values.get('email') or values.get('login'),
|
||||
})
|
||||
if partner.company_id:
|
||||
values['company_id'] = partner.company_id.id
|
||||
values['company_ids'] = [(6,0,[partner.company_id.id])]
|
||||
self._signup_create_user(cr, uid, values, context=context)
|
||||
else:
|
||||
# no token, sign up an external user
|
||||
|
||||
@@ -1053,6 +1053,14 @@ class crm_lead(base_stage, format_address, osv.osv):
|
||||
message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
|
||||
return self.message_post(cr, uid, ids, body=message, context=context)
|
||||
|
||||
def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
|
||||
if not duration:
|
||||
duration = _('unknown')
|
||||
else:
|
||||
duration = str(duration)
|
||||
message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
|
||||
return self.message_post(cr, uid, ids, body=message, context=context)
|
||||
|
||||
def onchange_state(self, cr, uid, ids, state_id, context=None):
|
||||
if state_id:
|
||||
country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
|
||||
|
||||
@@ -34,6 +34,13 @@ class crm_meeting(osv.Model):
|
||||
'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
|
||||
}
|
||||
|
||||
def create(self, cr, uid, vals, context=None):
|
||||
res = super(crm_meeting, self).create(cr, uid, vals, context=context)
|
||||
obj = self.browse(cr, uid, res, context=context)
|
||||
if obj.opportunity_id:
|
||||
self.pool.get('crm.lead').log_meeting(cr, uid, [obj.opportunity_id.id], obj.name, obj.date, obj.duration, context=context)
|
||||
return res
|
||||
|
||||
|
||||
class calendar_attendee(osv.osv):
|
||||
""" Calendar Attendee """
|
||||
|
||||
@@ -52,6 +52,9 @@ class hr_expense_expense(osv.osv):
|
||||
res[expense.id] = total
|
||||
return res
|
||||
|
||||
def _get_expense_from_line(self, cr, uid, ids, context=None):
|
||||
return [line.expense_id.id for line in self.pool.get('hr.expense.line').browse(cr, uid, ids, context=context)]
|
||||
|
||||
def _get_currency(self, cr, uid, context=None):
|
||||
user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0]
|
||||
if user.company_id:
|
||||
@@ -84,7 +87,10 @@ class hr_expense_expense(osv.osv):
|
||||
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
|
||||
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
|
||||
'note': fields.text('Note'),
|
||||
'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account')),
|
||||
'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'),
|
||||
store={
|
||||
'hr.expense.line': (_get_expense_from_line, ['unit_amount','unit_quantity'], 10)
|
||||
}),
|
||||
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
|
||||
'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
|
||||
'company_id': fields.many2one('res.company', 'Company', required=True),
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="name"/>
|
||||
<field name="currency_id" groups="base.group_multi_currency"/>
|
||||
<field name="amount"/>
|
||||
<field name="amount" sum="Total Expenses"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
@@ -7,19 +7,19 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2012-10-17 00:01+0000\n"
|
||||
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
|
||||
"PO-Revision-Date: 2013-04-18 18:07+0000\n"
|
||||
"Last-Translator: Thiago Tognoli <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:07+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
|
||||
"X-Generator: Launchpad (build 16567)\n"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:report.transaction.pos,product_nb:0
|
||||
msgid "Product Nb."
|
||||
msgstr "Produto No."
|
||||
msgstr "Núm. Produto"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
|
||||
@@ -286,7 +286,7 @@ msgstr "Desconto (%)"
|
||||
#: report:pos.details:0
|
||||
#: report:pos.details_summary:0
|
||||
msgid "Total discount"
|
||||
msgstr "Total de Desconto"
|
||||
msgstr "Desconto total"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -354,6 +354,9 @@ msgid ""
|
||||
"Check this if this point of sale should open by default in a self checkout "
|
||||
"mode. If unchecked, OpenERP uses the normal cashier mode by default."
|
||||
msgstr ""
|
||||
"Marque esta opção se este ponto de venda deve ser aberto por padrão em modo "
|
||||
"de auto atendimento. Se não marcada, o OpenERP irá usar o modo normal por "
|
||||
"padrão."
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
|
||||
@@ -444,7 +447,7 @@ msgstr "Você precisa associar um Ponto de Vendas a sua sessão."
|
||||
#. module: point_of_sale
|
||||
#: view:pos.order.line:0
|
||||
msgid "Total qty"
|
||||
msgstr "Total de Qtd"
|
||||
msgstr "Qtd Total"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
|
||||
@@ -460,6 +463,10 @@ msgid ""
|
||||
"close this session, you can update the 'Closing Cash Control' to avoid any "
|
||||
"difference."
|
||||
msgstr ""
|
||||
"Por favor, defina suas contas de lucros e perdas no seu método de pagamento "
|
||||
"'%s'. Isso permitirá o OpenERP colocar a diferença de %.2f em seu saldo "
|
||||
"final. Para fechar a sessão, você pode atualizar o 'Fechando Controle de "
|
||||
"Caixa'para evitar qualquer diferença."
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:315
|
||||
@@ -777,7 +784,7 @@ msgstr "Imprimir Relatório"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
|
||||
msgid "Dr. Oetker Ristorante Bolognese"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Bolognese"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:pos.category,name:point_of_sale.pizza
|
||||
@@ -787,7 +794,7 @@ msgstr "Pizza"
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session:0
|
||||
msgid "= Theoretical Balance"
|
||||
msgstr ""
|
||||
msgstr "= Balanço Teórico"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/wizard/pos_return.py:85
|
||||
@@ -974,7 +981,7 @@ msgstr "Lista de Caixas Registradoras"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.maes_50cl_product_template
|
||||
msgid "Maes 50cl"
|
||||
msgstr ""
|
||||
msgstr "Maes 50cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:report.pos.order:0
|
||||
@@ -1030,7 +1037,7 @@ msgstr "Spa Reine 33cl"
|
||||
#. module: point_of_sale
|
||||
#: model:ir.model,name:point_of_sale.model_pos_discount
|
||||
msgid "Add a Global Discount"
|
||||
msgstr "Adicionar Desconto Global"
|
||||
msgstr "Adicionar um Desconto Global"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.config:0
|
||||
@@ -1040,7 +1047,7 @@ msgstr "Diários"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
|
||||
msgid "Dr. Oetker Ristorante Prosciutto"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Prosciutto"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
|
||||
@@ -1126,7 +1133,7 @@ msgstr "Re-impressão"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
|
||||
msgid "Chimay Bleu 75cl"
|
||||
msgstr ""
|
||||
msgstr "Chimay Bleu 75cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.payment.report.user:0
|
||||
@@ -1156,7 +1163,7 @@ msgstr "No. de Linhas"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:89
|
||||
#, python-format
|
||||
msgid "Disc"
|
||||
msgstr "Disco"
|
||||
msgstr "Desc."
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.order:0
|
||||
@@ -1166,7 +1173,7 @@ msgstr "(atualizar)"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
|
||||
msgid "IJsboerke Vanilla 2.5L"
|
||||
msgstr ""
|
||||
msgstr "IJsboerke Vanilla 2.5L"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
|
||||
@@ -1177,7 +1184,7 @@ msgstr "Detalhes da Venda"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.evian_2l_product_template
|
||||
msgid "2L Evian"
|
||||
msgstr ""
|
||||
msgstr "2L Evian"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:373
|
||||
@@ -1185,7 +1192,7 @@ msgstr ""
|
||||
#: code:addons/point_of_sale/wizard/pos_session_opening.py:34
|
||||
#, python-format
|
||||
msgid "Start Point Of Sale"
|
||||
msgstr ""
|
||||
msgstr "Iniciar Ponto de Venda"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:pos.category,name:point_of_sale.pils
|
||||
@@ -1195,7 +1202,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: help:pos.session,cash_register_balance_end_real:0
|
||||
msgid "Computed using the cash control lines"
|
||||
msgstr ""
|
||||
msgstr "Calculado usando as linhas de controle de caixa"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:all.closed.cashbox.of.the.day:0
|
||||
@@ -1217,7 +1224,7 @@ msgstr "ABC"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
|
||||
msgid "IJsboerke 2.5L White Lady"
|
||||
msgstr ""
|
||||
msgstr "IJsboerke 2.5L White Lady"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.order,lines:0
|
||||
@@ -1239,7 +1246,7 @@ msgstr ""
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:485
|
||||
#, python-format
|
||||
msgid "Read Weighting Scale"
|
||||
msgstr ""
|
||||
msgstr "Lendo a Balança"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -1302,7 +1309,7 @@ msgstr "Marcar como Obsoleto"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.limon_product_template
|
||||
msgid "Stringers"
|
||||
msgstr ""
|
||||
msgstr "Limões"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.order,pricelist_id:0
|
||||
@@ -1369,19 +1376,19 @@ msgstr "Stella Artois 33cl"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
|
||||
msgid "Lays Natural XXL 300g"
|
||||
msgstr ""
|
||||
msgstr "Lays Natural XXL 300g"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:479
|
||||
#, python-format
|
||||
msgid "Scan Item Unrecognized"
|
||||
msgstr ""
|
||||
msgstr "item Escaneado não Reconhecido"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:all.closed.cashbox.of.the.day:0
|
||||
msgid "Today's Closed Cashbox"
|
||||
msgstr "Fechamento de Caixa do dia"
|
||||
msgstr "Fechamento de Caixa do Dia"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:897
|
||||
@@ -1397,7 +1404,7 @@ msgstr "Fatura Provisória"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
|
||||
msgid "Oven Baked Lays Paprika 150g"
|
||||
msgstr ""
|
||||
msgstr "Oven Baked Lays Paprika 150g"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.invoice:0
|
||||
@@ -1449,7 +1456,7 @@ msgstr "Coca-Cola Light 2L"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_funghi_product_template
|
||||
msgid "Dr. Oetker Ristorante Funghi"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Funghi"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
|
||||
@@ -1477,7 +1484,7 @@ msgstr "Ean Inválido"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
|
||||
msgid "Lindemans Kriek 37.5cl"
|
||||
msgstr ""
|
||||
msgstr "Lindemans Kriek 37.5cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.config:0
|
||||
@@ -1494,7 +1501,7 @@ msgstr "Coca-Cola Zero 33cl"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:405
|
||||
#, python-format
|
||||
msgid "ä"
|
||||
msgstr ""
|
||||
msgstr "ä"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.invoice:0
|
||||
@@ -1523,7 +1530,7 @@ msgstr "Desconhecido"
|
||||
#. module: point_of_sale
|
||||
#: field:product.product,income_pdt:0
|
||||
msgid "Point of Sale Cash In"
|
||||
msgstr ""
|
||||
msgstr "Colocar dinheiro no Ponto de Venda"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -1608,7 +1615,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
|
||||
msgid "Boon Framboise 37.5cl"
|
||||
msgstr ""
|
||||
msgstr "Boon Framboise 37.5cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.model,name:point_of_sale.model_pos_config
|
||||
@@ -1627,7 +1634,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: field:product.product,expense_pdt:0
|
||||
msgid "Point of Sale Cash Out"
|
||||
msgstr ""
|
||||
msgstr "Sacar do Ponto de Venda"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: selection:report.pos.order,month:0
|
||||
@@ -1639,7 +1646,7 @@ msgstr "Novembro"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:267
|
||||
#, python-format
|
||||
msgid "Please scan an item or your member card"
|
||||
msgstr ""
|
||||
msgstr "Por favor escaneie um item ou seu cartão de associado"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.poivron_verts_product_template
|
||||
@@ -1649,7 +1656,7 @@ msgstr "Pimentões Verdes"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
|
||||
msgid "Timmermans Faro 37.5cl"
|
||||
msgstr ""
|
||||
msgstr "Timmermans Faro 37.5cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:410
|
||||
@@ -1662,7 +1669,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session:0
|
||||
msgid "Validate Closing & Post Entries"
|
||||
msgstr ""
|
||||
msgstr "Validar Encerramento e Lançar Entradas"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:report.transaction.pos,no_trans:0
|
||||
@@ -1705,7 +1712,7 @@ msgstr "Cancelar"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:296
|
||||
#, python-format
|
||||
msgid "Please put your product on the scale"
|
||||
msgstr ""
|
||||
msgstr "Por favor, coloque seu produto na balança"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
|
||||
@@ -1715,12 +1722,12 @@ msgstr "Vendas(Resumo)"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.nectarine_product_template
|
||||
msgid "Peach"
|
||||
msgstr ""
|
||||
msgstr "Pêssego"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
|
||||
msgid "Timmermans Kriek 37.5cl"
|
||||
msgstr ""
|
||||
msgstr "Timmermans Kriek 37.5cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.config,sequence_id:0
|
||||
@@ -1753,7 +1760,7 @@ msgstr "fechar"
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.report.xml,name:point_of_sale.report_user_label
|
||||
msgid "User Labels"
|
||||
msgstr ""
|
||||
msgstr "Etiquetas do Usuário"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.model,name:point_of_sale.model_pos_order_line
|
||||
@@ -1897,6 +1904,9 @@ msgid ""
|
||||
"complete\n"
|
||||
" your purchase"
|
||||
msgstr ""
|
||||
"Por favor, insira seu cartão no leitor e aguarde as instruções para "
|
||||
"completar\n"
|
||||
" sua compra"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: help:product.product,income_pdt:0
|
||||
@@ -1935,6 +1945,8 @@ msgid ""
|
||||
"Unable to open the session. You have to assign a sale journal to your point "
|
||||
"of sale."
|
||||
msgstr ""
|
||||
"Não é possível abrir a sessão. Você tem que atribuir um diário de venda para "
|
||||
"o seu ponto de venda."
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:report.pos.order:0
|
||||
@@ -1988,7 +2000,7 @@ msgstr "Estabelecimento:"
|
||||
#. module: point_of_sale
|
||||
#: field:account.journal,self_checkout_payment_method:0
|
||||
msgid "Self Checkout Payment Method"
|
||||
msgstr ""
|
||||
msgstr "Forma de Pagamento do Auto Atendimento"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.order:0
|
||||
@@ -2124,7 +2136,7 @@ msgstr "Produtos"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
|
||||
msgid "Dr. Oetker Ristorante Quattro Formaggi"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Quattro Formaggi"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
|
||||
@@ -2654,7 +2666,7 @@ msgstr "Fatura"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:701
|
||||
#, python-format
|
||||
msgid "shift"
|
||||
msgstr ""
|
||||
msgstr "shift"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
|
||||
@@ -2786,7 +2798,7 @@ msgstr "Produto"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_pollo_product_template
|
||||
msgid "Dr. Oetker Ristorante Pollo"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Pollo"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: constraint:pos.session:0
|
||||
@@ -2836,7 +2848,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_margherita_product_template
|
||||
msgid "Dr. Oetker La Margherita"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker La Margherita"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.order:0
|
||||
@@ -2936,7 +2948,7 @@ msgstr "Gerente"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
|
||||
msgid "Lays Salt and Pepper Oven Baked 150g"
|
||||
msgstr ""
|
||||
msgstr "Lays Salt and Pepper Oven Baked 150g"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.details,date_start:0
|
||||
@@ -2993,7 +3005,7 @@ msgstr "Procurar Pedido de Venda"
|
||||
#. module: point_of_sale
|
||||
#: field:pos.config,iface_self_checkout:0
|
||||
msgid "Self Checkout Mode"
|
||||
msgstr ""
|
||||
msgstr "Modo de Auto Atendimento"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:account.journal,journal_user:0
|
||||
@@ -3027,7 +3039,7 @@ msgstr "Relatório de Pagamento"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
|
||||
msgid "Fanta Orange 25cl"
|
||||
msgstr ""
|
||||
msgstr "Fanta Laranja 25cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.confirm:0
|
||||
@@ -3063,7 +3075,7 @@ msgstr "Motivo"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.orangina_33cl_product_template
|
||||
msgid "Orangina 33cl"
|
||||
msgstr ""
|
||||
msgstr "Orangina 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.config:0
|
||||
@@ -3073,7 +3085,7 @@ msgstr "Definir como Inativo"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
|
||||
msgid "Chimay Bleu 33cl"
|
||||
msgstr ""
|
||||
msgstr "Chimay Bleu 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
|
||||
@@ -3089,7 +3101,7 @@ msgstr "Fritas"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_spinaci_product_template
|
||||
msgid "Dr. Oetker Ristorante Spinaci"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Spinaci"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -3121,7 +3133,7 @@ msgstr "Colocar dinheiro em"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
|
||||
msgid "Fanta Orange Zero 1.5L"
|
||||
msgstr ""
|
||||
msgstr "Fanta Laranja Zero 1.5L"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.boni_orange_product_template
|
||||
@@ -3234,7 +3246,7 @@ msgstr "Relatório do PDV"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
|
||||
msgid "Chaudfontaine 1.5l"
|
||||
msgstr ""
|
||||
msgstr "Chaudfontaine 1.5l"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:1069
|
||||
@@ -3304,7 +3316,7 @@ msgstr "Coca-Cola Zero 50cl"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_tonno_product_template
|
||||
msgid "Dr. Oetker Ristorante Tonno"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Tonno"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.invoice:0
|
||||
@@ -3346,7 +3358,7 @@ msgstr "cash.box.out"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
|
||||
msgid "Fanta Zero Orange 33cl"
|
||||
msgstr ""
|
||||
msgstr "Fanta Laranja Zero 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: help:product.product,available_in_pos:0
|
||||
@@ -3361,7 +3373,7 @@ msgstr "Dia da data do pedido"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.maes_33cl_product_template
|
||||
msgid "Maes 33cl"
|
||||
msgstr ""
|
||||
msgstr "Maes 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -3378,7 +3390,7 @@ msgstr "Configuração"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.orval_33cl_product_template
|
||||
msgid "Orval 33cl"
|
||||
msgstr ""
|
||||
msgstr "Orval 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -3411,7 +3423,7 @@ msgstr "Frutas Frescas"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,,5cl_product_template
|
||||
msgid "Lindemans sinful 37.5cl"
|
||||
msgstr ""
|
||||
msgstr "Lindemans sinful 37.5cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
|
||||
@@ -3431,7 +3443,7 @@ msgstr "Imagem"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
|
||||
msgid "Spa Barisart 1.5l"
|
||||
msgstr ""
|
||||
msgstr "Spa Barisart 1.5l"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:789
|
||||
@@ -3443,7 +3455,7 @@ msgstr "Retornar Produtos"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.jupiler_33cl_product_template
|
||||
msgid "Jupiler 33cl"
|
||||
msgstr ""
|
||||
msgstr "Jupiler 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -3551,7 +3563,7 @@ msgstr "Balança Eletrônica"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
|
||||
msgid "Spa Barisart 50cl"
|
||||
msgstr ""
|
||||
msgstr "Spa Barisart 50cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:res.users,pos_config:0
|
||||
@@ -3595,7 +3607,7 @@ msgstr "Pago"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:464
|
||||
#, python-format
|
||||
msgid "3.141Kg Oranges"
|
||||
msgstr ""
|
||||
msgstr "3.141Kg de Laranjas"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.invoice:0
|
||||
@@ -3611,7 +3623,7 @@ msgstr "Por favor informe um parceiro para a venda"
|
||||
#. module: point_of_sale
|
||||
#: model:pos.category,name:point_of_sale.fruity_beers
|
||||
msgid "Fruity Beers"
|
||||
msgstr ""
|
||||
msgstr "Cerveja de Frutas"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session:0
|
||||
@@ -3623,7 +3635,7 @@ msgstr ""
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:463
|
||||
#, python-format
|
||||
msgid "Soda 33cl"
|
||||
msgstr ""
|
||||
msgstr "Soda 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: help:pos.session,cash_register_balance_start:0
|
||||
@@ -3644,7 +3656,7 @@ msgstr "Vendas do Usuário"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_hawaii_product_template
|
||||
msgid "Dr. Oetker Ristorante Hawaii"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Hawaii"
|
||||
|
||||
#. module: point_of_sale
|
||||
#. openerp-web
|
||||
@@ -3678,12 +3690,12 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
|
||||
msgid "Chaudfontaine Petillante 33cl"
|
||||
msgstr ""
|
||||
msgstr "Chaudfontaine Petillante 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
|
||||
msgid "Pepsi Max 2L"
|
||||
msgstr ""
|
||||
msgstr "Pepsi Max 2L"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.session,details_ids:0
|
||||
@@ -3693,17 +3705,17 @@ msgstr "Controle de Caixa"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
|
||||
msgid "Dr. Oetker Ristorante Vegetable"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Vegetable"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:pos.category,name:point_of_sale.soda
|
||||
msgid "Soda"
|
||||
msgstr ""
|
||||
msgstr "Soda"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
|
||||
msgid "Lays Paprika XXL 300g"
|
||||
msgstr ""
|
||||
msgstr "Lays Paprika XXL 300g"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.invoice:0
|
||||
@@ -3715,7 +3727,7 @@ msgstr "Reembolso"
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:417
|
||||
#, python-format
|
||||
msgid "Your shopping cart is empty"
|
||||
msgstr ""
|
||||
msgstr "Seu Carrinho de Compras está vazio"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/report/pos_invoice.py:46
|
||||
@@ -3726,7 +3738,7 @@ msgstr "Por favor crie uma fatura para esta venda."
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
|
||||
msgid "Dr. Oetker Ristorante Mozzarella"
|
||||
msgstr ""
|
||||
msgstr "Dr. Oetker Ristorante Mozzarella"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.details:0
|
||||
@@ -3737,7 +3749,7 @@ msgstr "Desc(%)"
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session.opening:0
|
||||
msgid "The session"
|
||||
msgstr ""
|
||||
msgstr "A sessão"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.order:0
|
||||
@@ -3762,7 +3774,7 @@ msgstr "Ordem de Linhas"
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session.opening:0
|
||||
msgid "PoS Session Opening"
|
||||
msgstr ""
|
||||
msgstr "Abrindo Sessão do PDV"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.order.line,price_subtotal:0
|
||||
@@ -3780,7 +3792,7 @@ msgstr "excluir"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.spa_50cl_product_template
|
||||
msgid "Spa Reine 50cl"
|
||||
msgstr ""
|
||||
msgstr "Spa Reine 50cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.chicon_flandria_extra_product_template
|
||||
@@ -3791,22 +3803,22 @@ msgstr ""
|
||||
#: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
|
||||
#: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
|
||||
msgid "Lays Natural Light 170g"
|
||||
msgstr ""
|
||||
msgstr "Lays Natural Light 170g"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
|
||||
msgid "Leffe Blonde 33cl"
|
||||
msgstr ""
|
||||
msgstr "Leffe Blonde 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
|
||||
msgid "Pyament Report"
|
||||
msgstr ""
|
||||
msgstr "Relatório de Pagamento"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:report.transaction.pos,jl_id:0
|
||||
msgid "Cash Journals"
|
||||
msgstr ""
|
||||
msgstr "Diários de Dinheiro"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session:0
|
||||
@@ -3816,12 +3828,12 @@ msgstr "Sessão:"
|
||||
#. module: point_of_sale
|
||||
#: field:pos.config,iface_print_via_proxy:0
|
||||
msgid "Print via Proxy"
|
||||
msgstr ""
|
||||
msgstr "Imprimir via Proxy"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.sales.user.today:0
|
||||
msgid "Today's Sales By User"
|
||||
msgstr ""
|
||||
msgstr "Vendas de hoje por Usuário"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: report:pos.invoice:0
|
||||
@@ -3858,7 +3870,7 @@ msgstr "Anotações Internas"
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
|
||||
msgid "IJsboerke Chocolat 2.5L"
|
||||
msgstr ""
|
||||
msgstr "IJsboerke Chocolat 2.5L"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: help:pos.category,image_small:0
|
||||
@@ -3871,7 +3883,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: field:pos.session.opening,pos_state:0
|
||||
msgid "Session Status"
|
||||
msgstr ""
|
||||
msgstr "Status da Sessão"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: field:pos.order,picking_id:0
|
||||
@@ -3915,7 +3927,7 @@ msgstr "Editar"
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session.opening:0
|
||||
msgid "Click to continue the session."
|
||||
msgstr ""
|
||||
msgstr "Clique para continuar a sessão."
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:pos.config:0
|
||||
@@ -3930,7 +3942,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: view:pos.session.opening:0
|
||||
msgid "Start Selling"
|
||||
msgstr ""
|
||||
msgstr "Começar a Vender"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: selection:report.pos.order,month:0
|
||||
@@ -3963,7 +3975,7 @@ msgstr ""
|
||||
#. module: point_of_sale
|
||||
#: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
|
||||
msgid "Leffe Brune \"9\" 33cl"
|
||||
msgstr ""
|
||||
msgstr "Leffe Brune \"9\" 33cl"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: help:account.journal,journal_user:0
|
||||
@@ -4011,7 +4023,7 @@ msgstr ""
|
||||
#: code:addons/point_of_sale/static/src/xml/pos.xml:351
|
||||
#, python-format
|
||||
msgid "Sorry, we could not create a session for this user."
|
||||
msgstr ""
|
||||
msgstr "Desculpe, não podemos criar uma sessão para esse usuário."
|
||||
|
||||
#. module: point_of_sale
|
||||
#: code:addons/point_of_sale/point_of_sale.py:98
|
||||
@@ -4019,7 +4031,7 @@ msgstr ""
|
||||
#: selection:pos.session.opening,pos_state:0
|
||||
#, python-format
|
||||
msgid "Opening Control"
|
||||
msgstr ""
|
||||
msgstr "Abrindo Controle"
|
||||
|
||||
#. module: point_of_sale
|
||||
#: view:report.pos.order:0
|
||||
|
||||
@@ -8,15 +8,14 @@ msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 00:27+0000\n"
|
||||
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
|
||||
"<webmaster@guaru.net>\n"
|
||||
"PO-Revision-Date: 2013-04-18 17:42+0000\n"
|
||||
"Last-Translator: Thiago Tognoli <Unknown>\n"
|
||||
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:43+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
|
||||
"X-Generator: Launchpad (build 16567)\n"
|
||||
|
||||
#. module: procurement
|
||||
#: model:ir.ui.menu,name:procurement.menu_stock_sched
|
||||
@@ -57,7 +56,7 @@ msgid ""
|
||||
" available"
|
||||
msgstr ""
|
||||
"quantidades necessárias estão sempre\n"
|
||||
" disponíveis"
|
||||
" disponíveis"
|
||||
|
||||
#. module: procurement
|
||||
#: view:product.product:0
|
||||
@@ -68,9 +67,9 @@ msgid ""
|
||||
" create others rules like orderpoints."
|
||||
msgstr ""
|
||||
"Se não houver quantidade suficiente disponível, a ordem de entrega\n"
|
||||
" vai esperar por novos produtos. Para cumprir o "
|
||||
" vai esperar por novos produtos. Para cumprir o "
|
||||
"inventário, você deve\n"
|
||||
" criar outras regras como ponto de compra."
|
||||
" criar outras regras como ponto de compra."
|
||||
|
||||
#. module: procurement
|
||||
#: field:procurement.order,procure_method:0
|
||||
@@ -632,7 +631,7 @@ msgstr "Provisório"
|
||||
#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
|
||||
#: view:procurement.order.compute.all:0
|
||||
msgid "Run Schedulers"
|
||||
msgstr "executar Agendadores"
|
||||
msgstr "Executar Agendadores"
|
||||
|
||||
#. module: procurement
|
||||
#: view:procurement.order.compute:0
|
||||
|
||||
@@ -335,7 +335,7 @@
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">purchase.order</field>
|
||||
<field name="context">{}</field>
|
||||
<field name="domain">[('state','in',('draft','sent','cancel'))]</field>
|
||||
<field name="domain">[('state','in',('draft','sent','cancel', 'confirmed'))]</field>
|
||||
<field name="view_mode">tree,form,graph,calendar</field>
|
||||
<field name="search_view_id" ref="view_purchase_order_filter"/>
|
||||
<field name="help" type="html">
|
||||
|
||||
Reference in New Issue
Block a user