bzr revid: fp@tinyerp.com-20100916144232-qmchgh66ch2kao7j
This commit is contained in:
Fabien Pinckaers 2010-09-16 16:42:32 +02:00
commit 5f98530271
173 changed files with 3490 additions and 3975 deletions

View File

@ -2442,14 +2442,14 @@ class account_tax_template(osv.osv):
account_tax_template()
# Fiscal Position Templates
# Fiscal Mapping Templates
class account_fiscal_position_template(osv.osv):
_name = 'account.fiscal.position.template'
_description = 'Template for Fiscal Position'
_description = 'Template for Fiscal Mapping'
_columns = {
'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True),
'name': fields.char('Fiscal Mapping Template', size=64, translate=True, required=True),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
@ -2459,11 +2459,11 @@ account_fiscal_position_template()
class account_fiscal_position_tax_template(osv.osv):
_name = 'account.fiscal.position.tax.template'
_description = 'Fiscal Position Template Tax Mapping'
_description = 'Template Tax Fiscal Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True),
'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
}
@ -2472,10 +2472,10 @@ account_fiscal_position_tax_template()
class account_fiscal_position_account_template(osv.osv):
_name = 'account.fiscal.position.account.template'
_description = 'Fiscal Position Template Account Mapping'
_description = 'Template Account Fiscal Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
'account_src_id': fields.many2one('account.account.template', 'Account Source', domain=[('type','<>','view')], required=True),
'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True)
}

View File

@ -730,7 +730,7 @@ class account_bank_statement_line(osv.osv):
'reconcile_amount': fields.function(_reconcile_amount,
string='Amount reconciled', method=True, type='float'),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
_defaults = {
'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),

View File

@ -267,7 +267,7 @@ class account_cash_statement(osv.osv):
super(account_cash_statement, self).write(cr, uid, ids, vals)
res = self._get_starting_balance(cr, uid, ids)
for rs in res:
super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
return True
def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):

View File

@ -207,9 +207,9 @@
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
<filter string="Parent Account" icon="terp-folder-green" domain="" context="{'group_by':'parent_id'}"/>
<separator orientation="vertical"/>
<filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
<filter string="Account Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
<filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
</group>
</search>
@ -2436,14 +2436,14 @@
</field>
</record>
<!-- Fiscal Position Templates -->
<!-- Fiscal Mapping Templates -->
<record id="view_account_position_template_form" model="ir.ui.view">
<field name="name">account.fiscal.position.template.form</field>
<field name="model">account.fiscal.position.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Position Template">
<form string="Fiscal Mapping Template">
<field name="name" select="1"/>
<field name="chart_template_id"/>
<newline/>
@ -2475,14 +2475,14 @@
<field name="model">account.fiscal.position.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fiscal Position">
<tree string="Fiscal Mapping">
<field name="name"/>
</tree>
</field>
</record>
<record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
<field name="name">Fiscal Position Templates</field>
<field name="name">Fiscal Mapping Templates</field>
<field name="res_model">account.fiscal.position.template</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>

View File

@ -554,7 +554,7 @@
<!-- = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Templates -->
<!-- Fiscal Mapping Templates -->
<!-- = = = = = = = = = = = = = = = -->

View File

