[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20100608061019-hy7t6w9zczrz0egn
This commit is contained in:
mtr 2010-06-08 11:40:19 +05:30
commit fe1c79107b
170 changed files with 11243 additions and 3280 deletions

View File

@ -100,9 +100,9 @@ module named account_voucherss
'project/wizard/account_analytic_chart_view.xml', 'project/wizard/account_analytic_chart_view.xml',
'product_view.xml', 'product_view.xml',
'account_assert_test.xml', 'account_assert_test.xml',
'process/statement_process.xml', # 'process/statement_process.xml',
'process/customer_invoice_process.xml', # 'process/customer_invoice_process.xml',
'process/supplier_invoice_process.xml', # 'process/supplier_invoice_process.xml',
'sequence_view.xml', 'sequence_view.xml',
'company_view.xml', 'company_view.xml',
'account_installer.xml', 'account_installer.xml',

View File

@ -1564,8 +1564,42 @@ class account_tax(osv.osv):
cur_price_unit+=amount2 cur_price_unit+=amount2
return res return res
def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None): def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
"""
RETURN: {
'total': 0.0, # Total without taxes
'total_included: 0.0, # Total with taxes
'taxes': [] # List of taxes, see compute for the format
}
"""
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
totalin = totalex = round(price_unit * quantity, precision)
tin = []
tex = []
for tax in taxes:
if tax.price_include:
tin.append(tax)
else:
tex.append(tax)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
for r in tin:
totalex -= r['amount']
tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
for r in tex:
totalin += r['amount']
return {
'total': totalex,
'total_included': totalin,
'taxes': tin + tex
}
def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
logger = netsvc.Logger()
logger.notifyChannel("warning", netsvc.LOG_WARNING,
"Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
""" """
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID. Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@ -1582,7 +1616,6 @@ class account_tax(osv.osv):
else: else:
r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
total += r['amount'] total += r['amount']
return res return res
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None): def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):

View File

