Actualización de formatos
This commit is contained in:
parent
c072ff7023
commit
17af1d601b
File diff suppressed because it is too large
Load Diff
|
@ -72,7 +72,7 @@ def compute_report(data):
|
||||||
move_line
|
move_line
|
||||||
]
|
]
|
||||||
record[1] += a_l.debit
|
record[1] += a_l.debit
|
||||||
record[2] += a_l.credit
|
record[2] += a_l.credit * -(1)
|
||||||
record[3] += a_l.debit - a_l.credit
|
record[3] += a_l.debit - a_l.credit
|
||||||
total += a_l.debit - a_l.credit
|
total += a_l.debit - a_l.credit
|
||||||
def is_parent(parent, account, debit, credit):
|
def is_parent(parent, account, debit, credit):
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -23,10 +23,6 @@ def compute_report(data, domain, codes):
|
||||||
'posted': data['posted'],
|
'posted': data['posted'],
|
||||||
}
|
}
|
||||||
|
|
||||||
if data['posted']:
|
|
||||||
cosa = ['draft']
|
|
||||||
else:
|
|
||||||
cosa = []
|
|
||||||
|
|
||||||
def is_child(child, parent):
|
def is_child(child, parent):
|
||||||
if child in parent.childs:
|
if child in parent.childs:
|
||||||
|
@ -84,8 +80,6 @@ def compute_report(data, domain, codes):
|
||||||
for a in accounts:
|
for a in accounts:
|
||||||
record = []
|
record = []
|
||||||
record2 = []
|
record2 = []
|
||||||
#if a.type:
|
|
||||||
#if a.type.statement == 'income':
|
|
||||||
a.balance = a.balance * (-1)
|
a.balance = a.balance * (-1)
|
||||||
record.append(a)
|
record.append(a)
|
||||||
record2.append(a.code)
|
record2.append(a.code)
|
||||||
|
@ -162,7 +156,10 @@ def compute_report(data, domain, codes):
|
||||||
res['end_date'] = max(periods_dates)
|
res['end_date'] = max(periods_dates)
|
||||||
res['period'] = period
|
res['period'] = period
|
||||||
res['fiscalyear'] = fiscalyear
|
res['fiscalyear'] = fiscalyear
|
||||||
|
res['analytic_lines'] = data['analytic_lines']
|
||||||
|
res['detailed'] = data['detailed']
|
||||||
|
res['without_balance'] = data['without_balance']
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
@ -296,9 +293,6 @@ class IncomeStatementCOLGAAP(Report):
|
||||||
report_context.update(res)
|
report_context.update(res)
|
||||||
report_context['start_period'] = Period(data['start_period'])
|
report_context['start_period'] = Period(data['start_period'])
|
||||||
report_context['end_period'] = Period(data['end_period'])
|
report_context['end_period'] = Period(data['end_period'])
|
||||||
report_context['detailed'] = data['detailed']
|
|
||||||
report_context['company'] = company
|
report_context['company'] = company
|
||||||
report_context['without_balance'] = data['without_balance']
|
|
||||||
report_context['analytic_lines'] = data['analytic_lines']
|
|
||||||
|
|
||||||
return report_context
|
return report_context
|
||||||
|
|
|
@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<record model="ir.action.report" id="report_income_statement_colgaap">
|
<record model="ir.action.report" id="report_income_statement_colgaap">
|
||||||
<field name="name">Analytic Income Statement COLGAAP</field>
|
<field name="name">Analytic Income Statement</field>
|
||||||
<field name="model"></field>
|
<field name="model"></field>
|
||||||
<field name="report_name">analytic_account_co.income_statement_colgaap</field>
|
<field name="report_name">analytic_account_co.income_statement_colgaap</field>
|
||||||
<field name="report">analytic_account_co/income_statement_colgaap_report.fods</field>
|
<field name="report">analytic_account_co/income_statement_colgaap_report.fods</field>
|
||||||
|
@ -17,7 +17,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||||
<field name="name">print_income_statement_colgaap_start_form</field>
|
<field name="name">print_income_statement_colgaap_start_form</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.action.wizard" id="wizard_print_income_statement_colgaap">
|
<record model="ir.action.wizard" id="wizard_print_income_statement_colgaap">
|
||||||
<field name="name">Analytic Income Statement COLGAAP</field>
|
<field name="name">Analytic Income Statement</field>
|
||||||
<field name="wiz_name">analytic_account_co.print_income_statement_colgaap</field>
|
<field name="wiz_name">analytic_account_co.print_income_statement_colgaap</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem parent="account.menu_reporting" action="wizard_print_income_statement_colgaap"
|
<menuitem parent="account.menu_reporting" action="wizard_print_income_statement_colgaap"
|
||||||
|
|
|
@ -91,12 +91,12 @@ msgctxt "model:ir.action,name:wizard_print_analytic_account"
|
||||||
msgid "Analytic Account"
|
msgid "Analytic Account"
|
||||||
msgstr "Cuentas Analíticas"
|
msgstr "Cuentas Analíticas"
|
||||||
|
|
||||||
msgctxt "model:ir.action,name:report_income_statement_COLGAAP"
|
msgctxt "model:ir.action,name:report_income_statement_colgaap"
|
||||||
msgid "Analytic Income Statement"
|
msgid "Analytic Income Statement"
|
||||||
msgstr "Pérdidas y Ganancias Analíticas"
|
msgstr "Pérdidas y Ganancias Analíticas"
|
||||||
|
|
||||||
msgctxt "model:ir.action,name:wizard_print_income_statement_COLGAAP"
|
msgctxt "model:ir.action,name:wizard_print_income_statement_colgaap"
|
||||||
msgid "Analytic Income Analíticas"
|
msgid "Analytic Income Statement"
|
||||||
msgstr "Pérdidas y Ganancias Analíticas"
|
msgstr "Pérdidas y Ganancias Analíticas"
|
||||||
|
|
||||||
msgctxt "wizard_button:analytic_account_co.print_income_statement_colgaap,start,print_:"
|
msgctxt "wizard_button:analytic_account_co.print_income_statement_colgaap,start,print_:"
|
||||||
|
|
Loading…
Reference in New Issue