@ -590,7 +590,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -981,7 +981,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1003,7 +1003,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1088,7 +1088,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1120,7 +1120,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1181,7 +1181,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1755,7 +1755,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid "The fiscal position will determine taxes and the accounts used for the the partner."
msgid "The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2020,7 +2020,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3551,7 +3551,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3654,7 +3654,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5741,7 +5741,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,8 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2060,7 +2059,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3626,7 +3625,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3731,7 +3730,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5866,7 +5865,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -624,7 +624,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1018,7 +1018,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1040,7 +1040,7 @@ msgstr "Деца"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1129,7 +1129,7 @@ msgstr "Нова аналитична сметка"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1161,7 +1161,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1227,7 +1227,7 @@ msgstr "Валута на компанията"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1807,8 +1807,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2078,7 +2077,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3654,7 +3653,7 @@ msgstr "Последователност"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3759,7 +3758,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5908,8 +5907,8 @@ msgstr "Условие за плащане"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Фискални позиции"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -630,8 +630,8 @@ msgstr "(Zadržite prazno da biste otvorili tekuće stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapiranje fiskalne pozicije računa"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1028,7 +1028,7 @@ msgstr "Ukupno netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr "Fiskalna pozicija"
#. module: account
@ -1050,8 +1050,8 @@ msgstr "Potomci"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapiranje poreza fiskalne pozicije"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1139,8 +1139,8 @@ msgstr "Novo analitičko konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Predlošci fiskalne pozicije"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1171,8 +1171,8 @@ msgstr "Iznos izražen u alternativnoj drugoj valuti."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Predložak fiskalne pozicije"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1242,8 +1242,8 @@ msgstr "Valuta preduzeća"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapiranje fiskalne pozicije na konto predloška"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1824,9 +1824,8 @@ msgstr "Slijedeći"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr "Fiskalna pozicija će odrediti poreze i račune korištene za partnera."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2098,8 +2097,8 @@ msgstr "Proces fakturiranja kupcu"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Napomena za fiskalnu poziciju"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3697,8 +3696,8 @@ msgstr "Redoslijed"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Predložak za fiskalnu poziciju"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3804,8 +3803,8 @@ msgstr "Fakture u pripremi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapiranje fiskalne pozicije na predložak poreza"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5992,8 +5991,8 @@ msgstr "Uslovi plaćanja"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskalne pozicije"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -634,8 +634,8 @@ msgstr "(deixar-lo buit per a obrir la situació actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapa de relacions comptes posició fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Base:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posició fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Fills"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapa de relacions d'impostos posició fiscal"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Nou compte analític"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantilles de posicions fiscals"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "L'import expressat en una altra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de posició fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1246,8 +1246,8 @@ msgstr "Divisa de la companyia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapa comptes plantilla posició fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1830,11 +1830,9 @@ msgstr "Següent"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posició fiscal determinarà els impostos i els comptes utilitzats per la "
"empresa."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2107,8 +2105,8 @@ msgstr "Procés de factura de client"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Observació posició fiscal :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3711,8 +3709,8 @@ msgstr "Seqüència"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla per posició fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3818,8 +3816,8 @@ msgstr "Factures esborrany"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapa impostos plantilla posició fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6015,8 +6013,8 @@ msgstr "Termini de pagament"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posicions fiscals"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -612,7 +612,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1006,8 +1006,8 @@ msgstr "Čistá celkem:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiskální pozice"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1028,7 +1028,7 @@ msgstr "Děti"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1115,8 +1115,8 @@ msgstr "Nový analitickiý účet"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiskální pozice Šablony"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1147,8 +1147,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiskální pozice šablony"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1213,7 +1213,7 @@ msgstr "Společnost měny"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1791,8 +1791,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2062,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3628,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3733,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5868,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -616,7 +616,7 @@ msgstr "(Holdes tom for at åbne nuværende situation)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1010,8 +1010,8 @@ msgstr "Net Total:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Nuværende position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1032,7 +1032,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1119,7 +1119,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1151,7 +1151,7 @@ msgstr "Det beløb udtrykt i anden valgfri valuta."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1223,7 +1223,7 @@ msgstr "Firma valuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1803,7 +1803,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2074,7 +2074,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3640,7 +3640,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3745,7 +3745,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5880,7 +5880,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -629,8 +629,8 @@ msgstr "(frei lassen um aktuelle Einstellung zu verwenden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Summen und Salden Zuordnung"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1029,8 +1029,8 @@ msgstr "Nettosumme:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1051,8 +1051,8 @@ msgstr "(Sub-)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Summen- & Saldenliste Zuordnung Steuern"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1140,8 +1140,8 @@ msgstr "Neues Analytisches Konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Summen- & Saldenliste Vorlagen"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1172,8 +1172,8 @@ msgstr "optionaler Betrag in anderer Währung"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Summen- & Saldenliste Vorlage"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1243,8 +1243,8 @@ msgstr "Betriebl. Währung"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Steuerliche Position Vorlage für Kontenzuordnung"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1825,11 +1825,9 @@ msgstr "Weiter"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Die Position in der Saldenliste bestimmt Steuern- und Finanzkonten für den "
"Partner."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2103,8 +2101,8 @@ msgstr "Prozess Abrechnung von Kundenaufträgen"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Hinweis Steuermapping"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3702,8 +3700,8 @@ msgstr "Sequenzer"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Summen- und Saldenliste Vorlage"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3809,8 +3807,8 @@ msgstr "Entwurf Rechnungen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Steuerliche Position Vorlage Steuerzuordnung"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6008,8 +6006,8 @@ msgstr "Zahlungsbedingung"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Positionen Summen & Salden"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -634,8 +634,8 @@ msgstr "(Διατηρήστε κενό για να ανοίξετε την τρ
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Χάρτης Λογαριασμών Φορολογικής Θέσης"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Καθαρό Σύνολο:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Φορολογική Θέση"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Υποκατηγορίες"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Χάρτογράφηση Φόρων Φορολογικής Θέσης"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Νέος Λογαριασμός Αναλυτικής"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Πρότυπα Φορολογικής Θέσης"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "Το ποσό, εκφρασμένο σε ένα (προαιρετικό)
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Πρότυπο Φορολογικής Θέσης"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1247,8 +1247,8 @@ msgstr "Νόμισμα Εταιρίας"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Χάρτης Λογαριασμών Προτύπων Φορολογικής Θέσης"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1832,11 +1832,9 @@ msgstr "Επόμενο"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Η φορολογική θέση θα καθορίσει τους φόρους και τους λογαριασμούς που θα "
"χρησιμοποιηθούν για αυτόν τον συνεργάτη."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2109,8 +2107,8 @@ msgstr "Επεξεργασία Τιμολογίου Πελάτη"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Σχόλιο Φορολογικής Θέσης:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3713,8 +3711,8 @@ msgstr "Ιεράρχηση"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Πρότυπο για Φορολογική Θέση"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3820,8 +3818,8 @@ msgstr "Πρόχειρα Τιμολόγια"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Χάρτογράφηση Φόρων Προτύπου Φορολογικής Θέσης"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6024,8 +6022,8 @@ msgstr "Όρος Πληρωμής"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Φορολογικές Θέσεις"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -634,8 +634,8 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeo cuentas posición fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Base:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Hijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeo de impuestos posición fiscal"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Nueva cuenta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantillas de posiciones fiscales"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "El importe expresado en otra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de posición fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1247,8 +1247,8 @@ msgstr "Divisa de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeo cuentas plantilla posición fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1831,11 +1831,8 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posición fiscal determinará los impuestos y las cuentas utilizadas para "
"la empresa."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2109,8 +2106,8 @@ msgstr "Proceso de factura de cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Observación posición fiscal :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3712,8 +3709,8 @@ msgstr "Secuencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla para posición fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3819,8 +3816,8 @@ msgstr "Facturas borrador"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6017,8 +6014,8 @@ msgstr "Plazo de pago"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posiciones fiscales"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -632,8 +632,8 @@ msgstr "(dejar vacío para abrir el estado actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeo de cuentas y posición fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1030,8 +1030,8 @@ msgstr "Total Neto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1052,8 +1052,8 @@ msgstr "Hijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Cruce de posición de impuestos fiscales"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1141,8 +1141,8 @@ msgstr "Nueva cuenta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantillas de posiciones fiscales"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1173,8 +1173,8 @@ msgstr "El importe expresado en otra moneda opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de posición fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1245,8 +1245,8 @@ msgstr "Moneda de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Asociación de cuentas Planilla posición fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1828,11 +1828,8 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posición fiscal determinará los impuestos y las cuentas utilizadas por el "
"partner"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2106,7 +2103,7 @@ msgstr "Proceso de factura de cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3710,8 +3707,8 @@ msgstr "Secuencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla para posición fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3817,8 +3814,8 @@ msgstr "Facturas en borrador"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Asociación de impuestos plantilla posición fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6015,8 +6012,8 @@ msgstr "Términos de Pago"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posiciones fiscales"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -634,8 +634,8 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeo de cuentas por tipo de Contribuyentes"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Total neto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Hijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeo de Impuestos segun tipo de Contribuyente"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Nueva cuenta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantillas de Tipos de Contribuyentes"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "El importe expresado en otra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de Tipo de Contribuyente"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1247,8 +1247,8 @@ msgstr "Moneda de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeo cuentas plantilla posición fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1831,11 +1831,9 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posición fiscal determinará los impuestos y las cuentas utilizadas para "
"la empresa."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2109,8 +2107,8 @@ msgstr "Proceso de factura de cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Observación posición fiscal :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3712,8 +3710,8 @@ msgstr "Secuencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla para posición fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3819,8 +3817,8 @@ msgstr "Facturas borrador"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5977,7 +5975,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -615,8 +615,8 @@ msgstr "(Jätke tühjaks, et avada praegune seis)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Finantspositsioonide kontode kaardistamine"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1009,8 +1009,8 @@ msgstr "Netosumma:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Finantspositsioon"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1031,7 +1031,7 @@ msgstr "Alam"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1118,8 +1118,8 @@ msgstr "Uus analüütiline konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Finantspositsioonide mallid"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1150,8 +1150,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Finantspositsiooni mall"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1216,7 +1216,7 @@ msgstr "Ettevõtte valuuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1794,8 +1794,7 @@ msgstr "Järgmine"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2065,7 +2064,7 @@ msgstr "Kliendi arve protsess"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3631,8 +3630,8 @@ msgstr "Järjekord"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Mall finantspositsioonile"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3736,7 +3735,7 @@ msgstr "Mustandarved"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5873,8 +5872,8 @@ msgstr "Maksetingimus"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Finantspositsioonid"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -631,8 +631,8 @@ msgstr "Jätä tyhjäksi avataksesi nykyisen tilanteen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Talouskannan tilien kartoitus"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1029,8 +1029,8 @@ msgstr "Netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Talouskanta"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1051,8 +1051,8 @@ msgstr "Alatilit"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Talouskannan verojen kartoitus"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1140,8 +1140,8 @@ msgstr "Uusi analyyttinen tili"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Talouskantojen mallit"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1172,8 +1172,8 @@ msgstr "Summa ilmoitettuna valinnaisessa toisessa valuutassa."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Talouskannan malli"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1243,8 +1243,8 @@ msgstr "Yritysvaluutta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Talouskannan mallin tilien kartoitukset"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1825,9 +1825,8 @@ msgstr "Seuraava"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr "Talouskanta määrittelee kumppaniin sovellettavat verot ja tilit."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2098,7 +2097,7 @@ msgstr "Asiakaslaskutusprosessi"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3690,8 +3689,8 @@ msgstr "Sarja"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Malli talouskannalle"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3797,8 +3796,8 @@ msgstr "Luonnoslaskut"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Talouskannan mallin veron kartoitukset"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5982,8 +5981,8 @@ msgstr "Maksuehto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Talouskannat"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -693,8 +693,8 @@ msgstr "(Laisser vide pour consulter la situation courrante)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Affectation des comptes par régime fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1084,8 +1084,8 @@ msgstr "Total net :"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Régime fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1106,8 +1106,8 @@ msgstr "Enfant"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Affectation des taxes par régime fiscal"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1195,8 +1195,8 @@ msgstr "Nouveau compte analytique"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modèles de régimes fiscaux"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1227,8 +1227,8 @@ msgstr "Le montant exprimé dans une autre devise optionelle."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modèle de régime fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1299,8 +1299,8 @@ msgstr "Devise société"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Affectation des comptes suivant le modèle de régime fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1880,12 +1880,9 @@ msgstr "Suivant"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgid
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Le régime fiscal déterminera les taxes et les comptes utilisés pour le "
"partenaire."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2159,8 +2156,8 @@ msgstr "Processus de la facture client"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Remarque position fiscale :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3748,8 +3745,8 @@ msgstr "Séquence"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Modèle de régime fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3855,8 +3852,8 @@ msgstr "Factures en brouillon"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Affectation des taxes dans le modèle de régime fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6024,8 +6021,8 @@ msgstr "Condition de paiement"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Régimes fiscaux"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5869,7 +5868,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr "આગળ"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -623,8 +623,8 @@ msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Fiskalne pozicije - mapiranje konta"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1017,8 +1017,8 @@ msgstr "Ukupno netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Porezna grupa"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1039,8 +1039,8 @@ msgstr "Podređeni"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapiranje poreza fiskalne pozicije"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1128,8 +1128,8 @@ msgstr "Novi analitički konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Predlošci knjigovodstvenih grupa"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1160,8 +1160,8 @@ msgstr "Iznos u drugoj valuti."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Predložak fiskalne pozicije"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1226,8 +1226,8 @@ msgstr "Valuta tvrtke"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Predložak mapiranja konta za fiskalnu poziciju"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1808,10 +1808,9 @@ msgstr "Slijedeći"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Fiskalna pozicija definira poreze i konta knjiženja računa za partnera."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2081,8 +2080,8 @@ msgstr "Proces izlacnog računa"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Komentar fiskalne pozicije:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3668,8 +3667,8 @@ msgstr "Sekvenca"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Predložak za fiskalnu poziciju"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3775,7 +3774,7 @@ msgstr "Neodobreni računi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5932,8 +5931,8 @@ msgstr "Uvjet plaćanja"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskalne pozicije"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr "Nettó összesen:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr "Cég pénzneme"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,8 +1789,7 @@ msgstr "Tovább"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2060,7 +2059,7 @@ msgstr "Vevői számla folyamat"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3628,7 +3627,7 @@ msgstr "Sorszám"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3733,7 +3732,7 @@ msgstr "Számla tervezetek"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5870,7 +5869,7 @@ msgstr "Fizetési feltétel"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr "Anak"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr "Akun Analisis Baru"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr "Mata uang perusahaan"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5869,7 +5868,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -633,7 +633,7 @@ msgstr "(Tenere vuoto per aprire la situazione corrente)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1031,8 +1031,8 @@ msgstr "Totale imponibile"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posizione fiscale"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1053,7 +1053,7 @@ msgstr "Sottoconto"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1142,8 +1142,8 @@ msgstr "Nuovo conto analitico"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modelli di \"posizioni fiscali\""
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1174,8 +1174,8 @@ msgstr "L'importo espresso in un'altra valuta opzionale"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modelli di \"posizioni fiscali\""
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1240,7 +1240,7 @@ msgstr "Valuta società"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1820,10 +1820,9 @@ msgstr "Prossimo"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posizione fiscale determinerà tasse e il conto da usarsi per il partner."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2095,7 +2094,7 @@ msgstr "Processo di fatturazione cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3677,7 +3676,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3784,7 +3783,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5925,8 +5924,8 @@ msgstr "Modalità di pagamento"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posizioni fiscali"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr "다른 통화 단위로 환산된 금액"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -614,8 +614,8 @@ msgstr "(palikti tusčią tam, kad atidarytumėte einamąją situaciją)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Sąskaitų fiskalinė pozicija"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1010,8 +1010,8 @@ msgstr "Iš viso be mokesčių:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiskalinė pozicija"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1032,8 +1032,8 @@ msgstr "Žemesnysis"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Fiskalinė pozicija mokesčiams"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1121,8 +1121,8 @@ msgstr "Nauja analitinė sąskaita"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiskalinės pozicijos šablonai"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1153,8 +1153,8 @@ msgstr "Suma pasirinktinai gali būti įrašyta kita valiuta."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiskalinės pozicijos šablonas"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1219,8 +1219,8 @@ msgstr "Įmonės naudojama valiuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Sąskaitų fiskalinės pozicijos nustatymai"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1799,10 +1799,8 @@ msgstr "Toliau"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Fiskalinė pozicija padės nustatyti mokesčius ir apskaitą kontrahentams."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2075,7 +2073,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3659,8 +3657,8 @@ msgstr "Seka"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Fiskalinės pozicijos šablonas"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3766,8 +3764,8 @@ msgstr "Sąskaitų faktūrų juodraščiai"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Fiskalinės pozicijos mokesčiams nustatymai"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5933,8 +5931,8 @@ msgstr "Mokėjimo terminas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskalinė pozicija"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -623,7 +623,7 @@ msgstr "(Atstāt tukšu, lai atvērtu esošo stāvokli)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1017,8 +1017,8 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiskālā Pozīcija"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1039,7 +1039,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1126,7 +1126,7 @@ msgstr "Jauns Analītiskais Konts"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1158,7 +1158,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1224,7 +1224,7 @@ msgstr "Uzņēmuma valūta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1802,8 +1802,7 @@ msgstr "Nākamais"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2073,7 +2072,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3639,7 +3638,7 @@ msgstr "Secība"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3744,7 +3743,7 @@ msgstr "Neapstiprināti Rēķini"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5879,8 +5878,8 @@ msgstr "Apmaksas Termiņš"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskālās Pozīcijas"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -619,7 +619,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1015,8 +1015,8 @@ msgstr "Цэвэр дүн"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Фискал посишион"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1037,8 +1037,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Санхүүгийн байршил татварын зурагжуулалт"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1124,8 +1124,8 @@ msgstr "Шинэ аналитик данс"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Загвар фискал посишион"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1156,7 +1156,7 @@ msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1227,7 +1227,7 @@ msgstr "Компаны валют"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1809,10 +1809,8 @@ msgstr "Цааш нь"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Зөвхөн тухайн харилцагчид зориулагдсан татвар, дансуудыг тодорхойлно."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2083,8 +2081,8 @@ msgstr "Худалдан авагчийн нэхэмжлэлийн явц"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Фискал посишион тайлбар :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3673,8 +3671,8 @@ msgstr "Дугаарлалт"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Санхүүгийн байршилын загвар"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3780,7 +3778,7 @@ msgstr "Ноорог нэхэмжлэлүүд"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5964,7 +5962,7 @@ msgstr "Төлбөрийн нөхцөл"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -631,8 +631,8 @@ msgstr "(laat leeg om de huidige situatie te behouden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Fiscale toewijzing grootboekrekeningen"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1030,8 +1030,8 @@ msgstr "Netto totaal"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1052,8 +1052,8 @@ msgstr "Kinderen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Toewijzing belastingen"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1141,8 +1141,8 @@ msgstr "Nieuwe kostenplaats"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiscale situatie sjablonen"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1173,8 +1173,8 @@ msgstr "Het bedrag uitgedrukt in een optionele andere valuta."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiscale situatie sjabloon"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1244,8 +1244,8 @@ msgstr "Bedrijfsvaluta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Vervangingstabel belastingpositie-sjabloon"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1827,10 +1827,9 @@ msgstr "Volgend"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"De fiscale positie bepaald de belastingen op verkopen bij de huidige relatie."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2104,8 +2103,8 @@ msgstr "Verkoopfactuur proces"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Opmerking fiscale positie :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3710,8 +3709,8 @@ msgstr "Reeks"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Sjabloon voor fiscale situatie"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3817,8 +3816,8 @@ msgstr "Concept-facturen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Vervangingstabel belastingpositie belastingsjabloon"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6017,8 +6016,8 @@ msgstr "Betalingsconditie"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiscale positie"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -633,8 +633,8 @@ msgstr "(leeg om de huidige situatie te openen)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Rekeningkoppeling fiscale positie"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1031,8 +1031,8 @@ msgstr "Nettototaal:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1053,8 +1053,8 @@ msgstr "Afhankel."
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Btw-koppeling fiscale positie"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1142,8 +1142,8 @@ msgstr "Nieuwe analytische rekening"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Sjablonen fiscale posities"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1174,8 +1174,8 @@ msgstr "Het bedrag uitgedrukt in een optionele andere munt."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Sjabloon fiscale posities"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1248,8 +1248,8 @@ msgstr "Firmamunt"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Rekeningkoppeling sjabloon fiscale positie"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1830,9 +1830,9 @@ msgstr "Volgende"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr "Fiscale positie bepaalt btw en rekeningen voor de relatie."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2106,8 +2106,8 @@ msgstr "Verkoopfactuurprocedure"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Opmerking fiscale positie:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3687,7 +3687,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3792,7 +3792,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5928,7 +5928,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -613,7 +613,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1007,7 +1007,7 @@ msgstr "Total net :"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1029,7 +1029,7 @@ msgstr "Enfant"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1116,7 +1116,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1148,7 +1148,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1214,7 +1214,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1792,7 +1792,7 @@ msgstr "Seguent"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2063,7 +2063,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3629,7 +3629,7 @@ msgstr "Sequéncia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3734,7 +3734,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5869,7 +5869,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -630,8 +630,8 @@ msgstr "(Pozostaw puste, aby otworzyć bieżącą sytuację)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapowanie kont obszarów podatkowych"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1028,8 +1028,8 @@ msgstr "Suma netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Obszar podatkowy"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1050,8 +1050,8 @@ msgstr "Podrzędne"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapowanie podatków wg obszarów podatkowych"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1139,8 +1139,8 @@ msgstr "Nowe konto analityczne"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Szablony obszarów podatkowych"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1171,8 +1171,8 @@ msgstr "Wartość wyrażona w ewentualnej innej walucie."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Szablon obszaru podatkowego"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1242,8 +1242,8 @@ msgstr "Waluta firmy"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapowanie szablonów kont obszarów podatkowych"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1824,9 +1824,9 @@ msgstr "Następne"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr "Obszar podatkowy określa podatki i konta stosowane dla partnera."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2098,8 +2098,8 @@ msgstr "Proces faktury dla klienta"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Uwaga do obszaru podatkowego :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3697,8 +3697,8 @@ msgstr "Numeracja"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Szablon dla obszaru podatkowego"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3804,8 +3804,8 @@ msgstr "Projekty faktur"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapowanie podatków wg szablonów obszarów podatkowych"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5996,8 +5996,8 @@ msgstr "Warunki płatności"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Obszary podatkowe"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -628,8 +628,8 @@ msgstr "(Manter vazio para abrir a situação actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeamento de contas da posição fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1026,8 +1026,8 @@ msgstr "Neto total:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posição fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1048,8 +1048,8 @@ msgstr "Contas-filho"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeamento de impostos de posições fiscais"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1137,8 +1137,8 @@ msgstr "Nova conta da contabilidade analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modelos de posição fiscal"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1169,8 +1169,8 @@ msgstr "Montante apresentado numa outra moeda, opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modelo de posição fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1240,8 +1240,8 @@ msgstr "Moeda da empresa"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeamento do Modelo de Posição Fiscal."
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1822,10 +1822,9 @@ msgstr "Seguinte"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"A posição fiscal determinará os impostos e as contas usados para o parceiro."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2097,8 +2096,8 @@ msgstr "Processo de facturação a clientes"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Nota da posição fiscal"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3699,8 +3698,8 @@ msgstr "Sequência"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Modelo de posição fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3806,8 +3805,8 @@ msgstr "Facturas em rascunhos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapeamento de imposto e modelos de posição fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5999,8 +5998,8 @@ msgstr "Termo do Pagamento"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posições fiscais"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -631,8 +631,8 @@ msgstr "(Manter vazia para abrir a situação atual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapa da posição fiscal das contas"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1029,8 +1029,8 @@ msgstr "Total líquido:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posição fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1051,8 +1051,8 @@ msgstr "Filhos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeamento das posições Fiscais"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1140,8 +1140,8 @@ msgstr "Nova conta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modelo de posição fiscal"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1172,8 +1172,8 @@ msgstr "O valor expresso em outra moeda opcional"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modelo de posição fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1243,8 +1243,8 @@ msgstr "Moeda da empresa"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeamento contábil dos Modelos para Posição Fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1826,11 +1826,9 @@ msgstr "Próximo"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"A posição fiscal irá determinar os impostos e as contas usadas para o "
"parceiro."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2103,8 +2101,8 @@ msgstr "Processo de faturamento de clientes"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Ressalva de Posição Fiscal"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3706,8 +3704,8 @@ msgstr "Sequencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Modelo para posição fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3813,8 +3811,8 @@ msgstr "Faturas Provisórias"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Modelo para Mapeamento do Imposto na Posição Fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6011,8 +6009,8 @@ msgstr "Forma de Pagamento"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posições fiscais"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -631,8 +631,8 @@ msgstr "(Lasati necompletat pentru a deschide situaţia curentă)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Corespondenţa conturilor de poziţie fiscală"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1030,8 +1030,8 @@ msgstr "Total net :"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Poziţie fiscală"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1052,8 +1052,8 @@ msgstr "Descendenţi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Corespondenţa taxelor pentru poziţiile fiscale"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1141,8 +1141,8 @@ msgstr "Cont analitic nou"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Şabloane poziţii fiscale"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1173,8 +1173,8 @@ msgstr "Suma exprimată întro altă monedă opţională"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Şablon poziţie fiscală"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1245,8 +1245,8 @@ msgstr "Moneda companiei"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Corespondenţa conturilor cu şabloanele de poziţii fiscale"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1828,10 +1828,9 @@ msgstr "Înainte"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Poziţia fiscală va determina taxele şi conturile utilizate pentru partener."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2103,8 +2102,8 @@ msgstr "Proces facturare clienţi"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Comentariu poziţie fiscală"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3708,8 +3707,8 @@ msgstr "Secvenţă"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Şablon pentru poziţia fiscală"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3815,8 +3814,8 @@ msgstr "Facturi ciornă"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Corespondenţa taxelor pentru şablonul poziţiei fiscale"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6005,8 +6004,8 @@ msgstr "Termen de plată"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Poziţii fiscale"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -629,7 +629,7 @@ msgstr "(Оставить пустым для отображения текущ
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,8 +1027,8 @@ msgstr "Итог нетто"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Налоговая позиция"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1049,8 +1049,8 @@ msgstr "Потомки"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Структура налогов финансовой области"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1138,7 +1138,7 @@ msgstr "Новый счет аналитики"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1170,8 +1170,8 @@ msgstr "Сумма выраженная в дополнительной друг
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Шаблон финансовой области"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1241,8 +1241,8 @@ msgstr "Валюта компании"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Шаблон структуры счетов финансовой области"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1820,11 +1820,9 @@ msgstr "Далее"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Финансовая область будет определять налоги и счета, используемые для "
"контрагента."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2093,7 +2091,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3663,7 +3661,7 @@ msgstr "Последовательность"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3768,8 +3766,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Структура налоговых шаблонов для финансовой области"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5908,7 +5906,7 @@ msgstr "Условия оплаты"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -614,7 +614,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1008,7 +1008,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1030,7 +1030,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1117,7 +1117,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1149,7 +1149,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1215,7 +1215,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1793,7 +1793,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2064,7 +2064,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3630,7 +3630,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3735,7 +3735,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5870,7 +5870,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -623,8 +623,8 @@ msgstr "(Postite prazno da se odpre terenutno stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Preslikava kontov glede na davčno pozicijo"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1019,8 +1019,8 @@ msgstr "Skupaj (brez davkov):"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Davčna pozicija"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1041,8 +1041,8 @@ msgstr "Otroci"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Preslikava davkov glede na davčno pozicijo"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1130,8 +1130,8 @@ msgstr "Nov analitičen konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Predloge davčnih pozicij"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1162,8 +1162,8 @@ msgstr "Znesek izražen v poljubni drugi valuti"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Vzorec za davčno pozicijo"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1228,8 +1228,8 @@ msgstr "Valute družba"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Preslikava kontov za vzorec za davčno pozicijo"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1810,11 +1810,9 @@ msgstr "Naslednji"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Davčna pozicija bo določila davke in konte, ki se bodo uporabljali za tega "
"partnerja."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2087,8 +2085,8 @@ msgstr "Proces računa stranke"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Opomba za davčno pozicijo"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3657,7 +3655,7 @@ msgstr "Zaporedje"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3762,7 +3760,7 @@ msgstr "Osnutki računov"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5906,7 +5904,7 @@ msgstr "Plačilni pogoj"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -633,8 +633,8 @@ msgstr "(Mbaje zbrazët për të hapur gjenden aktuale)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Hartimi i Pozicionit Aktual Fiskal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1031,7 +1031,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1053,7 +1053,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1140,7 +1140,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1172,7 +1172,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1238,7 +1238,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1816,7 +1816,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2087,7 +2087,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3653,7 +3653,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3758,7 +3758,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5893,7 +5893,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -614,7 +614,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1008,7 +1008,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1030,7 +1030,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1117,7 +1117,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1149,7 +1149,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1215,7 +1215,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1793,7 +1793,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2064,7 +2064,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3630,7 +3630,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3735,7 +3735,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5870,7 +5870,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -620,8 +620,8 @@ msgstr "(Tomt öppnar med aktuella värden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mappning av momsredovisningskonton"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1018,8 +1018,8 @@ msgstr "Nettototal:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Momsredovisningsnummer"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1040,8 +1040,8 @@ msgstr "Barn"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mappning av momsredovisningsnummer"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1127,8 +1127,8 @@ msgstr "Nytt objektkonto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Förlaga för momsredovisningsnummer"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1159,8 +1159,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Förlaga för momsredovisningsnummer"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1230,7 +1230,7 @@ msgstr "Företagets valuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1808,7 +1808,7 @@ msgstr "Nästa"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2079,7 +2079,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3658,7 +3658,7 @@ msgstr "Sekvens"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3763,7 +3763,7 @@ msgstr "Utkastfakturor"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5917,8 +5917,8 @@ msgstr "Betalningsvillkor"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Momsredovisningsnummer"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr "నికర మొత్తం:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr "తర్వాత"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr "చెల్లింపు కాలం"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,7 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2060,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3626,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3731,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5866,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -613,8 +613,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mali Durum Eşleme Hes."
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1007,8 +1007,8 @@ msgstr "Net Toplam:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Mali Durum"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1029,8 +1029,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mali Durum Vergi Haritası"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1116,8 +1116,8 @@ msgstr "Yeni Analiz Hesabı"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Mali Durum Şablonu"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1148,8 +1148,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Mali Durum Şablonu"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1214,8 +1214,8 @@ msgstr "Firma Dövizi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mali Durum Şablonu Eşleme Hes."
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1792,7 +1792,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2063,8 +2063,8 @@ msgstr "Müşteri Fatura İşlemleri"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Mali Durum Beyanı :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3629,8 +3629,8 @@ msgstr "Sıra No"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Mali Durum için Şablon"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3734,8 +3734,8 @@ msgstr "Taslak Faturalar"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mali Durum Şablonu Vergi Eşlemesi"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5869,8 +5869,8 @@ msgstr "Ödeme Vadesi"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Mali Durumlar"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr "Дочірній"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr "Новий Аналітичний Рахунок"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr "Валюта компанії"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1792,7 +1792,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2063,7 +2063,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3639,7 +3639,7 @@ msgstr "Послідовність"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3744,7 +3744,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5891,7 +5891,7 @@ msgstr "Терміни оплати"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -624,8 +624,8 @@ msgstr "giữ vị trí trống cho lấn mở hiện tại"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "sơ đồ tài chính liên kết các tài khoản"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1018,7 +1018,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1040,7 +1040,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1127,7 +1127,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1159,7 +1159,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1225,7 +1225,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1803,7 +1803,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2074,7 +2074,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3640,7 +3640,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3745,7 +3745,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5880,7 +5880,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -612,8 +612,8 @@ msgstr "(当前状态留空为待处理)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "财务结构科目一览表"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1006,8 +1006,8 @@ msgstr "不含税合计:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "财务结构"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1028,8 +1028,8 @@ msgstr "子科目"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "财务结构税一览"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1115,8 +1115,8 @@ msgstr "新的辅助核算项目"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "财务结构模板"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1147,8 +1147,8 @@ msgstr "这金额表示一个可选的其它货币"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "财务结构模板"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1214,8 +1214,8 @@ msgstr "公司本位币"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "财务结构模板科目一览"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1794,9 +1794,9 @@ msgstr "下一步"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr "财务结构将决定业务伙伴使用的税和科目"
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2065,8 +2065,8 @@ msgstr "客户发票处理"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "财务状况备注:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3633,8 +3633,8 @@ msgstr "序列"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "财务结构模板"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3738,8 +3738,8 @@ msgstr "发票草稿"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "财务结构模板税一览"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5882,8 +5882,8 @@ msgstr "付款条款"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "财务结构"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

View File

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,7 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2060,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3626,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3731,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5866,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

View File

@ -315,7 +315,7 @@ class account_invoice(osv.osv):
'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]})
}
_defaults = {
'type': _get_type,
@ -1314,7 +1314,7 @@ class account_invoice_line(osv.osv):
# Parse the value_reference field to get the ID of the account.account record
account_id = int (my_value[0]["value_reference"].split(",")[1])
# Use the ID of the account.account record in the browse for the account.account record
app_acc_in = account_obj.browse(cr, uid, [account_id])[0]
app_acc_in = account_obj.browse(cr, uid, [account_id])[0]
if not exp_pro_id:
ex_acc = res.product_tmpl_id.property_account_expense
ex_acc_cate = res.categ_id.property_account_expense_categ
@ -1486,7 +1486,7 @@ account_invoice_line()
class account_invoice_tax(osv.osv):
_name = "account.invoice.tax"
_description = "Invoice Tax"
def _count_factor(self, cr, uid, ids, name, args, context=None):
res = {}
for invoice_tax in self.browse(cr, uid, ids, context=context):
@ -1497,13 +1497,13 @@ class account_invoice_tax(osv.osv):
if invoice_tax.amount <> 0.0:
factor_tax = invoice_tax.tax_amount / invoice_tax.amount
res[invoice_tax.id]['factor_tax'] = factor_tax
if invoice_tax.base <> 0.0:
factor_base = invoice_tax.base_amount / invoice_tax.base
res[invoice_tax.id]['factor_base'] = factor_base
return res
_columns = {
'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
'name': fields.char('Tax Description', size=64, required=True),

View File

@ -25,9 +25,9 @@ import ir
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Position'
_description = 'Fiscal Mapping'
_columns = {
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True),
'company_id': fields.many2one('res.company', 'Company'),
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
@ -64,10 +64,10 @@ account_fiscal_position()
class account_fiscal_position_tax(osv.osv):
_name = 'account.fiscal.position.tax'
_description = 'Fiscal Position Taxes Mapping'
_description = 'Taxes Fiscal Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
}
@ -76,10 +76,10 @@ account_fiscal_position_tax()
class account_fiscal_position_account(osv.osv):
_name = 'account.fiscal.position.account'
_description = 'Fiscal Position Accounts Mapping'
_description = 'Accounts Fiscal Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
}
@ -172,10 +172,10 @@ class res_partner(osv.osv):
'account.fiscal.position',
type='many2one',
relation='account.fiscal.position',
string="Fiscal Position",
string="Fiscal Mapping",
method=True,
view_load=True,
help="The fiscal position will determine taxes and the accounts used for the partner.",
help="The fiscal Mapping will determine taxes and the accounts used for the partner.",
),
'property_payment_term': fields.property(
'account.payment.term',

View File

@ -7,7 +7,7 @@
<field name="model">account.fiscal.position</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Position">
<form string="Fiscal Mapping">
<field name="name" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<separator string="Mapping" colspan="4"/>
@ -42,7 +42,7 @@
<field name="model">account.fiscal.position</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fiscal Position">
<tree string="Fiscal Mapping">
<field name="name"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</tree>
@ -50,7 +50,7 @@
</record>
<record id="action_account_fiscal_position_form" model="ir.actions.act_window">
<field name="name">Fiscal Positions</field>
<field name="name">Fiscal Mappings</field>
<field name="res_model">account.fiscal.position</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -130,7 +130,7 @@
<act_window
id="action_analytic_open"
name="Analytic Accounts"
res_model="account.analytic.account"
res_model="account.analytic.account"
context="{'search_default_partner_id':[active_id]}"
src_model="res.partner"
view_type="form"

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -24,7 +24,6 @@ import analytic_balance
import inverted_analytic_balance
import cost_ledger
import quantity_cost_ledger
import analytic_check
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -75,7 +75,7 @@ class account_analytic_balance(report_sxw.rml_parse):
sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \
FROM account_analytic_line AS aal, account_account AS aa \
WHERE (aal.general_account_id=aa.id) \
AND (aal.account_id IN aal.account_id IN %s)\
AND (aal.account_id IN %s)\
AND (date>=%s) AND (date<=%s) AND aa.active \
GROUP BY aal.general_account_id, aa.name, aa.code, aal.code \
ORDER BY aal.code", (tuple(ids), date1, date2))
@ -101,7 +101,7 @@ class account_analytic_balance(report_sxw.rml_parse):
self.acc_data_dict[account_id] = ids
else:
ids = self.acc_data_dict[account_id]
query_params = (tuple(ids), date1, date2)
if option == "credit" :
self.cr.execute("SELECT -sum(amount) FROM account_analytic_line \

View File

@ -3,37 +3,6 @@
<template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
<!--<stroke color="darkblue"/>-->
<!--TITLE COMPANY-->
<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Analytic Balance - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@ -41,156 +10,216 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockTableStyle id="Table_Header_analytic">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,2" stop="1,2"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,3" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Header_Tile">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="tbl_content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="tbl_data">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_right_bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="57.0,280.0,50.0,50.0,50.0,50.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit </para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
<tr>
<td>
<para style="terp_tblheader_General">Total</para>
</td>
<td></td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</u></para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
<blockTable colWidths="57.0,280.0,50.0,50.0,50.0,50.0" style="tbl_data">
<tr>
<blockTable colWidths="482.0" style="Table_Header_analytic">
<tr>
<td>
<para style="terp_default_8_bold">[[ o['code'] ]]</para>
</td>
<td>
<para style="terp_default_8_bold">[[ o['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'debit')) ]]</u></para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'credit')) ]]</u></para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'quantity')) ]]</u></para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<para style="terp_default_8">[[ move_g['code'] ]]</para>
</td>
<td>
<para style="terp_default_8">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['debit'])]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['credit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['balance'])]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
<para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<blockTable colWidths="55.0,221.0,55.0,52.0,60.0,39.0" style="Table_Header_Tile">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.name]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit(<font face="Helvetica" size="8.0">[[ company.currency_id.name]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.name]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="54.0,222.0,56.0,51.0,62.0,38.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Total</para>
</td>
<td>
<para style="terp_tblheader_Details">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
<blockTable colWidths="55.0,221.0,56.0,50.0,62.0,38.0" style="Table3">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o['code'] ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
</td>
</tr>
</blockTable>
</section>
<para style="terp_default_8">
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="55.0,222.0,56.0,49.0,63.0,37.0" style="Table2">
<tr>
<td>
<para style="terp_default_9">[[ move_g['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="Standard">
<font color="white"> </font>
</para>
</story>
</document>

View File

@ -1,100 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
import pooler
from report import report_sxw
class account_analytic_analytic_check(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_analytic_check, self).__init__(cr, uid, name, context=context)
self.sum_gen_deb = 0.0
self.sum_gen_cred = 0.0
self.sum_ana_deb = 0.0
self.sum_ana_cred = 0.0
self.localcontext.update( {
'time': time,
'lines_p': self._lines_p,
'general_debit': self._gen_deb,
'general_credit': self._gen_cred,
'analytic_debit': self._ana_deb,
'analytic_credit': self._ana_cred,
'delta_debit': self._delta_deb,
'delta_credit': self._delta_cred,
})
def _lines_p(self, date1, date2):
res = []
acc_obj = self.pool.get('account.account')
for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code']):
self.cr.execute("SELECT sum(debit), sum(credit) \
FROM account_move_line \
WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %s", (date1, date2, a['id']))
(gd, gc) = self.cr.fetchone()
gd = gd or 0.0
gc = gc or 0.0
self.cr.execute("SELECT abs(sum(amount)) AS balance \
FROM account_analytic_line \
WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
(ad,) = self.cr.fetchone()
ad = ad or 0.0
self.cr.execute("SELECT abs(sum(amount)) AS balance \
FROM account_analytic_line \
WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
(ac,) = self.cr.fetchone()
ac = ac or 0.0
res.append({'code': a['code'], 'name': a['name'],
'gen_debit': gd,
'gen_credit': gc,
'ana_debit': ad,
'ana_credit': ac,
'delta_debit': gd - ad,
'delta_credit': gc - ac,})
self.sum_gen_deb += gd
self.sum_gen_cred += gc
self.sum_ana_deb += ad
self.sum_ana_cred += ac
return res
def _gen_deb(self, date1, date2):
return self.sum_gen_deb
def _gen_cred(self, date1, date2):
return self.sum_gen_cred
def _ana_deb(self, date1, date2):
return self.sum_ana_deb
def _ana_cred(self, date1, date2):
return self.sum_ana_cred
def _delta_deb(self, date1, date2):
return (self._gen_deb(date1,date2)-self._ana_deb(date1,date2))
def _delta_cred(self, date1, date2):
return (self._gen_cred(date1,date2)-self._ana_cred(date1,date2))
report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account.analytic.account', 'addons/account/project/report/analytic_check.rml',parser=account_analytic_analytic_check, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -169,19 +169,19 @@
<blockTable colWidths="63.0,249.0,57.0,57.0,57.0" style="Table_Header_Title">
<tr>
<td>
<para style="terp_tblheader_Details">Date or Code</para>
<para style="terp_tblheader_Details">Date/Code</para>
</td>
<td>
<para style="terp_tblheader_Details">J.C. or Move name</para>
<para style="terp_tblheader_Details">J.C. /Move name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit </para>
<para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
<para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
<para style="terp_tblheader_Details_Centre">Balance([[ company.currency_id.code]])</para>
</td>
</tr>
</blockTable>
@ -199,13 +199,13 @@
</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -223,13 +223,13 @@
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -247,13 +247,13 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -274,13 +274,13 @@
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>

View File

@ -84,8 +84,8 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="539.0" style="Table_Title">
<tr>
@ -94,10 +94,7 @@
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<para style="terp_default_space">
<para style="Text body">
<font color="white"> </font>
</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table">
@ -109,13 +106,13 @@
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
<para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
<para style="terp_tblheader_Details_Right">Credit<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance </para>
<para style="terp_tblheader_Details_Right">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
@ -136,22 +133,19 @@
</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3">
@ -163,22 +157,19 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table4">
@ -190,16 +181,16 @@
<para style="terp_default_9">[[ move_a['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity'] or 0.00) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
</td>
</tr>
</blockTable>
@ -207,12 +198,6 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</story>
</document>
</document>

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Quantity Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@ -79,16 +79,16 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@ -110,12 +110,12 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Right" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
<tr>
@ -134,15 +134,6 @@
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Detail">
<tr>
<td>
@ -159,13 +150,13 @@
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content">
<tr>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date1'],date = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date2'],date = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date = True) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
</td>
</tr>
</blockTable>
@ -175,7 +166,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="82.0,247.0,92.0,60.0" style="Table_Header_Move_Line">
<blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Header_Move_Line">
<tr>
<td>
<para style="terp_tblheader_Details">Code/Date</para>
@ -191,10 +182,7 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="81.0,249.0,92.0,60.0" style="Table_Final_Total">
<blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Final_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
@ -214,21 +202,15 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="81.0,249.0,92.0,59.0" style="Table_Account_Detail">
<blockTable colWidths="58.0,287.0,78.0,59.0" style="Table_Account_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o.code ]]<font face="Times-Roman" size="10.0"/></para>
<para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para>
</td>
<td>
<para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Times-Roman" size="10.0"/></para>
<para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Helvetica" size="10.0"/></para>
</td>
<td>
<para style="terp_default_Bold_9">Max Qty: [[ formatLang (o.quantity_max )]]</para>
@ -238,15 +220,9 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="81.0,342.0,59.0" style="Table_Analytical_Detail">
<blockTable colWidths="58.0,365.0,59.0" style="Table_Analytical_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ move_g['code'] ]] </para>
@ -259,7 +235,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="81.0,51.0,290.0,59.0" style="Table_Move_Line_Content">
<blockTable colWidths="59.0,32.0,332.0,59.0" style="Table_Move_Line_Content">
<tr>
<td>
<para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para>
@ -280,15 +256,6 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</story>
</document>
</document>

View File

@ -65,7 +65,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
res_partner.name AS name \
FROM res_partner,account_move_line AS l, account_account\
WHERE (l.account_id=account_account.id)\
WHERE (l.account_id=account_account.id) \
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (l.partner_id=res_partner.id)\
@ -78,19 +78,23 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
#
# Build a string like (1,2,3) for easy use in SQL query
partner_ids = [x['id'] for x in partners]
# This dictionary will store the debit-credit for all partners, using partner_id as key.
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
totals = {}
self.cr.execute('SELECT partner_id, SUM(debit-credit) \
FROM account_move_line AS l, account_account\
WHERE (l.account_id = account_account.id)\
self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id) \
AND (am.state IN %s)\
AND (account_account.type IN %s)\
AND (partner_id IN %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (l.partner_id IN %s)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND ' + self.query + '\
AND account_account.active\
GROUP BY partner_id ' , (tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from,))
GROUP BY partner_id ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
t = self.cr.fetchall()
for i in t:
totals[i[0]] = i[1]
@ -98,32 +102,34 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
# This dictionary will store the future or past of all partners
future_past = {}
if self.direction_selection == 'future':
self.cr.execute('SELECT partner_id, SUM(debit-credit) \
FROM account_move_line AS l, account_account\
WHERE (l.account_id=account_account.id)\
self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id=account_account.id) AND (l.move_id=am.id) \
AND (am.state IN %s)\
AND (account_account.type IN %s)\
AND (COALESCE(date_maturity, date) < %s)\
AND (partner_id IN %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (COALESCE(l.date_maturity, l.date) < %s)\
AND (l.partner_id IN %s)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active\
GROUP BY partner_id', (tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids),self.date_from,))
GROUP BY l.partner_id', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids),self.date_from))
t = self.cr.fetchall()
for i in t:
future_past[i[0]] = i[1]
elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
self.cr.execute('SELECT partner_id, SUM(debit-credit) \
FROM account_move_line AS l, account_account\
WHERE (l.account_id=account_account.id)\
self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (account_account.type IN %s)\
AND (COALESCE(date_maturity,date) > %s)\
AND (partner_id IN %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (COALESCE(l.date_maturity,l.date) > %s)\
AND (l.partner_id IN %s)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active\
GROUP BY partner_id' , (tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from,))
GROUP BY l.partner_id' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from))
t = self.cr.fetchall()
for i in t:
future_past[i[0]] = i[1]
@ -132,8 +138,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
# Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
history = []
for i in range(5):
args_list = (tuple(self.ACCOUNT_TYPE), tuple(partner_ids) ,self.date_from,)
dates_query = '(COALESCE(date_maturity,date)'
args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids) ,self.date_from,)
dates_query = '(COALESCE(l.date_maturity,l.date)'
if form[str(i)]['start'] and form[str(i)]['stop']:
dates_query += ' BETWEEN %s AND %s)'
args_list += (form[str(i)]['start'], form[str(i)]['stop'])
@ -143,17 +149,19 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
else:
dates_query += ' < %s)'
args_list += (form[str(i)]['stop'],)
self.cr.execute('SELECT partner_id, SUM(debit-credit)\
FROM account_move_line AS l, account_account\
WHERE (l.account_id = account_account.id)\
self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit)\
FROM account_move_line AS l, account_account , account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (account_account.type IN %s)\
AND (partner_id IN %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (l.partner_id IN %s)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active\
AND ' + dates_query + '\
GROUP BY partner_id' , args_list)
GROUP BY l.partner_id' , args_list)
t = self.cr.fetchall()
d = {}
for i in t:
@ -177,7 +185,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
after = [ future_past[partner['id']] ]
self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
values['direction'] = after and after[0] or ""
values['direction'] = after and after[0] or 0.0
for i in range(5):
during = False
@ -185,8 +193,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
during = [ history[i][partner['id']] ]
# Ajout du compteur
self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
values[str(i)] = during and during[0] or ""
values[str(i)] = during and during[0] or 0.0
total = False
if totals.has_key( partner['id'] ):
total = [ totals[partner['id']] ]
@ -210,97 +217,119 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def _get_lines_with_out_partner(self, form):
res = []
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
## mise a 0 du total
for i in range(7):
self.total_account.append(0)
totals = {}
self.cr.execute('SELECT SUM(debit-credit) \
FROM account_move_line AS l, account_account\
WHERE (l.account_id = account_account.id)\
self.cr.execute('SELECT SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account , account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (l.partner_id IS NULL)\
AND (account_account.type IN %s)\
AND ((reconcile_id IS NULL) \
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND ((l.reconcile_id IS NULL) \
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND ' + self.query + '\
AND account_account.active ' ,(tuple(self.ACCOUNT_TYPE), self.date_from, ))
AND account_account.active ' ,(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from))
t = self.cr.fetchall()
for i in t:
totals['No Partner Defined'] = i[0]
totals['Unknown Partner'] = i[0]
future_past = {}
if self.direction_selection == 'future':
self.cr.execute('SELECT SUM(debit-credit) \
FROM account_move_line AS l, account_account\
WHERE (l.account_id=account_account.id)\
self.cr.execute('SELECT SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account, account_move am\
WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (l.partner_id IS NULL)\
AND (account_account.type IN %s)\
AND (COALESCE(date_maturity, date) < %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (COALESCE(l.date_maturity, l.date) < %s)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active ', (tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from, ))
AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
t = self.cr.fetchall()
for i in t:
future_past['No Partner Defined'] = i[0]
future_past['Unknown Partner'] = i[0]
elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
self.cr.execute('SELECT SUM(debit-credit) \
FROM account_move_line AS l, account_account\
WHERE (l.account_id=account_account.id)\
self.cr.execute('SELECT SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (l.partner_id IS NULL)\
AND (account_account.type IN %s)\
AND (COALESCE(date_maturity,date) > %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (COALESCE(l.date_maturity,l.date) > %s)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active ' , (tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
AND account_account.active ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
t = self.cr.fetchall()
for i in t:
future_past['No Partner Defined'] = i[0]
future_past['Unknown Partner'] = i[0]
history = []
for i in range(5):
self.cr.execute('SELECT SUM(debit-credit)\
FROM account_move_line AS l, account_account\
WHERE (l.account_id = account_account.id)\
AND (l.partner_id IS NULL)\
args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from,)
dates_query = '(COALESCE(l.date_maturity,l.date)'
if form[str(i)]['start'] and form[str(i)]['stop']:
dates_query += ' BETWEEN %s AND %s)'
args_list += (form[str(i)]['start'], form[str(i)]['stop'])
elif form[str(i)]['start']:
dates_query += ' > %s)'
args_list += (form[str(i)]['start'],)
else:
dates_query += ' < %s)'
args_list += (form[str(i)]['stop'],)
self.cr.execute('SELECT SUM(l.debit-l.credit)\
FROM account_move_line AS l, account_account , account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (account_account.type IN %s)\
AND (COALESCE(date_maturity,date) BETWEEN %s AND %s)\
AND ((reconcile_id IS NULL)\
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (l.partner_id IS NULL)\
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active ' , (tuple(self.ACCOUNT_TYPE), form[str(i)]['start'], form[str(i)]['stop'], self.date_from,))
AND account_account.active\
AND ' + dates_query + '\
GROUP BY l.partner_id' , args_list)
t = self.cr.fetchall()
d = {}
for i in t:
d['No Partner Defined'] = i[0]
d['Unknown Partner'] = i[0]
history.append(d)
values = {}
if self.direction_selection == 'future':
before = False
if future_past.has_key('No Partner Defined'):
before = [ future_past['No Partner Defined'] ]
if future_past.has_key('Unknown Partner'):
before = [ future_past['Unknown Partner'] ]
self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
values['direction'] = before and before[0] or 0.0
elif self.direction_selection == 'past':
after = False
if future_past.has_key('No Partner Defined'):
after = [ future_past['No Partner Defined'] ]
if future_past.has_key('Unknown Partner'):
after = [ future_past['Unknown Partner'] ]
self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
values['direction'] = after and after[0] or ""
values['direction'] = after and after[0] or 0.0
for i in range(5):
during = False
if history[i].has_key('No Partner Defined'):
during = [ history[i]['No Partner Defined'] ]
if history[i].has_key('Unknown Partner'):
during = [ history[i]['Unknown Partner'] ]
self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
values[str(i)] = during and during[0] or ""
values[str(i)] = during and during[0] or 0.0
total = False
if totals.has_key( 'No Partner Defined' ):
total = [ totals['No Partner Defined'] ]
if totals.has_key( 'Unknown Partner' ):
total = [ totals['Unknown Partner'] ]
values['total'] = total and total[0] or 0.0
## Add for total
self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
values['name'] = 'No Partner Defined'
values['name'] = 'Unknown Partner'
if values['total']:
res.append(values)
@ -316,15 +345,15 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def _get_total(self,pos):
period = self.total_account[int(pos)]
return period
return period or 0.0
def _get_direction(self,pos):
period = self.total_account[int(pos)]
return period
return period or 0.0
def _get_for_period(self,pos):
period = self.total_account[int(pos)]
return period
return period or 0.0
def _get_partners(self,data):
if data['form']['result_selection'] == 'customer':

View File

@ -82,9 +82,22 @@
<paraStyle name="Caption" fontName="Helvetica" fontSize="8.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
</stylesheet>
<story>
<para style="P9">
@ -146,36 +159,34 @@
</td>
</tr>
</blockTable>
<para style="P9">
<font color="white"> </font>
</para> <para style="P9">
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="300.0,100.0,100.0,100.0,100.0,105.0,105.0,125.0" style="Table2" repeatRows="1">
<tr>
<td>
<para style="P2">Partners</para>
<para style="terp_tblheader_Details">Partners</para>
</td>
<td>
<para style="P8">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
<para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
<td>
<para style="P8">[[ data['form']['4']['name'] ]]</para>
<para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
<td>
<para style="P8">[[ data['form']['3']['name'] ]]</para>
<para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
<td>
<para style="P8">[[ data['form']['2']['name'] ]]</para>
<para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
<td>
<para style="P8">[[ data['form']['1']['name'] ]]</para>
<para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
<td>
<para style="P8">[[ data['form']['0']['name'] ]]</para>
<para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
<td>
<para style="P8">Total</para>
<para style="terp_tblheader_Details_Right">Total<font size="8.0">([[ company.currency_id.code ]])</font></para>
</td>
</tr>
@ -184,36 +195,28 @@
<td>
<para style="P3"> <font color="white">[[ (get_lines(data['form']), 'partner') == False or removeParentNode('para') ]]</font></para>
<para style="P3"> <font color="white">[[ (get_lines_with_out_partner(data['form']), 'not_partner') == False or removeParentNode('para') ]]</font></para>
<para style="P9"><font color="white"> </font></para>
<para style="Total">Account Total</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_direction('6') or 0.00) ]] </para>
<para style="Total_right">[[ formatLang(get_direction('6')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_for_period('4') or 0.00) ]]</para>
<para style="Total_right">[[ formatLang(get_for_period('4')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_for_period('3') or 0.00) ]]</para>
<para style="Total_right">[[ formatLang(get_for_period('3')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_for_period('2') or 0.00) ]]</para>
<para style="Total_right">[[ formatLang(get_for_period('2')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_for_period('1') or 0.00) ]]</para>
<para style="Total_right">[[ formatLang(get_for_period('1')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_for_period('0') or 0.00) ]]</para>
<para style="Total_right">[[ formatLang(get_for_period('0')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P9"><font color="white"> </font></para>
<para style="Total_right">[[ formatLang(get_total('5') or 0.00) ]]</para>
<para style="Total_right">[[ formatLang(get_total('5')) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
@ -223,25 +226,25 @@
<para style="P2_content">[[ partner['name'] ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['direction'] or 0.00) ]] </para>
<para style="content">[[ formatLang(partner['direction']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['4'] or 0.00)]]</para>
<para style="content">[[ formatLang(partner['4'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['3'] or 0.00)]]</para>
<para style="content">[[ formatLang(partner['3'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['2'] or 0.00) ]]</para>
<para style="content">[[ formatLang(partner['2']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['1'] or 0.00) ]]</para>
<para style="content">[[ formatLang(partner['1']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['0'] or 0.00) ]]</para>
<para style="content">[[ formatLang(partner['0']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(partner['total'] or 0.00 ) ]]</para>
<para style="content">[[ formatLang(partner['total']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@ -250,25 +253,25 @@
<para style="P2_content">[[ not_partner['name'] ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['direction'] or 0.00) ]] </para>
<para style="content">[[ formatLang(not_partner['direction']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['4'] or 0.00)]]</para>
<para style="content">[[ formatLang(not_partner['4'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['3'] or 0.00)]]</para>
<para style="content">[[ formatLang(not_partner['3'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['2'] or 0.00) ]]</para>
<para style="content">[[ formatLang(not_partner['2']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['1'] or 0.00) ]]</para>
<para style="content">[[ formatLang(not_partner['1']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['0'] or 0.00) ]]</para>
<para style="content">[[ formatLang(not_partner['0']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="content">[[ formatLang(not_partner['total'] or 0.00 ) ]]</para>
<para style="content">[[ formatLang(not_partner['total']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>

View File

@ -50,7 +50,7 @@
<separator orientation="vertical"/>
<field name="product_id" />
<field name="user_id" widget="selection">
<filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
<filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
</field>
</group>
<newline/>
@ -90,7 +90,7 @@
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Analytic Entries Analysis" type="bar">
<field name="user_id"/>
<field name="user_id"/>
<field name="amount" operator="+"/>
<field name="unit_amount" operator="+"/>
<field name="amount_currency" operator="+"/>

View File

@ -63,15 +63,15 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
def sum_dr(self):
if self.res_bl['type'] == 'Net Profit':
self.result_sum_dr += self.res_bl['balance']
return self.result_sum_dr or 0.0
return self.result_sum_dr
def sum_cr(self):
if self.res_bl['type'] == 'Net Loss':
self.result_sum_cr += self.res_bl['balance']
return self.result_sum_cr or 0.0
return self.result_sum_cr
def get_pl_balance(self):
return self.res_bl or 0.0
return self.res_bl
def get_data(self,data):
cr, uid = self.cr, self.uid
@ -98,7 +98,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
elif data['form']['filter'] == 'filter_date':
ctx['date_from'] = data['form'].get('date_from', False)
ctx['date_to'] = data['form'].get('date_to', False)
ctx['state'] = data['form'].get('target_move', 'all')
cal_list = {}
pl_dict = {}
account_dict = {}

View File

@ -65,7 +65,7 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
@ -117,7 +117,10 @@
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@ -161,13 +164,6 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_Heading">
<tr>
<td>
<para style="terp_header_Centre">[[ get_company(data) ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@ -181,42 +177,42 @@
</para>
<blockTable colWidths="120.0,100.0,140.0,90.0,90.0" style="Table2_header" >
<tr>
<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font></para></td>
<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
<td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
<td><para style="terp_tblheader_Details_Centre">End Period</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
</tr>
</blockTable>
<para style="Standard">
<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
<td><para style="terp_tblheader_Details_Centre">End Period</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="Standard">
@ -225,6 +221,44 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="100.0,326.0,113.0" style="Table1" repeatRows="1">
<tr>
<td>
<para style="terp_default_Bold_9">Code</para>
</td>
<td>
<para style="terp_default_Bold_9">Assets</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
<blockTable colWidths="426.0,113.0" style="Table3">
<tr>
<td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
<condPageBreak height="20cm"/>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
<tr>
<td>
@ -245,7 +279,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@ -255,45 +289,7 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
<condPageBreak height="20cm"/>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="100.0,326.0,113.0" style="Table1" repeatRows="1">
<tr>
<td>
<para style="terp_default_Bold_9">Code</para>
</td>
<td>
<para style="terp_default_Bold_9">Assets</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="426.0,113.0" style="Table3">
<tr>
<td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>

View File

@ -128,7 +128,7 @@
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
</blockTableStyle>
<initialize>
@ -197,62 +197,53 @@
<para style="Standard">
<font color="white"> </font>
</para>
<para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
<para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
<blockTable colWidths="210.0,210.0,200.0,200.0,200.0" style="Table2_header" >
<tr>
<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
<td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
<td><para style="terp_tblheader_Details_Centre">End Period</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
</tr>
</blockTable>
<para style="Standard">
<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
<td><para style="terp_tblheader_Details_Centre">End Period</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="Standard">
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Account_Line_Title" repeatRows="1">
<tr>
<td>
<para style="terp_default_Bold_9">Code</para>
</td>
<td>
<para style="terp_default_Bold_9">Liabilities</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Bold_9">Code</para>
</td>
@ -262,44 +253,52 @@
<td>
<para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]]) </para>
</td>
<td>
<para style="terp_default_Bold_9">Code</para>
</td>
<td>
<para style="terp_default_Bold_9">Liabilities</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code1'] ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
<tr>
<td>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code1'] ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
<blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
<tr>
<td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]]) </para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</tr>
</blockTable>
<para style="terp_default_Right_9">
<font color="white"> </font>

View File

@ -3,9 +3,6 @@
<template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
<pageGraphics>
</pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@ -227,9 +224,6 @@
</stylesheet>
<images/>
<story>
<para style="P9">
<font color="white"> </font>
</para>
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
<tr>
@ -239,9 +233,6 @@
<td><para style="terp_header"><font color="white"> </font></para></td>
</tr>
</blockTable>
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="90.0,80.0,100.0,130.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
@ -283,35 +274,35 @@
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="50.0,200.0,95.0,92.0,69.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
<td><para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para></td>
<td><para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para></td>
<td><para style="terp_tblheader_Details_Right">Balance([[ company.currency_id.code]])</para></td>
<td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
<td><para style="terp_tblheader_Details_Right">Debit</para></td>
<td><para style="terp_tblheader_Details_Right">Credit</para></td>
<td><para style="terp_tblheader_Details_Right">Balance</para></td>
<td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
<td><para style="terp_default_Bold_9">Total<font size="8.0">([[ company.currency_id.code]])</font>:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@ -323,7 +314,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
<blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@ -332,7 +323,7 @@
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@ -342,9 +333,6 @@
<td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and line['currency_code'] or '']]</para></td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="P9">
<font color="white"> </font>

View File

@ -3,9 +3,6 @@
<template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
<pageGraphics>
</pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@ -268,9 +265,9 @@
<tr>
<td><para style="terp_tblheader_Details">Code</para></td>
<td><para style="terp_tblheader_Details">Journal Name</para></td>
<td><para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para></td>
<td><para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para></td>
<td><para style="terp_tblheader_Details_Right">Balance([[ company.currency_id.code]])</para></td>
<td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
@ -284,9 +281,9 @@
<tr>
<td><para style="terp_tblheader_Details">Code</para></td>
<td><para style="terp_tblheader_Details">Journal Name</para></td>
<td><para style="terp_tblheader_Details_Right">Debit</para></td>
<td><para style="terp_tblheader_Details_Right">Credit</para></td>
<td><para style="terp_tblheader_Details_Right">Balance</para></td>
<td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
<tr>

View File

@ -141,9 +141,10 @@
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="date" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="date" fontName="Helvetica-Bold" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="LEFT"/>
<paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3b" fontName="Helvetica-Bold" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3_centre" fontName="Helvetica" fontSize="8.3" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@ -176,9 +177,6 @@
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
</stylesheet>
<story>
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@ -186,7 +184,7 @@
</td>
</tr>
</blockTable>
<para style="P9">
<para>
<font color="white"> </font>
</para>
<para>[[ repeatIn(objects, 'a') ]]</para>
@ -241,14 +239,14 @@
<blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td><para style="P3">Date</para></td>
<td><para style="P3">Partner</para></td>
<td><para style="P3">Ref</para></td>
<td><para style="P3">Move</para></td>
<td><para style="P3">Entry Label</para></td>
<td><para style="P9">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P9">Crebit([[ company.currency_id.code]])</para></td>
<td><para style="P9">Balance([[ company.currency_id.code]])</para></td>
<td><para style="date">Date</para></td>
<td><para style="P3b">Partner</para></td>
<td><para style="P3b">Ref</para></td>
<td><para style="P3b">Move</para></td>
<td><para style="P3b">Entry Label</para></td>
<td><para style="P9b">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P9b">Crebit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P9b">Balance<font size="7.0">([[ company.currency_id.code]])</font></para></td>
</tr>
</blockTable>
<section>
@ -289,17 +287,17 @@
<blockTable colWidths="70.0,40.0,60.0,65.0,89.0,53.0,53.0,58.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td><para style="P3">Date</para></td>
<td><para style="P3">Partner</para></td>
<td><para style="P3">Ref</para></td>
<td><para style="P3">Move</para></td>
<td><para style="P3">Entry Label</para></td>
<td><para style="P3">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P3">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
<td><para style="P4">Currency</para></td>
<td><para style="date">Date</para></td>
<td><para style="P3b">Partner</para></td>
<td><para style="P3b">Ref</para></td>
<td><para style="P3b">Move</para></td>
<td><para style="P3b">Entry Label</para></td>
<td><para style="P9b">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P9b">Credit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P9b">Balance<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P9b">Currency</para></td>
</tr>
</blockTable>
<section>

View File

@ -3,9 +3,6 @@
<template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
<pageTemplate id="first">
<frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
<pageGraphics>
</pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@ -146,7 +143,9 @@
<paraStyle name="date" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3_center" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3_content_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
@ -179,9 +178,6 @@
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
</stylesheet>
<story>
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@ -189,9 +185,6 @@
</td>
</tr>
</blockTable>
<para style="P9">
<font color="white"> </font>
</para>
<para>[[ repeatIn(objects, 'a') ]]</para>
<para style="terp_default_8">
@ -247,7 +240,7 @@
<font color="white"> </font>
</para>
<blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,69.0,72.0,64.0,88.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<tr>
<td><para style="date">Date</para></td>
<td><para style="P2">JNRL</para></td>
@ -255,7 +248,7 @@
<td><para style="P2">Ref</para></td>
<td><para style="P2">Move</para></td>
<td><para style="P3">Entry Label</para></td>
<td><para style="P3">Counterpart</para></td>
<td><para style="P3_center">Counterpart</para></td>
<td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
@ -266,49 +259,49 @@
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
<blockTable rowHeights="0.65cm" colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<tr>
<td>
<blockTable colWidths="404.0,335.0,75.0,75.0,75.0,79.00" style="Table5">
<tr>
<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.symbol or '' ]]</u></para></td>
</tr>
</blockTable>
</td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
</tr>
<tr><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]</para>
<td><para style="P2_content"> [[ formatLang(line['ldate'],date=True) ]]</para></td>
<td><para style="P2_content">[[ line['lcode'] ]]</para></td>
<td><para style="P2_content">[[ line['partner_name'] ]]</para></td>
<td><para style="P2_content">[[ line['lref'] ]]</para></td>
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content">[[ line['line_corresp'] ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<tr>
<td>
<blockTable colWidths="404.0,335.0,75.0,75.0,75.0,79.00" style="Table5">
<tr>
<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.code or '' ]]</u></para></td>
</tr>
</blockTable>
</td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
</tr>
<tr><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]</para>
<td><para style="P2_content"> [[ formatLang(line['ldate'],date=True) ]]</para></td>
<td><para style="P2_content">[[ line['lcode'] ]]</para></td>
<td><para style="P2_content">[[ line['partner_name'] ]]</para></td>
<td><para style="P2_content">[[ line['lref'] ]]</para></td>
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]]</para></td>
</tr>
</blockTable>
</section>
</section>
<blockTable colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="66.0,35.0,166.0,90.0,60.0,348.0,80.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P2">Date</para></td>
<td><para style="date">JNRL</para></td>
@ -316,57 +309,57 @@
<td><para style="P2">Ref</para></td>
<td><para style="P2">Move</para></td>
<td><para style="P3">Entry Label</para></td>
<td><para style="P3">Counterpart</para></td>
<td><para style="P3_center">Counterpart</para></td>
<td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
</tr>
</blockTable>
</blockTable>
<section>
<section>
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
<blockTable rowHeights="0.65cm" colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td>
<blockTable colWidths="405.0,435.0,69.0,72.0,64.0" style="Table5">
<tr>
<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
</tr>
</blockTable>
</td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
</tr>
<tr>
<td><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]<font>[[ line['ldate'] and formatLang(line['ldate'],date=True) or removeParentNode('tr') ]]</font></para></td>
<para>[[ line or removeParentNode('tr')</para>
<td><para style="P2_content">[[ line['lcode'] ]]</para></td>
<td><para style="P2_content">[[ line['partner'] ]]</para></td>
<td><para style="P2_content">[[ line['lref'] ]]</para></td>
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content">[[ strip_name(line['line_corresp'],15) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="66.0,35.0,166.0,90.0,60.0,348.0,80.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td>
<blockTable colWidths="405.0,435.0,69.0,72.0,64.0" style="Table5">
<tr>
<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
</tr>
</blockTable>
</td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
<td><para style="Standard"></para></td>
</tr>
<tr>
<td><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]<font>[[ line['ldate'] and formatLang(line['ldate'],date=True) or removeParentNode('tr') ]]</font></para></td>
<para>[[ line or removeParentNode('tr')</para>
<td><para style="P2_content">[[ line['lcode'] ]]</para></td>
<td><para style="P2_content">[[ line['partner'] ]]</para></td>
<td><para style="P2_content">[[ line['lref'] ]]</para></td>
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
</section>
<para style="terp_default_8">
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>

View File

@ -39,7 +39,7 @@ class account_invoice_report(osv.osv):
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),

View File

@ -54,6 +54,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
def set_context(self, objects, data, ids, report_type=None):
new_ids = ids
self.query_get_clause = ''
self.target_move = data['form'].get('target_move', 'all')
if (data['model'] == 'ir.ui.menu'):
new_ids = data['form'].get('active_ids', [])
self.query_get_clause = 'AND '
@ -66,6 +67,46 @@ class journal_print(report_sxw.rml_parse, common_report_header):
self.period_ids, self.journal_ids = zip(*res)
return super(journal_print, self).set_context(objects, data, ids, report_type=report_type)
def _sum_debit(self, period_id=False, journal_id=False):
if journal_id and isinstance(journal_id, int):
journal_id = [journal_id]
if period_id and isinstance(period_id, int):
period_id = [period_id]
if not journal_id:
journal_id = self.journal_ids
if not period_id:
period_id = self.period_ids
if not (period_id and journal_id):
return 0.0
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
self.cr.execute('SELECT SUM(debit) FROM account_move_line l , account_move am '
'WHERE l.move_id=am.id AND am.state IN %s AND l.period_id IN %s AND l.journal_id IN %s ' + self.query_get_clause + ' ',
(tuple(move_state), tuple(period_id), tuple(journal_id)))
return self.cr.fetchone()[0] or 0.0
def _sum_credit(self, period_id=False, journal_id=False):
if journal_id and isinstance(journal_id, int):
journal_id = [journal_id]
if period_id and isinstance(period_id, int):
period_id = [period_id]
if not journal_id:
journal_id = self.journal_ids
if not period_id:
period_id = self.period_ids
if not (period_id and journal_id):
return 0.0
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
self.cr.execute('SELECT SUM(l.credit) FROM account_move_line l, account_move am '
'WHERE l.move_id=am.id AND am.state IN %s AND l.period_id IN %s AND l.journal_id IN %s '+ self.query_get_clause+'',
(tuple(move_state), tuple(period_id), tuple(journal_id)))
return self.cr.fetchone()[0] or 0.0
def lines(self, period_id, journal_id=False):
if not journal_id:
journal_id = self.journal_ids
@ -74,7 +115,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
obj_mline = self.pool.get('account.move.line')
self.cr.execute('update account_journal_period set state=%s where journal_id IN %s and period_id=%s and state=%s', ('printed', self.journal_ids, period_id, 'draft'))
self.cr.commit()
self.cr.execute('SELECT id FROM account_move_line l WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ' ORDER BY '+ self.sort_selection + '' ,(period_id, tuple(journal_id) ))
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + '' ,(tuple(move_state), period_id, tuple(journal_id) ))
ids = map(lambda x: x[0], self.cr.fetchall())
return obj_mline.browse(self.cr, self.uid, ids)

View File

@ -246,7 +246,7 @@
<para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="40.0,65.0,50.0,62.0,154.0,58.0,60.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="40.0,65.0,50.0,62.0,152.0,60.0,60.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Entry No</para></td>
@ -281,16 +281,16 @@
</blockTable>
<blockTable colWidths="50.0,65.0,50.0,60.0,89.0,40.0,60.0,50.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,65.0,50.0,60.0,69.0,60.0,60.0,60.0,50.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Entry No</para></td>
<td><para style="P10">A/c No.</para></td>
<td><para style="P10a">Partner</para></td>
<td><para style="P10a">Entry label</para></td>
<td><para style="P10b">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P10b">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P10b">Balance([[ company.currency_id.code]])</para></td>
<td><para style="P10a">Move - Entry label</para></td>
<td><para style="P10b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P10b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P10b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P10b">Currency</para></td>
</tr>
<tr>
@ -309,11 +309,11 @@
<td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
<td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
<td><para style="terp_default_8">[[ line.name ]]</para></td>
<td><para style="terp_default_8">[[ line.move_id.name ]] - [[ line.name ]]</para></td>
<td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.code or '']]</para></td>
<td><para style="P8">[[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
</tr>
</blockTable>

View File

@ -104,6 +104,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
self.query = data['form'].get('query_line', '')
self.init_query = data['form'].get('initial_bal_query', '')
self.result_selection = data['form'].get('result_selection')
self.target_move = data['form'].get('target_move', 'all')
if (self.result_selection == 'customer' ):
self.ACCOUNT_TYPE = ('receivable',)
@ -122,6 +123,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return super(partner_balance, self).set_context(objects, data, ids, report_type=report_type)
def lines(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
full_account = []
result_tmp = 0.0
self.cr.execute(
@ -142,11 +147,13 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
") AS enlitige " \
"FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \
"JOIN account_account ac ON (l.account_id = ac.id)" \
"JOIN account_move am ON (am.id = l.move_id)" \
"WHERE ac.type IN %s " \
"AND am.state IN %s " \
"AND " + self.query + "" \
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
"ORDER BY l.account_id,p.name",
(self.ACCOUNT_TYPE,))
(self.ACCOUNT_TYPE, tuple(move_state)))
res = self.cr.dictfetchall()
#For include intial balance..
@ -211,10 +218,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
full_account = [r for r in res if r['sdebit'] > 0 or r['scredit'] > 0]
else:
full_account = [r for r in res]
for rec in full_account:
if not rec.get('name', False):
rec.update({'name': 'No Partner Defined'})
rec.update({'name': 'Unknown Partner'})
## We will now compute Total
subtotal_row = self._add_subtotal(full_account)
@ -348,15 +355,21 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return completearray
def _sum_debit(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
temp_res = 0.0
self.cr.execute(
"SELECT sum(debit) " \
"FROM account_move_line AS l " \
"JOIN account_move am ON (am.id = l.move_id)" \
"WHERE l.account_id IN %s" \
"AND am.state IN %s" \
"AND " + self.query + "" ,
(tuple(self.account_ids), ))
(tuple(self.account_ids), tuple(move_state)))
temp_res = float(self.cr.fetchone()[0] or 0.0)
# if self.initial_balance:
# self.cr.execute(
@ -369,15 +382,21 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return temp_res
def _sum_credit(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
temp_res = 0.0
self.cr.execute(
"SELECT sum(credit) " \
"FROM account_move_line AS l " \
"JOIN account_move am ON (am.id = l.move_id)" \
"WHERE l.account_id IN %s" \
"AND am.state IN %s" \
"AND " + self.query + "" ,
(tuple(self.account_ids),))
(tuple(self.account_ids), tuple(move_state)))
temp_res = float(self.cr.fetchone()[0] or 0.0)
# if self.initial_balance:
# self.cr.execute(
@ -390,16 +409,22 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return temp_res
def _sum_litige(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
temp_res = 0.0
self.cr.execute(
"SELECT sum(debit-credit) " \
"FROM account_move_line AS l " \
"JOIN account_move am ON (am.id = l.move_id)" \
"WHERE l.account_id IN %s" \
"AND am.state IN %s" \
"AND " + self.query + " " \
"AND l.blocked=TRUE ",
(tuple(self.account_ids), ))
(tuple(self.account_ids), tuple(move_state), ))
temp_res = float(self.cr.fetchone()[0] or 0.0)
# if self.initial_balance:
# self.cr.execute(
@ -413,6 +438,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return temp_res
def _sum_sdebit(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
result_tmp = 0.0
@ -423,10 +452,12 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
"ELSE 0 " \
"END " \
"FROM account_move_line AS l " \
"JOIN account_move am ON (am.id = l.move_id)" \
"WHERE l.account_id IN %s" \
"AND am.state IN %s" \
"AND " + self.query + " " \
"GROUP BY l.partner_id",
(tuple(self.account_ids),))
(tuple(self.account_ids), tuple(move_state),))
a = self.cr.fetchone()[0]
if self.cr.fetchone() != None:
@ -436,6 +467,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return result_tmp
def _sum_scredit(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
result_tmp = 0.0
@ -447,9 +482,11 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
"END " \
"FROM account_move_line AS l " \
"WHERE l.account_id IN %s" \
"JOIN account_move am ON (am.id = l.move_id)" \
"AND am.state IN %s" \
"AND " + self.query + " " \
"GROUP BY l.partner_id",
(tuple(self.account_ids), ))
(tuple(self.account_ids), tuple(move_state), ))
a = self.cr.fetchone()[0] or 0.0
if self.cr.fetchone() != None:
result_tmp = result_tmp + (a or 0.0)

View File

@ -151,7 +151,7 @@
<paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@ -172,12 +172,6 @@
<story>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@ -233,17 +227,17 @@
<font color="white"> </font>
</para>
<para style="P12a"></para>
<blockTable colWidths="61.0,190.0,69.0,68.0,69.0,84.0" repeatRows="1" style="Table2">
<blockTable colWidths="80.0,170.0,70.0,70.0,70.0,80.0" repeatRows="1" style="Table2">
<tr>
<td><para style="P12a">Code</para></td>
<td><para style="P12a">(Account/Partner) Name</para></td>
<td><para style="P12b">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P12b">Credi([[ company.currency_id.code]])</para></td>
<td><para style="P12b">Balance([[ company.currency_id.code]])</para></td>
<td><para style="P12b">In dispute([[ company.currency_id.code]])</para></td>
<td><para style="P12b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P12b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P12b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P12a">In dispute<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
<td><para style="P7">Grand total([[ company.currency_id.code]])</para></td>
<td><para style="P7">Total<font size="8.0">([[ company.currency_id.code]]) :</font></para></td>
<td><para style="P8"></para></td>
<td><para style="P8"><u>[[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P8"><u>[[ formatLang(sum_credit()) ]] [[ company.currency_id.symbol ]]</u></para></td>
@ -253,10 +247,10 @@
<tr>
<td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
<td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.0) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
</story>

View File

@ -62,7 +62,12 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
self.initial_balance = data['form'].get('initial_balance', True)
self.result_selection = data['form'].get('result_selection', 'customer')
self.amount_currency = data['form'].get('amount_currency', False)
self.target_move = data['form'].get('target_move', 'all')
PARTNER_REQUEST = ''
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if (data['model'] == 'res.partner'):
## Si on imprime depuis les partenaires
if ids:
@ -85,14 +90,17 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
partner_to_use = []
self.cr.execute(
"SELECT DISTINCT l.partner_id " \
"FROM account_move_line AS l, account_account AS account " \
"FROM account_move_line AS l, account_account AS account, " \
" account_move AS am " \
"WHERE l.partner_id IS NOT NULL " \
"AND l.account_id = account.id " \
"AND am.id = l.move_id " \
"AND am.state IN %s"
"AND " + self.query +" " \
"AND l.account_id IN %s " \
" " + PARTNER_REQUEST + " " \
"AND account.active " ,
(tuple(self.account_ids),))
(tuple(move_state), tuple(self.account_ids),))
res = self.cr.dictfetchall()
for res_line in res:
@ -117,23 +125,30 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
return self.comma_me(new)
def lines(self, partner):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
full_account = []
if self.reconcil:
RECONCILE_TAG = " "
else:
RECONCILE_TAG = "AND l.reconcile_id IS NULL"
self.cr.execute(
"SELECT l.id,l.date,j.code, l.ref, m.name as move_name, l.name, l.debit, l.credit,l.amount_currency,c.code AS currency_code " \
"SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
"FROM account_move_line l " \
"LEFT JOIN account_journal j " \
"ON (l.journal_id = j.id) " \
"LEFT JOIN res_currency c on (l.currency_id=c.id)" \
"LEFT JOIN account_move m on (m.id=l.move_id)" \
"LEFT JOIN account_account acc " \
"ON (l.account_id = acc.id) " \
"LEFT JOIN res_currency c ON (l.currency_id=c.id)" \
"LEFT JOIN account_move m ON (m.id=l.move_id)" \
"WHERE l.partner_id = %s " \
"AND l.account_id IN %s AND " + self.query +" " \
"AND m.state IN %s " \
" " + RECONCILE_TAG + " "\
"ORDER BY l.id",
(partner.id, tuple(self.account_ids)))
"ORDER BY l.date",
(partner.id, tuple(self.account_ids), tuple(move_state)))
res = self.cr.dictfetchall()
sum = 0.0
for r in res:
@ -143,17 +158,28 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
return full_account
def _get_intial_balance(self, partner):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
self.cr.execute(
"SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id = %s " \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
"AND reconcile_id IS NULL " \
"AND " + self.init_query + " ",
(partner.id, tuple(self.account_ids)))
(partner.id, tuple(move_state), tuple(self.account_ids)))
return self.cr.fetchall()
def _sum_debit_partner(self, partner):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
result_tmp = 0.0
if self.reconcil :
RECONCILE_TAG = " "
@ -161,12 +187,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
RECONCILE_TAG = "AND reconcile_id IS NULL"
self.cr.execute(
"SELECT sum(debit) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id = %s " \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
" " + RECONCILE_TAG + " " \
"AND " + self.query + " " ,
(partner.id,tuple(self.account_ids),))
(partner.id, tuple(move_state), tuple(self.account_ids),))
contemp = self.cr.fetchone()
if contemp != None:
@ -176,6 +205,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
return result_tmp
def _sum_credit_partner(self, partner):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
result_tmp = 0.0
if self.reconcil :
RECONCILE_TAG = " "
@ -183,12 +216,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
RECONCILE_TAG = "AND reconcile_id IS NULL"
self.cr.execute(
"SELECT sum(credit) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id=%s " \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
" " + RECONCILE_TAG + " " \
"AND " + self.query + " " ,
(partner.id, tuple(self.account_ids),))
(partner.id, tuple(move_state), tuple(self.account_ids),))
contemp = self.cr.fetchone()
if contemp != None:
@ -198,6 +234,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
return result_tmp
def _sum_debit(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
result_tmp = 0.0
@ -209,12 +249,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
if self.initial_balance:
self.cr.execute(
"SELECT sum(debit) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id IN %s" \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
"AND reconcile_id IS NULL " \
"AND " + self.init_query + " ",
(tuple(self.partner_ids), tuple(self.account_ids)))
(tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
contemp = self.cr.fetchone()
if contemp != None:
result_init = contemp[0] or 0.0
@ -223,12 +266,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
self.cr.execute(
"SELECT sum(debit) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id IN %s" \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
" " + RECONCILE_TAG + " " \
"AND " + self.query + " " ,
(tuple(self.partner_ids), tuple(self.account_ids),))
(tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
contemp = self.cr.fetchone()
if contemp != None:
result_tmp = contemp[0] or 0.0
@ -237,6 +283,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
return result_tmp + result_init
def _sum_credit(self):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
if not self.ids:
return 0.0
result_tmp = 0.0
@ -248,12 +298,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
if self.initial_balance:
self.cr.execute(
"SELECT sum(credit) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id IN %s" \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
"AND reconcile_id IS NULL " \
"AND " + self.init_query + " ",
(tuple(self.partner_ids), tuple(self.account_ids)))
(tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
contemp = self.cr.fetchone()
if contemp != None:
result_init = contemp[0] or 0.0
@ -262,12 +315,15 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
self.cr.execute(
"SELECT sum(credit) " \
"FROM account_move_line AS l " \
"FROM account_move_line AS l, " \
"account_move AS m "
"WHERE partner_id IN %s" \
"AND m.id = l.move_id " \
"AND m.state IN %s "
"AND account_id IN %s" \
" " + RECONCILE_TAG + " " \
"AND " + self.query + " " ,
(tuple(self.partner_ids), tuple(self.account_ids),))
(tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
contemp = self.cr.fetchone()
if contemp != None:
result_tmp = contemp[0] or 0.0
@ -314,4 +370,4 @@ report_sxw.report_sxw('report.account.third_party_ledger_other', 'res.partner',
'addons/account/report/account_partner_ledger_other.rml',parser=third_party_ledger,
header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -24,6 +24,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@ -36,7 +37,7 @@
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2_header">
<blockAlignment value="LEFT"/>
@ -69,6 +70,9 @@
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
@ -80,6 +84,7 @@
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3_header">
<blockAlignment value="LEFT"/>
@ -96,12 +101,13 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
@ -123,6 +129,7 @@
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@ -270,7 +277,7 @@
<para style="P4">
<font color="white"> </font>
</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -281,6 +288,9 @@
<td>
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
</td>
@ -298,53 +308,37 @@
<para style="P4">
<font color="white"> </font>
</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_credit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]]</u></para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="349.0,57.0,58.0,65.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -353,7 +347,7 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@ -365,16 +359,19 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3"><b>b</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
<para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -382,7 +379,7 @@
<font color="white"> </font>
</para>
</section>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -393,6 +390,9 @@
<td>
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
</td>
@ -403,51 +403,33 @@
<para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance ([[ get_currency(data) ]])</para>
<para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
<para style="terp_tblheader_Details_Right">Currency</para>
</td>
</tr>
</blockTable>
<para style="P4">
<font color="white"> </font>
</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_credit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]]</u></para>
</td>
<td>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<blockTable colWidths="308.0,56.0,58.0,63.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">
@ -457,16 +439,16 @@
</tr>
<tr>
<td>[[display_initial_balance(data) or removeParentNode('tr') ]]
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5"></para>
@ -478,7 +460,7 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@ -490,16 +472,19 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3"><b>a</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>

View File

@ -181,7 +181,9 @@
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
</blockTableStyle>
<blockTableStyle id="Table9">
<blockAlignment value="LEFT"/>
@ -207,6 +209,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@ -219,7 +222,7 @@
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
@ -231,6 +234,7 @@
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
@ -243,6 +247,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
@ -256,7 +261,7 @@
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
@ -269,6 +274,7 @@
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@ -324,12 +330,6 @@
<images/>
</stylesheet>
<story>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_header">
<tr>
<td>
@ -431,7 +431,7 @@
<para style="P5">
<font color="white"> </font>
</para>
<blockTable colWidths="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -442,6 +442,9 @@
<td>
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
</td>
@ -456,59 +459,42 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]]</para>
</td>
</tr>
</blockTable>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="349.0,60.0,60.0,60.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
<td>[[ display_initial_balance(data) or removeParentNode('tr') ]]
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@ -520,22 +506,25 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '')+ ' ' + line['name'] ]]</para>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
</section>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -546,6 +535,9 @@
<td>
<para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">A/c No.- Name</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
</td>
@ -559,48 +551,27 @@
<para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
<para style="terp_tblheader_Details_Right">Currency</para>
</td>
</tr>
</blockTable>
<para style="P4"/>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]]</para>
</td>
<td>
<para style="P5">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<blockTable colWidths="320.0,53.0,53.0,60.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">
@ -610,16 +581,16 @@
</tr>
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
<para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9"></para>
@ -628,7 +599,7 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="57.0,25.0,60.0,134.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
@ -639,17 +610,20 @@
<td>
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
<para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>

View File

@ -274,7 +274,7 @@
</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<td>
<para style="terp_default_9">
@ -287,7 +287,7 @@
</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@ -300,7 +300,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Bold_9"></para>
@ -309,7 +309,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -320,13 +320,13 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]] )</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>

View File

@ -63,12 +63,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
def sum_dr(self):
if self.res_pl['type'] == 'Net Profit C.F.B.L.':
self.result_sum_dr += self.res_pl['balance']
return self.result_sum_dr or 0.0
return self.result_sum_dr
def sum_cr(self):
if self.res_pl['type'] == 'Net Loss C.F.B.L.':
self.result_sum_cr += self.res_pl['balance']
return self.result_sum_cr or 0.0
return self.result_sum_cr
def get_data(self, data):
cr, uid = self.cr, self.uid

View File

@ -185,9 +185,6 @@
</stylesheet>
<images/>
<story>
<para style="terp_header_Centre">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@ -267,7 +264,7 @@
</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@ -280,7 +277,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -290,7 +287,7 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
@ -322,7 +319,7 @@
</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@ -335,7 +332,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
<para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -345,7 +342,7 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@ -23,12 +23,12 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
<blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
<blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
<blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<blockBackground colorName="#b3b3b3" start="4,0" stop="4,-1"/>
<blockBackground colorName="#b3b3b3" start="5,0" stop="5,-1"/>
<blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
<blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
<blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
<blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
<blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
<blockBackground colorName="#ffffff" start="5,0" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@ -37,10 +37,10 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
<blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
<blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
<blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
<blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
<blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
<blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
@ -93,48 +93,35 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
<blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
<blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
<blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
<blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
<blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
<blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
<blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
<blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
<blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Table Contents" fontName="Times-Roman"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<para style="terp_default_8">[[ repeatIn(get_years(data['form']), 'y') ]]</para>
<blockTable colWidths="482.0" style="Table_Tiltle">
@ -144,11 +131,8 @@
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<para style="terp_header">Year : [[ y['year'] ]]</para>
<blockTable colWidths="57.0,134.0,51.0,62.0,67.0,111.0" style="Table_header_account">
<blockTable colWidths="57.0,214.0,54.0,46.0,57.0,52.0" style="Table_header_account">
<tr>
<td>
<para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
@ -157,7 +141,7 @@
<para style="terp_tblheader_Details">Account Name </para>
</td>
<td>
<para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P)" or removeParentNode('font') ]]</font></para>
<para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
@ -166,123 +150,107 @@
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Balance</para>
<para style="terp_tblheader_Details_Right">Balance</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="56.0,134.0,50.0,240.0" style="Table1">
<blockTable colWidths="56.0,315.0,56.0,53.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">[[ data['form']['show_columns'] and removeParentNode('blockTable') or 'Code' ]]</para>
<para style="terp_tblheader_Details">[[ (data['form']['show_columns'] and removeParentNode('blockTable')) or 'Code' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name </para>
</td>
<td>
<para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P)" or removeParentNode('font') ]]</font></para>
<para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Balance</para>
<para style="terp_tblheader_Details_Right">Balance</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
<blockTable colWidths="56.0,134.0,51.0,61.0,69.0,110.0" style="Table4">
<blockTable colWidths="56.0,208.0,58.0,49.0,55.0,54.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
<para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
<para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['debit'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['credit'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['balance'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="56.0,134.0,52.0,61.0,69.0,74.0,36.0" style="Table2">
<blockTable colWidths="56.0,153.0,55.0,54.0,54.0,56.0,54.0" style="Table2">
<tr>
<td>
<para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
<para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
<para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['debit'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['credit'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['balance'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance_perc'] ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2"/>
<blockTable colWidths="55.0,135.0,113.0,178.0" style="Table6">
<blockTable colWidths="55.0,154.0,218.0,54.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
<para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
<para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['balance'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table5">
<tr>
<td>
<para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
<para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font> [[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
<para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['balance'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance_perc'] ]]</para>
</td>
</tr>
</blockTable>
@ -290,10 +258,7 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="52.0,189.0,61.0,69.0,110.0" style="Table3">
<blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table3">
<tr>
<td>
<para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
@ -319,4 +284,4 @@
</para>
<para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P) : Compare Selected Years In Terms of Cash/Perc" or removeParentNode('font') ]]</para>
</story>
</document>
</document>

View File

@ -42,7 +42,7 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Header_Invoice_Line">
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@ -52,7 +52,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Invoice_Line_Content">
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@ -62,89 +62,28 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Format_2">
<blockTableStyle id="Table10">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#ffffff" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="0,1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,1" stop="1,1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,4" stop="0,4"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,4" stop="1,4"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
</blockTableStyle>
<blockTableStyle id="Table_format_Table_Line_total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_eclu_Taxes_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Taxes_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table_Total_Include_Taxes">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockTableStyle id="Table9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@ -178,14 +117,15 @@
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica"/>
<images/>
</stylesheet>
<story>
@ -240,7 +180,7 @@
<blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
<tr>
<td>
<para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para>
<para style="terp_default_Centre_9">[[ o.name or ' ' ]]<font color="white"> </font></para>
</td>
<td>
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
@ -253,13 +193,13 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="211.0,74.0,62.0,59.0,51.0,68.0" style="Table_Header_Invoice_Line">
<blockTable colWidths="219.0,87.0,56.0,56.0,51.0,62.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
</td>
<td>
<para style="terp_tblheader_Details">Taxes</para>
<para style="terp_tblheader_Details_Centre">Taxes</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Quantity</para>
@ -271,19 +211,19 @@
<para style="terp_tblheader_Details_Right">Disc.(%)</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Price</para>
<para style="terp_tblheader_Details_Centre">Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
<blockTable colWidths="211.0,70.0,60.0,58.0,49.0,74.0" style="Table_Invoice_Line_Content">
<para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
<blockTable colWidths="218.0,88.0,56.0,56.0,51.0,62.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
<para style="terp_default_Centre_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]]</para>
@ -301,157 +241,136 @@
<tr>
<td>
<para style="terp_default_Note">[[ format(l.note or '') or removeParentNode('tr') ]]</para>
<para style="terp_default_Note">
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
</section>
<blockTable colWidths="370.0,153.0" style="Table_Format_2">
<blockTable colWidths="407.0,54.0,69.0" style="Table10">
<tr>
<td>
<blockTable colWidths="176.0,258.0" style="Table_format_Table_Line_total">
<tr>
<td>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
</td>
<td>
<blockTable colWidths="62.0,84.0" style="Table_eclu_Taxes_Total">
<tr>
<td>
<para style="terp_default_9">Net Total:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="63.0,84.0" style="Table_Taxes_Total">
<tr>
<td>
<para style="terp_default_9">Taxes:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
</td>
<td>
<para style="terp_default_9">Net Total:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="63.0,84.0" style="Table_Total_Include_Taxes">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
<para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
<blockTable colWidths="530.0" style="Table4">
<tr>
<td>
<blockTable colWidths="149.0,55.0,52.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">Tax</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
</tr>
</blockTable>
<para style="terp_default_9">Taxes:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
<blockTable colWidths="149.0,55.0,52.0" style="Table5">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_tblheader_Details">Total:</para>
</td>
<td>
<para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="530.0" style="Table3">
<para style="Text body"/>
<blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
<tr>
<td>
<para style="terp_default_9">[[ format(o.comment or '') or removeParentNode('blockTable') ]]</para>
<para style="terp_tblheader_Details">Tax</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="530.0" style="Table2">
<section>
<para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
<blockTable colWidths="167.0,60.0,55.0,248.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
</td>
<td>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
</section>
<para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_9">[[ (o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="120.0,410.0" style="Table1">
<tr>
<td>
<para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or '') or removeParentNode('blockTable') ]]</para>
<para style="terp_default_Bold_9">Fiscal Mapping Remark : </para>
</td>
<td>
<para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="128.0,402.0" style="Table1">
<tr>
<td>
<para style="terp_default_Bold_9">Fiscal Position Remark :</para>
</td>
<td>
<para style="terp_default_9">[[ format((o.fiscal_position and o.fiscal_position.note) or '') or removeParentNode('blockTable') ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</story>
</document>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -46,15 +46,18 @@ class Overdue(report_sxw.rml_parse):
result = {
'name': False,
'street': False,
'street2': False,
'city' : False,
'zip' : False,
'state_id':False,
'country_id' : False,
}
if adr_id:
result = res_partner_address.read(self.cr, self.uid, [adr_id], context=self.context.copy())
result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
return result
result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
return result
res.append(result)
return res
@ -80,12 +83,12 @@ class Overdue(report_sxw.rml_parse):
('state', '<>', 'draft'), ('reconcile_id', '=', False)])
movelines = moveline_obj.browse(self.cr, self.uid, movelines)
return movelines
def _message(self, obj, company):
company_pool = pooler.get_pool(self.cr.dbname).get('res.company')
message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg
message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg
return message
report_sxw.report_sxw('report.account.overdue', 'res.partner',
'addons/account/report/overdue.rml', parser=Overdue)

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Overdue" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Overdue Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
</pageTemplate>
@ -55,16 +55,16 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@ -96,9 +96,10 @@
</td>
<td>
<para style="terp_default_9">[[ o.name ]]</para>
<para style="terp_default_9">[[ addr['name'] ]]</para>
<para style="terp_default_9">[[ addr['street'] ]]</para>
<para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
<para style="terp_default_9">[[ addr['state_id'] or removeParentNode('para')]]</para>
<para style="terp_default_9">[[ addr['country_id'] ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
@ -115,7 +116,7 @@
</para>
<para style="terp_default_9">Document: Customer account statement</para>
<para style="terp_default_9">Date: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
<para style="terp_default_9">Customer Ref: [[ o.ref ]]</para>
<para style="terp_default_9">Customer Ref: [[ o.ref or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@ -135,7 +136,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="56.0,137.0,52.0,72.0,60.0,57.0,56.0,18.0" style="Table1">
<blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@ -147,16 +148,16 @@
<para style="terp_tblheader_Details_Centre">Ref</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Due date</para>
<para style="terp_tblheader_Details_Centre">Maturity date</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Due</para>
<para style="terp_tblheader_Details_Right">Due<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Paid</para>
<para style="terp_tblheader_Details_Right">Paid<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Maturity</para>
<para style="terp_tblheader_Details_Right">Maturity<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Li.</para>
@ -165,7 +166,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
<blockTable colWidths="56.0,138.0,52.0,73.0,60.0,57.0,56.0,17.0" style="Table3">
<blockTable colWidths="56.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
<tr>
<td>
<para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
@ -180,13 +181,13 @@
<para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]</para>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@ -194,7 +195,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="247.0,72.0,60.0,57.0,56.0,17.0" style="Table2">
<blockTable colWidths="247.0,65.0,59.0,56.0,66.0,17.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">
@ -205,13 +206,13 @@
<para style="terp_default_Bold_9">Sub-Total : </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] [[ company.currency_id.symbol ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">
@ -229,7 +230,7 @@
<para style="terp_default_Bold_9">Balance : </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]]</para>
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">
@ -248,7 +249,7 @@
</td>
</tr>
</blockTable>
<para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.name ]].</para>
<para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]].</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>

View File

@ -61,7 +61,6 @@
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau1">
<blockAlignment value="LEFT"/>
@ -75,7 +74,7 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Helvetica-bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
@ -88,8 +87,8 @@
<paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@ -103,32 +102,21 @@
<paraStyle name="Index" fontName="Helvetica"/>
<blockTableStyle id="TrLevel">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<paraStyle name="Level"
fontSize="8.0"
fontName="Helvetica-Bold"
/>
</stylesheet>
<story>
<para style="P2"><font color="white"> </font></para>
<blockTable colWidths="347.0,64.0,59.0,71.0" style="Table2" repeatRows="1">
<para style="P2">Taxes</para>
<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
<tr>
<td><para style="P12">Tax Name</para></td>
<td><para style="P12a">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P12a">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P12a">Tax Amount([[ company.currency_id.code]])</para></td>
<td><para style="P12a">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P12a">Credit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P12a">Tax Amount<font size="7.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
<td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font><font>[[ o['code'] ]] [[ o['name'] ]]</font></para></td>
<td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
<td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
<td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font></para></td>
<td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])&lt;5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]] [[ o['name'] ]] </font></para></td>
<td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] [[ company.currency_id.symbol ]]</font></para></td>
<td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]] [[ company.currency_id.symbol ]]</font></para></td>
<td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
</tr>
</blockTable>
</story>