@ -63,6 +63,7 @@
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
<newline/> <newline/>
<field name="price_subtotal"/> <field name="price_subtotal"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/> <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
</page> </page>
@ -146,7 +147,7 @@
<field name="number" readonly="1"/> <field name="number" readonly="1"/>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/> <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/> <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change"/>
<newline/> <newline/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/> <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@ -403,7 +404,7 @@
<field name="view_id" ref="invoice_form"/> <field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree"/> <field name="act_window_id" ref="action_invoice_tree"/>
</record> </record>
<menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/> <!-- <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>-->
<record id="action_invoice_tree1" model="ir.actions.act_window"> <record id="action_invoice_tree1" model="ir.actions.act_window">
<field name="name">Customer Invoices</field> <field name="name">Customer Invoices</field>
@ -426,10 +427,10 @@
<field name="view_id" ref="invoice_form"/> <field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree1"/> <field name="act_window_id" ref="action_invoice_tree1"/>
</record> </record>
<menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_invoice"/> <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
<record id="action_invoice_tree2" model="ir.actions.act_window"> <record id="action_invoice_tree2" model="ir.actions.act_window">
<field name="name">Supplier Invoices</field> <field name="name">Vendor Invoices</field>
<field name="res_model">account.invoice</field> <field name="res_model">account.invoice</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field> <field name="view_mode">tree,form,calendar,graph</field>
@ -438,7 +439,7 @@
<field name="context">{'type':'in_invoice'}</field> <field name="context">{'type':'in_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
</record> </record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/> <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
<record id="action_invoice_tree3" model="ir.actions.act_window"> <record id="action_invoice_tree3" model="ir.actions.act_window">
<field name="name">Customer Refunds</field> <field name="name">Customer Refunds</field>
@ -464,10 +465,10 @@
<field name="act_window_id" ref="action_invoice_tree3"/> <field name="act_window_id" ref="action_invoice_tree3"/>
</record> </record>
<menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/> <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
<record id="action_invoice_tree4" model="ir.actions.act_window"> <record id="action_invoice_tree4" model="ir.actions.act_window">
<field name="name">Supplier Refunds</field> <field name="name">Vendor Refunds</field>
<field name="res_model">account.invoice</field> <field name="res_model">account.invoice</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field> <field name="view_mode">tree,form,calendar,graph</field>
@ -476,7 +477,7 @@
<field name="context">{'type':'in_refund'}</field> <field name="context">{'type':'in_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
</record> </record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/> <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
<act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/> <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>

View File

@ -1,28 +1,52 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="1"/>
<menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="2"/>
<menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="3"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank And Cash" parent="menu_finance" sequence="4"/>
<!-- <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="10"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
<menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
<menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/> <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/> <!-- <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
<menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/> <!-- <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/> <!-- <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/> <!-- <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="7"/> <!-- <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance" sequence="80"/>-->
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="account.menu_finance_reporting" sequence="1"/> <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
<menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance_reporting" sequence="2"/> <!-- <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
<menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/> <!-- <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
<menuitem id="menu_finance_entries" name="Accounting" parent="account.menu_finance" sequence="1" <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="1"
groups="group_account_user"/> groups="group_account_user"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/> <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing" sequence="15"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" <!-- <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
sequence="3" <!-- sequence="3"-->
groups="group_account_user"/> <!-- groups="group_account_user"/>-->
<menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/> <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="account.menu_finance_reporting" sequence="3"/> <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
</data> </data>
</openerp> </openerp>

View File

@ -163,13 +163,13 @@
</record> </record>
<record id="action_account_form" model="ir.actions.act_window"> <record id="action_account_form" model="ir.actions.act_window">
<field name="name">List of Accounts</field> <field name="name">Accounts</field>
<field name="res_model">account.account</field> <field name="res_model">account.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="search_view_id" ref="view_account_search"/> <field name="search_view_id" ref="view_account_search"/>
</record> </record>
<menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_accounting"/> <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
<menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/> <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
<record id="view_account_tree" model="ir.ui.view"> <record id="view_account_tree" model="ir.ui.view">
@ -197,7 +197,7 @@
<field name="view_id" ref="view_account_tree"/> <field name="view_id" ref="view_account_tree"/>
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
</record> </record>
<menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/> <!-- <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
<!-- <!--
Journal Journal
@ -328,12 +328,12 @@
</field> </field>
</record> </record>
<record id="action_account_journal_form" model="ir.actions.act_window"> <record id="action_account_journal_form" model="ir.actions.act_window">
<field name="name">Financial Journals</field> <field name="name">Journals</field>
<field name="res_model">account.journal</field> <field name="res_model">account.journal</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_finance_accounting"/> <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
<record id="view_bank_statement_tree" model="ir.ui.view"> <record id="view_bank_statement_tree" model="ir.ui.view">
<field name="name">account.bank.statement.tree</field> <field name="name">account.bank.statement.tree</field>
@ -417,12 +417,12 @@
</field> </field>
</record> </record>
<record id="action_bank_statement_tree" model="ir.actions.act_window"> <record id="action_bank_statement_tree" model="ir.actions.act_window">
<field name="name">Entries by Statements</field> <field name="name">Bank Statements</field>
<field name="res_model">account.bank.statement</field> <field name="res_model">account.bank.statement</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_entries" sequence="7"/> <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
<record id="action_bank_statement_draft_tree" model="ir.actions.act_window"> <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
<field name="name">Draft statements</field> <field name="name">Draft statements</field>
@ -519,7 +519,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="account.account_account_menu"/> <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
<!-- <!--
Entries Entries
--> -->
@ -611,7 +611,7 @@
<field name="view_id" ref="view_tax_code_tree"/> <field name="view_id" ref="view_tax_code_tree"/>
</record> </record>
<menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/> <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
<menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/> <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
<!-- <!--
@ -625,7 +625,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Account Tax"> <tree string="Account Tax">
<field name="name"/> <field name="name"/>
<field name="price_include"/> <field name="price_include" groups="base.group_extended"/>
<field name="description"/> <field name="description"/>
</tree> </tree>
</field> </field>
@ -1007,8 +1007,19 @@
<field name="view_id" ref="view_move_tree"/> <field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/> <field name="search_view_id" ref="view_account_move_filter"/>
</record> </record>
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
<menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/> <record id="action_move_to_review" model="ir.actions.act_window">
<field name="name">Journal Entries to Review</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
<field name="domain">[('to_check','=',True)]</field>
</record>
<menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
<!-- <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
<!-- <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
<record id="action_move_line_form_encode_by_move" model="ir.actions.act_window"> <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
<field name="name">Journal Entries</field> <field name="name">Journal Entries</field>
@ -1020,6 +1031,30 @@
</record> </record>
<menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/> <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
<record id="action_account_moves_sale" model="ir.actions.act_window">
<field name="name">Journal Items</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
<field name="domain">[('journal_id.type', '=', 'sale')]</field>
</record>
<menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
<record id="action_account_moves_purchase" model="ir.actions.act_window">
<field name="name">Transaction Journals</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
<field name="domain">[('journal_id.type', '=', 'purchase')]</field>
</record>
<menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
<record id="action_move_line_search" model="ir.actions.act_window"> <record id="action_move_line_search" model="ir.actions.act_window">
<field name="name">Entry Lines</field> <field name="name">Entry Lines</field>
@ -1041,7 +1076,30 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="act_window_id" ref="action_move_line_search"/> <field name="act_window_id" ref="action_move_line_search"/>
</record> </record>
<menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/> <record id="action_move_line_search_view3" model="ir.actions.act_window">
<field name="name">Cash Register</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_line_tree"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
<field name="domain">[('journal_id.type', '=', 'cash')]</field>
</record>
<record id="action_move_line_search_view4" model="ir.actions.act_window">
<field name="name">Checks Register</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_line_tree"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
</record>
<menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
<menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
<!-- <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
<menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/> <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
<!-- <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/> <!-- <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
@ -1109,20 +1167,20 @@
<field name="view_mode">form,tree</field> <field name="view_mode">form,tree</field>
<field name="view_id" ref="view_bank_statement_reconcile_form"/> <field name="view_id" ref="view_bank_statement_reconcile_form"/>
</record> </record>
<menuitem <!-- <menuitem-->
id="next_id_30" <!-- id="next_id_30"-->
name="Bank Reconciliation" <!-- name="Bank Reconciliation"-->
parent="account.menu_finance_periodical_processing" <!-- parent="account.menu_finance_periodical_processing"-->
groups="group_account_user"/> <!-- groups="group_account_user"/>-->
<menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/> <!-- <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>-->
<!-- <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> --> <!-- <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
<!-- <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/> --> <!-- <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/> -->
<!-- bank reconsilation --> <!-- bank reconsilation -->
<menuitem action="action_account_bank_reconcile_tree" <!-- <menuitem action="action_account_bank_reconcile_tree"-->
id="menu_action_account_bank_reconcile_check_tree" <!-- id="menu_action_account_bank_reconcile_check_tree"-->
parent="account.next_id_30" /> <!-- parent="account.next_id_30" />-->
<act_window <act_window
@ -1245,12 +1303,12 @@
</field> </field>
</record> </record>
<record id="action_model_form" model="ir.actions.act_window"> <record id="action_model_form" model="ir.actions.act_window">
<field name="name">Models Definition</field> <field name="name">Define Models</field>
<field name="res_model">account.model</field> <field name="res_model">account.model</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_model_form" id="menu_action_model_form" parent="menu_finance_configuration"/> <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_finance_recurrent_entries"/>
<!-- <!--
@ -1313,7 +1371,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_finance_configuration"/> <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
<!-- <!--
# Account Subscriptions # Account Subscriptions
@ -1393,7 +1451,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/> <!-- <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>-->
<record id="action_subscription_form_running" model="ir.actions.act_window"> <record id="action_subscription_form_running" model="ir.actions.act_window">
<field name="name">Running Subscriptions</field> <field name="name">Running Subscriptions</field>
@ -1526,8 +1584,18 @@
<menuitem <menuitem
id="account_template_folder" id="account_template_folder"
name="Templates" name="Templates"
parent="account.menu_finance_accounting" parent="menu_finance_accounting"
groups="base.group_multi_company"/> groups="base.group_multi_company"/>
<menuitem
id="account_template_taxes"
name="Taxes"
parent="account_template_folder"
groups="base.group_multi_company" sequence="2"/>
<menuitem
id="account_template_accounts"
name="Accounts"
parent="account_template_folder"
groups="base.group_multi_company" sequence="1"/>
<record id="view_account_template_form" model="ir.ui.view"> <record id="view_account_template_form" model="ir.ui.view">
@ -1578,7 +1646,7 @@
</record> </record>
<menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_folder"/> <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
<!-- Chart of Accounts Templates --> <!-- Chart of Accounts Templates -->
@ -1623,7 +1691,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_folder"/> <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
<!-- Account Tax Templates --> <!-- Account Tax Templates -->
@ -1699,7 +1767,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_folder" sequence="13"/> <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
<!-- Account Tax Code Templates --> <!-- Account Tax Code Templates -->
<record id="view_tax_code_template_tree" model="ir.ui.view"> <record id="view_tax_code_template_tree" model="ir.ui.view">
@ -1737,7 +1805,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_folder" sequence="14"/> <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
<!-- Wizard for Multi Charts of Accounts --> <!-- Wizard for Multi Charts of Accounts -->

View File

@ -33,7 +33,7 @@
--> -->
<!-- automatic reconcile --> <!-- automatic reconcile -->
<menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/> <!-- <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>-->
<!-- <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/> <!-- <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
<menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>--> <menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>-->

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-04-18 09:39+0000\n" "PO-Revision-Date: 2010-06-04 09:39+0000\n"
"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"tic.com>\n" "<jesteve@zikzakmedia.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n" "X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account #. module: account
@ -61,12 +61,12 @@ msgstr "Nom de model no vàlid en la definició de l'acció."
#. module: account #. module: account
#: help:account.journal,currency:0 #: help:account.journal,currency:0
msgid "The currency used to enter statement" msgid "The currency used to enter statement"
msgstr "La moneda utilitzada per introduir assentaments" msgstr "La divisa utilitzada per introduir assentaments"
#. module: account #. module: account
#: wizard_view:account_use_models,init_form:0 #: wizard_view:account_use_models,init_form:0
msgid "Select Message" msgid "Select Message"
msgstr "Selecciona missatge" msgstr "Seleccioneu missatge"
#. module: account #. module: account
#: help:product.category,property_account_income_categ:0 #: help:product.category,property_account_income_categ:0
@ -189,7 +189,7 @@ msgstr "Plans comptables"
#. module: account #. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select #: model:ir.actions.wizard,name:account.wizard_move_line_select
msgid "Move line select" msgid "Move line select"
msgstr "Selecciona línia moviment" msgstr "Seleccioneu línia moviment"
#. module: account #. module: account
#: rml:account.journal.period.print:0 #: rml:account.journal.period.print:0
@ -202,7 +202,7 @@ msgstr "Ref. assentament"
#. module: account #. module: account
#: model:ir.model,name:account.model_account_model_line #: model:ir.model,name:account.model_account_model_line
msgid "Account Model Entries" msgid "Account Model Entries"
msgstr "Línia de model d'assentament" msgstr "Líniees de model d'assentament"
#. module: account #. module: account
#: field:account.tax.code,sum_period:0 #: field:account.tax.code,sum_period:0
@ -315,7 +315,7 @@ msgstr "Pagaments fora de termini"
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
#: wizard_view:account.vat.declaration,init:0 #: wizard_view:account.vat.declaration,init:0
msgid "Select period" msgid "Select period"
msgstr "Selecciona període" msgstr "Seleccioneu període"
#. module: account #. module: account
#: field:account.invoice,origin:0 #: field:account.invoice,origin:0
@ -457,7 +457,7 @@ msgstr "Estat"
#: model:ir.actions.act_window,name:account.action_invoice_tree13 #: model:ir.actions.act_window,name:account.action_invoice_tree13
#: model:ir.ui.menu,name:account.menu_action_invoice_tree13 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
msgid "Unpaid Supplier Refunds" msgid "Unpaid Supplier Refunds"
msgstr "Factures d'abonament de proveïdor sense pagar" msgstr "Factures rectificatives (abonament) de proveïdor sense pagar"
#. module: account #. module: account
#: view:account.tax:0 #: view:account.tax:0
@ -710,7 +710,7 @@ msgstr "Informació addicional"
#. module: account #. module: account
#: selection:account.invoice,type:0 #: selection:account.invoice,type:0
msgid "Customer Refund" msgid "Customer Refund"
msgstr "Factura d'abonament de client" msgstr "Factura rectificativa (abonament) de client"
#. module: account #. module: account
#: wizard_view:account.analytic.account.chart,init:0 #: wizard_view:account.analytic.account.chart,init:0
@ -909,7 +909,7 @@ msgstr "Diari de desajust"
#: field:account.model.line,amount_currency:0 #: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0 #: field:account.move.line,amount_currency:0
msgid "Amount Currency" msgid "Amount Currency"
msgstr "Import canvi" msgstr "Import divisa"
#. module: account #. module: account
#: field:account.chart.template,property_account_expense_categ:0 #: field:account.chart.template,property_account_expense_categ:0
@ -938,7 +938,7 @@ msgstr "Exercici fiscal per obrir"
#. module: account #. module: account
#: view:account.config.wizard:0 #: view:account.config.wizard:0
msgid "Select Chart of Accounts" msgid "Select Chart of Accounts"
msgstr "Selecciona pla comptable" msgstr "Seleccioneu un pla comptable"
#. module: account #. module: account
#: field:account.analytic.account,quantity:0 #: field:account.analytic.account,quantity:0
@ -1242,7 +1242,7 @@ msgstr ""
#. module: account #. module: account
#: field:account.account,company_currency_id:0 #: field:account.account,company_currency_id:0
msgid "Company Currency" msgid "Company Currency"
msgstr "Moneda de la companyia" msgstr "Divisa de la companyia"
#. module: account #. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template #: model:ir.model,name:account.model_account_fiscal_position_account_template
@ -1353,7 +1353,7 @@ msgstr "Missatge"
#. module: account #. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0 #: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Select invoices you want to pay and manages advances" msgid "Select invoices you want to pay and manages advances"
msgstr "Selecciona factures que es volen pagar i gestiona avançaments" msgstr "Seleccioneu les factures que voleu pagar i gestionar avançaments"
#. module: account #. module: account
#: selection:account.account,type:0 #: selection:account.account,type:0
@ -1887,7 +1887,7 @@ msgstr "Data inicial"
#. module: account #. module: account
#: model:account.journal,name:account.refund_expenses_journal #: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal" msgid "x Expenses Credit Notes Journal"
msgstr "x Diari factures d'abonament de despeses" msgstr "x Diari factures rectificatives (abonament) de despeses"
#. module: account #. module: account
#: field:account.analytic.journal,type:0 #: field:account.analytic.journal,type:0
@ -1914,7 +1914,7 @@ msgstr "Base imposable"
#: field:account.tax,account_collected_id:0 #: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0 #: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account" msgid "Invoice Tax Account"
msgstr "Compte impostos de factura" msgstr "Compte impostos de factures"
#. module: account #. module: account
#: view:account.move.line:0 #: view:account.move.line:0
@ -2026,7 +2026,7 @@ msgstr "Informe analític de diari"
#: model:ir.actions.act_window,name:account.action_invoice_tree3 #: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds" msgid "Customer Refunds"
msgstr "Factures d'abonament de client" msgstr "Factures rectificatives (abonament) de client"
#. module: account #. module: account
#: rml:account.vat.declaration:0 #: rml:account.vat.declaration:0
@ -2047,7 +2047,7 @@ msgstr "Nom diari-període"
#: field:account.tax.code,name:0 #: field:account.tax.code,name:0
#: field:account.tax.code.template,name:0 #: field:account.tax.code.template,name:0
msgid "Tax Case Name" msgid "Tax Case Name"
msgstr "Nom impost del cas" msgstr "Nom codi d'impost"
#. module: account #. module: account
#: help:account.journal,entry_posted:0 #: help:account.journal,entry_posted:0
@ -2057,7 +2057,7 @@ msgid ""
"manual validation." "manual validation."
msgstr "" msgstr ""
"Marqueu aquesta casella si no voleu que els nous assentaments passin per " "Marqueu aquesta casella si no voleu que els nous assentaments passin per "
"l'estat 'esborrany' i vagin directament a l'estat 'fixat' sense validar-se " "l'estat 'Esborrany' i vagin directament a l'estat 'Fixat' sense validar-los "
"manualment." "manualment."
#. module: account #. module: account
@ -2144,7 +2144,7 @@ msgstr "Anterior"
#: field:account.model.line,currency_id:0 #: field:account.model.line,currency_id:0
#: field:account.move.line,currency_id:0 #: field:account.move.line,currency_id:0
msgid "Currency" msgid "Currency"
msgstr "Moneda" msgstr "Divisa"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@ -2179,7 +2179,8 @@ msgid "Analytic Entry"
msgstr "Assentament analític" msgstr "Assentament analític"
#. module: account #. module: account
#: view:res.company:0 field:res.company,overdue_msg:0 #: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message" msgid "Overdue Payments Message"
msgstr "Missatge de pagaments fora de termini" msgstr "Missatge de pagaments fora de termini"
@ -2285,7 +2286,7 @@ msgstr "Diari assentaments d'obertura"
#. module: account #. module: account
#: view:account.config.wizard:0 #: view:account.config.wizard:0
msgid "Create a Fiscal Year" msgid "Create a Fiscal Year"
msgstr "Crea un exercici fiscal" msgstr "Creeu un exercici fiscal"
#. module: account #. module: account
#: field:product.template,taxes_id:0 #: field:product.template,taxes_id:0
@ -2320,7 +2321,8 @@ msgstr "2"
#: wizard_view:account.chart,init:0 #: wizard_view:account.chart,init:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)" msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr "" msgstr ""
"(Si no es selecciona cap any fiscal s'utilitzen tots els anys fiscals oberts)" "(Si no es selecciona cap exercici fiscal s'utilitzen tots els exercicis "
"fiscals oberts)"
#. module: account #. module: account
#: help:account.invoice.tax,base_code_id:0 #: help:account.invoice.tax,base_code_id:0
@ -2467,7 +2469,7 @@ msgstr "Data final"
#: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.actions.act_window,name:account.action_move_line_tree1
#: model:ir.ui.menu,name:account.menu_action_move_line_search #: model:ir.ui.menu,name:account.menu_action_move_line_search
msgid "Entry Lines" msgid "Entry Lines"
msgstr "Línies de l'extracte" msgstr "Apunts"
#. module: account #. module: account
#: view:account.tax:0 #: view:account.tax:0
@ -2526,7 +2528,7 @@ msgstr "Assentaments conciliats"
#. module: account #. module: account
#: help:account.bank.statement.reconcile,total_second_amount:0 #: help:account.bank.statement.reconcile,total_second_amount:0
msgid "The amount in the currency of the journal" msgid "The amount in the currency of the journal"
msgstr "La quantitat en la moneda del diari" msgstr "La quantitat en la divisa del diari"
#. module: account #. module: account
#: wizard_field:account.general.ledger.report,checktype,landscape:0 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@ -2836,7 +2838,7 @@ msgstr "Companyies que es refereixen a l'empresa"
#. module: account #. module: account
#: field:account.move.line,date:0 #: field:account.move.line,date:0
msgid "Effective date" msgid "Effective date"
msgstr "Data vigència" msgstr "Data"
#. module: account #. module: account
#: help:account.tax.template,sequence:0 #: help:account.tax.template,sequence:0
@ -2961,7 +2963,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
#: model:ir.actions.act_window,name:account.action_invoice_tree12 #: model:ir.actions.act_window,name:account.action_invoice_tree12
#: model:ir.ui.menu,name:account.menu_action_invoice_tree12 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
msgid "Draft Supplier Refunds" msgid "Draft Supplier Refunds"
msgstr "Factures d'abonament de proveïdor esborrany" msgstr "Factures rectificatives (abonament) de proveïdor esborrany"
#. module: account #. module: account
#: model:process.node,name:account.process_node_accountingstatemententries0 #: model:process.node,name:account.process_node_accountingstatemententries0
@ -3048,7 +3050,7 @@ msgstr "Taxa de divises de sortida"
#: model:ir.actions.act_window,name:account.action_invoice_tree10 #: model:ir.actions.act_window,name:account.action_invoice_tree10
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
msgid "Draft Customer Refunds" msgid "Draft Customer Refunds"
msgstr "Factures d'abonament de client esborrany" msgstr "Factures rectificatives (abonament) de client esborrany"
#. module: account #. module: account
#: field:account.journal.column,readonly:0 #: field:account.journal.column,readonly:0
@ -3606,7 +3608,7 @@ msgstr "Impressió"
#: model:ir.actions.act_window,name:account.action_invoice_tree4_new #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
msgid "New Supplier Refund" msgid "New Supplier Refund"
msgstr "Nova factura d'abonament de proveïdor" msgstr "Nova factura rectificativa (abonament) de proveïdor"
#. module: account #. module: account
#: view:account.model:0 #: view:account.model:0
@ -3616,7 +3618,7 @@ msgstr "Model d'assentament"
#. module: account #. module: account
#: wizard_field:account.general.ledger.report,checktype,amount_currency:0 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
msgid "With Currency" msgid "With Currency"
msgstr "Amb moneda" msgstr "Mostra divisa"
#. module: account #. module: account
#: view:account.account:0 #: view:account.account:0
@ -3721,12 +3723,12 @@ msgstr "Codificació extracte"
#: wizard_view:account.invoice.refund,init:0 #: wizard_view:account.invoice.refund,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_refund #: model:ir.actions.wizard,name:account.wizard_invoice_refund
msgid "Credit Note" msgid "Credit Note"
msgstr "Factura d'abonament" msgstr "Factura rectificativa (abonament)"
#. module: account #. module: account
#: model:ir.actions.todo,note:account.config_fiscalyear #: model:ir.actions.todo,note:account.config_fiscalyear
msgid "Define Fiscal Years and Select Charts of Account" msgid "Define Fiscal Years and Select Charts of Account"
msgstr "Defineix exercicis fiscals i selecciona pla comptable" msgstr "Definiu els exercicis fiscals i seleccioneu el pla comptable"
#. module: account #. module: account
#: wizard_field:account.move.line.reconcile,addendum,period_id:0 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
@ -3736,7 +3738,7 @@ msgstr "Període de desajust"
#. module: account #. module: account
#: selection:account.config.wizard,period:0 #: selection:account.config.wizard,period:0
msgid "3 Months" msgid "3 Months"
msgstr "3 mesos" msgstr "Trimestral"
#. module: account #. module: account
#: wizard_view:account.move.journal,init:0 #: wizard_view:account.move.journal,init:0
@ -3800,7 +3802,7 @@ msgstr "Data inicial"
#. module: account #. module: account
#: wizard_view:account.general.ledger.report,account_selection:0 #: wizard_view:account.general.ledger.report,account_selection:0
msgid "Select Chart" msgid "Select Chart"
msgstr "Selecciona pla comptable" msgstr "Seleccioneu un pla comptable"
#. module: account #. module: account
#: selection:account.chart,init,target_move:0 #: selection:account.chart,init,target_move:0
@ -3867,7 +3869,7 @@ msgstr "Seqüència de l'assentament"
#: selection:account.account,type:0 #: selection:account.account,type:0
#: selection:account.account.template,type:0 #: selection:account.account.template,type:0
msgid "Closed" msgid "Closed"
msgstr "Tancat" msgstr "Tancament"
#. module: account #. module: account
#: model:process.node,name:account.process_node_paymententries0 #: model:process.node,name:account.process_node_paymententries0
@ -4022,7 +4024,7 @@ msgstr "Propietats de comptabilitat del client"
#. module: account #. module: account
#: view:account.bank.statement:0 #: view:account.bank.statement:0
msgid "Select entries" msgid "Select entries"
msgstr "Selecciona les entrades" msgstr "Seleccioneu les entrades"
#. module: account #. module: account
#: selection:account.chart,init,target_move:0 #: selection:account.chart,init,target_move:0
@ -4048,7 +4050,7 @@ msgstr "Compte a pagar"
#: field:account.account,currency_id:0 #: field:account.account,currency_id:0
#: field:account.account.template,currency_id:0 #: field:account.account.template,currency_id:0
msgid "Secondary Currency" msgid "Secondary Currency"
msgstr "Moneda secundària" msgstr "Divisa secundària"
#. module: account #. module: account
#: field:account.account,credit:0 #: field:account.account,credit:0
@ -4083,7 +4085,7 @@ msgstr ""
#: field:account.tax,account_paid_id:0 #: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0 #: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account" msgid "Refund Tax Account"
msgstr "Compte impostos de devolucions" msgstr "Compte impostos de reintegraments"
#. module: account #. module: account
#: field:account.tax.code,child_ids:0 #: field:account.tax.code,child_ids:0
@ -4186,7 +4188,7 @@ msgstr "Seqüències de diaris separades"
#. module: account #. module: account
#: help:account.bank.statement.reconcile,total_second_currency:0 #: help:account.bank.statement.reconcile,total_second_currency:0
msgid "The currency of the journal" msgid "The currency of the journal"
msgstr "La moneda del diari" msgstr "La divisa del diari"
#. module: account #. module: account
#: view:account.journal.column:0 #: view:account.journal.column:0
@ -4429,7 +4431,7 @@ msgstr "Fixat"
#: view:account.tax:0 #: view:account.tax:0
#: view:account.tax.template:0 #: view:account.tax.template:0
msgid "Credit Notes" msgid "Credit Notes"
msgstr "Factures d'abonament" msgstr "Factures rectificatives (abonament)"
#. module: account #. module: account
#: field:account.config.wizard,date2:0 #: field:account.config.wizard,date2:0
@ -4621,7 +4623,7 @@ msgstr "Per data"
#: model:ir.actions.act_window,name:account.action_invoice_tree4 #: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds" msgid "Supplier Refunds"
msgstr "Factures d'abonament de proveïdor" msgstr "Factures rectificatives (abonament) de proveïdor"
#. module: account #. module: account
#: help:account.model.line,date:0 #: help:account.model.line,date:0
@ -4951,7 +4953,7 @@ msgstr "Confirmat"
#. module: account #. module: account
#: wizard_view:account.account.balance.report,account_selection:0 #: wizard_view:account.account.balance.report,account_selection:0
msgid "Select parent account" msgid "Select parent account"
msgstr "Selecciona compte pare" msgstr "Seleccioneu el compte pare"
#. module: account #. module: account
#: field:account.account.template,parent_id:0 #: field:account.account.template,parent_id:0
@ -5126,7 +5128,7 @@ msgstr "Compte d'ingressos en plantilla producte"
#: help:account.account.template,currency_id:0 #: help:account.account.template,currency_id:0
msgid "Force all moves for this account to have this secondary currency." msgid "Force all moves for this account to have this secondary currency."
msgstr "" msgstr ""
"Força a tots els moviments d'aquest compte que tinguin aquesta moneda " "Força a tots els moviments d'aquest compte que tinguin aquesta divisa "
"secundària." "secundària."
#. module: account #. module: account
@ -5140,7 +5142,7 @@ msgstr "_Cancel·la"
#: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0
msgid "Select Date-Period" msgid "Select Date-Period"
msgstr "Selecciona data-període" msgstr "Seleccioneu data-període"
#. module: account #. module: account
#: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.inverted.balance:0
@ -5169,7 +5171,7 @@ msgstr "Grup de l'impost"
#: model:ir.actions.act_window,name:account.action_invoice_tree3_new #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
msgid "New Customer Refund" msgid "New Customer Refund"
msgstr "Nova factura d'abonament de client" msgstr "Nova factura rectificativa (abonament) de client"
#. module: account #. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0 #: help:wizard.multi.charts.accounts,seq_journal:0
@ -5343,7 +5345,7 @@ msgstr "Filtrat per data"
#. module: account #. module: account
#: wizard_view:populate_statement_from_inv,init:0 #: wizard_view:populate_statement_from_inv,init:0
msgid "Choose Journal and Payment Date" msgid "Choose Journal and Payment Date"
msgstr "Selecciona diari i data de pagament" msgstr "Seleccioneu diari i data de pagament"
#. module: account #. module: account
#: selection:account.analytic.account,state:0 #: selection:account.analytic.account,state:0
@ -5367,7 +5369,7 @@ msgstr "Pagat"
#: model:ir.actions.act_window,name:account.action_invoice_tree11 #: model:ir.actions.act_window,name:account.action_invoice_tree11
#: model:ir.ui.menu,name:account.menu_action_invoice_tree11 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
msgid "Unpaid Customer Refunds" msgid "Unpaid Customer Refunds"
msgstr "Factures d'abonament de client sense pagar" msgstr "Factures rectificatives (abonament) de client sense pagar"
#. module: account #. module: account
#: help:account.invoice,residual:0 #: help:account.invoice,residual:0
@ -5524,7 +5526,7 @@ msgstr "Fi del període"
#: view:account.move:0 #: view:account.move:0
#: model:ir.model,name:account.model_account_move #: model:ir.model,name:account.model_account_move
msgid "Account Entry" msgid "Account Entry"
msgstr "Assentament de compte" msgstr "Assentament comptable"
#. module: account #. module: account
#: rml:account.general.journal:0 #: rml:account.general.journal:0
@ -5555,7 +5557,7 @@ msgstr "Saldo pendent"
#. module: account #. module: account
#: rml:account.invoice:0 #: rml:account.invoice:0
msgid "Refund" msgid "Refund"
msgstr "Factura d'abonament" msgstr "Factura rectificativa (abonament)"
#. module: account #. module: account
#: model:ir.model,name:account.model_account_invoice_tax #: model:ir.model,name:account.model_account_invoice_tax
@ -5792,7 +5794,7 @@ msgstr ""
#: field:account.tax.code,code:0 #: field:account.tax.code,code:0
#: field:account.tax.code.template,code:0 #: field:account.tax.code.template,code:0
msgid "Case Code" msgid "Case Code"
msgstr "Codi cas" msgstr "Codi"
#. module: account #. module: account
#: selection:account.automatic.reconcile,init,power:0 #: selection:account.automatic.reconcile,init,power:0
@ -5916,7 +5918,7 @@ msgstr "Deixeu-lo buit per a tots els exercicis fiscals oberts"
#: rml:account.invoice:0 #: rml:account.invoice:0
#: selection:account.invoice,type:0 #: selection:account.invoice,type:0
msgid "Supplier Refund" msgid "Supplier Refund"
msgstr "Factura d'abonament de proveïdor" msgstr "Factura rectificativa (abonament) de proveïdor"
#. module: account #. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0 #: model:process.transition,note:account.process_transition_entriesreconcile0
@ -6072,3 +6074,6 @@ msgstr ""
#: wizard_button:account.subscription.generate,init,generate:0 #: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates" msgid "Compute Entry Dates"
msgstr "Calcula les dates de l'assentament" msgstr "Calcula les dates de l'assentament"
#~ msgid "account.config.wizard"
#~ msgstr "account.config.assistent"

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-04-16 09:47+0000\n" "PO-Revision-Date: 2010-06-03 20:09+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n" "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n" "X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account #. module: account
@ -272,10 +272,6 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each " "in which order. You can create your own view for a faster encoding in each "
"journal." "journal."
msgstr "" msgstr ""
"zeigt die Ansicht des Journalberichtes. Open ERP wird gezeigt welche Felder "
"sichtbar sein sollen, welche erforderlich sind oder keine Schreibrechte habe "
"und in der Reihenfolge der Auftragsnummern. Sie können einen eigenen View "
"für eine schnellere Buchungsbearbeitung herstellen."
#. module: account #. module: account
#: help:account.invoice,date_due:0 #: help:account.invoice,date_due:0
@ -2176,7 +2172,8 @@ msgid "Analytic Entry"
msgstr "Buchung Analysekonto" msgstr "Buchung Analysekonto"
#. module: account #. module: account
#: view:res.company:0 field:res.company,overdue_msg:0 #: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message" msgid "Overdue Payments Message"
msgstr "Text Zahlungserinnerung" msgstr "Text Zahlungserinnerung"
@ -3314,7 +3311,9 @@ msgstr "Buchen OP Ausgleich"
#. module: account #. module: account
#: wizard_view:account.wizard_paid_open,init:0 #: wizard_view:account.wizard_paid_open,init:0
msgid "(Invoice should be unreconciled if you want to open it)" msgid "(Invoice should be unreconciled if you want to open it)"
msgstr "(Rechnungen müssen ausgeglichen werden)" msgstr ""
"(Rechnungen dürfen nicht ausgeglichen sein, wenn diese wieder geöffnet "
"werden sollen)"
#. module: account #. module: account
#: view:account.invoice:0 #: view:account.invoice:0
@ -5314,7 +5313,7 @@ msgstr "Benutze Buchungsvorlage"
#. module: account #. module: account
#: wizard_button:account.wizard_paid_open,init,end:0 #: wizard_button:account.wizard_paid_open,init,end:0
msgid "No" msgid "No"
msgstr "Nummer" msgstr "Nein"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move #: model:ir.actions.act_window,name:account.act_account_partner_account_move
@ -6062,3 +6061,6 @@ msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
#: wizard_button:account.subscription.generate,init,generate:0 #: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates" msgid "Compute Entry Dates"
msgstr "Berechne eingegebene Daten" msgstr "Berechne eingegebene Daten"
#~ msgid "account.config.wizard"
#~ msgstr "account.config.wizard"

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-13 14:03+0000\n" "PO-Revision-Date: 2010-06-04 16:42+0000\n"
"Last-Translator: Carlo - didotech.com <Unknown>\n" "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n" "X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account #. module: account
@ -3047,7 +3047,7 @@ msgstr ""
#. module: account #. module: account
#: field:account.invoice.line,uos_id:0 #: field:account.invoice.line,uos_id:0
msgid "Unit of Measure" msgid "Unit of Measure"
msgstr "" msgstr "Unità di misura"
#. module: account #. module: account
#: field:account.chart.template,property_account_receivable:0 #: field:account.chart.template,property_account_receivable:0
@ -3107,7 +3107,7 @@ msgstr "Imposta come bozza"
#: help:account.invoice,origin:0 #: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0 #: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice." msgid "Reference of the document that produced this invoice."
msgstr "" msgstr "Riferimento al documento che ha prodotto questa fattura."
#. module: account #. module: account
#: selection:account.account,type:0 #: selection:account.account,type:0
@ -3608,7 +3608,7 @@ msgstr "Manuale"
#. module: account #. module: account
#: view:account.invoice:0 #: view:account.invoice:0
msgid "Compute Taxes" msgid "Compute Taxes"
msgstr "" msgstr "Calcola tasse"
#. module: account #. module: account
#: field:wizard.multi.charts.accounts,code_digits:0 #: field:wizard.multi.charts.accounts,code_digits:0
@ -4596,7 +4596,7 @@ msgstr ""
#. module: account #. module: account
#: field:account.tax,price_include:0 #: field:account.tax,price_include:0
msgid "Tax Included in Price" msgid "Tax Included in Price"
msgstr "" msgstr "Tassa compresa nel prezzo"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2

View File

@ -333,6 +333,7 @@ class account_invoice(osv.osv):
raise orm.except_orm(_('Configuration Error!'), raise orm.except_orm(_('Configuration Error!'),
_('There is no Accounting Journal of type Sale/Purchase defined!')) _('There is no Accounting Journal of type Sale/Purchase defined!'))
else: else:
raise
raise orm.except_orm(_('UnknownError'), str(e)) raise orm.except_orm(_('UnknownError'), str(e))
def confirm_paid(self, cr, uid, ids, context=None): def confirm_paid(self, cr, uid, ids, context=None):
@ -1125,17 +1126,17 @@ account_invoice()
class account_invoice_line(osv.osv): class account_invoice_line(osv.osv):
def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict): def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
res = {} res = {}
cur_obj=self.pool.get('res.currency') tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
for line in self.browse(cr, uid, ids): for line in self.browse(cr, uid, ids):
price = line.price_unit * (1-(line.discount or 0.0)/100.0)
taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity)
res[line.id] = taxes['total']
if line.invoice_id: if line.invoice_id:
res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)
cur = line.invoice_id.currency_id cur = line.invoice_id.currency_id
res[line.id] = cur_obj.round(cr, uid, cur, res[line.id]) res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
else:
res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
return res return res
def _price_unit_default(self, cr, uid, context=None): def _price_unit_default(self, cr, uid, context=None):
if context is None: if context is None:
context = {} context = {}
@ -1149,7 +1150,7 @@ class account_invoice_line(osv.osv):
taxes = l[2].get('invoice_line_tax_id') taxes = l[2].get('invoice_line_tax_id')
if len(taxes[0]) >= 3 and taxes[0][2]: if len(taxes[0]) >= 3 and taxes[0][2]:
taxes = tax_obj.browse(cr, uid, taxes[0][2]) taxes = tax_obj.browse(cr, uid, taxes[0][2])
for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)): for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
t = t - tax['amount'] t = t - tax['amount']
return t return t
return 0 return 0
@ -1164,7 +1165,8 @@ class account_invoice_line(osv.osv):
'product_id': fields.many2one('product.product', 'Product', ondelete='set null'), 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."), 'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')), 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
digits_compute= dp.get_precision('Account'), store=True),
'quantity': fields.float('Quantity', required=True), 'quantity': fields.float('Quantity', required=True),
'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')), 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]), 'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
@ -1333,10 +1335,10 @@ class account_invoice_line(osv.osv):
continue continue
res.append(mres) res.append(mres)
tax_code_found= False tax_code_found= False
for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
(line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)), (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
line.quantity, inv.address_invoice_id.id, line.product_id, line.quantity, inv.address_invoice_id.id, line.product_id,
inv.partner_id): inv.partner_id)['taxes']:
if inv.type in ('out_invoice', 'in_invoice'): if inv.type in ('out_invoice', 'in_invoice'):
tax_code_id = tax['base_code_id'] tax_code_id = tax['base_code_id']
@ -1439,7 +1441,7 @@ class account_invoice_tax(osv.osv):
company_currency = inv.company_id.currency_id.id company_currency = inv.company_id.currency_id.id
for line in inv.invoice_line: for line in inv.invoice_line:
for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id): for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
val={} val={}
val['invoice_id'] = inv.id val['invoice_id'] = inv.id
val['name'] = tax['name'] val['name'] = tax['name']
@ -1501,11 +1503,7 @@ account_invoice_tax()
class res_partner(osv.osv): class res_partner(osv.osv):
""" Inherits partner and adds invoice information in the partner form """ """ Inherits partner and adds invoice information in the partner form """
_inherit = 'res.partner' _inherit = 'res.partner'
_columns = { _columns = {
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True), 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
} }
res_partner() res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -57,7 +57,7 @@
<menuitem <menuitem
action="action_account_fiscal_position_form" action="action_account_fiscal_position_form"
id="menu_action_account_fiscal_position_form" id="menu_action_account_fiscal_position_form"
parent="account.menu_finance_accounting" sequence="20"/> parent="next_id_27" sequence="20"/>
<!-- <!--
Partners Extension Partners Extension

