openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #00173
Re: lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008 into lp:openobject-addons
Can't say I like the new phrasing for the default due payment ...
*Old*
Would your payment have been carried
out after this mail was sent, please consider the present one as
void. Do not hesitate to contact our accounting department
*New*
Please note that the following payments are now due. If your payment
has been sent, kindly forward your payment details. If payment will be
delayed further, please contact us to discuss.
Would your payment have been carried out after this mail was sent, please
consider the present one as void.
The new message seems to imply 2 possible actions when the payment has been
done already:
a) forward the payment details
b) consider the present one as void
Does this new message have any backing from the ISO9001 manual then ? Is it
copy&paste ?
Regards,
Niels
2010/12/14 Maxime Chambreuil (http://www.savoirfairelinux.com) <
maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>
> Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging
> lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008
> into lp:openobject-addons.
>
> Requested reviews:
> OpenERP Core Team (openerp)
>
>
> [IMP] Quality Manual updated to ISO9001:2008
> --
>
> https://code.launchpad.net/~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008/+merge/43599<https://code.launchpad.net/%7Eopenerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008/+merge/43599>
> Your team OpenERP Community is subscribed to branch
> lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008.
>
> === modified file 'account/account.py'
> --- account/account.py 2010-11-26 16:13:59 +0000
> +++ account/account.py 2010-12-14 03:25:00 +0000
> @@ -2678,7 +2678,8 @@
> tax_template_ref[tax.id] = new_tax
>
> #deactivate the parent_store functionnality on account_account for
> rapidity purpose
> - self.pool._init = True
> + ctx = context and context.copy() or {}
> + ctx['defer_parent_store_computation'] = True
>
> children_acc_template = obj_acc_template.search(cr, uid,
> [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
> children_acc_template.sort()
> @@ -2706,17 +2707,16 @@
> 'tax_ids': [(6,0,tax_ids)],
> 'company_id': company_id,
> }
> - new_account = obj_acc.create(cr, uid, vals)
> + new_account = obj_acc.create(cr, uid, vals, context=ctx)
> acc_template_ref[account_template.id] = new_account
> #reactivate the parent_store functionnality on account_account
> - self.pool._init = False
> self.pool.get('account.account')._parent_store_compute(cr)
>
> for key,value in todo_dict.items():
> if value['account_collected_id'] or value['account_paid_id']:
> obj_acc_tax.write(cr, uid, [key], {
> - 'account_collected_id':
> acc_template_ref[value['account_collected_id']],
> - 'account_paid_id':
> acc_template_ref[value['account_paid_id']],
> + 'account_collected_id':
> acc_template_ref.get(value['account_collected_id'], False),
> + 'account_paid_id':
> acc_template_ref.get(value['account_paid_id'], False),
> })
>
> # Creating Journals Sales and Purchase
> @@ -2857,7 +2857,7 @@
> 'name': tmp,
> 'currency_id': line.currency_id and line.currency_id.id or
> False,
> 'code': new_code,
> - 'type': 'other',
> + 'type': 'liquidity',
> 'user_type': account_template.user_type and
> account_template.user_type.id or False,
> 'reconcile': True,
> 'parent_id': acc_template_ref[ref_acc_bank.id] or False,
> @@ -2879,7 +2879,7 @@
> vals_journal['name']= vals['name']
> vals_journal['code']= _('BNK') + str(current_num)
> vals_journal['sequence_id'] = seq_id
> - vals_journal['type'] = 'cash'
> + vals_journal['type'] = line.account_type == 'cash' and 'cash'
> or 'bank'
> vals_journal['company_id'] = company_id
> vals_journal['analytic_journal_id'] = analitical_journal_bank
>
>
> === modified file 'account/account_bank_statement.py'
> --- account/account_bank_statement.py 2010-11-26 15:14:46 +0000
> +++ account/account_bank_statement.py 2010-12-14 03:25:00 +0000
> @@ -428,7 +428,7 @@
> _columns = {
> 'name': fields.char('Communication', size=64, required=True),
> 'date': fields.date('Date', required=True),
> - 'amount': fields.float('Amount'),
> + 'amount': fields.float('Amount',
> digits_compute=dp.get_precision('Account')),
> 'type': fields.selection([
> ('supplier','Supplier'),
> ('customer','Customer'),
>
> === modified file 'account/account_invoice_view.xml'
> --- account/account_invoice_view.xml 2010-11-12 12:54:47 +0000
> +++ account/account_invoice_view.xml 2010-12-14 03:25:00 +0000
> @@ -302,7 +302,7 @@
> <field name="amount_total"/>
> <field name="state"/>
> <field name="residual"/>
> - <group col="7" colspan="4"
> groups="base.group_user">
> + <group col="8" colspan="4"
> groups="base.group_user">
> <button name="invoice_cancel"
> states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
> <button name="action_cancel_draft"
> states="cancel" string="Reset to Draft" type="object"
> icon="terp-stock_effects-object-colorize"/>
>
> @@ -310,6 +310,7 @@
> <button
> name='%(action_account_state_open)d' type='action' string='Re-Open'
> states='paid' icon="gtk-convert" groups="base.group_no_one"/>
> <button name="invoice_proforma2"
> states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause"
> groups="account.group_account_user"/>
> <button name="invoice_open"
> states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
> + <button name="%(account_invoices)d"
> string="Invoices" type="action" icon="gtk-print"/>
> </group>
> </group>
> </page>
> @@ -465,7 +466,7 @@
> <menuitem action="action_invoice_tree2"
> id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
>
> <record id="action_invoice_tree3" model="ir.actions.act_window">
> - <field name="name">Customer Refunds</field>
> + <field name="name">Credit Memo</field>
> <field name="res_model">account.invoice</field>
> <field name="view_type">form</field>
> <field name="view_mode">tree,form,calendar,graph</field>
> @@ -473,7 +474,7 @@
> <field name="domain">[('type','=','out_refund')]</field>
> <field name="context">{'type':'out_refund', 'journal_type':
> 'sale_refund'}</field>
> <field name="search_view_id"
> ref="view_account_invoice_filter"/>
> - <field name="help">Customer Refunds helps you manage the
> credit notes issued/to be issued for your customers. A refund invoice is a
> document that cancels an invoice or a part of it. You can easily generate
> refunds and reconcile them from the invoice form.</field>
> + <field name="help">Credit Memo helps you manage the credit
> notes issued/to be issued for your customers. A refund invoice is a document
> that cancels an invoice or a part of it. You can easily generate refunds and
> reconcile them from the invoice form.</field>
> </record>
>
> <record id="action_invoice_tree3_view1"
> model="ir.actions.act_window.view">
> @@ -499,7 +500,7 @@
> <field name="domain">[('type','=','in_refund')]</field>
> <field name="context">{'type':'in_refund', 'journal_type':
> 'purchase_refund'}</field>
> <field name="search_view_id"
> ref="view_account_invoice_filter"/>
> - <field name="help">A vendor refund is a credit note from your
> supplier indicating that he refunds part or totality of the invoice sent to
> you.</field>
> + <field name="help">A supplier refund is a credit note from
> your supplier indicating that he refunds part or totality of the invoice
> sent to you.</field>
> </record>
> <menuitem action="action_invoice_tree4"
> id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
>
>
> === modified file 'account/account_menuitem.xml'
> --- account/account_menuitem.xml 2010-11-26 16:13:59 +0000
> +++ account/account_menuitem.xml 2010-12-14 03:25:00 +0000
> @@ -6,22 +6,23 @@
>
> groups="group_account_user,group_account_manager,group_account_invoice"
> web_icon="images/accounting.png"
> web_icon_hover="images/accounting-hover.png"/>
> - <menuitem id="menu_finance_receivables" name="Customers"
> parent="menu_finance" sequence="1"/>
> - <menuitem id="menu_finance_payables" name="Suppliers"
> parent="menu_finance" sequence="2"/>
> - <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash"
> parent="menu_finance" sequence="3"
> + <menuitem id="menu_partners" name="Partners" parent="menu_finance"
> sequence="1"/>
> + <menuitem id="menu_finance_receivables" name="Customers"
> parent="menu_finance" sequence="2"/>
> + <menuitem id="menu_finance_payables" name="Suppliers"
> parent="menu_finance" sequence="3"/>
> + <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash"
> parent="menu_finance" sequence="4"
> groups="group_account_user,group_account_manager"/>
> - <menuitem id="menu_finance_periodical_processing" name="Periodical
> Processing" parent="menu_finance" sequence="8"
> groups="group_account_user,group_account_manager"/>
> + <menuitem id="menu_finance_periodical_processing" name="Periodical
> Processing" parent="menu_finance" sequence="9"
> groups="group_account_user,group_account_manager"/>
> <!-- This menu is used in account_code module -->
> <menuitem id="menu_account_pp_statements" name="Statements"
> parent="menu_finance_periodical_processing" sequence="12"/>
> <menuitem id="periodical_processing_journal_entries_validation"
> name="Draft Entries" parent="menu_finance_periodical_processing"/>
> <menuitem id="periodical_processing_reconciliation"
> name="Reconciliation" parent="menu_finance_periodical_processing"/>
> <menuitem id="periodical_processing_invoicing" name="Invoicing"
> parent="menu_finance_periodical_processing"/>
> - <menuitem id="menu_finance_charts" name="Charts"
> parent="menu_finance" sequence="5"/>
> - <menuitem id="menu_finance_reporting" name="Reporting"
> parent="account.menu_finance" sequence="12"/>
> + <menuitem id="menu_finance_charts" name="Charts"
> parent="menu_finance" sequence="6"/>
> + <menuitem id="menu_finance_reporting" name="Reporting"
> parent="account.menu_finance" sequence="13"/>
> <menuitem id="menu_finance_reporting_budgets" name="Budgets"
> parent="menu_finance_reporting" groups="group_account_user"/>
> <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" groups="group_account_manager"/>
> + <menuitem id="menu_finance_configuration" name="Configuration"
> parent="menu_finance" sequence="14" groups="group_account_manager"/>
> <menuitem id="menu_finance_accounting" name="Financial Accounting"
> parent="menu_finance_configuration"/>
> <menuitem id="menu_analytic_accounting" name="Analytic Accounting"
> parent="menu_finance_configuration"
> groups="analytic.group_analytic_accounting"/>
> <menuitem id="menu_analytic" parent="menu_analytic_accounting"
> name="Accounts" groups="analytic.group_analytic_accounting"/>
> @@ -29,7 +30,7 @@
> <menuitem id="menu_configuration_misc" name="Miscellaneous"
> parent="menu_finance_configuration" sequence="30"
> groups="group_account_manager"/>
> <menuitem id="base.menu_action_currency_form"
> parent="menu_configuration_misc" sequence="20"/>
> <menuitem id="menu_finance_generic_reporting" name="Generic
> Reporting" parent="menu_finance_reporting" sequence="100"/>
> - <menuitem id="menu_finance_entries" name="Journal Entries"
> parent="menu_finance" sequence="4"
> groups="group_account_user,group_account_manager"/>
> + <menuitem id="menu_finance_entries" name="Journal Entries"
> parent="menu_finance" sequence="5"
> groups="group_account_user,group_account_manager"/>
> <menuitem id="account.menu_finance_recurrent_entries"
> name="Recurring Entries" parent="menu_finance_periodical_processing"
> sequence="15"
> groups="base.group_extended,group_account_manager,group_account_user"/>
>
> <menuitem id="menu_account_end_year_treatments" name="End of
> Period" parent="menu_finance_periodical_processing"
> groups="group_account_manager,group_account_user" sequence="25"/>
>
> === modified file 'account/account_move_line.py'
> --- account/account_move_line.py 2010-11-27 20:14:29 +0000
> +++ account/account_move_line.py 2010-12-14 03:25:00 +0000
> @@ -429,7 +429,7 @@
> 'period_id': fields.many2one('account.period', 'Period',
> required=True, select=2),
> 'journal_id': fields.many2one('account.journal', 'Journal',
> required=True, select=1),
> 'blocked': fields.boolean('Litigation', help="You can check this
> box to mark this journal item as a litigation with the associated partner"),
> - 'partner_id': fields.many2one('res.partner', 'Partner', select=1),
> + 'partner_id': fields.many2one('res.partner', 'Partner', select=1,
> ondelete='restrict'),
> 'date_maturity': fields.date('Due date', help="This field is used
> for payable and receivable journal entries. You can put the limit date for
> the payment of this line."),
> 'date': fields.related('move_id','date', string='Effective date',
> type='date', required=True,
> store = {
> @@ -757,7 +757,7 @@
> if 'comment' in context and context['comment']:
> libelle = context['comment']
> else:
> - libelle = 'Write-Off'
> + libelle = _('Write-Off')
> writeoff_lines = [
> (0, 0, {
> 'name': libelle,
>
> === modified file 'account/account_report.xml'
> --- account/account_report.xml 2010-11-18 11:56:06 +0000
> +++ account/account_report.xml 2010-12-14 03:25:00 +0000
> @@ -18,7 +18,8 @@
> rml="account/report/account_print_invoice.rml"
> string="Invoices"
> attachment="(object.state in ('open','paid')) and
> ('INV'+(object.number or '').replace('/',''))"
> - attachment_use="1"/>
> + attachment_use="1"
> + multi="True"/>
> <report id="account_transfers" model="account.transfer"
> name="account.transfer" string="Transfers" xml="account/report/transfer.xml"
> xsl="account/report/transfer.xsl"/>
> <report auto="False" id="account_intracom" menu="False"
> model="account.move.line" name="account.intracom" string="IntraCom"/>
>
>
> === modified file 'account/account_view.xml'
> --- account/account_view.xml 2010-11-26 16:13:59 +0000
> +++ account/account_view.xml 2010-12-14 03:25:00 +0000
> @@ -946,7 +946,14 @@
> <field groups="base.group_extended"
> name="child_depend"/>
> <field groups="base.group_extended"
> name="sequence"/>
> <field groups="base.group_extended"
> name="include_base_amount"/>
> - <field groups="base.group_extended"
> colspan="4" name="child_ids"/>
> + <field groups="base.group_extended"
> colspan="4" name="child_ids">
> + <tree string="Account Tax">
> + <field name="sequence"/>
> + <field
> name="name"/>
> + <field
> name="price_include" groups="base.group_extended"/>
> + <field
> name="description"/>
> + </tree>
> + </field>
> </group>
> </page>
> <page groups="base.group_extended" string="Special
> Computation">
> @@ -1163,7 +1170,7 @@
> <filter icon="terp-document-new"
> string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced
> Journal Items"/>
> <separator orientation="vertical"/>
> <filter icon="terp-document-new" string="Unposted"
> domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
> - <filter icon="terp-camera_test" string="Posted"
> domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
> + <filter name="posted" icon="terp-camera_test"
> string="Posted" domain="[('move_id.state','=','posted')]" help="Posted
> Journal Items"/>
> <separator orientation="vertical"/>
> <filter
> icon="terp-dolar_ok!"
> @@ -1209,6 +1216,7 @@
> <field name="res_model">account.move.line</field>
> <field name="view_type">form</field>
> <field name="view_mode">tree,form</field>
> + <field name="context">{'search_default_posted': 1}</field>
> <field name="search_view_id"
> ref="view_account_move_line_filter"/>
> <field name="help">This view is used by accountants in order to
> record entries massively in OpenERP. If you want to record a supplier
> invoice, start by recording the line of the expense account, OpenERP will
> propose to you automatically the Tax related to this account and the
> counter-part "Account Payable".</field>
> </record>
> @@ -2153,7 +2161,8 @@
> <filter icon="terp-sale" string="Receivale
> Accounts" domain="[('type','=','receivable')]"/>
> <filter icon="terp-purchase" string="Payable
> Accounts" domain="[('type','=','payable')]"/>
> <separator orientation="vertical"/>
> - <field name="code"/>
> + <field name="code"/>
> + <field name="name"/>
> <field name="parent_id"/>
> <field name="type"/>
> <field name="user_type"/>
> @@ -2194,13 +2203,13 @@
> <field name="tax_template_ids" colspan="4" readonly="1"
> nolabel="1"/>
> <separator string="Properties" colspan="4"/>
> <group>
> - <field name="property_account_receivable"/>
> - <field name="property_account_payable"/>
> - <field name="property_account_expense_categ" />
> - <field name="property_account_income_categ"/>
> - <field name="property_account_expense"/>
> - <field name="property_account_income"/>
> - <field name="property_reserve_and_surplus_account"/>
> + <field name="property_account_receivable"
> domain="[('id', 'child_of', [account_root_id])]"/>
> + <field name="property_account_payable" domain="[('id',
> 'child_of', [account_root_id])]"/>
> + <field name="property_account_expense_categ"
> domain="[('id', 'child_of', [account_root_id])]"/>
> + <field name="property_account_income_categ"
> domain="[('id', 'child_of', [account_root_id])]" />
> + <field name="property_account_expense" domain="[('id',
> 'child_of', [account_root_id])]"/>
> + <field name="property_account_income" domain="[('id',
> 'child_of', [account_root_id])]"/>
> + <field name="property_reserve_and_surplus_account" />
> </group>
> </form>
> </field>
> @@ -2437,7 +2446,7 @@
> <attribute name='string'></attribute>
> </xpath>
> <group string="res_config_contents" position="replace">
> - <field name="company_id" widget="selection"/>
> + <field name="company_id" widget="selection"
> groups="base.group_extended"/>
> <field name ="code_digits"
> groups="base.group_extended"/>
> <field name="chart_template_id" widget="selection"
> on_change="onchange_chart_template_id(chart_template_id)"/>
> <field name ="seq_journal"
> groups="base.group_extended"/>
> @@ -2745,5 +2754,19 @@
> <menuitem action="action_view_bank_statement_tree"
> id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
> groups="group_account_user,group_account_manager"/>
>
> + <record id="action_partner_all" model="ir.actions.act_window">
> + <field name="name">Partners</field>
> + <field name="type">ir.actions.act_window</field>
> + <field name="res_model">res.partner</field>
> + <field name="view_type">form</field>
> + <field name="filter" eval="True"/>
> + </record>
> +
> + <menuitem id="menu_partners_partners"
> + name="Partners"
> + parent="menu_partners"
> + action="action_partner_all"
> + sequence="1"/>
> +
> </data>
> </openerp>
>
> === modified file 'account/board_account_view.xml'
> --- account/board_account_view.xml 2010-11-15 12:37:32 +0000
> +++ account/board_account_view.xml 2010-12-14 03:25:00 +0000
> @@ -68,7 +68,7 @@
>
> <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2"
> parent="account.menu_finance_reporting"
> groups="group_account_user,group_account_manager"/>
> <menuitem action="open_board_account" icon="terp-graph"
> id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
> - <menuitem icon="terp-account" id="account.menu_finance"
> name="Accounting" sequence="13" action="open_board_account"/>
> + <menuitem icon="terp-account" id="account.menu_finance"
> name="Accounting" sequence="14" action="open_board_account"/>
>
>
> </data>
>
> === modified file 'account/company.py'
> --- account/company.py 2010-11-02 08:31:53 +0000
> +++ account/company.py 2010-12-14 03:25:00 +0000
> @@ -37,9 +37,10 @@
> }
>
> _defaults = {
> - 'overdue_msg': 'Would your payment have been carried \
> -out after this mail was sent, please consider the present one as \
> -void. Do not hesitate to contact our accounting department'
> + 'overdue_msg': 'Please note that the following payments are now
> due. If your payment \
> + has been sent, kindly forward your payment
> details. If payment will be \
> + delayed further, please contact us to discuss. \
> + \nWould your payment have been carried out after
> this mail was sent, please consider the present one as void.'
> }
>
> res_company()
>
> === modified file 'account/i18n/account.pot'
> --- account/i18n/account.pot 2010-12-10 17:40:27 +0000
> +++ account/i18n/account.pot 2010-12-14 03:25:00 +0000
> @@ -959,11 +959,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1858,7 +1853,7 @@
>
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> -msgid "A vendor refund is a credit note from your supplier indicating that
> he refunds part or totality of the invoice sent to you."
> +msgid "A supplier refund is a credit note from your supplier indicating
> that he refunds part or totality of the invoice sent to you."
> msgstr ""
>
> #. module: account
> @@ -2538,11 +2533,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/da.po'
> --- account/i18n/da.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/da.po 2010-12-14 03:25:00 +0000
> @@ -1013,11 +1013,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1942,7 +1937,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2666,11 +2661,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/de.po'
> --- account/i18n/de.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/de.po 2010-12-14 03:25:00 +0000
> @@ -1074,11 +1074,6 @@
> msgstr "Überblick"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Zu buchende Ausgangsrechnungen"
> @@ -2036,7 +2031,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
> "Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder
> "
> @@ -2802,11 +2797,6 @@
> msgstr "Steuergrundlage Betrag"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Standard Steuer Verkauf"
>
> === modified file 'account/i18n/el.po'
> --- account/i18n/el.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/el.po 2010-12-14 03:25:00 +0000
> @@ -1033,11 +1033,6 @@
> msgstr "Προβολή Τοπίου"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Τιμολόγια Πελάτη προς Έγκριση"
> @@ -1970,7 +1965,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2700,11 +2695,6 @@
> msgstr "Ποσό Βασικού Κώδικα"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/es.po'
> --- account/i18n/es.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/es.po 2010-12-14 03:25:00 +0000
> @@ -1058,11 +1058,6 @@
> msgstr "Modo horizontal"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Facturas de cliente para aprobar"
> @@ -2016,7 +2011,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
> "Un abono de proveedor de es una factura rectificativa de su proveedor "
> @@ -2767,11 +2762,6 @@
> msgstr "Importe código base"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Impuesto de venta por defecto"
>
> === modified file 'account/i18n/es_EC.po'
> --- account/i18n/es_EC.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/es_EC.po 2010-12-14 03:25:00 +0000
> @@ -1027,11 +1027,6 @@
> msgstr "Modo horizontal"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1958,7 +1953,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2685,11 +2680,6 @@
> msgstr "Importe código base"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/fr.po'
> --- account/i18n/fr.po 2010-12-12 04:45:47 +0000
> +++ account/i18n/fr.po 2010-12-14 03:25:00 +0000
> @@ -1126,11 +1126,6 @@
> msgstr "Mode paysage"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr "Compte de bilan - passif - compte de capital"
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Factures client à approuver"
> @@ -2077,7 +2072,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2801,11 +2796,6 @@
> msgstr "Montant Hors Taxe"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr "Vue"
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Taxe de vente par défaut"
>
> === modified file 'account/i18n/hi.po'
> --- account/i18n/hi.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/hi.po 2010-12-14 03:25:00 +0000
> @@ -1011,11 +1011,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1940,7 +1935,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2658,11 +2653,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/hu.po'
> --- account/i18n/hu.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/hu.po 2010-12-14 03:25:00 +0000
> @@ -1010,11 +1010,6 @@
> msgstr "Fekvő mód"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1939,7 +1934,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2657,11 +2652,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/it.po'
> --- account/i18n/it.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/it.po 2010-12-14 03:25:00 +0000
> @@ -1063,11 +1063,6 @@
> msgstr "Modalità Orizzontale"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Fatture dei clienti da approvare"
> @@ -2017,7 +2012,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
> "Il rimborso da un fornitore consiste in una nota di credito che indica
> che "
> @@ -2765,11 +2760,6 @@
> msgstr "Importo codice base"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Imposta di default per le vendite"
>
> === modified file 'account/i18n/nl.po'
> --- account/i18n/nl.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/nl.po 2010-12-14 03:25:00 +0000
> @@ -1044,11 +1044,6 @@
> msgstr "Landschap modus"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1993,7 +1988,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2726,11 +2721,6 @@
> msgstr "Basiscode bedrag"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr "Weergave"
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/pl.po'
> --- account/i18n/pl.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/pl.po 2010-12-14 03:25:00 +0000
> @@ -1057,11 +1057,6 @@
> msgstr "Poziomo"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Faktury dla klienta do aprobowania"
> @@ -1989,7 +1984,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2716,11 +2711,6 @@
> msgstr "Kwota do rejestru podstawy"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Domyślny podatek sprzedaży"
>
> === modified file 'account/i18n/pt.po'
> --- account/i18n/pt.po 2010-12-12 04:45:47 +0000
> +++ account/i18n/pt.po 2010-12-14 03:25:00 +0000
> @@ -1049,11 +1049,6 @@
> msgstr "Modo \"Landescape\""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Faturas de cliente, para aprovar"
> @@ -1994,7 +1989,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2724,11 +2719,6 @@
> msgstr "Montante de código base"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Taxa pré-definida para vendas"
>
> === modified file 'account/i18n/pt_BR.po'
> --- account/i18n/pt_BR.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/pt_BR.po 2010-12-14 03:25:00 +0000
> @@ -1043,11 +1043,6 @@
> msgstr "Modo paisagem"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1975,7 +1970,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2701,11 +2696,6 @@
> msgstr "Valor do código básico"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/ro.po'
> --- account/i18n/ro.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/ro.po 2010-12-14 03:25:00 +0000
> @@ -1023,11 +1023,6 @@
> msgstr "Mod vedere"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1955,7 +1950,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2682,11 +2677,6 @@
> msgstr "Suma cod bază"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/ru.po'
> --- account/i18n/ru.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/ru.po 2010-12-14 03:25:00 +0000
> @@ -1017,11 +1017,6 @@
> msgstr "Режим: пейзаж"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Счета заказчиков для утверждения"
> @@ -1946,7 +1941,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2670,11 +2665,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/sk.po'
> --- account/i18n/sk.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/sk.po 2010-12-14 03:25:00 +0000
> @@ -1011,11 +1011,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Zákaznícke faktúry na schválenie"
> @@ -1940,7 +1935,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2658,11 +2653,6 @@
> msgstr ""
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/sv.po'
> --- account/i18n/sv.po 2010-12-12 04:45:47 +0000
> +++ account/i18n/sv.po 2010-12-14 03:25:00 +0000
> @@ -1026,11 +1026,6 @@
> msgstr "Landscape Mode"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Kundfaktura att godkänna"
> @@ -1962,7 +1957,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2691,11 +2686,6 @@
> msgstr "Baskodsbelopp"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr "Visa"
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Standard moms"
>
> === modified file 'account/i18n/tr.po'
> --- account/i18n/tr.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/tr.po 2010-12-14 03:25:00 +0000
> @@ -1046,11 +1046,6 @@
> msgstr "Landscape Mode"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1994,7 +1989,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2734,11 +2729,6 @@
> msgstr "Base Code Amount"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/i18n/vi.po'
> --- account/i18n/vi.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/vi.po 2010-12-14 03:25:00 +0000
> @@ -1060,11 +1060,6 @@
> msgstr "Landscape Mode"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr "Customer Invoices to Approve"
> @@ -2014,10 +2009,10 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
>
> #. module: account
> @@ -2765,11 +2760,6 @@
> msgstr "Base Code Amount"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr "Default Sale Tax"
>
> === modified file 'account/i18n/zh_CN.po'
> --- account/i18n/zh_CN.po 2010-12-11 05:08:50 +0000
> +++ account/i18n/zh_CN.po 2010-12-14 03:25:00 +0000
> @@ -1010,11 +1010,6 @@
> msgstr "横向模式"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_liability
> -msgid "Bilanzkonten - Passiva - Kapitalkonten"
> -msgstr ""
> -
> -#. module: account
> #: view:board.board:0
> msgid "Customer Invoices to Approve"
> msgstr ""
> @@ -1939,7 +1934,7 @@
> #. module: account
> #: model:ir.actions.act_window,help:account.action_invoice_tree4
> msgid ""
> -"A vendor refund is a credit note from your supplier indicating that he "
> +"A supplier refund is a credit note from your supplier indicating that he
> "
> "refunds part or totality of the invoice sent to you."
> msgstr ""
>
> @@ -2659,11 +2654,6 @@
> msgstr "基础税事务代码的金额"
>
> #. module: account
> -#: model:account.account.type,name:account.account_type_view
> -msgid "Ansicht"
> -msgstr ""
> -
> -#. module: account
> #: field:wizard.multi.charts.accounts,sale_tax:0
> msgid "Default Sale Tax"
> msgstr ""
>
> === modified file 'account/installer.py'
> --- account/installer.py 2010-11-16 08:00:18 +0000
> +++ account/installer.py 2010-12-14 03:25:00 +0000
> @@ -95,6 +95,25 @@
> 'bank_accounts_id': _get_default_accounts,
> 'charts': _get_default_charts
> }
> +
> + def fields_view_get(self, cr, uid, view_id=None, view_type='form',
> context=None, toolbar=False, submenu=False):
> + res = super(account_installer, self).fields_view_get(cr, uid,
> view_id=view_id, view_type=view_type, context=context,
> toolbar=toolbar,submenu=False)
> + configured_cmp = []
> + unconfigured_cmp = []
> + cmp_select = []
> + company_ids = self.pool.get('res.company').search(cr, uid, [],
> context=context)
> + cr.execute("SELECT company_id FROM account_account WHERE
> account_account.parent_id IS NULL")
> + for r in cr.fetchall():
> + configured_cmp.append(r[0])
> + unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
> + if unconfigured_cmp:
> + for line in self.pool.get('res.company').browse(cr, uid,
> unconfigured_cmp):
> + cmp_select.append((line.id,line.name))
> + for field in res['fields']:
> + if field == 'company_id':
> + res['fields'][field]['domain'] = unconfigured_cmp
> + res['fields'][field]['selection'] = cmp_select
> + return res
>
> def on_change_tax(self, cr, uid, id, tax):
> return {'value': {'purchase_tax': tax}}
> @@ -200,7 +219,8 @@
> tax_template_ref[tax.id] = new_tax
>
> #deactivate the parent_store functionnality on account_account for
> rapidity purpose
> - self.pool._init = True
> + ctx = context and context.copy() or {}
> + ctx['defer_parent_store_computation'] = True
>
> children_acc_template = obj_acc_template.search(cr, uid,
> [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)],
> context=context)
> children_acc_template.sort()
> @@ -229,7 +249,7 @@
> 'tax_ids': [(6, 0, tax_ids)],
> 'company_id': company_id.id,
> }
> - new_account = obj_acc.create(cr, uid, vals, context=context)
> + new_account = obj_acc.create(cr, uid, vals, context=ctx)
> acc_template_ref[account_template.id] = new_account
> if account_template.name == 'Bank Current Account':
> b_vals = {
> @@ -243,8 +263,7 @@
> 'tax_ids': [(6,0,tax_ids)],
> 'company_id': company_id.id,
> }
> - bank_account = obj_acc.create(cr, uid, b_vals,
> context=context)
> -
> + bank_account = obj_acc.create(cr, uid, b_vals,
> context=ctx)
>
> view_id_cash = obj_acc_journal_view.search(cr, uid,
> [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed
> name here?
> view_id_cur = obj_acc_journal_view.search(cr, uid,
> [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')],
> context=context)[0] #Why Fixed name here?
> @@ -314,7 +333,7 @@
> 'parent_id': bank_account,
> 'company_id': company_id.id
> }
> - child_bnk_acc = obj_acc.create(cr, uid, vals_bnk,
> context=context)
> + child_bnk_acc = obj_acc.create(cr, uid, vals_bnk,
> context=ctx)
> vals_seq_child = {
> 'name': _(vals_bnk['name'] + ' ' + 'Journal'),
> 'code': 'account.journal',
> @@ -348,7 +367,6 @@
> code_cnt += 1
>
> #reactivate the parent_store functionality on account_account
> - self.pool._init = False
> obj_acc._parent_store_compute(cr)
>
> for key, value in todo_dict.items():
>
> === modified file 'account/invoice.py'
> --- account/invoice.py 2010-11-27 20:16:05 +0000
> +++ account/invoice.py 2010-12-14 03:25:00 +0000
> @@ -1312,6 +1312,7 @@
> if context is None:
> context = {}
> company_id = context.get('company_id',False)
> + tax_obj = self.pool.get('account.tax')
> if not partner_id:
> raise osv.except_osv(_('No Partner Defined !'),_("You must
> first select a partner !") )
> if not product:
> @@ -1400,17 +1401,24 @@
> if a:
> result['account_id'] = a
>
> + tax_ids = tax_obj.search(cr, uid, [('company_id', '=',
> company_id)])
> if type in ('out_invoice', 'out_refund'):
> - taxes = res.taxes_id and res.taxes_id or (a and
> self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
> - tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
> + sale_taxes_def = map(lambda x: x.id, res.taxes_id)
> + sale_tax_ids = [tax for tax in tax_ids if tax in
> sale_taxes_def]
> + sale_taxes = tax_obj.browse(cr, uid, sale_tax_ids)
> + sale_taxes_all = sale_taxes and sale_taxes or (a and
> self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
> + tax_id = fpos_obj.map_tax(cr, uid, fpos, sale_taxes_all)
> else:
> - taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a
> and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
> - tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
> + pur_taxes_def = map(lambda x: x.id, res.supplier_taxes_id)
> + pur_tax_ids = [tax for tax in tax_ids if tax in pur_taxes_def]
> + pur_taxes = tax_obj.browse(cr, uid, pur_tax_ids)
> + pur_taxes_all = pur_taxes and pur_taxes or (a and
> self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
> + tax_id = fpos_obj.map_tax(cr, uid, fpos, pur_taxes_all)
> +
> if type in ('in_invoice', 'in_refund'):
> result.update( {'price_unit': price_unit or
> res.standard_price,'invoice_line_tax_id': tax_id} )
> else:
> result.update({'price_unit': res.list_price,
> 'invoice_line_tax_id': tax_id})
> -
> # if not name:
> result['name'] = res.partner_ref
>
>
> === modified file 'account/report/account_balance.py'
> --- account/report/account_balance.py 2010-10-26 09:35:41 +0000
> +++ account/report/account_balance.py 2010-12-14 03:25:00 +0000
> @@ -84,11 +84,12 @@
> }
> self.sum_debit += account_rec['debit']
> self.sum_credit += account_rec['credit']
> + acc_digit =
> self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
> if disp_acc == 'bal_movement':
> - if res['credit'] > 0 or res['debit'] > 0 or
> res['balance'] > 0:
> + if round(res['credit'], acc_digit) > 0 or
> round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
> self.result_acc.append(res)
> elif disp_acc == 'bal_solde':
> - if res['balance'] != 0:
> + if round(res['balance'], acc_digit) != 0:
> self.result_acc.append(res)
> else:
> self.result_acc.append(res)
>
> === modified file 'account/report/account_balance_sheet.py'
> --- account/report/account_balance_sheet.py 2010-12-10 00:35:57 +0000
> +++ account/report/account_balance_sheet.py 2010-12-14 03:25:00 +0000
> @@ -136,15 +136,16 @@
> 'level': account.level,
> 'balance':account.balance,
> }
> + acc_digit =
> self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
> if typ == 'liability' and account.type <> 'view' and
> (account.debit <> account.credit):
> self.result_sum_dr += account.balance
> if typ == 'asset' and account.type <> 'view' and
> (account.debit <> account.credit):
> self.result_sum_cr += account.balance
> if data['form']['display_account'] == 'bal_movement':
> - if account.credit > 0 or account.debit > 0 or
> account.balance > 0:
> + if round(account.credit, acc_digit) > 0 or
> round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) !=
> 0:
> accounts_temp.append(account_dict)
> elif data['form']['display_account'] == 'bal_solde':
> - if account.balance != 0:
> + if round(account.balance, acc_digit) != 0:
> accounts_temp.append(account_dict)
> else:
> accounts_temp.append(account_dict)
>
> === modified file 'account/report/account_entries_report.py'
> --- account/report/account_entries_report.py 2010-10-18 07:09:26 +0000
> +++ account/report/account_entries_report.py 2010-12-14 03:25:00 +0000
> @@ -94,7 +94,7 @@
> return super(account_entries_report, self).search(cr, uid,
> args=args, offset=offset, limit=limit, order=order,
> context=context, count=count)
>
> - def read_group(self, cr, uid, domain, fields, groupby, offset=0,
> limit=None, context=None):
> + def read_group(self, cr, uid, domain, fields, groupby, offset=0,
> limit=None, context=None, orderby=False):
> todel=[]
> fiscalyear_obj = self.pool.get('account.fiscalyear')
> period_obj = self.pool.get('account.period')
> @@ -112,7 +112,7 @@
> for a in [['period_id','in','current_year'],
> ['period_id','in','current_period']]:
> if a in domain:
> domain.remove(a)
> - return super(account_entries_report, self).read_group(cr, uid,
> domain, fields, groupby, offset, limit, context)
> + return super(account_entries_report, self).read_group(cr, uid,
> domain, fields, groupby, offset, limit, context, orderby)
>
> def init(self, cr):
> tools.drop_view_if_exists(cr, 'account_entries_report')
>
> === modified file 'account/report/account_invoice_report_view.xml'
> --- account/report/account_invoice_report_view.xml 2010-11-18 14:32:20
> +0000
> +++ account/report/account_invoice_report_view.xml 2010-12-14 03:25:00
> +0000
> @@ -78,7 +78,7 @@
> domain="['|',
> ('type','=','out_invoice'),('type','=','out_refund')]"
> help="Customer Invoices And Refunds"/>
> <filter icon="terp-personal"
> - string="supplier"
> + string="Supplier"
> separator="1"
> domain="['|',
> ('type','=','in_invoice'),('type','=','in_refund')]"
> help="Supplier Invoices And Refunds"/>
>
> === modified file 'account/report/account_print_overdue.rml'
> --- account/report/account_print_overdue.rml 2010-11-16 05:50:35 +0000
> +++ account/report/account_print_overdue.rml 2010-12-14 03:25:00 +0000
> @@ -157,7 +157,6 @@
> <para style="terp_default_9">
> <font color="white"> </font>
> </para>
> - <para style="terp_default_9">Exception made of a mistake of our side,
> it seems that the following bills stay unpaid. Please, take appropriate
> measures in order to carry out this payment in the next 8 days.</para>
> <para style="terp_default_9">
> <font color="white"> </font>
> </para>
>
> === modified file 'account/report/account_print_overdue.sxw'
> Binary files account/report/account_print_overdue.sxw 2010-10-12 09:26:17
> +0000 and account/report/account_print_overdue.sxw 2010-12-14 03:25:00
> +0000 differ
> === modified file 'account/report/account_profit_loss.py'
> --- account/report/account_profit_loss.py 2010-12-10 00:35:57 +0000
> +++ account/report/account_profit_loss.py 2010-12-14 03:25:00 +0000
> @@ -106,15 +106,16 @@
> accounts_temp = []
> for account in accounts:
> if (account.user_type.report_type) and
> (account.user_type.report_type == typ):
> + acc_digit =
> self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
> if typ == 'expense' and account.type <> 'view' and
> (account.debit <> account.credit):
> self.result_sum_dr += abs(account.debit -
> account.credit)
> if typ == 'income' and account.type <> 'view' and
> (account.debit <> account.credit):
> self.result_sum_cr += abs(account.debit -
> account.credit)
> if data['form']['display_account'] == 'bal_movement':
> - if account.credit > 0 or account.debit > 0 or
> account.balance > 0:
> + if round(account.credit, acc_digit) > 0 or
> round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) !=
> 0:
> accounts_temp.append(account)
> elif data['form']['display_account'] == 'bal_solde':
> - if account.balance != 0:
> + if round(account.balance, acc_digit) != 0:
> accounts_temp.append(account)
> else:
> accounts_temp.append(account)
>
> === modified file 'account/security/ir.model.access.csv'
> --- account/security/ir.model.access.csv 2010-10-20 04:57:25 +0000
> +++ account/security/ir.model.access.csv 2010-12-14 03:25:00 +0000
> @@ -115,3 +115,5 @@
>
> "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
>
> "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
> "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear
> invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
>
> +"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
>
> +"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
>
> === modified file 'account/wizard/account_chart.py'
> --- account/wizard/account_chart.py 2010-10-28 08:35:00 +0000
> +++ account/wizard/account_chart.py 2010-12-14 03:25:00 +0000
> @@ -33,8 +33,9 @@
> help = 'Keep empty for all open fiscal
> years'),
> 'period_from': fields.many2one('account.period', 'Start period'),
> 'period_to': fields.many2one('account.period', 'End period'),
> - 'target_move': fields.selection([('all', 'All Entries'),
> - ('posted', 'All Posted Entries')],
> 'Target Moves', required = True),
> + 'target_move': fields.selection([('posted', 'All Posted Entries'),
> + ('all', 'All Entries'),
> + ], 'Target Moves', required =
> True),
> }
>
> def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False,
> context=None):
> @@ -92,7 +93,7 @@
> return result
>
> _defaults = {
> - 'target_move': 'all'
> + 'target_move': 'posted'
> }
>
> account_chart()
>
> === modified file 'account/wizard/account_move_journal.py'
> --- account/wizard/account_move_journal.py 2010-11-15 18:46:17 +0000
> +++ account/wizard/account_move_journal.py 2010-12-14 03:25:00 +0000
> @@ -21,7 +21,7 @@
>
> from lxml import etree
>
> -from osv import osv
> +from osv import osv, fields
> from tools.translate import _
> import tools
>
> @@ -29,6 +29,15 @@
> _name = "account.move.journal"
> _description = "Move journal"
>
> + _columns = {
> + 'target_move': fields.selection([('posted', 'All Posted Entries'),
> + ('all', 'All Entries'),
> + ], 'Target Moves', required=True),
> + }
> +
> + _defaults = {
> + 'target_move': 'posted'
> + }
> def _get_period(self, cr, uid, context={}):
> """
> Return default account period value
> @@ -93,6 +102,8 @@
> view = """<?xml version="1.0" encoding="utf-8"?>
> <form string="Standard entries">
> <separator string="Open Journal Items !" colspan="4"/>
> + <field name="target_move" />
> + <newline/>
> <group colspan="4" >
> <label width="300" string="Journal: %s"/>
> <newline/>
> @@ -132,6 +143,7 @@
>
> journal_id = self._get_journal(cr, uid, context)
> period_id = self._get_period(cr, uid, context)
> + target_move = self.read(cr, uid, ids, [])[0]['target_move']
>
> name = _("Journal Items")
> if journal_id:
> @@ -156,23 +168,26 @@
> }
> period_pool.create(cr, uid, res,context=context)
>
> - ids = period_pool.search(cr, uid, [('journal_id', '=',
> journal_id), ('period_id', '=', period_id)],context=context)
> + ids = period_pool.search(cr, uid, [('journal_id', '=',
> journal_id), ('period_id', '=', period_id)], context=context)
> period = period_pool.browse(cr, uid, ids[0], context=context)
> name = (period.journal_id.code or '') + ':' +
> (period.period_id.code or '')
>
> result = data_pool.get_object_reference(cr, uid, 'account',
> 'view_account_move_line_filter')
> res_id = result and result[1] or False
> + move = 0
> + if target_move == 'posted':
> + move = 1
> return {
> 'name': name,
> 'view_type': 'form',
> 'view_mode': 'tree,graph,form',
> 'res_model': 'account.move.line',
> 'view_id': False,
> - 'context': "{'visible_id':%s, 'search_default_journal_id':%d,
> 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
> + 'context': "{'search_default_posted': %d, 'visible_id':%s,
> 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move,
> journal_id, journal_id, period_id),
> 'type': 'ir.actions.act_window',
> 'search_view_id': res_id
> }
>
> account_move_journal()
>
> -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
> +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
> \ No newline at end of file
>
> === modified file 'account/wizard/account_report_common.py'
> --- account/wizard/account_report_common.py 2010-10-15 06:33:48 +0000
> +++ account/wizard/account_report_common.py 2010-12-14 03:25:00 +0000
> @@ -38,8 +38,9 @@
> 'journal_ids': fields.many2many('account.journal',
> 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals',
> required=True),
> 'date_from': fields.date("Start Date"),
> 'date_to': fields.date("End Date"),
> - 'target_move': fields.selection([('all', 'All Entries'),
> - ('posted', 'All Posted Entries')],
> 'Target Moves', required=True),
> + 'target_move': fields.selection([('posted', 'All Posted Entries'),
> + ('all', 'All Entries'),
> + ], 'Target Moves', required=True),
>
> }
>
> @@ -101,7 +102,7 @@
> 'journal_ids': _get_all_journal,
> 'filter': 'filter_no',
> 'chart_account_id': _get_account,
> - 'target_move': 'all',
> + 'target_move': 'posted',
> }
>
> def _build_contexts(self, cr, uid, ids, data, context=None):
>
> === modified file 'account/wizard/account_tax_chart.py'
> --- account/wizard/account_tax_chart.py 2010-10-28 08:35:00 +0000
> +++ account/wizard/account_tax_chart.py 2010-12-14 03:25:00 +0000
> @@ -31,8 +31,9 @@
> 'period_id': fields.many2one('account.period', \
> 'Period', \
> ),
> - 'target_move': fields.selection([('all', 'All Entries'),
> - ('posted', 'All Posted Entries')],
> 'Target Moves', required=True),
> + 'target_move': fields.selection([('posted', 'All Posted Entries'),
> + ('all', 'All Entries'),
> + ], 'Target Moves', required=True),
> }
>
> def _get_period(self, cr, uid, context=None):
> @@ -72,7 +73,7 @@
>
> _defaults = {
> 'period_id': _get_period,
> - 'target_move': 'all'
> + 'target_move': 'posted'
> }
>
> account_tax_chart()
>
> === modified file 'account_analytic_plans/__openerp__.py'
> --- account_analytic_plans/__openerp__.py 2010-09-17 09:30:07 +0000
> +++ account_analytic_plans/__openerp__.py 2010-12-14 03:25:00 +0000
> @@ -59,6 +59,7 @@
> 'depends' : ['account', 'account_analytic_default'],
> 'init_xml' : [],
> 'update_xml': [
> + 'security/account_analytic_plan_security.xml',
> 'security/ir.model.access.csv',
> 'account_analytic_plans_view.xml',
> 'account_analytic_plans_report.xml',
>
> === modified file 'account_analytic_plans/account_analytic_plans.py'
> --- account_analytic_plans/account_analytic_plans.py 2010-10-12 10:52:58
> +0000
> +++ account_analytic_plans/account_analytic_plans.py 2010-12-14 03:25:00
> +0000
> @@ -240,7 +240,7 @@
> _description = "Analytic Instance Line"
> _columns = {
> 'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan
> Id'),
> - 'analytic_account_id': fields.many2one('account.analytic.account',
> 'Analytic Account', required=True),
> + 'analytic_account_id': fields.many2one('account.analytic.account',
> 'Analytic Account', required=True, domain=[('type','<>','view')]),
> 'rate': fields.float('Rate (%)', required=True),
> }
> _defaults = {
>
> === modified file 'account_analytic_plans/report/crossovered_analytic.py'
> --- account_analytic_plans/report/crossovered_analytic.py 2010-10-11
> 11:25:50 +0000
> +++ account_analytic_plans/report/crossovered_analytic.py 2010-12-14
> 03:25:00 +0000
> @@ -97,19 +97,21 @@
>
> self.final_list = children_list
> selected_ids = line_pool.search(self.cr, self.uid, [('account_id',
> 'in' ,self.final_list)])
> +
> + res['ref_qty'] = 0.0
> + res['ref_amt'] = 0.0
> + self.base_amount = 0.0
> +
> if selected_ids:
> query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS
> qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
> WHERE aal.account_id = aaa.id AND aal.id IN
> ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +")
> AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" +
> str(form['date2']) + "'"
>
> self.cr.execute(query)
> info=self.cr.dictfetchall()
> -
> res['ref_qty'] = info[0]['qty']
> res['ref_amt'] = info[0]['amt']
> self.base_amount = info[0]['amt']
> - res['ref_qty'] = 0.0
> - res['ref_amt'] = 0.0
> - self.base_amount = 0.0
> +
> result.append(res)
> return result
>
>
> === added file
> 'account_analytic_plans/security/account_analytic_plan_security.xml'
> --- account_analytic_plans/security/account_analytic_plan_security.xml
> 1970-01-01 00:00:00 +0000
> +++ account_analytic_plans/security/account_analytic_plan_security.xml
> 2010-12-14 03:25:00 +0000
> @@ -0,0 +1,10 @@
> +<?xml version="1.0" encoding="utf-8"?>
> +<openerp>
> + <data>
> +
> + <record id="base.user_root" model="res.users">
> + <field name="groups_id" eval="[(4,
> ref('analytic.group_analytic_accounting'))]"/>
> + </record>
> +
> + </data>
> +</openerp>
>
> === modified file
> 'account_analytic_plans/wizard/account_crossovered_analytic.py'
> --- account_analytic_plans/wizard/account_crossovered_analytic.py
> 2010-11-04 12:42:42 +0000
> +++ account_analytic_plans/wizard/account_crossovered_analytic.py
> 2010-12-14 03:25:00 +0000
> @@ -31,7 +31,7 @@
> 'date1': fields.date('Start Date', required=True),
> 'date2': fields.date('End Date', required=True),
> 'journal_ids': fields.many2many('account.analytic.journal',
> 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic
> Journal'),
> - 'ref': fields.many2one('account.analytic.account', 'Analytic
> Account Reference', required=False),
> + 'ref': fields.many2one('account.analytic.account', 'Analytic
> Account Reference', required=True),
> 'empty_line': fields.boolean('Dont show empty lines'),
> }
> _defaults = {
>
> === modified file 'account_budget/account_budget.py'
> --- account_budget/account_budget.py 2010-10-20 13:54:21 +0000
> +++ account_budget/account_budget.py 2010-12-14 03:25:00 +0000
> @@ -177,7 +177,7 @@
> res = {}
> for line in self.browse(cr, uid, ids):
> if line.theoritical_amount <> 0.00:
> - res[line.id] = float(line.practical_amount or 0.0 /
> line.theoritical_amount) * 100
> + res[line.id] = float((line.practical_amount or 0.0) /
> line.theoritical_amount) * 100
> else:
> res[line.id] = 0.00
> return res
>
> === modified file 'account_budget/account_budget_view.xml'
> --- account_budget/account_budget_view.xml 2010-12-08 10:23:05 +0000
> +++ account_budget/account_budget_view.xml 2010-12-14 03:25:00 +0000
> @@ -45,7 +45,7 @@
> <field name="view_id" ref="view_budget_post_tree"/>
> <field name="search_view_id" ref="view_budget_post_search"/>
> </record>
> - <menuitem id="next_id_31" name="Budgets"
> parent="account.menu_finance" sequence="5"/>
> + <menuitem id="next_id_31" name="Budgets"
> parent="account.menu_finance" sequence="6"/>
> <menuitem id="next_id_pos" name="Budgets"
> parent="account.menu_finance_configuration" sequence="20"/>
> <menuitem action="open_budget_post_form" id="menu_budget_post_form"
> parent="next_id_pos" sequence="20"/>
>
> @@ -131,7 +131,6 @@
> <field name="date_to"/>
> <field name="paid_date" select="1"/>
> <field name="planned_amount"
> select="1"/>
> - <field name="analytic_account_id"/>
> <field name="company_id"
> widget="selection" groups="base.group_multi_company"/>
> </form>
> </field>
>
> === modified file 'account_payment/account_payment_view.xml'
> --- account_payment/account_payment_view.xml 2010-11-02 07:04:55 +0000
> +++ account_payment/account_payment_view.xml 2010-12-14 03:25:00 +0000
> @@ -39,7 +39,7 @@
> </field>
> </record>
>
> - <menuitem id="menu_main_payment" name="Payment"
> parent="account.menu_finance" sequence="6"/>
> + <menuitem id="menu_main_payment" name="Payment"
> parent="account.menu_finance" sequence="7"/>
>
> <record id="view_payment_mode_search" model="ir.ui.view">
> <field name="name">payment.mode.search</field>
>
> === modified file
> 'account_payment/wizard/account_payment_populate_statement.py'
> --- account_payment/wizard/account_payment_populate_statement.py
> 2010-10-21 05:39:17 +0000
> +++ account_payment/wizard/account_payment_populate_statement.py
> 2010-12-14 03:25:00 +0000
> @@ -37,10 +37,12 @@
> res = super(account_payment_populate_statement,
> self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type,
> context=context, toolbar=toolbar, submenu=False)
> line_ids = line_obj.search(cr, uid, [
> ('move_line_id.reconcile_id', '=', False),
> - ('bank_statement_line_id', '=', False),])
> + ('bank_statement_line_id', '=', False),
> + ('move_line_id.state','=','valid')])
> line_ids.extend(line_obj.search(cr, uid, [
> ('move_line_id.reconcile_id', '=', False),
> - ('order_id.mode', '=', False)]))
> + ('order_id.mode', '=', False),
> + ('move_line_id.state','=','valid')]))
> domain = '[("id", "in", '+ str(line_ids)+')]'
> doc = etree.XML(res['arch'])
> nodes = doc.xpath("//field[@name='lines']")
>
> === modified file 'account_voucher/account_voucher.py'
> --- account_voucher/account_voucher.py 2010-11-24 12:13:47 +0000
> +++ account_voucher/account_voucher.py 2010-12-14 03:25:00 +0000
> @@ -23,10 +23,11 @@
> from lxml import etree
>
> import netsvc
> -from osv import fields
> -from osv import osv
> +from osv import osv, fields
> +import decimal_precision as dp
> from tools.translate import _
>
> +
> class account_move_line(osv.osv):
> _inherit = 'account.move.line'
>
> @@ -109,6 +110,11 @@
> def _get_narration(self, cr, uid, context={}):
> return context.get('narration', False)
>
> + def _get_amount(self, cr, uid, context=None):
> + if context is None:
> + context= {}
> + return context.get('amount', 0.0)
> +
> def name_get(self, cr, uid, ids, context=None):
> if not ids:
> return []
> @@ -140,18 +146,29 @@
> res['arch'] = etree.tostring(doc)
> return res
>
> + def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids,
> amount):
> + debit = credit = 0.0
> + for l in line_dr_ids:
> + debit += l['amount']
> + for l in line_cr_ids:
> + credit += l['amount']
> + return abs(amount - abs(credit - debit))
> +
> + def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids,
> amount):
> + line_dr_ids = [x[2] for x in line_dr_ids]
> + line_cr_ids = [x[2] for x in line_cr_ids]
> + return {'value': {'writeoff_amount':
> self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
> +
> def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
> if not ids: return {}
> res = {}
> + debit = credit = 0.0
> for voucher in self.browse(cr, uid, ids, context=context):
> - debit= credit = 0.0
> - if voucher.line_dr_ids:
> - for line in voucher.line_dr_ids:
> - debit += line.amount_unreconciled
> - if voucher.line_cr_ids:
> - for line in voucher.line_cr_ids:
> - credit += line.amount_unreconciled
> - res[voucher.id] = abs(voucher.amount - abs(credit - debit))
> + for l in voucher.line_dr_ids:
> + debit += l.amount
> + for l in voucher.line_cr_ids:
> + credit += l.amount
> + res[voucher.id] = abs(voucher.amount - abs(credit - debit))
> return res
>
> _name = 'account.voucher'
> @@ -189,8 +206,8 @@
> \n* The \'Pro-forma\' when voucher is in Pro-forma
> state,voucher does not have an voucher number. \
> \n* The \'Posted\' state is used when user create
> voucher,a voucher number is generated and voucher entries are created in
> account \
> \n* The \'Cancelled\' state is used when user
> cancel voucher.'),
> - 'amount': fields.float('Total', digits=(16, 2), required=True,
> readonly=True, states={'draft':[('readonly',False)]}),
> - 'tax_amount':fields.float('Tax Amount', digits=(14,2),
> readonly=True, states={'draft':[('readonly',False)]}),
> + 'amount': fields.float('Total',
> digits_compute=dp.get_precision('Account'), required=True, readonly=True,
> states={'draft':[('readonly',False)]}),
> + 'tax_amount':fields.float('Tax Amount',
> digits_compute=dp.get_precision('Account'), readonly=True,
> states={'draft':[('readonly',False)]}),
> 'reference': fields.char('Ref #', size=64, readonly=True,
> states={'draft':[('readonly',False)]}, help="Transaction reference
> number."),
> 'number': fields.char('Number', size=32, readonly=True,),
> 'move_id':fields.many2one('account.move', 'Account Entry'),
> @@ -205,14 +222,13 @@
> 'pre_line':fields.boolean('Previous Payments ?', required=False),
> 'date_due': fields.date('Due Date', readonly=True,
> states={'draft':[('readonly',False)]}),
> 'payment_option':fields.selection([
> - ('without_writeoff', 'Without
> Write-off'),
> - ('with_writeoff', 'With
> Write-off'),
> - ], 'Payment Option',
> required=True, readonly=True, states={'draft': [('readonly', False)]}),
> + ('without_writeoff', 'Keep
> Open'),
> + ('with_writeoff', 'Reconcile
> with Write-Off'),
> + ], 'Payment Difference',
> required=True, readonly=True, states={'draft': [('readonly', False)]}),
> 'writeoff_acc_id': fields.many2one('account.account', 'Write-Off
> account', readonly=True, states={'draft': [('readonly', False)]}),
> - 'writeoff_journal_id': fields.many2one('account.journal',
> 'Write-Off journal', readonly=True, states={'draft': [('readonly',
> False)]}),
> - 'comment': fields.char('Comment', size=64, readonly=True,
> states={'draft': [('readonly', False)]}),
> - 'analytic_id':
> fields.many2one('account.analytic.account','Analytic Account',
> readonly=True, states={'draft': [('readonly', False)]}),
> - 'writeoff_amount': fields.function(_get_writeoff_amount,
> method=True, string='Writeoff Amount', type='float', readonly=True),
> + 'comment': fields.char('Write-Off Comment', size=64,
> required=True, readonly=True, states={'draft': [('readonly', False)]}),
> + 'analytic_id':
> fields.many2one('account.analytic.account','Write-Off Analytic Account',
> readonly=True, states={'draft': [('readonly', False)]}),
> + 'writeoff_amount': fields.function(_get_writeoff_amount,
> method=True, string='Write-Off Amount', type='float', readonly=True),
> }
> _defaults = {
> 'period_id': _get_period,
> @@ -221,6 +237,7 @@
> 'currency_id': _get_currency,
> 'reference': _get_reference,
> 'narration':_get_narration,
> + 'amount': _get_amount,
> 'type':_get_type,
> 'state': 'draft',
> 'pay_now': 'pay_later',
> @@ -229,7 +246,7 @@
> 'company_id': lambda self,cr,uid,c:
> self.pool.get('res.company')._company_default_get(cr, uid,
> 'account.voucher',context=c),
> 'tax_id': _get_tax,
> 'payment_option': 'without_writeoff',
> - 'comment': 'Write-Off',
> + 'comment': _('Write-Off'),
> }
>
> def compute_tax(self, cr, uid, ids, context={}):
> @@ -384,13 +401,17 @@
>
> @return: Returns a dict which contains new values, and context
> """
> + if context is None:
> + context = {}
> if not journal_id:
> return {}
>
> - if context is None:
> - context = {}
> - currency_pool = self.pool.get('res.currency')
> line_pool = self.pool.get('account.voucher.line')
> + line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=',
> ids[0])]) or False
> + if line_ids:
> + line_pool.unlink(cr, uid, line_ids)
> +
> + currency_pool = self.pool.get('res.currency')
> move_line_pool = self.pool.get('account.move.line')
> partner_pool = self.pool.get('res.partner')
> journal_pool = self.pool.get('account.journal')
> @@ -404,13 +425,6 @@
>
> if not partner_id:
> return default
> -
> - if not partner_id and ids:
> - line_ids = line_pool.search(cr, uid, [('voucher_id', '=',
> ids[0])])
> - if line_ids:
> - line_pool.unlink(cr, uid, line_ids)
> - return default
> -
> journal = journal_pool.browse(cr, uid, journal_id)
> partner = partner_pool.browse(cr, uid, partner_id)
> account_id = False
> @@ -463,13 +477,13 @@
> if line.debit and line.reconcile_partial_id and ttype ==
> 'payment':
> continue
>
> - orignal_amount = line.credit or line.debit or 0.0
> + original_amount = line.credit or line.debit or 0.0
> rs = {
> 'name':line.move_id.name,
> 'type': line.credit and 'dr' or 'cr',
> 'move_line_id':line.id,
> 'account_id':line.account_id.id,
> - 'amount_original':currency_pool.compute(cr, uid,
> company_currency, currency_id, orignal_amount),
> + 'amount_original':currency_pool.compute(cr, uid,
> company_currency, currency_id, original_amount),
> 'date_original':line.date,
> 'date_due':line.date_maturity,
> 'amount_unreconciled':currency_pool.compute(cr, uid,
> company_currency, currency_id, line.amount_unreconciled)
> @@ -493,6 +507,7 @@
> default['value']['pre_line'] = 1
> elif ttype == 'receipt' and
> len(default['value']['line_dr_ids']) > 0:
> default['value']['pre_line'] = 1
> + default['value']['writeoff_amount'] =
> self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'],
> default['value']['line_cr_ids'], price)
>
> return default
>
> @@ -719,16 +734,20 @@
> if line.move_line_id.id:
> rec_ids = [master_line, line.move_line_id.id]
> rec_list_ids.append(rec_ids)
> - writeoff_account_id = False
> - writeoff_journal_id = False
> - writeoff_period_id = inv.period_id.id,
> - comment = False
>
> if not currency_pool.is_zero(cr, uid, inv.currency_id,
> line_total):
> diff = line_total
> + account_id = False
> + if inv.payment_option == 'with_writeoff':
> + account_id = inv.writeoff_acc_id.id
> + elif inv.type in ('sale', 'receipt'):
> +# if inv.journal_id.type in ('sale','sale_refund', 'cash',
> 'bank'):
> + account_id =
> inv.partner_id.property_account_receivable.id
> + else:
> + account_id =
> inv.partner_id.property_account_payable.id
> move_line = {
> 'name': name,
> - 'account_id': False,
> + 'account_id': account_id,
> 'move_id': move_id,
> 'partner_id': inv.partner_id.id,
> 'date': inv.date,
> @@ -737,24 +756,8 @@
> 'amount_currency': company_currency <> current_currency
> and currency_pool.compute(cr, uid, company_currency, current_currency, diff
> * -1) or 0.0,
> 'currency_id': company_currency <> current_currency and
> current_currency or False,
> }
> - account_id = False
> - if inv.type in ('sale', 'receipt'):
> -# if inv.journal_id.type in ('sale','sale_refund', 'cash',
> 'bank'):
> - account_id =
> inv.partner_id.property_account_receivable.id
> - else:
> - account_id =
> inv.partner_id.property_account_payable.id
> - move_line['account_id'] = account_id
>
> move_line_pool.create(cr, uid, move_line)
> - for rec_ids in rec_list_ids:
> - if len(rec_ids) >= 2:
> - if inv.payment_option == 'with_writeoff':
> - writeoff_account_id = inv.writeoff_acc_id.id
> - writeoff_journal_id = inv.writeoff_journal_id.id
> - comment = inv.comment
> - move_line_pool.reconcile(cr, uid, rec_ids,
> 'manual', writeoff_account_id, writeoff_period_id, writeoff_journal_id,
> context)
> - else:
> - move_line_pool.reconcile_partial(cr, uid, rec_ids)
>
> self.write(cr, uid, [inv.id], {
> 'move_id': move_id,
> @@ -762,6 +765,9 @@
> 'number': name,
> })
> move_pool.post(cr, uid, [move_id], context={})
> + for rec_ids in rec_list_ids:
> + if len(rec_ids) >= 2:
> + move_line_pool.reconcile_partial(cr, uid, rec_ids)
> return True
>
> def copy(self, cr, uid, id, default={}, context=None):
> @@ -813,7 +819,7 @@
> 'account_id':fields.many2one('account.account','Account',
> required=True),
> 'partner_id':fields.related('voucher_id', 'partner_id',
> type='many2one', relation='res.partner', string='Partner'),
> 'untax_amount':fields.float('Untax Amount'),
> - 'amount':fields.float('Amount', digits=(14,2)),
> + 'amount':fields.float('Amount',
> digits_compute=dp.get_precision('Account')),
> 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
> 'account_analytic_id': fields.many2one('account.analytic.account',
> 'Analytic Account'),
> 'move_line_id': fields.many2one('account.move.line', 'Journal
> Item'),
> @@ -826,7 +832,6 @@
> _defaults = {
> 'name': ''
> }
> -
> def onchange_move_line_id(self, cr, user, ids, move_line_id,
> context={}):
> """
> Returns a dict that contains new values and context
> @@ -949,6 +954,17 @@
> res[line.id] = 0.0
> return res
>
> + def _check_amount(self, cr, uid, ids, context=None):
> + for obj in self.browse(cr, uid, ids, context=context):
> + if obj.voucher_id:
> + if not (obj.amount == obj.voucher_id.amount):
> + return False
> + return True
> +
> + _constraints = [
> + (_check_amount, 'The amount of the voucher must be the same amount
> as the one on the statement line', ['amount']),
> + ]
> +
> _columns = {
> 'amount_reconciled': fields.function(_amount_reconciled,
> string='Amount reconciled', method=True, type='float'),
>
> === modified file 'account_voucher/account_voucher_report.xml'
> --- account_voucher/account_voucher_report.xml 2010-10-15 06:01:40 +0000
> +++ account_voucher/account_voucher_report.xml 2010-12-14 03:25:00 +0000
> @@ -1,7 +1,7 @@
> <?xml version="1.0"?>
> <openerp>
> <data>
> - <report id="report_account_voucher"
> + <!-- <report id="report_account_voucher"
> string="Voucher"
> model="account.voucher"
> name="voucher.cash_receipt.drcr"
> @@ -9,7 +9,7 @@
> groups="base.group_extended"
> auto="False"
> header = "False"
> - menu="True"/>
> + menu="True"/> -->
>
> <report id="report_account_voucher_print"
> string="Voucher Print"
>
> === modified file 'account_voucher/account_voucher_view.xml'
> --- account_voucher/account_voucher_view.xml 2010-11-11 05:48:20 +0000
> +++ account_voucher/account_voucher_view.xml 2010-12-14 03:25:00 +0000
> @@ -70,8 +70,21 @@
> <field name="period_id"/>
> <field name="audit"/>
> </group>
> - <separator string="Journal Items"
> colspan="4"/>
> - <field name="move_ids" colspan="4" nolabel="1"
> readonly="1"/>
> + <field name="move_ids" colspan="4" nolabel="1"
> readonly="1">
> + <tree string="Journal Items">
> + <field name="move_id"/>
> + <field name="ref"/>
> + <field name="date"/>
> + <field name="statement_id"/>
> + <field name="partner_id"/>
> + <field name="account_id"/>
> + <field name="name"/>
> + <field name="debit"/>
> + <field name="credit"/>
> + <field name="state"/>
> + <field name="reconcile_id"/>
> + </tree>
> + </field>
> </page>
> </notebook>
> <group col="10" colspan="4">
>
> === modified file 'account_voucher/i18n/account_voucher.pot'
> --- account_voucher/i18n/account_voucher.pot 2010-12-10 17:40:27 +0000
> +++ account_voucher/i18n/account_voucher.pot 2010-12-14 03:25:00 +0000
> @@ -416,7 +416,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -530,7 +530,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -662,7 +662,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
> @@ -755,7 +755,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor Invoices and Outstanding transactions"
> +msgid "supplier Invoices and Outstanding transactions"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/ar.po'
> --- account_voucher/i18n/ar.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/ar.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/bg.po'
> --- account_voucher/i18n/bg.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/bg.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/bs.po'
> --- account_voucher/i18n/bs.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/bs.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/ca.po'
> --- account_voucher/i18n/ca.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/ca.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/cs.po'
> --- account_voucher/i18n/cs.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/cs.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/de.po'
> --- account_voucher/i18n/de.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/de.po 2010-12-14 03:25:00 +0000
> @@ -450,7 +450,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr "Buchen von Auszahlungen"
>
> #. module: account_voucher
> @@ -573,7 +573,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "supplier"
> msgstr "Lieferant"
>
> #. module: account_voucher
> @@ -705,7 +705,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open supplier Journal Entries"
> msgstr "Offene Posten Lieferanten"
>
> #. module: account_voucher
> @@ -798,7 +798,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor Invoices and Outstanding transactions"
> +msgid "supplier Invoices and Outstanding transactions"
> msgstr "Eingangsrechnungen und andere offene Posten"
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/el.po'
> --- account_voucher/i18n/el.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/el.po 2010-12-14 03:25:00 +0000
> @@ -431,7 +431,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "supplier Payment"
> msgstr "Πληρωμή Πωλητή"
>
> #. module: account_voucher
> @@ -549,8 +549,8 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> -msgstr "Πωλητής"
> +msgid "Supplier"
> +msgstr "προμηθευτής"
>
> #. module: account_voucher
> #: view:account.voucher:0
> @@ -681,7 +681,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/es.po'
> --- account_voucher/i18n/es.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/es.po 2010-12-14 03:25:00 +0000
> @@ -443,8 +443,8 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> -msgstr "Pago del vendedor"
> +msgid "Supplier Payment"
> +msgstr "Pago del Proveedor"
>
> #. module: account_voucher
> #: view:account.invoice:0
> @@ -561,8 +561,8 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> -msgstr "Vendedor"
> +msgid "Supplier"
> +msgstr "Proveedor"
>
> #. module: account_voucher
> #: view:account.voucher:0
> @@ -693,8 +693,8 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> -msgstr "Abrir entradas diario de vendedores"
> +msgid "Open Supplier Journal Entries"
> +msgstr "Abrir entradas diario de Proveedors"
>
> #. module: account_voucher
> #: field:account.voucher.line,voucher_id:0
> @@ -786,8 +786,8 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor Invoices and Outstanding transactions"
> -msgstr "Facturas de vendedor y transacciones de salida"
> +msgid "Supplier Invoices and Outstanding transactions"
> +msgstr "Facturas de Proveedor y transacciones de salida"
>
> #. module: account_voucher
> #: field:account.statement.from.invoice,journal_ids:0
>
> === modified file 'account_voucher/i18n/es_AR.po'
> --- account_voucher/i18n/es_AR.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/es_AR.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/es_EC.po'
> --- account_voucher/i18n/es_EC.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/es_EC.po 2010-12-14 03:25:00 +0000
> @@ -449,7 +449,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr "Pago a Proveedor"
>
> #. module: account_voucher
> @@ -571,7 +571,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr "Proveedor"
>
> #. module: account_voucher
> @@ -703,7 +703,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr "Abrir asientos de diario de proveedor"
>
> #. module: account_voucher
> @@ -796,7 +796,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor Invoices and Outstanding transactions"
> +msgid "Supplier Invoices and Outstanding transactions"
> msgstr "Facturas de Proveedor y transacciones pendientes"
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/et.po'
> --- account_voucher/i18n/et.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/et.po 2010-12-14 03:25:00 +0000
> @@ -445,7 +445,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -563,7 +563,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -695,7 +695,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/fr.po'
> --- account_voucher/i18n/fr.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/fr.po 2010-12-14 03:25:00 +0000
> @@ -431,7 +431,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -549,7 +549,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -681,7 +681,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
> @@ -774,7 +774,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor Invoices and Outstanding transactions"
> +msgid "Supplier Invoices and Outstanding transactions"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/hr.po'
> --- account_voucher/i18n/hr.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/hr.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/hu.po'
> --- account_voucher/i18n/hu.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/hu.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
> #. module: account_voucher
>
> === modified file 'account_voucher/i18n/id.po'
> --- account_voucher/i18n/id.po 2010-12-11 05:08:50 +0000
> +++ account_voucher/i18n/id.po 2010-12-14 03:25:00 +0000
> @@ -430,7 +430,7 @@
> #. module: account_voucher
> #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
> #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
> -msgid "Vendor Payment"
> +msgid "Supplier Payment"
> msgstr ""
>
> #. module: account_voucher
> @@ -548,7 +548,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Vendor"
> +msgid "Supplier"
> msgstr ""
>
> #. module: account_voucher
> @@ -680,7 +680,7 @@
>
> #. module: account_voucher
> #: view:account.voucher:0
> -msgid "Open Vendor Journal Entries"
> +msgid "Open Supplier Journal Entries"
> msgstr ""
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community<https://launchpad.net/%7Eopenerp-community>
> Post to : openerp-community@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openerp-community<https://launchpad.net/%7Eopenerp-community>
> More help : https://help.launchpad.net/ListHelp
>
>
--
Niels Huylebroeck
Bubbles-IT
Tel. : +32 (0)9 328 33 88
Fax. : +32 (0)9 328 33 77
Web : http://www.bubbles-it.be
https://code.launchpad.net/~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008/+merge/43599
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008.
Follow ups
References