View File

@ -223,7 +223,7 @@
</record>
<record id="account_fiscal_position_comp_rule" model="ir.rule">
<field name="name">Account fiscal position company rule</field>
<field name="name">Account fiscal Mapping company rule</field>
<field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
<field eval="True" name="global"/>
<field name="domain_force">[('company_id','=',user.company_id.id)]</field>

View File

@ -80,7 +80,7 @@ class account_aged_trial_balance(osv.osv_memory):
res[str(i)] = {
'name': (i!=0 and (str((5-(i+1)) * period_length) + '-' + str((5-i) * period_length)) or ('+'+str(4 * period_length))),
'stop': start.strftime('%Y-%m-%d'),
'start': (i!=0 and stop.strftime('%Y-%m-%d') or None),
'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
}
start = stop - RelativeDateTime(days=1)
else:
@ -89,7 +89,7 @@ class account_aged_trial_balance(osv.osv_memory):
res[str(5-(i+1))] = {
'name' : (i!=4 and str((i) * period_length)+'-' + str((i+1) * period_length) or ('+'+str(4 * period_length))),
'start': start.strftime('%Y-%m-%d'),
'stop': (i!=4 and stop.strftime('%Y-%m-%d') or None),
'stop': (i!=4 and stop.strftime('%Y-%m-%d') or False),
}
start = stop + RelativeDateTime(days=1)
data['form'].update(res)