View File

@ -101,7 +101,7 @@
<field name="search_view_id" ref="account.view_account_analytic_account_search"/> <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record> </record>
<!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>--> <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/> <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic"/>
<record id="act_account_renew_view" model="ir.actions.act_window"> <record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field> <field name="name">Accounts to Renew</field>
@ -114,7 +114,7 @@
</record> </record>
<record id="action_account_analytic_account_tree2" model="ir.actions.act_window"> <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
<field name="name">Analytic Chart of Accounts</field> <field name="name">Chart of Analytic Accounts</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
@ -122,10 +122,10 @@
<field name="view_mode">form,graph</field> <field name="view_mode">form,graph</field>
<field name="view_id" ref="view_account_analytic_account_tree"/> <field name="view_id" ref="view_account_analytic_account_tree"/>
</record> </record>
<menuitem <!-- <menuitem-->
action="action_account_analytic_account_tree2" <!-- action="action_account_analytic_account_tree2"-->
id="account_analytic_def_chart" <!-- id="account_analytic_def_chart"-->
parent="account_analytic_def_account"/> <!-- parent="account_analytic_def_account"/>-->
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>--> <!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
<!-- <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/> <!-- <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
@ -206,14 +206,14 @@
<field name="context">{"search_default_user_id":uid}</field> <field name="context">{"search_default_user_id":uid}</field>
<field name="view_id" ref="view_account_analytic_line_tree"/> <field name="view_id" ref="view_account_analytic_line_tree"/>
</record> </record>
<wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/> <!-- <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>-->
<menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/> <!-- <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>-->
<!-- Entries by Line --> <!-- Entries by Line -->
<menuitem icon="STOCK_JUSTIFY_FILL" <!-- <menuitem icon="STOCK_JUSTIFY_FILL"-->
action="action_project_account_analytic_line_form" <!-- action="action_project_account_analytic_line_form"-->
id="account_entries_analytic_entries" <!-- id="account_entries_analytic_entries"-->
parent="next_id_41"/> <!-- parent="next_id_41"/>-->
<record id="action_account_tree1" model="ir.actions.act_window"> <record id="action_account_tree1" model="ir.actions.act_window">
<field name="name">Analytic Entries</field> <field name="name">Analytic Entries</field>
@ -293,31 +293,49 @@
</field> </field>
</record> </record>
<record id="action_account_analytic_journal_form" model="ir.actions.act_window"> <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
<field name="name">Analytic Journal Definition</field> <field name="name">Analytic Journals</field>
<field name="res_model">account.analytic.journal</field> <field name="res_model">account.analytic.journal</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.menu_analytic_accounting"/> <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
# #
# Open journal entries # Open journal entries
# #
<record id="action_account_analytic_journal_open_form" model="ir.actions.act_window"> <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field name="name">Entries of Open Analytic Journals</field> <field name="name">Analytic Journal Items</field>
<field name="res_model">account.analytic.line</field> <field name="res_model">account.analytic.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field> <field name="domain">[('journal_id','=',active_id)]</field>
</record> </record>
<record id="ir_open_account_journal_analytic" model="ir.values"> <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
<field eval="'tree_but_open'" name="key2"/> <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field eval="'account.analytic.journal'" name="model"/> <field name="name">Check Register</field>
<field name="name">Open Analytic Journal</field> <field name="res_model">account.analytic.line</field>
<field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/> <field name="view_type">form</field>
<field eval="True" name="object"/> <field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field>
</record> </record>
<!-- <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
<record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field name="name">Checks Register</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field>
</record>
<!-- <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
<!-- <record id="ir_open_account_journal_analytic" model="ir.values">-->
<!-- <field eval="'tree_but_open'" name="key2"/>-->
<!-- <field eval="'account.analytic.journal'" name="model"/>-->
<!-- <field name="name">Open Analytic Journal</field>-->
<!-- <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>-->
<!-- <field eval="True" name="object"/>-->
<!-- </record>-->
# #
# Reporting # Reporting
@ -331,13 +349,13 @@
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/> <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
<record id="action_account_analytic_journal_tree2" model="ir.actions.act_window"> <!-- <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">-->
<field name="name">Analytic Entries by Journal</field> <!-- <field name="name">Analytic Entries by Journal</field>-->
<field name="res_model">account.analytic.journal</field> <!-- <field name="res_model">account.analytic.journal</field>-->
<field name="view_type">tree</field> <!-- <field name="view_type">tree</field>-->
<field name="view_id" ref="view_account_analytic_journal_tree"/> <!-- <field name="view_id" ref="view_account_analytic_journal_tree"/>-->
</record> <!-- </record>-->
<menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/> <!-- <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>-->
# #
# Statistics # Statistics

