Commit eb835a5b authored by Sergio Ernesto Tostado Sánchez's avatar Sergio Ernesto Tostado Sánchez
Browse files

[FIX][email_template_att_dinamic] Pylint and conflict troubleshooting was resolved

parents 96e98dfc 858e883d
......@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_advance_payment
#: field:res.partner,property_account_customer_advance:0
......
......@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_advance_payment
#: field:res.partner,property_account_customer_advance:0
......
......@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_advance_payment
#: field:res.partner,property_account_customer_advance:0
......
......@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_advance_payment
#: field:res.partner,property_account_customer_advance:0
......
......@@ -31,8 +31,8 @@ class res_partner(osv.Model):
def _supplier_customer_advance_get(self, cr, uid, ids, field, arg, context=None):
res = {}
for id in ids:
res = {id: {'customer_advance': 0.0, 'supplier_advance': 0.0}}
for record_id in ids:
res = {record_id: {'customer_advance': 0.0, 'supplier_advance': 0.0}}
return res
_columns = {
......
......@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
......
......@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
......
......@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-09-23 07:11+0000\n"
"X-Generator: Launchpad (build 17196)\n"
"X-Launchpad-Export-Date: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
......
# Macedonian translation for addons-vauxoo
# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
# This file is distributed under the same license as the addons-vauxoo package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: addons-vauxoo\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-11-07 01:14+0000\n"
"PO-Revision-Date: 2014-10-27 17:17+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Macedonian <mk@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: 2014-11-13 06:34+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
#: view:wizard.report.aged.partner.balance:0
#: field:wizard.report.aged.partner.balance,partner_ids:0
msgid "Partners"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
msgid "Partners with movements"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:wizard.report.aged.partner.balance,partner_ids_default:0
msgid "Partners Default"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.trial.balance:0
msgid "Aged Report"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.trial.balance,type:0
msgid "Documents spread in Periods"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
msgid "Partners default to show in Report"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:20
msgid "Period Length(days)"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_document
msgid "account.aged.partner.document"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.actions.wizard,name:account_aged_partner_balance_vw.wizard_open_move_line
msgid "Open Moves Lines"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.balance.vw,not_due:0
#: field:account.aged.partner.document,not_due:0
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:195
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:372
msgid "Not Due"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: field:account.aged.partner.balance.vw,days_due_121togr:0
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,days_due_121togr:0
msgid "+121"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:wizard.report.aged.partner.balance,group_user:0
msgid "Group by User"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:wizard.report.aged.partner.balance,show_aml:0
msgid "In the report was show the journal entries"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.trial.balance,state:0
msgid "New"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.trial.balance:0
#: view:wizard.report.aged.partner.balance:0
msgid "Print"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.trial.balance:0
msgid "Compute"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.document,document_id:0
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:193
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:370
msgid "Document"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:17
msgid "Chart of Accounts"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:wizard.report.aged.partner.balance,show_aml:0
msgid "Show Journal Entries"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.trial.balance,state:0
msgid "Status"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.document,date_due:0
#: help:account.aged.partner.document,date_due:0
msgid "Due Date"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.document,due_days:0
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:196
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:373
msgid "Due Days"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.model,name:account_aged_partner_balance_vw.model_wizard_report_aged_partner_balance
msgid "wizard.report.aged.partner.balance"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:account.aged.trial.balance,type:0
msgid "Reporte Type"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.balance.vw,company_id:0
#: field:account.aged.partner.document,company_id:0
msgid "Company"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.document:0
msgid "Aged Partner Document"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_expense_report_tree
msgid "Expense Company"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: field:account.aged.partner.balance.vw,days_due_01to30:0
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,days_due_01to30:0
msgid "01/30"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_account_aged_partner_balance_vw
#: model:ir.ui.menu,name:account_aged_partner_balance_vw.menu_action_account_aged_partner_balance_vw
msgid "Aged Partner Balance View"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.balance.vw,currency_company_id:0
#: field:account.aged.partner.document,currency_company_id:0
msgid "Company Currency"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.document,user_id:0
msgid "User"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:account.aged.partner.document,user_id:0
msgid "User's Document"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.trial.balance:0
msgid "Back to Start"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: field:account.aged.partner.balance.vw,days_due_91to120:0
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,days_due_91to120:0
msgid "91/120"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:23
msgid "Target Moves"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:36
msgid "Receivable and Payable Accounts"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:wizard.report.aged.partner.balance,group_user:0
msgid "¿Group report by user?"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
msgid "Vouchers Partner"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: field:account.aged.partner.balance.vw,days_due_61to90:0
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,days_due_61to90:0
msgid "61/90"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.trial.balance,type:0
msgid "Balance Variation in Periods"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:44
msgid "All Posted Entries"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.actions.report.xml,name:account_aged_partner_balance_vw.account_aged_partner_balance_report
msgid "Aged Partner Balance"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:account.aged.trial.balance,state:0
msgid "Document State"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:22
msgid "Analysis Direction"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.balance.vw,aatb_id:0
#: field:account.aged.partner.document,aatb_id:0
msgid "Aged Trial Balance"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:303
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:493
msgid "Grand Total"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:18
msgid "Fiscal Year"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:41
msgid "Future"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
msgid ""
"Select the partners to show in report, if this field is empty will take all "
"partners"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,residual:0
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:197
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:374
msgid "Residual"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
#: help:wizard.report.aged.partner.balance,partner_ids:0
msgid "Partners to show in Report"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.trial.balance,type:0
msgid "Type of Report"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:account.aged.partner.balance.vw,aatb_id:0
#: help:account.aged.partner.document,aatb_id:0
msgid "Aged Trail Balance Document"
msgstr ""
#. module: account_aged_partner_balance_vw
#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_balance_vw
msgid "account.aged.partner.balance.vw"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:194
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:371
msgid "Type"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.trial.balance,type:0
msgid "Distributed Payments over Debts"
msgstr ""
#. module: account_aged_partner_balance_vw
#: help:wizard.report.aged.partner.balance,partner_ids_default:0
msgid "Partners to show in Report by default"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:32
msgid "Receivable Accounts"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.trial.balance,partner_doc_ids:0
#: help:account.aged.trial.balance,partner_doc_ids:0
#: field:account.aged.trial.balance,partner_line_ids:0
#: help:account.aged.trial.balance,partner_line_ids:0
msgid "Partner Aged Trail Balance"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:34
msgid "Payable Accounts"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: field:account.aged.partner.balance.vw,days_due_31to60:0
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,days_due_31to60:0
msgid "31/60"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:39
msgid "Past"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:21
msgid "Partners "
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: view:account.aged.partner.document:0
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:67
msgid "Not due"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.partner.document,document_id:0
msgid "Journal Entry Line"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.trial.balance,state:0
msgid "Done"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.partner.document,document_id:0
msgid "Voucher"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.partner.document,document_id:0
msgid "Invoice"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.trial.balance,wizard_ids:0
#: field:wizard.report.aged.partner.balance,aged_trial_report_id:0
msgid "unknown"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
msgid "Cancel"
msgstr ""
#. module: account_aged_partner_balance_vw
#: field:account.aged.partner.balance.vw,partner_id:0
#: field:account.aged.partner.document,partner_id:0
msgid "Partner"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:19
msgid "Start Date"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:account.aged.partner.balance.vw:0
#: field:account.aged.partner.balance.vw,total:0
#: view:account.aged.partner.document:0
#: field:account.aged.partner.document,total:0
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:72
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:116
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:262
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:450
msgid "Total"
msgstr ""
#. module: account_aged_partner_balance_vw
#: selection:account.aged.trial.balance,state:0
msgid "Open"
msgstr ""
#. module: account_aged_partner_balance_vw
#: view:wizard.report.aged.partner.balance:0
msgid "or"
msgstr ""
#. module: account_aged_partner_balance_vw
#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:46
msgid "All Entries"
msgstr ""
......@@ -78,6 +78,14 @@ class account_aged_partner_document(osv.TransientModel):
class account_aged_trial_balance(osv.TransientModel):
_inherit = 'account.aged.trial.balance'
account_type = None
date_from = None
total_account = None
query = None
target = None
direction_selection = None
target_move =None
_columns = {
'partner_doc_ids': fields.one2many('account.aged.partner.document',
'aatb_id', 'Partner Aged Trail Balance',
......@@ -143,11 +151,11 @@ class account_aged_trial_balance(osv.TransientModel):
self.set_context(cr, uid, ids, data, context=context)
if wzd_brw.type in ('variation', 'distributed'):
res = self._get_lines(cr, uid, ids, form, context=context)
res = map(lambda x: (0, 0, x), res)
res = [(0, 0, x) for x in res]
wzd_brw.write({'partner_line_ids': res})
elif wzd_brw.type == 'by_document':
res = self._get_doc_lines(cr, uid, ids, form, context=context)
res = map(lambda x: (0, 0, x), res)
res = [(0, 0, x) for x in res]
wzd_brw.write({'partner_doc_ids': res})
return {}
......@@ -164,16 +172,15 @@ class account_aged_trial_balance(osv.TransientModel):
self.date_from = data['form'].get(
'date_from',
time.strftime('%Y-%m-%d'))
if (data['form']['result_selection'] == 'customer'):
self.ACCOUNT_TYPE = ['receivable']
elif (data['form']['result_selection'] == 'supplier'):
self.ACCOUNT_TYPE = ['payable']
if data['form']['result_selection'] == 'customer':
self.account_type = ['receivable']
elif data['form']['result_selection'] == 'supplier':
self.account_type = ['payable']
else:
self.ACCOUNT_TYPE = ['payable', 'receivable']
self.account_type = ['payable', 'receivable']
def _get_partners(self, cr, uid, ids, form, context=None):
context = context or {}
wzd_brw = self.browse(cr, uid, ids[0], context=context)
move_state = ['draft', 'posted']
if self.target_move == 'posted':
move_state = ['posted']
......@@ -190,7 +197,7 @@ class account_aged_trial_balance(osv.TransientModel):
AND (l.partner_id=res_partner.id)\
AND (l.date <= %s)\
AND ' + self.query + ' \
ORDER BY res_partner.name', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
ORDER BY res_partner.name', (tuple(move_state), tuple(self.account_type), self.date_from, self.date_from,))
return cr.dictfetchall()
def _get_lines(self, cr, uid, ids, form, context=None):
......@@ -237,9 +244,9 @@ class account_aged_trial_balance(osv.TransientModel):
AND ' + self.query + '\
AND account_account.active\
AND (l.date <= %s)\
GROUP BY l.partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from, self.date_from,))
t = cr.fetchall()
for i in t:
GROUP BY l.partner_id ', (tuple(move_state), tuple(self.account_type), tuple(partner_ids), self.date_from, self.date_from,))
t_var = cr.fetchall()
for i in t_var