View File

@ -36,11 +36,14 @@ class account_bs_report(osv.osv_memory):
'display_type': fields.boolean("Landscape Mode"),
'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
'target_move': fields.selection([('all', 'All Entries'),
('posted', 'All Posted Entries')], 'Target Moves', required=True),
}
_defaults={
'display_type': True,
'journal_ids': [],
'target_move': 'all',
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@ -62,7 +65,7 @@ class account_bs_report(osv.osv_memory):
if not account.company_id.property_reserve_and_surplus_account:
raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
data['form'].update(self.read(cr, uid, ids, ['display_type','target_move'])[0])
if data['form']['display_type']:
return {
'type': 'ir.actions.report.xml',
@ -78,4 +81,4 @@ class account_bs_report(osv.osv_memory):
account_bs_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -10,6 +10,7 @@
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="display_account"/>
<field name="target_move"/>
<field name="display_type"/>
<newline/>
</field>

View File

@ -8,35 +8,27 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Report Options">
<group colspan="4" expand="1">
<field name="chart_account_id" widget='selection'/>
<field name="fiscalyear_id"/>
<group colspan="2" name='Journals'>
<notebook tabpos="up">
<page string="Journals" >
<notebook tabpos="up" colspan="4">
<page string="Filters" name="filters">
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
<separator string="Dates" colspan="4"/>
<field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
<field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
<separator string="Periods" colspan="4"/>
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
</page>
<page string="Journals" name="journal_ids">
<field name="journal_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</group>
<group colspan="2" name='Filters'>
<notebook tabpos="up">
<page string="Filters">
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" />
<separator string="Dates" colspan="4"/>
<field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
<field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
<separator string="Periods" colspan="4"/>
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
</page>
</notebook>
</group>
<separator colspan="4"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
<button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
</group>
</group>
</form>
</field>
</record>

Some files were not shown because too many files have changed in this diff Show More