View File

@ -43,7 +43,7 @@
name="Automatic reconciliation" name="Automatic reconciliation"
action="action_account_automatic_reconcile" action="action_account_automatic_reconcile"
id="menu_automatic_reconcile" id="menu_automatic_reconcile"
parent="next_id_20"/> parent="periodical_processing_reconciliation"/>
<record id="account_automatic_reconcile_view1" model="ir.ui.view"> <record id="account_automatic_reconcile_view1" model="ir.ui.view">
<field name="name">Automatic reconcile unreconcile</field> <field name="name">Automatic reconcile unreconcile</field>

View File

@ -31,7 +31,7 @@
</record> </record>
<record id="action_account_fiscalyear_close" model="ir.actions.act_window"> <record id="action_account_fiscalyear_close" model="ir.actions.act_window">
<field name="name">Generate Fiscal Year Opening Entries</field> <field name="name">Generate Opening Entries</field>
<field name="res_model">account.fiscalyear.close</field> <field name="res_model">account.fiscalyear.close</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>

View File

@ -32,10 +32,10 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<menuitem icon="STOCK_JUSTIFY_FILL" <!-- <menuitem icon="STOCK_JUSTIFY_FILL"-->
action="action_account_move_journal_line_form" <!-- action="action_account_move_journal_line_form"-->
id="menu_action_move_journal_line_form" <!-- id="menu_action_move_journal_line_form"-->
parent="account.menu_finance_entries" sequence="5" /> <!-- parent="account.menu_finance_entries" sequence="5" />-->
</data> </data>
</openerp> </openerp>

View File

@ -32,7 +32,7 @@
</record> </record>
<menuitem action="action_account_reconcile_select" <menuitem action="action_account_reconcile_select"
id="menu_reconcile_select" parent="account.next_id_20" /> id="menu_reconcile_select" parent="periodical_processing_reconciliation" />
</data> </data>
</openerp> </openerp>

View File

@ -32,7 +32,7 @@
</record> </record>
<menuitem action="action_account_unreconcile_select" <menuitem action="action_account_unreconcile_select"
id="menu_unreconcile_select" parent="account.next_id_20" /> id="menu_unreconcile_select" parent="periodical_processing_reconciliation" />
</data> </data>
</openerp> </openerp>

View File

@ -29,9 +29,9 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<menuitem action="action_account_open_closed_fiscalyear" <!-- <menuitem action="action_account_open_closed_fiscalyear"-->
id="menu_wizard_open_closed_fy" sequence="2" <!-- id="menu_wizard_open_closed_fy" sequence="2"-->
parent="account.menu_account_end_year_treatments" /> <!-- parent="account.menu_account_end_year_treatments" />-->
</data> </data>
</openerp> </openerp>

View File

@ -32,7 +32,7 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" /> <!-- <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" />-->
</data> </data>
</openerp> </openerp>

View File

@ -39,8 +39,8 @@
<field name="model">account.move.line</field> <field name="model">account.move.line</field>
</record> </record>
<menuitem action="action_view_account_use_model" name="Create Entries From Models" <!-- <menuitem action="action_view_account_use_model" name="Create Entries From Models"-->
parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/> <!-- parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
<record id="view_account_use_model_open_entry" model="ir.ui.view"> <record id="view_account_use_model_open_entry" model="ir.ui.view">
<field name="name">account.use.model.open.entry.form</field> <field name="name">account.use.model.open.entry.form</field>

View File

@ -34,7 +34,7 @@
<menuitem <menuitem
name="Validate Ledger Postings" name="Validate Ledger Postings"
parent="account.menu_finance_periodical_processing" parent="periodical_processing_journal_entries_validation"
action="action_validate_account_move" action="action_validate_account_move"
id="menu_validate_account_moves" id="menu_validate_account_moves"
/> />

View File

@ -42,10 +42,10 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <!-- <menuitem-->
action="action_analytic_default_form" <!-- action="action_analytic_default_form"-->
id="menu_analytic_defaul_form" <!-- id="menu_analytic_defaul_form"-->
parent="account.menu_analytic_accounting"/> <!-- parent="account.menu_analytic_accounting"/>-->
<act_window <act_window
domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/> domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>

View File

@ -129,10 +129,10 @@
src_model="account.analytic.plan" src_model="account.analytic.plan"
id="account_analytic_instance_model_open"/> id="account_analytic_instance_model_open"/>
<menuitem <!-- <menuitem-->
name="Analytic Distribution's models" parent="account.account_def_analytic_journal" <!-- name="Analytic Distribution's models" parent="account.account_def_analytic_journal"-->
id="menu_account_analytic_plan_instance_action" <!-- id="menu_account_analytic_plan_instance_action"-->
action="account_analytic_plan_instance_action"/> <!-- action="account_analytic_plan_instance_action"/>-->
<record model="ir.ui.view" id="account_analytic_plan_instance_line_form"> <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
<field name="name">account.analytic.plan.instance.line.form</field> <field name="name">account.analytic.plan.instance.line.form</field>
@ -192,11 +192,16 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <menuitem
parent="account.account_analytic_def_account" parent="account.menu_analytic"
id="menu_account_analytic_plan_action" name="Multi Plans"
action="account_analytic_plan_form_action"/> id="menu_account_analytic_multi_plan_action"
/>
<menuitem
parent="menu_account_analytic_multi_plan_action"
id="menu_account_analytic_plan_action"
action="account_analytic_plan_form_action"/>
<record model="ir.ui.view" id="account_analytic_plan_line_form"> <record model="ir.ui.view" id="account_analytic_plan_line_form">
<field name="name">account.analytic.plan.line.form</field> <field name="name">account.analytic.plan.line.form</field>

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n" "Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:13+0000\n" "PO-Revision-Date: 2010-06-04 13:32+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n" "Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n" "X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
@ -251,12 +251,12 @@ msgstr "无效XML视图结构!"
#: wizard_button:populate_payment,search,end:0 #: wizard_button:populate_payment,search,end:0
#: wizard_button:populate_statement,init,end:0 #: wizard_button:populate_statement,init,end:0
msgid "_Cancel" msgid "_Cancel"
msgstr "取消" msgstr "取消(_C)"
#. module: account_payment #. module: account_payment
#: field:payment.line,create_date:0 #: field:payment.line,create_date:0
msgid "Created" msgid "Created"
msgstr "创建" msgstr "创建"
#. module: account_payment #. module: account_payment
#: view:payment.line:0 #: view:payment.line:0

View File

@ -58,16 +58,16 @@ class payment_order_create(osv.osv_memory):
def create_payment(self, cr, uid, ids, context=None): def create_payment(self, cr, uid, ids, context=None):
order_obj = self.pool.get('payment.order') order_obj = self.pool.get('payment.order')
line_obj = self.pool.get('account.move.line') line_obj = self.pool.get('account.move.line')
payment_obj = self.pool.get('payment.line')
data = self.read(cr, uid, ids, [], context)[0] if context is None:
line_ids= data['entries'] context = {}
data = self.read(cr, uid, ids, [])[0]
line_ids = data['entries']
if not line_ids: return {} if not line_ids: return {}
payment = order_obj.browse(cr, uid, data['active_id'], payment = order_obj.browse(cr, uid, context['active_id'], context=context)
context=context)
t = payment.mode and payment.mode.type.id or None t = payment.mode and payment.mode.type.id or None
line2bank = pool.get('account.move.line').line2bank(cr, uid, line2bank = line_obj.line2bank(cr, uid, line_ids, t, context)
line_ids, t, context)
## Finally populate the current payment with new lines: ## Finally populate the current payment with new lines:
for line in line_obj.browse(cr, uid, line_ids, context=context): for line in line_obj.browse(cr, uid, line_ids, context=context):
@ -78,7 +78,7 @@ class payment_order_create(osv.osv_memory):
date_to_pay = line.date_maturity date_to_pay = line.date_maturity
elif payment.date_prefered == 'fixed': elif payment.date_prefered == 'fixed':
date_to_pay = payment.date_planned date_to_pay = payment.date_planned
pool.get('payment.line').create(cr, uid,{ payment_obj.create(cr, uid,{
'move_line_id': line.id, 'move_line_id': line.id,
'amount_currency': line.amount_to_pay, 'amount_currency': line.amount_to_pay,
'bank_id': line2bank.get(line.id), 'bank_id': line2bank.get(line.id),
@ -88,13 +88,14 @@ class payment_order_create(osv.osv_memory):
'date': date_to_pay, 'date': date_to_pay,
'currency': line.invoice and line.invoice.currency_id.id or False, 'currency': line.invoice and line.invoice.currency_id.id or False,
}, context=context) }, context=context)
return {} return {'nodestroy':True,}
def search_entries(self, cr, uid, ids, context=None): def search_entries(self, cr, uid, ids, context=None):
order_obj = self.pool.get('payment.order') order_obj = self.pool.get('payment.order')
line_obj = self.pool.get('account.move.line') line_obj = self.pool.get('account.move.line')
mod_obj = self.pool.get('ir.model.data') mod_obj = self.pool.get('ir.model.data')
if context is None:
context = {}
data = self.read(cr, uid, ids, [], context=context)[0] data = self.read(cr, uid, ids, [], context=context)[0]
search_due_date = data['duedate'] search_due_date = data['duedate']
payment = order_obj.browse(cr, uid, context['active_id'], context=context) payment = order_obj.browse(cr, uid, context['active_id'], context=context)

View File

@ -7,12 +7,14 @@
<field name="model">account.payment.make.payment</field> <field name="model">account.payment.make.payment</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Make Payment"> <form string="Make Payment">
<label string ="Are you sure you want to make payment?" /> <group height="80" width="320">
<group colspan="4" col="6"> <separator string="Are you sure you want to make payment?"/>
<label string ="" colspan="2"/> <newline/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <group colspan="2" col="4">
<button name="launch_wizard" string="Print" type="object" icon="gtk-print" default_focus="1"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
</group>
</group> </group>
</form> </form>
</field> </field>

View File

@ -186,7 +186,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'})) ]][[ a['name'] ]]</font></para> <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'})) ]][[ a['name'] ]]</font></para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para> <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -196,7 +196,7 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(sum_dr()) or 0.0 ]]</u></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -224,7 +224,7 @@
<para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para> <para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para> <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -234,7 +234,7 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]</u></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -197,7 +197,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'})) ]][[ a['name'] ]]</font></para> <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'})) ]][[ a['name'] ]]</font></para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para> <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code1'] ]]</font></para> <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code1'] ]]</font></para>
@ -206,7 +206,7 @@
<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'})) ]][[ a['name1'] ]]</font></para> <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'})) ]][[ a['name1'] ]]</font></para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance1'])) ]]</para> <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -216,13 +216,13 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
</td> </td>
<td> <td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -201,7 +201,7 @@
</para> </para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a.balance)) ]]</para> <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -214,7 +214,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para> <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>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]</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'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -224,7 +224,7 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -256,7 +256,7 @@
</para> </para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a.balance)) ]]</para> <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -269,7 +269,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para> <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>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]</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'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -279,7 +279,7 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -214,7 +214,7 @@
</para> </para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para> <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_9"> <para style="terp_default_9">
@ -227,7 +227,7 @@
</para> </para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance1'])) ]]</para> <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -240,7 +240,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para> <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]</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'])) or 0.0 ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Bold_9"></para> <para style="terp_default_Bold_9"></para>
@ -249,7 +249,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para> <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or '' ]]</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'])) or 0.0 ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -260,13 +260,13 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
</td> </td>
<td> <td>
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para> <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para> <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -1,25 +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 account_tax_include
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,42 +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/>.
#
##############################################################################
{
'name': 'Invoices and prices with taxes included',
'version': '1.0',
'category': 'Generic Modules/Accounting',
'description': """Allow the user to work tax included prices.
Especially useful for b2c businesses.
This module implement the modification on the invoice form.
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['account'],
'init_xml': [],
'update_xml': ['account_tax_include_view.xml'],
'demo_xml': [],
'installable': True,
'active': False,
'certificate': '0070514190381',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,230 +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
from osv import fields, osv
import decimal_precision as dp
class account_invoice(osv.osv):
_inherit = "account.invoice"
_columns = {
'price_type': fields.selection([('tax_included','Tax included'),
('tax_excluded','Tax excluded')],
'Price method', required=True, readonly=True,
states={'draft':[('readonly',False)]}),
}
_defaults = {
'price_type': 'tax_excluded',
}
def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
map_old_new = {}
refund_ids = []
for old_inv_id in ids:
new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description)
refund_ids += new_id
map_old_new[old_inv_id] = new_id[0]
for old_inv_id in map_old_new.keys():
old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type']
self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record})
return refund_ids
account_invoice()
class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"
def _amount_line2(self, cr, uid, ids, name, args, context=None):
"""
Return the subtotal excluding taxes with respect to price_type.
"""
res = {}
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
dec_obj = self.pool.get('decimal.precision')
for line in self.browse(cr, uid, ids):
cur = line.invoice_id and line.invoice_id.currency_id or False
res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
res[line.id] = {
'price_subtotal': 0.0,
'price_subtotal_incl': 0.0,
'data': []
}
if not line.quantity:
continue
if line.invoice_id:
product_taxes = []
if line.product_id:
if line.invoice_id.type in ('out_invoice', 'out_refund'):
product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
else:
product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
else:
res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.precision_get(cr, uid, 'Account'))
else:
res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
if res[line.id]['price_subtotal']:
res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
res[line.id]['data'].append(tax)
else:
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
res[line.id]['data'].append( tax)
res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
return res
def _price_unit_default(self, cr, uid, context=None):
if context is None:
context = {}
if 'check_total' in context:
t = context['check_total']
if context.get('price_type', False) == 'tax_included':
for l in context.get('invoice_line', {}):
if len(l) >= 3 and l[2]:
p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0)
t = t - (p * l[2].get('quantity'))
return t
return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
return 0
def _get_invoice(self, cr, uid, ids, context):
result = {}
for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
for line in inv.invoice_line:
result[line.id] = True
return result.keys()
_columns = {
'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
}
_defaults = {
'price_unit': _price_unit_default,
}
def move_line_get_item(self, cr, uid, line, context=None):
return {
'type':'src',
'name':line.name,
'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal,
'quantity':line.quantity,
'price':line.price_subtotal,
'account_id':line.account_id.id,
'product_id': line.product_id.id,
'uos_id':line.uos_id.id,
'account_analytic_id':line.account_analytic_id.id,
}
def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
if context is None:
context = {}
# if the tax is already included, just return the value without calculations
if context.get('price_type', False) == 'tax_included':
return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
else:
return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
# note: will call product_id_change_unit_price_inv with context...
# Temporary trap, for bad context that came from koo:
# if isinstance(context, str):
# print "str context:", context
ctx = (context and context.copy()) or {}
ctx.update({'price_type': ctx.get('price_type','tax_excluded')})
return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
account_invoice_line()
class account_invoice_tax(osv.osv):
_inherit = "account.invoice.tax"
def compute(self, cr, uid, invoice_id, context=None):
tax_grouped = {}
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
line_obj = self.pool.get('account.invoice.line')
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
line_ids = map(lambda x: x.id, inv.invoice_line)
cur = inv.currency_id
company_currency = inv.company_id.currency_id.id
for line in inv.invoice_line:
data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
for tax in data['data']:
val={}
val['invoice_id'] = inv.id
val['name'] = tax['name']
val['amount'] = tax['amount']
val['manual'] = False
val['sequence'] = tax['sequence']
val['base'] = tax['price_unit'] * line['quantity']
if inv.type in ('out_invoice','in_invoice'):
val['base_code_id'] = tax['base_code_id']
val['tax_code_id'] = tax['tax_code_id']
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['account_id'] = tax['account_collected_id'] or line.account_id.id
else:
val['base_code_id'] = tax['ref_base_code_id']
val['tax_code_id'] = tax['ref_tax_code_id']
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['account_id'] = tax['account_paid_id'] or line.account_id.id
key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
if not key in tax_grouped:
tax_grouped[key] = val
else:
tax_grouped[key]['amount'] += val['amount']
tax_grouped[key]['base'] += val['base']
tax_grouped[key]['base_amount'] += val['base_amount']
tax_grouped[key]['tax_amount'] += val['tax_amount']
for t in tax_grouped.values():
t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
return tax_grouped
account_invoice_tax()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,79 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="account_tax_view_price" model="ir.ui.view">
<field name="name">account.tax.exlcuded.view.form</field>
<field name="type">form</field>
<field name="model">account.tax</field>
<field name="inherit_id" ref="account.view_tax_form"/>
<field name="arch" type="xml">
<field name="python_compute" position="after">
<separator colspan="4" string="Compute Code for Taxes included prices"/>
<field colspan="4" name="python_compute_inv" nolabel="1"/>
</field>
</field>
</record>
<record id="account_invoice_view_price" model="ir.ui.view">
<field name="name">account.invoice.vat.exlcuded.view.form</field>
<field name="type">form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form"/>
<field name="arch" type="xml">
<field name="payment_term" position="after">
<field name="price_type"/>
</field>
</field>
</record>
<record id="invoice_supplier_form_tax_include" model="ir.ui.view">
<field name="name">account.invoice.supplier.tax_include</field>
<field name="type">form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml">
<field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
<field name="price_type"/>
</field>
</field>
</record>
<record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
<field name="name">account.invoice.supplier.tax_include2</field>
<field name="type">form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml">
<field name="price_subtotal" position="after">
<field name="price_subtotal_incl"/>
</field>
</field>
</record>
<record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
<field name="name">account.invoice.supplier.tax_include3</field>
<field name="type">form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml">
<field name="product_id" position="replace">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id,{'price_type':parent.price_type})"/>
</field>
</field>
</record>
<record id="view_invoice_line_tree" model="ir.ui.view">
<field name="name">account.invoice.line.tree</field>
<field name="model">account.invoice.line</field>
<field name="type">tree</field>
<field name="inherit_id" ref="account.view_invoice_line_tree"/>
<field name="arch" type="xml">
<field name="price_subtotal" position="after">
<field name="price_subtotal_incl"/>
</field>
</field>
</record>
</data>
</openerp>

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 06:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 12:06+0000\n"
"Last-Translator: lem0na <nickyk@gmx.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Невалиден XML за преглед на архитектурата"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Начин на изчисляване"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "С включен данък"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Без данък"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-10 12:26+0000\n"
"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Cjenovna procedura"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Računi i cijene sa uključenim porezom"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Porez uključen"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Porez nije uključen"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Izračunaj cijene sa porezima"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Sub-ukupno"

View File

@ -1,53 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-29 06:30+0000\n"
"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invàlid per a la definició de la vista!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Mètode preu"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Factures i preus amb impostos inclosos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Impostos inclosos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Impostos exclosos"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Codi pel càlcul dels preus amb impostos inclosos"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-04-26 09:10+0000\n"
"Last-Translator: Martin Volf <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-28 03:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Neplatný XML pro zobrazení architektury"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Metoda určování cen"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Faktury a ceny včetně daní"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Daně zahrnuty"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Daně vyloučeny"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Výpočetní kód pro ceny včetně daně"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Mezisoučet"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-04-09 13:20+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Fehlerhafter xml Code für diese Ansicht!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Preismethode"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Rechnungen und Preise mit inkludierten Steuern"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Steuer inklusive"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Steuern exklusive"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Berechnungsgrundlage (inkl. Steuer)"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Zwischensumme"

View File

@ -1,53 +0,0 @@
# Greek translation for openobject-addons
# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 15:27+0000\n"
"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Μέθοδος Τιμής"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Τιμολόγια και τιμές με ενσωμάτωση φόρων"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Συμπερίληψη φόρου"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Εξαιρούνται φόροι"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Κωδικός Υπολογισμού για Φόρους που εμπεριέχονται στις τιμές"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Υποσύνολο"

View File

@ -1,53 +0,0 @@
# English (Australia) translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-09 21:19+0000\n"
"Last-Translator: MoLE <Unknown>\n"
"Language-Team: English (Australia) <en_AU@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Invalid XML for View Architecture!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Price method"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Invoices and prices with taxes included"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Tax included"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Tax excluded"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Compute Code for Taxes included prices"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,53 +0,0 @@
# English (United Kingdom) translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-09 21:20+0000\n"
"Last-Translator: MoLE <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Invalid XML for View Architecture!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Price method"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Invoices and prices with taxes included"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Tax included"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Tax excluded"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Compute Code for Taxes included prices"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-24 20:17+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "¡XML inválido para la definición de la vista!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Método precio"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturas y precios con impuestos incluidos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Impuestos incluidos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Impuestos excluidos"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Código para el cálculo de precios con impuestos incluidos"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-14 18:28+0000\n"
"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML inválido para la definición de la vista!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Método de precio"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturas y precios con impuestos incluidos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Impuestos incluidos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Impuestos no incluidos"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Código del cálculo para precios con impuestos incluídos"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-09 16:28+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Vigane XML vaate arhitektuurile!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Hinna meetod"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Makse sisaldavad arved ja hinnad"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Maksuga"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Maksuta"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Arvuta kood maksuga hindadele"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Vahesumma"

View File

@ -1,53 +0,0 @@
# Finnish translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-17 10:06+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Hinnan tyyppi"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Laskut ja hinnat veroilla"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Vero sisältyy"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Ilman veroa"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Laske koodi hinnoille joissa on vero mukana"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Välisumma"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:23+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML non valide pour l'architecture de la vue"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Méthode de prix"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Factures et prix avec taxes comprises"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Taxe comprise"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Hors-taxe"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Code de calcul pour les prix taxes comprises"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Sous-total"

View File

@ -1,54 +0,0 @@
# translation of account-tax-include-es.po to Galego
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: account-tax-include-es\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 12:37+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Galego <g11n@mancomun.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "¡XML non válido para a definición da vista!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Método prezo"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturas e prezos con impostos incluídos"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Imposto incluído"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Imposto excluído"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Código para o cálculo dos impostos en prezos incluídos"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:23+0000\n"
"Last-Translator: Dragan Jovanovic <dragan.jovanovic@strojotex.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Nevažeći XML za Arhitekturu Prikaza!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Cjenovna metoda"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Računi i cijene sa uključenim porezom"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Porez uključen"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Nije uključen porez"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Kod za izračun cijena sa uključenim porezima"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Podzbroj"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 06:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-09 13:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 08:32+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML non valido per Visualizzazione Architettura!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Tasse incluse"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Tasse escluse"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,53 +0,0 @@
# Korean translation for openobject-addons
# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 16:43+0000\n"
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "뷰 아키텍처의 XML이 유효하지 않습니다."
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "가격 방식"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "세금이 포함된 인보이스와 가격"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "세금 포함"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "세금 제외"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "세금 포함 가격을 위한 컴퓨터 코드"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "서브토털"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 15:54+0000\n"
"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-12-14 21:11+0000\n"
"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Ongeldige XML voor weergave!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Prijsmethode"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturen en prijzen inclusief belastingen"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Inclusief belastingen"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Exclusief belastingen"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Bereken code voor prijzen inclusief belastingen"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotaal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-04-24 15:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,53 +0,0 @@
# Occitan (post 1500) translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-04-29 14:21+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid per l'arquitectura de la vista"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Metòde de prètz"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturas e prèses amb taxas inclusas"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Taxa inclusa"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Fòra taxa"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Còde de calcul pels prèses amb taxas compresas"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Sostotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-21 15:43+0000\n"
"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Metoda wyceny"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Faktury i ceny zawierające podatki."
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Zawiera podatek"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Nie zawiera podatku"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Wylicz kod dla cen z podatkiem"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Suma częściowa"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-28 23:29+0000\n"
"Last-Translator: Paulino <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML inválido para a arquitectura da vista"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Método do preço"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturas e preços com imposto incluído"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Imposto incluído"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Imposto excluído"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Código de cálculo para preços com imposto incluído"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 12:28+0000\n"
"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Invalido XML para Arquitetura da View"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-28 16:40+0000\n"
"Last-Translator: geopop65 <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid pentru arhitectura machetei de afișare !"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Metoda de pret"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Facturi şi preţuri cu taxele incluse"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Taxe incluse"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Fără taxe"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Calcul cod pentru preţuri cu taxe incluse"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Subtotal"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 13:39+0000\n"
"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Неправильный XML для просмотра архитектуры!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Метод расчета цены"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Счета и цены с налогами"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "С налогами"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "До налогов"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Промежуточный итог"

View File

@ -1,53 +0,0 @@
# Slovak translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-06 14:22+0000\n"
"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
"Language-Team: Slovak <sk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Neplatné XML pre zobrazenie architektúry!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Faktúry a ceny zahrnuté s DPH"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Medzisúčet"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:23+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Neveljaven XML za arhitekturo pogleda."
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Metoda cene"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Računi in cene z vključenimi davki"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "Davek vključen"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "Davek ni vključen"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "Koda izračuna za davke v cenah"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Delna vsota"

View File

@ -1,104 +0,0 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-14 15:44+0000\n"
"Last-Translator: Treecko <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Felaktig XML för Vyarkitektur!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 06:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-14 21:31+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Görüntüleme mimarisi için Geçersiz XML"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "Fiyat Yöntemi"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "Vergiler dahil fiyat ve faturalar"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "KDV Dahil"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "KDV Hariç"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "Alt Toplam"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 15:16+0000\n"
"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Неправильний XML для Архітектури Вигляду!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,104 +0,0 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -1,63 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:29+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效的视图结构XML文件!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr "价格规则"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr "发票和含税价"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr "含税"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr "不含税"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr "含税价格计算代码"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr "小计"
#~ msgid ""
#~ "Allow the user to work tax included prices.\n"
#~ "Especially useful for b2c businesses.\n"
#~ " \n"
#~ "This module implement the modification on the invoice form.\n"
#~ msgstr ""
#~ "允许用户使用含税价格\n"
#~ "特别适用于B2C商务\n"
#~ "\n"
#~ "这模块使发票的格式生效\n"

View File

@ -1,52 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_tax_include
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-01-30 12:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
msgstr ""

View File

@ -108,18 +108,29 @@
</field> </field>
</record> </record>
<!-- Receipt Vouchers --> <!-- Receipt Vouchers -->
<record model="ir.actions.act_window" id="action_receipt_vou_voucher_list"> <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
<field name="name">Voucher Entries</field> <field name="name">Customer Vouchers</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/> <field name="view_id" eval="view_voucher_tree"/>
<!-- <field name="domain">[('type','like','rec_voucher')]</field>--> <field name="domain">[('journal_id.type','=','sale')]</field>
<!-- <field name="context">{'type':'rec_voucher'}</field>-->
</record> </record>
<menuitem id="menu_action_receipt_vou_voucher_list" <menuitem id="menu_action_receipt_vou_voucher_list"
action="action_receipt_vou_voucher_list" parent="account.menu_finance_entries" sequence="8"/> action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="8"/>
<!-- Purchase Vouchers -->
<record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
<field name="name">Vendor Vouchers</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
<field name="domain">[('journal_id.type','=','purchase')]</field>
</record>
<menuitem id="menu_action_pay_vou_voucher_list"
action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="8"/>
<!-- <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">--> <!-- <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
<!-- <field name="name">Cash Receipt</field>--> <!-- <field name="name">Cash Receipt</field>-->

View File

@ -1,20 +1,20 @@
# Translation of OpenERP Server. # Catalan translation for openobject-addons
# This file contains the translation of the following modules: # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# * account_voucher_payment # This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-05-13 20:11+0000\n" "POT-Creation-Date: 2009-05-13 20:11+0000\n"
"PO-Revision-Date: 2010-01-26 11:00+0000\n" "PO-Revision-Date: 2010-06-04 09:33+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"<jesteve@zikzakmedia.com>\n" "Language-Team: Catalan <ca@li.org>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-21 03:47+0000\n" "X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment #. module: account_voucher_payment

View File

@ -1,19 +1,20 @@
# Translation of OpenERP Server. # Spanish translation for openobject-addons
# This file contains the translation of the following modules: # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# * account_voucher_payment # This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-05-13 20:11+0000\n" "POT-Creation-Date: 2009-05-13 20:11+0000\n"
"PO-Revision-Date: 2010-02-19 05:54+0000\n" "PO-Revision-Date: 2010-06-04 09:33+0000\n"
"Last-Translator: Luis Alejandro Rangel Sánchez <xlarsx@gmail.com>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: \n" "Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-21 03:47+0000\n" "X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment #. module: account_voucher_payment

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n" "Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 11:09+0000\n" "PO-Revision-Date: 2010-06-04 21:56+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" "Last-Translator: ErnestŻyciński <Unknown>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n" "X-Launchpad-Export-Date: 2010-06-06 03:34+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: auction #. module: auction
@ -39,12 +39,12 @@ msgstr ""
#: field:report.seller.auction,seller:0 #: field:report.seller.auction,seller:0
#: field:report.seller.auction2,seller:0 #: field:report.seller.auction2,seller:0
msgid "Seller" msgid "Seller"
msgstr "" msgstr "Sprzedawca"
#. module: auction #. module: auction
#: constraint:ir.actions.act_window:0 #: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition." msgid "Invalid model name in the action definition."
msgstr "" msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: auction #. module: auction
#: selection:auction.lots.send.aie,date_ask,numerotation:0 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@ -102,7 +102,7 @@ msgstr ""
#: field:report.buyer.auction,buyer:0 #: field:report.buyer.auction,buyer:0
#: field:report.buyer.auction2,buyer:0 #: field:report.buyer.auction2,buyer:0
msgid "Buyer" msgid "Buyer"
msgstr "" msgstr "Kupujący"
#. module: auction #. module: auction
#: field:report.auction.view,nobjects:0 #: field:report.auction.view,nobjects:0
@ -140,7 +140,7 @@ msgstr ""
#: wizard_field:auction.lots.make_invoice,init,amount:0 #: wizard_field:auction.lots.make_invoice,init,amount:0
#: wizard_field:auction.lots.make_invoice_buyer,init,amount:0 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
msgid "Invoiced Amount" msgid "Invoiced Amount"
msgstr "" msgstr "Kwota zafakturowana"
#. module: auction #. module: auction
#: selection:auction.lot.category,aie_categ:0 #: selection:auction.lot.category,aie_categ:0
@ -165,7 +165,7 @@ msgstr ""
#. module: auction #. module: auction
#: field:auction.deposit.cost,amount:0 #: field:auction.deposit.cost,amount:0
msgid "Amount" msgid "Amount"
msgstr "" msgstr "Kwota"
#. module: auction #. module: auction
#: model:ir.actions.act_window,name:auction.action_deposit_border #: model:ir.actions.act_window,name:auction.action_deposit_border
@ -191,12 +191,12 @@ msgstr ""
#. module: auction #. module: auction
#: field:auction.dates,account_analytic_id:0 #: field:auction.dates,account_analytic_id:0
msgid "Analytic Account" msgid "Analytic Account"
msgstr "" msgstr "Konto analityczne"
#. module: auction #. module: auction
#: selection:auction.lot.category,aie_categ:0 #: selection:auction.lot.category,aie_categ:0
msgid "Unclassifieds" msgid "Unclassifieds"
msgstr "" msgstr "Niesklasyfikowane"
#. module: auction #. module: auction
#: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
@ -232,7 +232,7 @@ msgstr "Rodzaj obiektu"
#. module: auction #. module: auction
#: wizard_field:auction.lots.sms_send,init,text:0 #: wizard_field:auction.lots.sms_send,init,text:0
msgid "SMS Message" msgid "SMS Message"
msgstr "" msgstr "Wiadomość SMS"
#. module: auction #. module: auction
#: selection:auction.lot.category,aie_categ:0 #: selection:auction.lot.category,aie_categ:0
@ -243,7 +243,7 @@ msgstr "Sztuka nowoczesna"
#: view:auction.lots:0 #: view:auction.lots:0
#: view:report.unclassified.objects:0 #: view:report.unclassified.objects:0
msgid "Ref" msgid "Ref"
msgstr "" msgstr "Odnośnik"
#. module: auction #. module: auction
#: field:report.auction.view,nseller:0 #: field:report.auction.view,nseller:0

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n" "Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:33+0000\n" "PO-Revision-Date: 2010-06-04 12:37+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n" "Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n" "X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: auction #. module: auction
@ -415,7 +415,7 @@ msgstr "库存数量"
#: wizard_button:auction.lots.numerotate,search,end:0 #: wizard_button:auction.lots.numerotate,search,end:0
#: wizard_button:auction.lots.numerotate_cont,init,end:0 #: wizard_button:auction.lots.numerotate_cont,init,end:0
msgid "Exit" msgid "Exit"
msgstr "出" msgstr "退出"
#. module: auction #. module: auction
#: field:report.buyer.auction2,net_revenue:0 #: field:report.buyer.auction2,net_revenue:0

View File

@ -7,25 +7,25 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-24 09:27+0000\n" "PO-Revision-Date: 2010-06-06 23:30+0000\n"
"Last-Translator: Drazen Bosak <Unknown>\n" "Last-Translator: Drazen Bosak <Unknown>\n"
"Language-Team: Vinteh\n" "Language-Team: Vinteh\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n" "X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n" "Language: hr\n"
#. module: base_report_designer #. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,text:0 #: wizard_field:base_report_designer.modify,init,text:0
msgid "Introduction" msgid "Introduction"
msgstr "" msgstr "Uvod"
#. module: base_report_designer #. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form:0 #: wizard_view:base_report_designer.modify,send_form:0
msgid "Upload your modified report" msgid "Upload your modified report"
msgstr "" msgstr "Pošalji promijenjen izvještaj na Server"
#. module: base_report_designer #. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,send_form:0 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0

View File

@ -28,9 +28,9 @@
<field name="currency" widget="selection"/><field name="street"/> <field name="currency" widget="selection"/><field name="street"/>
<field name="zip"/> <field name="zip"/>
<field name="street2"/> <field name="street2"/>
<field name="city"/>
<field name="country_id"/> <field name="country_id"/>
<field name="state_id"/> <field name="state_id"/>
<field name="city"/>
<field name="email"/> <field name="email"/>
<field name="phone"/> <field name="phone"/>
<field name="website"/> <field name="website"/>

View File

@ -71,7 +71,6 @@ class base_gtkcontactform(osv.osv_memory):
'other':fields.boolean('Other'), 'other':fields.boolean('Other'),
'ebook':fields.boolean('ebook'), 'ebook':fields.boolean('ebook'),
'updates':fields.boolean('Updates'), 'updates':fields.boolean('Updates'),
'contact_me':fields.boolean('Contact Me'),
} }
def execute(self, cr, uid, ids, context=None): def execute(self, cr, uid, ids, context=None):
if context is None: if context is None:
@ -81,10 +80,10 @@ class base_gtkcontactform(osv.osv_memory):
company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context) company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
company_data = company_data and company_data[0] or {} company_data = company_data and company_data[0] or {}
country = '' country = ''
if company_data.get('country_id', False): if company_data.get('country_id', False):
country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name'] country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
for res in self.read(cr, uid, ids, context=context): for res in self.read(cr, uid, ids, context=context):
email = res.get('email','') email = res.get('email','')
result = "\ncompany: "+ tools.ustr(company_data.get('name','')) result = "\ncompany: "+ tools.ustr(company_data.get('name',''))

View File

@ -24,9 +24,7 @@
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<group colspan="4" height="450" width="600"> <group colspan="4" height="450" width="600">
<group colspan="4"> <group colspan="4">
<field name="contact_me" nolabel="1"/> <field name="ebook" nolabel="1"/>
<label align="0.0" string="I accept to be contacted by OpenERP." colspan="3"/>
<field name="ebook" nolabel="1"/>
<label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/> <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
<field name="updates" nolabel="1"/> <field name="updates" nolabel="1"/>
<label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/> <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-26 01:09+0000\n" "PO-Revision-Date: 2010-06-06 23:31+0000\n"
"Last-Translator: Drazen Bosak <Unknown>\n" "Last-Translator: Drazen Bosak <Unknown>\n"
"Language-Team: Vinteh\n" "Language-Team: Vinteh\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" "X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n" "Language: hr\n"
@ -22,7 +22,7 @@ msgstr ""
#: wizard_field:base_setup.base_setup,init,city:0 #: wizard_field:base_setup.base_setup,init,city:0
#: wizard_field:base_setup.base_setup,update,city:0 #: wizard_field:base_setup.base_setup,update,city:0
msgid "City" msgid "City"
msgstr "" msgstr "Grad"
#. module: base_setup #. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0 #: wizard_view:base_setup.base_setup,finish:0

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-03 03:33+0000\n" "X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat #. module: base_vat

View File

@ -17,6 +17,13 @@
<xpath expr="//label[@string='description']" <xpath expr="//label[@string='description']"
position="attributes"> position="attributes">
<attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute> <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='rowspan'>13</attribute>
<attribute name='string'></attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath> </xpath>
<group colspan="8"> <group colspan="8">
<group colspan="2" col="2"> <group colspan="2" col="2">

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/> <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
<menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/> <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/>
<record model="ir.ui.view" id="email_template_account_form"> <record model="ir.ui.view" id="email_template_account_form">
<field name="name">email_template.account.form</field> <field name="name">email_template.account.form</field>
<field name="model">email_template.account</field> <field name="model">email_template.account</field>
@ -74,12 +74,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Accounts"> <search string="Accounts">
<filter icon="terp-crm" string="My Accounts" name="my" domain="[('user','=',uid)]"/> <filter icon="terp-personal" string="My Accounts" name="my" domain="[('user','=',uid)]"/>
<filter icon="terp-crm" string="Personal Accounts" domain="[('company','=','no')]"/> <filter icon="terp-personal+" string="Personal Accounts" domain="[('company','=','no')]"/>
<filter icon="terp-crm" string="Company Accounts" domain="[('company','=','yes')]"/> <filter icon="terp-go-home" string="Company Accounts" domain="[('company','=','yes')]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-crm" string="Draft" name="draft" domain="[('state','=','draft')]"/> <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
<filter icon="terp-crm" string="Suspended" domain="[('state','=','suspended')]"/> <filter icon="terp-emblem-important" string="Suspended" domain="[('state','=','suspended')]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="user" select="1"/> <field name="user" select="1"/>

View File

@ -127,8 +127,8 @@
<search string="Events"> <search string="Events">
<group col="10" colspan="4"> <group col="10" colspan="4">
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name" string="Event" select="1"/> <field name="name" string="Event" select="1"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>
@ -282,8 +282,8 @@
<search string="Event Registration"> <search string="Event Registration">
<group col="12" colspan="4"> <group col="12" colspan="4">
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="event_id" select="1"/> <field name="event_id" select="1"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>

View File

@ -1,22 +1,20 @@
#!/usr/bin/env python # -*- coding: utf-8 -*-
#-*- coding:utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# mga@tinyerp.com
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU Affero General Public License as
# the Free Software Foundation, either version 3 of the License, or # published by the Free Software Foundation, either version 3 of the
# (at your option) any later version. # License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # 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/>.
# #
############################################################################## ##############################################################################

View File

@ -0,0 +1,277 @@
# Croatian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-25 12:18+0000\n"
"PO-Revision-Date: 2010-06-06 23:51+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Croatian <hr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
#: field:hr_evaluation.type,info:0
msgid "Information"
msgstr ""
#. module: hr_evaluation
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Schedule next evaluation"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_bad:0
msgid "Bad Points"
msgstr ""
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
msgid "My Next Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,value_ids:0
msgid "Values"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_good:0
msgid "Good Points"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,state:0
msgid "State"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,score:0
#: field:hr_evaluation.quote,score:0
#: field:hr_evaluation.type,score:0
#: field:hr_evaluation.type.value,score:0
msgid "Score"
msgstr ""
#. module: hr_evaluation
#: selection:hr_evaluation.evaluation,state:0
msgid "Draft"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Informal Data"
msgstr ""
#. module: hr_evaluation
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,employee_id:0
msgid "Employee"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_improve:0
msgid "To Improve"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,evaluation_id:0
msgid "Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type.value,type_id:0
msgid "Evaluation Type"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Status"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Apply to categories"
msgstr ""
#. module: hr_evaluation
#: model:ir.module.module,description:hr_evaluation.module_meta_information
msgid "Ability to create employees evaluation."
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,name:0
msgid "Quote"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,category_ids:0
msgid "Appliable Role"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,user_id:0
msgid "Evaluation User"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Choices Results"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,date:0
msgid "Date"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
msgid "Evaluations"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
msgid "Configuration"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
msgid "Next Evaluations"
msgstr ""
#. module: hr_evaluation
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
msgid "Evaluation Criterions"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
msgid "My Preceeding Evaluations"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
msgid "HR Responsible"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,value_id:0
#: field:hr_evaluation.type.value,name:0
msgid "Value"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,name:0
msgid "Summary"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,active:0
msgid "Active"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Notes"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
msgid "Employee Evaluation"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
msgid "Employee Evaluation Type"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Quotations"
msgstr ""
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
msgid "Next Employee Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,type_id:0
msgid "Type"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.type:0
#: field:hr_evaluation.type,name:0
msgid "Evaluation Criterion"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
msgid "My Next Evaluations"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.quote:0
msgid "Evalution Quote"
msgstr ""
#. module: hr_evaluation
#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
msgid "Human Resources Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,quote_ids:0
msgid "Quotes"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: selection:hr_evaluation.evaluation,state:0
msgid "Done"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
msgid "Employee Evaluation Quote"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_employee:0
msgid "Employee Response"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
msgid "Evaluation Type Value"
msgstr ""

View File

@ -40,7 +40,7 @@
""", """,
'author': 'Tiny', 'author': 'Tiny',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['hr', 'account', 'account_tax_include'], 'depends': ['hr', 'account'],
'init_xml': [], 'init_xml': [],
'update_xml': [ 'update_xml': [
'security/ir.model.access.csv', 'security/ir.model.access.csv',

View File

@ -153,7 +153,6 @@ class hr_expense_expense(osv.osv):
'address_contact_id': exp.employee_id.address_id.id, 'address_contact_id': exp.employee_id.address_id.id,
'origin': exp.name, 'origin': exp.name,
'invoice_line': lines, 'invoice_line': lines,
'price_type': 'tax_included',
'currency_id': exp.currency_id.id, 'currency_id': exp.currency_id.id,
'payment_term': payment_term_id, 'payment_term': payment_term_id,
'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id 'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id

View File

@ -127,18 +127,18 @@
<search string="Expense"> <search string="Expense">
<group> <group>
<filter <filter
icon="terp-hr" icon="terp-document-new"
domain="[('state','=','draft')]" domain="[('state','=','draft')]"
string="Draft" string="Draft"
help="Draft Expense"/> help="Draft Expense"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter <filter
icon="terp-hr" icon="terp-gtk-go-back-rtl"
domain="[('state','=','confirm')]" domain="[('state','=','confirm')]"
string="To Validate" string="To Validate"
help="Confirmed Expense"/> help="Confirmed Expense"/>
<filter <filter
icon="terp-hr" icon="terp-gtk-go-back-rtl"
domain="[('state','=','accepted')]" domain="[('state','=','accepted')]"
string="To Pay" string="To Pay"
help="Expenses to Invoice"/> help="Expenses to Invoice"/>
@ -146,18 +146,18 @@
<field name="name" select='1'/> <field name="name" select='1'/>
<field name="date" select='1'/> <field name="date" select='1'/>
<field name="user_id" select="1" widget="selection" string="User"> <field name="user_id" select="1" widget="selection" string="User">
<filter icon="terp-hr" <filter icon="terp-personal+"
domain="[('department_id','=',context.get('department_id',False))]" domain="[('department_id','=',context.get('department_id',False))]"
string="Expenses of My Department"/> string="Expenses of My Department"/>
</field> </field>
<field name="department_id" widget="selection" groups="base.group_extended"/> <field name="department_id" widget="selection" groups="base.group_extended"/>
</group> </group>
<newline /> <newline />
<group expand="1" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -51,29 +51,29 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Expenses Analysis"> <search string="Expenses Analysis">
<group> <group>
<filter icon="gtk-media-rewind" string=" 365 Days " <filter icon="terp-go-year" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 year"/> help="Expenses during last 7 year"/>
<filter icon="gtk-media-rewind" string=" 30 Days " <filter icon="terp-go-month" string=" 30 Days "
name="month" name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last month"/> help="Expenses during last month"/>
<filter icon="gtk-media-rewind" <filter icon="terp-go-week"
string=" 7 Days " string=" 7 Days "
separator="1" separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 days"/> help="Expenses during last 7 days"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Draft" <filter string="Draft"
icon="terp-hr" icon="terp-document-new"
domain="[('state','=','draft')]" domain="[('state','=','draft')]"
help = "Draft Expenses"/> help = "Draft Expenses"/>
<filter string="Waiting" <filter string="Waiting"
icon="terp-hr" icon="terp-gtk-media-pause"
domain="[('state', '=' ,'confirm')]" domain="[('state', '=' ,'confirm')]"
help = "Confirm Expenses"/> help = "Confirm Expenses"/>
<filter string="Accepted" <filter string="Accepted"
icon="terp-hr" icon="terp-camera_test"
domain="[('state','=','accepted')]" domain="[('state','=','accepted')]"
help = "Accepted Expenses"/> help = "Accepted Expenses"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@ -87,22 +87,22 @@
</field> </field>
</group> </group>
<newline/> <newline/>
<group expand="1" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/> <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
<filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/> <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
<filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/> <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
<filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="State" icon="terp-hr" context="{'group_by':'state'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/> <filter string="Force Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Extended filters..." groups="base.group_extended"> <group expand="0" string="Extended filters..." groups="base.group_extended">

View File

@ -8,27 +8,27 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leave"> <search string="Search Leave">
<group col='8' colspan='4'> <group col='8' colspan='4'>
<filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/> <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
<filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/> <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"/>
<filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated" <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
default="context.get('report', False)"/> default="context.get('report', False)"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="user_id" widget="selection"/> <field name="user_id" widget="selection"/>
<field name="department_id" widget="selection"> <field name="department_id" widget="selection">
<filter icon="terp-hr" help="My Department Holidays" <filter icon="terp-personal+" help="My Department Holidays"
domain="[('department_id.manager_id','=',uid)]" domain="[('department_id.manager_id','=',uid)]"
/> />
</field> </field>
<field name="holiday_status_id" widget="selection"/> <field name="holiday_status_id" widget="selection"/>
</group> </group>
<newline /> <newline />
<group expand="1" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
<filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'holiday_status_id'}" <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
default="context.get('report', False)"/> default="context.get('report', False)"/>
</group> </group>
</search> </search>

View File

@ -48,21 +48,21 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leaves"> <search string="Leaves">
<group> <group>
<filter icon="terp-hr" string="Employee" <filter icon="terp-personal" string="Employee"
domain="[('category_id', '=', False)]" domain="[('category_id', '=', False)]"
help="Leaves by empolyee"/> help="Leaves by empolyee"/>
<filter icon="terp-hr" string="Category" <filter icon="terp-stock_symbol-selection" string="Category"
domain="[('employee_id', '=', False)]" domain="[('employee_id', '=', False)]"
help="Leaves by category"/> help="Leaves by category"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-hr" string="This Year" <filter icon="terp-go-year" string="This Year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Leaves in this year"/> help="Leaves in this year"/>
<filter icon="terp-hr" string="This Month" <filter icon="terp-go-month" string="This Month"
name="month" name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Leaves in this month"/> help="Leaves in this month"/>
<filter icon="gtk-media-rewind" <filter icon="terp-go-week"
string=" 7 Days " string=" 7 Days "
separator="1" separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@ -71,7 +71,7 @@
<field name="employee_id"/> <field name="employee_id"/>
<field name="user_id" widget="selection"> <field name="user_id" widget="selection">
<filter icon="terp-hr" <filter icon="terp-personal"
string="My Leaves" string="My Leaves"
domain="[('user_id','=',uid)]"/> domain="[('user_id','=',uid)]"/>
</field> </field>
@ -82,15 +82,15 @@
<field name="department_id" widget="selection"/> <field name="department_id" widget="selection"/>
</group> </group>
<newline/> <newline/>
<group expand="1" string="Group By..." colspan="10" col="12"> <group expand="0" string="Group By..." colspan="10" col="12">
<filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/> <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
<filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -45,36 +45,36 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leaves"> <search string="Leaves">
<group> <group>
<filter icon="terp-hr" string="Employee" <filter icon="terp-personal" string="Employee"
domain="[('category_id', '=', False)]" domain="[('category_id', '=', False)]"
help="Leaves by empolyee"/> help="Leaves by empolyee"/>
<filter icon="terp-hr" string="Category" <filter icon="terp-stock_symbol-selection" string="Category"
domain="[('employee_id', '=', False)]" domain="[('employee_id', '=', False)]"
help="Leaves by category"/> help="Leaves by category"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-hr" string="This Year" <filter icon="terp-go-year" string="This Year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Leaves in this year"/> help="Leaves in this year"/>
<filter icon="terp-hr" string="This Month" <filter icon="terp-go-month" string="This Month"
name="month" name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Leaves in this month"/> help="Leaves in this month"/>
<filter icon="gtk-media-rewind" <filter icon="terp-go-week"
string=" 7 Days " string=" 7 Days "
separator="1" separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Leaves during last 7 days"/> help="Leaves during last 7 days"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Draft" <filter string="Draft"
icon="terp-hr" icon="terp-document-new"
domain="[('state','=','draft')]" domain="[('state','=','draft')]"
help = "Draft Leaves"/> help = "Draft Leaves"/>
<filter string="Waiting Validation" <filter string="Waiting Validation"
icon="terp-hr" icon="terp-gtk-media-pause"
domain="[('state', '=' ,'confirm')]" domain="[('state', '=' ,'confirm')]"
help = "In progress Leaves"/> help = "In progress Leaves"/>
<filter string="Validated" <filter string="Validated"
icon="terp-hr" icon="terp-camera_test"
domain="[('state','=','validate')]" domain="[('state','=','validate')]"
help = "Pending Leaves"/> help = "Pending Leaves"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@ -83,20 +83,20 @@
</field> </field>
</group> </group>
<newline/> <newline/>
<group expand="1" string="Group By..." colspan="10" col="12"> <group expand="0" string="Group By..." colspan="10" col="12">
<filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/> <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
<filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<filter string="State" icon="terp-hr" context="{'group_by':'state'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
<filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Extended options..." colspan="10" col="12"> <group expand="0" string="Extended options..." colspan="10" col="12">
<filter icon="terp-hr" <filter icon="terp-gtk-stop"
string="Refused" string="Refused"
name="done" name="done"
domain="[('state','=','refuse')]"/> domain="[('state','=','refuse')]"/>
@ -105,7 +105,7 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="holiday_status_id" widget="selection"/> <field name="holiday_status_id" widget="selection"/>
<newline/> <newline/>
<filter icon="terp-hr" <filter icon="terp-gtk-stop"
string="Cancelled" string="Cancelled"
domain="[('state','=','cancel')]"/> domain="[('state','=','cancel')]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>

View File

@ -0,0 +1,26 @@
#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# d$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import hr_payroll
import report
import wizard

View File

@ -0,0 +1,59 @@
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# d$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Human Resource Payroll',
'version': '1.0',
'category': 'Generic Modules/Human Resources',
'description': """Generic Payroll system
* Employee Details
* Employee Contracts
* Passport based Contract
* Allowances / Deductions
* Allow to configure Basic / Grows / Net Salary
* Employee Payslip
* Monthly Payroll Register
* Integrated with Holiday Management
""",
'author':'Tiny/Axelor',
'website':'http://www.openerp.com',
'depends': [
'hr',
'account',
'hr_contract',
'hr_holidays',
'hr_expense'
],
'init_xml': [
],
'update_xml': [
'hr_payroll_view.xml',
# 'hr_payroll_workflow.xml',
# 'hr_payroll_sequence.xml',
# 'hr_paroll_report.xml',
# 'hr_payroll_data.xml',
# 'hr_payroll_wizard.xml'
],
'demo_xml': [
],
'installable': True,
'active': False,
}

View File

@ -0,0 +1,57 @@
<?xml version="1.0"?>
<openerp>
<data>
<report
auto="False"
id="salary_payslip"
model="hr.payslip"
name="payslip.pdf"
rml="hr_payroll/report/payslip.rml"
string="Employee PaySlip" />
<report
auto="False"
id="payroll_advice"
model="hr.payroll.advice"
name="payroll.advice"
rml="hr_payroll/report/report_payroll_advice.rml"
string="Bank Payment Advice" />
<report
auto="False"
id="year_salary_report"
model="hr.payslip"
name="year.salary"
rml="hr_payroll/report/report_year_report.rml"
menu = "False"
string="Year Salary Report" />
<report
auto="False"
id="year_payroll_register"
model="hr.payroll.register"
name="hr.payroll.register.sheet"
rml="hr_payroll/report/payroll_register.rml"
menu = "True"
string="Print Statement" />
<report
auto="False"
id="year_employees_detail"
model="hr.payslip"
name="employees.salary"
rml="hr_payroll/report/report_employees_detail.rml"
menu = "False"
string="Employees Salary Detail" />
<report
auto="False"
id="salary_structure_register"
model="hr.employee"
name="salary.structure"
rml="hr_payroll/report/report_emp_salary_structure.rml"
menu = "True"
string="Print Salary Structure" />
</data>
</openerp>

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