diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-10-11 10:15:08 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-10-11 10:15:08 +0530 |
| commit | 4194e2bdd4bdb8eda3517f4becd5b22f6ee7a3dd (patch) | |
| tree | 4da6770d144befcbf70ec0456b5f5cafc3a367ce | |
| parent | 4c1a9e61399655f34652dea50ee46a5bd5b5e6e1 (diff) | |
| parent | af5b3ef4e62f1ebef04003e5c25c48b7fa1ee2b1 (diff) | |
[Merge]
bzr revid: vir@tinyerp.com-20101011044508-feu4u973c126efsd
108 files changed, 3046 insertions, 1737 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index 9176a2eec64..b0271a4fee1 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2473,14 +2473,14 @@ class account_tax_template(osv.osv): account_tax_template() -# Fiscal Mapping Templates +# Fiscal Position Templates class account_fiscal_position_template(osv.osv): _name = 'account.fiscal.position.template' - _description = 'Template for Fiscal Mapping' + _description = 'Template for Fiscal Position' _columns = { - 'name': fields.char('Fiscal Mapping Template', size=64, translate=True, required=True), + 'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True), 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True), 'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'), 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping') @@ -2490,11 +2490,11 @@ account_fiscal_position_template() class account_fiscal_position_tax_template(osv.osv): _name = 'account.fiscal.position.tax.template' - _description = 'Template Tax Fiscal Mapping' + _description = 'Template Tax Fiscal Position' _rec_name = 'position_id' _columns = { - 'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'), + 'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'), 'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True), 'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax') } @@ -2722,7 +2722,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): # Bank Journals data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')]) - data = obj_pool.browse(cr, uid, data_id[0]) + data = obj_data.browse(cr, uid, data_id[0]) view_id_cash = data.res_id data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')]) @@ -2860,4 +2860,4 @@ class account_bank_accounts_wizard(osv.osv_memory): account_bank_accounts_wizard() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index a3570fae79a..2b736a514c3 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -26,7 +26,7 @@ <group colspan="8"> <group colspan="4" height="450" width="600"> <field name="charts"/> - <group colspan="4"> + <group colspan="4" groups="base.group_extended"> <separator col="4" colspan="4" string="Configure Fiscal Year"/> <field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/> <field name="date_start" on_change="on_change_start_date(date_start)"/> @@ -34,24 +34,24 @@ <field name="period" colspan="4"/> </group> <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}"> - <separator col="4" colspan="4" string="Bank and Cost Account"/> + <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/> + <field name="purchase_tax" groups="base.group_extended"/> + </group> + <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}"> + <separator col="4" colspan="4" string="Bank and Cash Accounts"/> <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list"> <form string=""> <field name="acc_name"/> <field name="account_type"/> - <field name="currency_id" widget="selection"/> + <field name="currency_id" widget="selection" groups="base.group_extended"/> </form> <tree editable="bottom" string=""> <field name="acc_name"/> <field name="account_type"/> - <field name="currency_id" widget="selection"/> + <field name="currency_id" widget="selection" groups="base.group_extended"/> </tree> </field> </group> - <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}"> - <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/> - <field name="purchase_tax" colspan="2" /> - </group> </group> </group> </data> diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 734b99e81f3..e72bd584f9d 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -36,11 +36,11 @@ <field name="arch" type="xml"> <tree string="Invoice Line"> <field name="name"/> - <field name="account_id" groups="base.group_user"/> + <field name="account_id" groups="account.group_account_user"/> <field name="quantity"/> <field name="uos_id"/> <field name="price_unit"/> - <field name="discount"/> + <field name="discount" groups="base.group_extended"/> <field name="price_subtotal"/> </tree> </field> @@ -55,16 +55,14 @@ <notebook> <page string="Line"> <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/> - <field name="uos_id" widget="selection" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/> + <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/> <field name="quantity"/> <field name="price_unit"/> - <field name="discount"/> + <field name="discount" groups="base.group_extended"/> <field colspan="4" name="name"/> - <field colspan="4" name="origin" groups="base.group_extended"/> - <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/> + <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/> <field domain="[('type','<>','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <newline/> - <field name="price_subtotal"/> <field name="company_id" groups="base.group_multi_company" readonly="1"/> <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/> </page> @@ -85,7 +83,7 @@ <field name="sequence"/> <field name="manual"/> <field name="name"/> - <field name="account_id" groups="base.group_user"/> + <field name="account_id" groups="base.group_account_user"/> <field name="base"/> <field name="amount"/> </tree> @@ -100,7 +98,7 @@ <form string="Manual Invoice Taxes"> <field name="name"/> <field name="sequence"/> - <field name="account_id" groups="base.group_user"/> + <field name="account_id"/> <field name="manual"/> <field name="amount"/> <field name="base" readonly="0"/> @@ -148,7 +146,7 @@ <field name="type">form</field> <field name="priority">2</field> <field name="arch" type="xml"> - <form string="Supplier invoice"> + <form string="Supplier Invoice"> <group col="8" colspan="4"> <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/> <field name="number" readonly="1"/> @@ -156,7 +154,7 @@ <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/> <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> <newline/> - <field string="Vendor" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/> + <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/> <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> <field name="fiscal_position" groups="base.group_extended" widget="selection"/> <newline/> @@ -213,9 +211,9 @@ <group col="6" colspan="4"> <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/> <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/> - <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/> <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/> <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_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/> </group> </group> </page> @@ -236,14 +234,14 @@ <page string="Payments" groups="base.group_extended"> <field name="payment_ids" colspan="4" nolabel="1" > <tree string="Payments"> - <field name="date"/> + <field name="date" string="Payment Date"/> <field name="ref"/> - <field name="name"/> + <field name="name" groups="base.group_extended"/> <field name="journal_id"/> <field name="debit"/> <field name="credit"/> - <field name="amount_currency"/> - <field name="currency_id"/> + <field name="amount_currency" groups="base.group_extended"/> + <field name="currency_id" groups="base.group_extended"/> </tree> </field> </page> @@ -307,11 +305,10 @@ <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"/> - <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="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/> <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/> - <button name="%(account_invoices)d" type='action' string='Print' states='open' icon="gtk-print"/> + <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"/> </group> </group> </page> @@ -356,9 +353,9 @@ <field name="arch" type="xml"> <search string="Search Invoice"> <group col="10" colspan="4"> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/> - <filter icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/> - <filter icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> + <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/> + <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/> + <filter name="invoices" icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> <separator orientation="vertical"/> <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/> <separator orientation="vertical"/> @@ -452,7 +449,7 @@ <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/> <record id="action_invoice_tree2" model="ir.actions.act_window"> - <field name="name">Vendor Invoices</field> + <field name="name">Supplier Invoices</field> <field name="res_model">account.invoice</field> <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,graph</field> @@ -460,7 +457,7 @@ <field name="domain">[('type','=','in_invoice')]</field> <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field> <field name="search_view_id" ref="view_account_invoice_filter"/> - <field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field> + <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field> </record> <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/> @@ -491,7 +488,7 @@ <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/> <record id="action_invoice_tree4" model="ir.actions.act_window"> - <field name="name">Vendor Refunds</field> + <field name="name">Supplier Refunds</field> <field name="res_model">account.invoice</field> <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,graph</field> @@ -516,6 +513,7 @@ domain="[('account_id.reconcile', '=', True)]" context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}" id="act_account_invoice_account_move_unreconciled" + groups="base.group_extended" name="Items to Reconcile" res_model="account.move.line" src_model="account.invoice"/> @@ -523,7 +521,8 @@ <act_window context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}" id="act_account_invoice_account_move_invoice_link" - name="Invoice Items " + name="Invoice Items" + groups="base.group_extended" res_model="account.move.line" src_model="account.invoice"/> diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index fac1a1eec4d..dde71f4efc1 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -2,47 +2,49 @@ <openerp> <data> - <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/> - <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager"/> - <menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager"/> - <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/> - <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,group_account_invoice"/> + <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13" + groups="group_account_user,group_account_manager,group_account_invoice"/> + <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" + groups="group_account_user"/> + <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/> <!-- 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" groups="group_account_user,group_account_manager"/> + <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" groups="group_account_manager,group_account_user"/> - <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/> + <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/> + <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" 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_accounting" name="Financial Accounting" parent="menu_finance_configuration" groups="group_account_manager"/> - <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" 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"/> <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/> <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/> <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" groups="group_account_manager"/> - <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" - groups="group_account_user,group_account_manager"/> + <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"/> <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/> - <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager" sequence="25"/> + <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager" sequence="25"/> <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/> - <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/> + <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/> <menuitem - parent="account.menu_finance_legal_statement" - id="final_accounting_reports" - name="Accounting Reports"/> + parent="account.menu_finance_legal_statement" + id="final_accounting_reports" + name="Accounting Reports"/> <menuitem - parent="account.menu_finance_legal_statement" - id="menu_journals_report" - name="Journals"/> + parent="account.menu_finance_legal_statement" + id="menu_journals_report" + groups="group_account_user" + name="Journals"/> </data> </openerp> diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 907ff01b832..c9f7cc6cf66 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -45,6 +45,7 @@ <menuitem id="menu_tax_report" name="Taxes" + groups="group_account_user" parent="account.menu_finance_generic_reporting" sequence="3"/> <report id="account_account_balance_landscape" diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e7e1c055c32..36ee5255523 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -347,10 +347,10 @@ <field name="arch" type="xml"> <tree string="Search Account Journal"> <group> - <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Customer Journals" icon="terp-sale"/> - <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Vendor Journals" icon="terp-purchase"/> - <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity Journals" icon="terp-dolar"/> - <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Global Journals" icon="terp-stock"/> + <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-sale"/> + <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/> + <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/> + <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/> <separator orientation="vertical"/> <field name="code"/> <field name="name"/> @@ -900,13 +900,6 @@ </record> <!-- - <menuitem - action="action_tax_code_tree" - id="menu_action_tax_code_tree" - parent="menu_finance_charts" - sequence="12"/> --> <!-- move to wizard --> - - <!-- Entries lines --> @@ -1389,6 +1382,7 @@ action="action_move_journal_line" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" + groups="group_account_user" sequence="5"/> <record id="action_move_line_form" model="ir.actions.act_window"> @@ -1428,8 +1422,6 @@ <field name="act_window_id" ref="action_move_line_search"/> </record> - <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/> - <record id="view_bank_statement_reconcile_form" model="ir.ui.view"> <field name="name">account.bank.statement.form</field> <field name="model">account.bank.statement</field> @@ -1502,8 +1494,8 @@ <menuitem - name="Manual Reconcilication" icon="STOCK_EXECUTE" - action="action_account_manual_reconcile" + name="Manual Reconcilication" icon="STOCK_EXECUTE" + action="action_account_manual_reconcile" id="menu_manual_reconcile" parent="account.periodical_processing_reconciliation"/> @@ -1655,7 +1647,9 @@ <field name="view_mode">tree,form,search</field> <field name="search_view_id" ref="view_model_search"/> </record> - <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc" groups="base.group_extended"/> + <menuitem + action="action_model_form" id="menu_action_model_form" sequence="5" + parent="account.menu_configuration_misc" groups="base.group_extended"/> <!-- # Payment Terms @@ -1741,7 +1735,9 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/> + <menuitem action="action_payment_term_form" + id="menu_action_payment_term_form" parent="menu_configuration_misc" + groups="group_account_manager"/> <!-- # Account Subscriptions @@ -1853,7 +1849,11 @@ <field name="view_mode">tree,form</field> <field name="search_view_id" ref="view_subscription_search"/> </record> - <menuitem name="Define Recurring Entries" action="action_subscription_form" id="menu_action_subscription_form" sequence="1" parent="account.menu_finance_recurrent_entries"/> + <menuitem + name="Define Recurring Entries" action="action_subscription_form" + groups="base.group_extended" + id="menu_action_subscription_form" sequence="1" + parent="account.menu_finance_recurrent_entries"/> <record id="action_subscription_form_running" model="ir.actions.act_window"> <field name="name">Running Subscriptions</field> @@ -2075,7 +2075,6 @@ <field name="view_mode">tree,form,search</field> </record> - <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/> <!-- Chart of Accounts Templates --> @@ -2368,7 +2367,9 @@ <field name="target">new</field> </record> - <menuitem name="New Company Financial Setting" parent="account.account_template_folder" action="account.action_account_configuration_installer" id="menu_wizard"/> + <menuitem name="New Company Financial Setting" parent="account.account_template_folder" + groups="group_account_manager" + action="account.action_account_configuration_installer" id="menu_wizard"/> <record id="account_account_graph" model="ir.ui.view"> <field name="name">account.account.graph</field> @@ -2382,14 +2383,14 @@ </field> </record> - <!-- Fiscal Mapping Templates --> + <!-- Fiscal Position Templates --> <record id="view_account_position_template_form" model="ir.ui.view"> <field name="name">account.fiscal.position.template.form</field> <field name="model">account.fiscal.position.template</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Fiscal Mapping Template"> + <form string="Fiscal Position Template"> <field name="name" select="1"/> <field name="chart_template_id"/> <newline/> @@ -2421,14 +2422,14 @@ <field name="model">account.fiscal.position.template</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Fiscal Mapping"> + <tree string="Fiscal Position"> <field name="name"/> </tree> </field> </record> <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window"> - <field name="name">Fiscal Mapping Templates</field> + <field name="name">Fiscal Position Templates</field> <field name="res_model">account.fiscal.position.template</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> @@ -2606,7 +2607,8 @@ <field name="view_id" ref="account_cash_statement_graph"/> <field name="act_window_id" ref="action_view_bank_statement_tree"/> </record> - <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/> + <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash" + groups="group_account_user"/> </data> </openerp> diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index 639dc2dc111..0e48dfc7b66 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/> + <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/> </data> </openerp> diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index 8e2da0697f9..e86d4b5b06a 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 11:28+0000\n" +"PO-Revision-Date: 2010-10-09 14:32+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -40,7 +40,7 @@ msgstr "تشفير المدخلات" #. module: account #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form msgid "Specify The Message for the Overdue Payment Report." -msgstr "" +msgstr "تحديد الرسالة لتقرير الدفع المتأخر" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -55,17 +55,17 @@ msgstr "أصل" #. module: account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "اسم النموذج غير صالح في تعريف العمل." #. module: account #: help:account.journal,currency:0 msgid "The currency used to enter statement" -msgstr "" +msgstr "العملة المستعملة لإدخال البيان" #. module: account #: wizard_view:account_use_models,init_form:0 msgid "Select Message" -msgstr "أختر رسالة" +msgstr "اختر رسالة" #. module: account #: help:product.category,property_account_income_categ:0 @@ -73,28 +73,29 @@ msgid "" "This account will be used to value incoming stock for the current product " "category" msgstr "" +"سيتم استخدام هذا الحساب لتقييم المؤن الواردة بالنسبة لفئة المنتج الحالي" #. module: account #: help:account.invoice,period_id:0 msgid "Keep empty to use the period of the validation(invoice) date." -msgstr "" +msgstr "الإبقاء فارغ لاستخدام فترة تاريخ المصادقة (الفاتورة)" #. module: account #: wizard_view:account.automatic.reconcile,reconcile:0 msgid "Reconciliation result" -msgstr "" +msgstr "نتيجة التسوية" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled entries" -msgstr "مدخلات لم يتم تسويتها" +msgstr "إدخالات لم يتم تسويتها" #. module: account #: field:account.invoice.tax,base_code_id:0 #: field:account.tax,base_code_id:0 #: field:account.tax.template,base_code_id:0 msgid "Base Code" -msgstr "" +msgstr "رمز الأساس" #. module: account #: view:account.account:0 @@ -115,12 +116,12 @@ msgstr "أصل" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "" +msgstr "قسيمة الدفتر" #. module: account #: field:account.invoice,residual:0 msgid "Residual" -msgstr "" +msgstr "متبقي" #. module: account #: field:account.tax,base_sign:0 @@ -128,18 +129,18 @@ msgstr "" #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "" +msgstr "علامة رمز الأساس" #. module: account #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "" +msgstr "إلغاء تسوية الإدخالات" #. module: account #: constraint:account.period:0 msgid "Error ! The duration of the Period(s) is/are invalid. " -msgstr "" +msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة " #. module: account #: view:account.bank.statement.reconcile:0 @@ -149,17 +150,17 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_move_line_form #: model:ir.ui.menu,name:account.menu_action_move_line_form msgid "Entries" -msgstr "مُدخلات" +msgstr "إدخالات" #. module: account #: selection:account.move.line,centralisation:0 msgid "Debit Centralisation" -msgstr "" +msgstr "تمركز المدين" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm msgid "Confirm draft invoices" -msgstr "" +msgstr "تثبيت مشاريع الفواتير" #. module: account #: help:account.payment.term.line,days2:0 @@ -168,11 +169,14 @@ msgid "" "positive, it gives the day of the next month. Set 0 for net days (otherwise " "it's based on the beginning of the month)." msgstr "" +"يوم الشهر، إدخال -1 من أجل آخر يوم من الشهر الحالي. إذا كان إيجابيا فسيعطي " +"اليوم من الشهر القادم. إدخال 0 من أجل أيام صافية (وإلا فإنه يستند إلى بداية " +"الشهر)." #. module: account #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "مجموع المدين" #. module: account #: field:account.config.wizard,charts:0 @@ -190,39 +194,39 @@ msgstr "" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Entry label" -msgstr "" +msgstr "تسمية المدخل" #. module: account #: model:ir.model,name:account.model_account_model_line msgid "Account Model Entries" -msgstr "" +msgstr "إدخالات نماذج الحسابات" #. module: account #: field:account.tax.code,sum_period:0 msgid "Period Sum" -msgstr "" +msgstr "مجموع الفترة" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Compute Code (if type=code)" -msgstr "" +msgstr "رمز الحساب (إذا كان النوع = الرمز)" #. module: account #: view:account.move:0 #: view:account.move.line:0 msgid "Account Entry Line" -msgstr "" +msgstr "خط إدخال الحساب" #. module: account #: wizard_view:account.aged.trial.balance,init:0 msgid "Aged Trial Balance" -msgstr "" +msgstr "ميزان المراجعة القديم" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurrent Entries" -msgstr "" +msgstr "إدخالات متكررة" #. module: account #: field:account.analytic.line,amount:0 @@ -235,19 +239,19 @@ msgstr "" #: field:account.tax.template,amount:0 #: xsl:account.transfer:0 msgid "Amount" -msgstr "" +msgstr "المبلغ" #. module: account #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger #: model:ir.actions.wizard,name:account.wizard_third_party_ledger #: model:ir.ui.menu,name:account.menu_third_party_ledger msgid "Partner Ledger" -msgstr "" +msgstr "دفتر الشركاء" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "" +msgstr "ضرائب المورد" #. module: account #: view:account.move:0 diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index dca0d843292..3d0b6f9dc62 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-07 19:39+0000\n" +"PO-Revision-Date: 2010-10-08 07:35+0000\n" "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n" "Language-Team: <> <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/installer.py b/addons/account/installer.py index cf0049efa54..60251a673ae 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -61,7 +61,7 @@ class account_installer(osv.osv_memory): 'date_stop': fields.date('End Date', required=True), 'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')], 'Periods', required=True), - 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True), + 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts',required=True), 'sale_tax':fields.float('Sale Tax(%)'), 'purchase_tax':fields.float('Purchase Tax(%)'), 'company_id': fields.many2one('res.company', 'Company'), @@ -241,7 +241,6 @@ class account_installer(osv.osv_memory): view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here? view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here? - ref_acc_bank = obj_multi.bank_account_view_id cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash') cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id'] @@ -445,7 +444,6 @@ class account_installer(osv.osv_memory): # Bank Journals view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ? view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name? - ref_acc_bank = obj_multi.bank_account_view_id #create the properties diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 79978c0bbaf..0c83814c15d 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -251,7 +251,7 @@ class account_invoice(osv.osv): \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \ \n* The \'Paid\' state is set automatically when invoice is paid.\ \n* The \'Cancelled\' state is used when user cancel invoice.'), - 'date_invoice': fields.date('Date Invoiced', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"), + 'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"), 'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="If you use payment terms, the due date will be computed automatically at the generation "\ "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."), @@ -315,7 +315,7 @@ class account_invoice(osv.osv): 'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'), 'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}), 'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}), - 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]}) + 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]}) } _defaults = { 'type': _get_type, @@ -353,7 +353,7 @@ class account_invoice(osv.osv): nodes = doc.xpath("//field[@name='partner_id']") partner_string = 'Customer' if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'): - partner_string = 'Vendor' + partner_string = _('Supplier') for node in nodes: node.set('string', partner_string) res['arch'] = etree.tostring(doc) diff --git a/addons/account/partner.py b/addons/account/partner.py index 536976d1e39..8b0f1057c52 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -21,13 +21,12 @@ from operator import itemgetter from osv import fields, osv -import ir class account_fiscal_position(osv.osv): _name = 'account.fiscal.position' - _description = 'Fiscal Mapping' + _description = 'Fiscal Position' _columns = { - 'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True), + 'name': fields.char('Fiscal Position', size=64, translate=True, required=True), 'company_id': fields.many2one('res.company', 'Company'), 'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'), 'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'), @@ -64,10 +63,10 @@ account_fiscal_position() class account_fiscal_position_tax(osv.osv): _name = 'account.fiscal.position.tax' - _description = 'Taxes Fiscal Mapping' + _description = 'Taxes Fiscal Position' _rec_name = 'position_id' _columns = { - 'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'), + 'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'), 'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True), 'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax') } @@ -76,10 +75,10 @@ account_fiscal_position_tax() class account_fiscal_position_account(osv.osv): _name = 'account.fiscal.position.account' - _description = 'Accounts Fiscal Mapping' + _description = 'Accounts Fiscal Position' _rec_name = 'position_id' _columns = { - 'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'), + 'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'), 'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True), 'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True) } @@ -102,10 +101,6 @@ class res_partner(osv.osv): GROUP BY l.partner_id, a.type """, (tuple(ids),)) - tinvert = { - 'credit': 'receivable', - 'debit': 'payable' - } maps = {'receivable':'credit', 'payable':'debit' } res = {} for id in ids: @@ -172,10 +167,10 @@ class res_partner(osv.osv): 'account.fiscal.position', type='many2one', relation='account.fiscal.position', - string="Fiscal Mapping", + string="Fiscal Position", method=True, view_load=True, - help="The fiscal Mapping will determine taxes and the accounts used for the partner.", + help="The fiscal position will determine taxes and the accounts used for the partner.", ), 'property_payment_term': fields.property( 'account.payment.term', @@ -187,7 +182,7 @@ class res_partner(osv.osv): help="This payment term will be used instead of the default one for the current partner"), 'ref_companies': fields.one2many('res.company', 'partner_id', 'Companies that refers to partner'), - 'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time') + 'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time') } res_partner() diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index ca489acd9bd..890e477a726 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -7,7 +7,7 @@ <field name="model">account.fiscal.position</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Fiscal Mapping"> + <form string="Fiscal Position"> <field name="name" select="1"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> <separator string="Mapping" colspan="4"/> @@ -42,7 +42,7 @@ <field name="model">account.fiscal.position</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Fiscal Mapping"> + <tree string="Fiscal Position"> <field name="name"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </tree> @@ -50,7 +50,7 @@ </record> <record id="action_account_fiscal_position_form" model="ir.actions.act_window"> - <field name="name">Fiscal Mappings</field> + <field name="name">Fiscal Positions</field> <field name="res_model">account.fiscal.position</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> @@ -143,7 +143,7 @@ <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> <field name="credit_limit" position="after"> - <field name="last_reconciliation_date"/> + <field name="last_reconciliation_date" groups="base.group_extended"/> </field> </field> </record> diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index b34dca0dbb9..ca013f48be7 100644 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -83,7 +83,6 @@ </record> <record id="process_node_reconciliation0" model="process.node"> - <field name="menu_id" ref="account.menu_eaction_account_moves_all"/> <field name="model_id" ref="account.model_account_move_reconcile"/> <field eval=""""state"""" name="kind"/> <field eval=""""Reconciliation"""" name="name"/> @@ -105,7 +104,6 @@ </record> <record id="process_node_accountingstatemententries0" model="process.node"> - <field name="menu_id" ref="account.menu_eaction_account_moves_all"/> <field name="model_id" ref="account.model_account_move_line"/> <field eval=""""subflow"""" name="kind"/> <field eval=""""Bank Statement"""" name="name"/> diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index 8635b083d72..6f5526623df 100644 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -72,7 +72,6 @@ </record> <record id="process_node_supplierpaymentorder0" model="process.node"> - <field name="menu_id" ref="account.menu_eaction_account_moves_all"/> <field name="model_id" ref="account.model_account_move_line"/> <field eval=""""state"""" name="kind"/> <field eval=""""Payment Order"""" name="name"/> @@ -83,7 +82,6 @@ </record> <record id="process_node_supplierreconciliation0" model="process.node"> - <field name="menu_id" ref="account.menu_eaction_account_moves_all"/> <field name="model_id" ref="account.model_account_move_reconcile"/> <field eval=""""state"""" name="kind"/> <field eval=""""Reconciliation"""" name="name"/> diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml index e989f766d7b..114c75f40af 100644 --- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml +++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml @@ -2,44 +2,44 @@ <openerp> <data> - <record id="account_analytic_invert_balance_view" model="ir.ui.view"> - <field name="name">Account Analytic Inverted Balance</field> - <field name="model">account.analytic.inverted.balance</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Select Period"> - <group colspan="4" col="6"> - <field name="date1"/> - <field name="date2"/> - </group> - <separator colspan="4"/> - <group colspan="4" col="6"> - <button special="cancel" string="Cancel" icon="gtk-cancel"/> - <button name="check_report" string="Print" type="object" icon="gtk-print"/> - </group> - </form> - </field> - </record> + <record id="account_analytic_invert_balance_view" model="ir.ui.view"> + <field name="name">Account Analytic Inverted Balance</field> + <field name="model">account.analytic.inverted.balance</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Select Period"> + <group colspan="4" col="6"> + <field name="date1"/> + <field name="date2"/> + </group> + <separator colspan="4"/> + <group colspan="4" col="6"> + <button special="cancel" string="Cancel" icon="gtk-cancel"/> + <button name="check_report" string="Print" type="object" icon="gtk-print"/> + </group> + </form> + </field> + </record> - <record id="action_account_analytic_invert_balance" model="ir.actions.act_window"> - <field name="name">Inverted Analytic Balance</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">account.analytic.inverted.balance</field> - <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="view_id" ref="account_analytic_invert_balance_view"/> - <field name="target">new</field> - </record> + <record id="action_account_analytic_invert_balance" model="ir.actions.act_window"> + <field name="name">Inverted Analytic Balance</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">account.analytic.inverted.balance</field> + <field name="view_type">form</field> + <field name="view_mode">form</field> + <field name="view_id" ref="account_analytic_invert_balance_view"/> + <field name="target">new</field> + </record> - <record model="ir.values" id="account_analytic_invert_balance_values"> - <field name="model_id" ref="analytic.model_account_analytic_account" /> - <field name="object" eval="1" /> - <field name="name">Account Analytic Inverted Balance</field> - <field name="key2">client_print_multi</field> - <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" /> - <field name="key">action</field> - <field name="model">account.analytic.account</field> - </record> + <record model="ir.values" id="account_analytic_invert_balance_values"> + <field name="model_id" ref="analytic.model_account_analytic_account" /> + <field name="object" eval="1" /> + <field name="name">Account Analytic Inverted Balance</field> + <field name="key2">client_print_multi</field> + <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" /> + <field name="key">action</field> + <field name="model">account.analytic.account</field> + </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index 5a1b8ac868b..22b04e05f39 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -79,6 +79,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header): # # Build a string like (1,2,3) for easy use in SQL query partner_ids = [x['id'] for x in partners] + if not partner_ids: + return [] # This dictionary will store the debit-credit for all partners, using partner_id as key. move_state = ['draft','posted'] if self.target_move == 'posted': diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index a131400948b..34d23826e80 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -108,7 +108,10 @@ <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field> </record> - <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/> + <menuitem action="action_analytic_entries_report" + id="menu_action_analytic_entries_report" + groups="analytic.group_analytic_accounting" + parent="account.menu_finance_statistic_report_statement" sequence="4"/> </data> </openerp> diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 081328d89fb..a80fb3c3233 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -117,6 +117,9 @@ <field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field> <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field> </record> - <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/> + <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" + parent="account.menu_finance_statistic_report_statement" + groups="group_account_manager" + sequence="2"/> </data> </openerp> diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 39a1709d503..125edb0d992 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -39,7 +39,7 @@ class account_invoice_report(osv.osv): 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True), 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True), - 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True), + 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), 'categ_id': fields.many2one('product.category','Category of Product', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 12f8b23e550..a2ea227d707 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -78,14 +78,14 @@ domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/> <filter icon="terp-purchase" - string="Vendor" + string="supplier" separator="1" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" - help="Vendor Invoices And Refunds"/> + help="Supplier Invoices And Refunds"/> <separator orientation="vertical"/> <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" - help="Customer And Vendor Invoices"/> + help="Customer And Supplier Invoices"/> <filter icon="terp-dolar_ok!" string="Refund" separator="1" @@ -94,7 +94,7 @@ <separator orientation="vertical"/> <field name="partner_id"/> <field name="user_id" /> - <field name="date" string="Date Invoiced"/> + <field name="date" string="Invoice Date"/> <field name="categ_id" /> </group> <newline/> diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 173cbd1e6c4..c6ff4015ea6 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -362,7 +362,7 @@ <blockTable colWidths="120.0,410.0" style="Table1"> <tr> <td> - <para style="terp_default_Bold_9">Fiscal Mapping Remark : </para> + <para style="terp_default_Bold_9">Fiscal Position: </para> </td> <td> <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para> diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py index 1136300f065..dd8e0a2ce4e 100644 --- a/addons/account/report/account_report.py +++ b/addons/account/report/account_report.py @@ -165,7 +165,7 @@ class report_invoice_created(osv.osv): 'amount_untaxed': fields.float('Untaxed', readonly=True), 'amount_total': fields.float('Total', readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), - 'date_invoice': fields.date('Date Invoiced', readonly=True), + 'date_invoice': fields.date('Invoice Date', readonly=True), 'date_due': fields.date('Due Date', readonly=True), 'residual': fields.float('Residual', readonly=True), 'state': fields.selection([ diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py index d9bcabf0ce4..b03aea5c05d 100644 --- a/addons/account/report/account_tax_report.py +++ b/addons/account/report/account_tax_report.py @@ -26,195 +26,195 @@ import rml_parse from report import report_sxw class tax_report(rml_parse.rml_parse): - _name = 'report.account.vat.declaration' - def __init__(self, cr, uid, name, context={}): - super(tax_report, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - 'get_period': self._get_period, - 'get_codes': self._get_codes, - 'get_general': self._get_general, - 'get_company': self._get_company, - 'get_currency': self._get_currency, - 'get_lines': self._get_lines, - }) - - - def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}): - res = self._get_codes(based_on, company_id, parent, level, period_list, context=context) - - if period_list: - res = self._add_codes(based_on, res, period_list, context=context) - else: - self.cr.execute ("select id from account_fiscalyear") - fy = self.cr.fetchall() - self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],)) - periods = self.cr.fetchall() - for p in periods: - period_list.append(p[0]) - res = self._add_codes(based_on, res, period_list, context=context) - - i = 0 - top_result = [] - while i < len(res): - - res_dict = { 'code': res[i][1].code, - 'name': res[i][1].name, - 'debit': 0, - 'credit': 0, - 'tax_amount': res[i][1].sum_period, - 'type': 1, - 'level': res[i][0], - 'pos': 0 - } - - top_result.append(res_dict) - res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context) - ind_general = 0 - while ind_general < len(res_general): - res_general[ind_general]['type'] = 2 - res_general[ind_general]['pos'] = 0 - res_general[ind_general]['level'] = res_dict['level'] - top_result.append(res_general[ind_general]) - ind_general+=1 - i+=1 - return top_result - #return array_result - - def _get_period(self, period_id, context={}): - return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name - - def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}): - res=[] - obj_account = self.pool.get('account.account') - periods_ids = tuple(period_list) - if based_on == 'payments': - self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \ - SUM(line.debit) AS debit, \ - SUM(line.credit) AS credit, \ - COUNT(*) AS count, \ - account.id AS account_id, \ - account.name AS name, \ - account.code AS code \ - FROM account_move_line AS line, \ - account_account AS account, \ - account_move AS move \ - LEFT JOIN account_invoice invoice ON \ - (invoice.move_id = move.id) \ - WHERE line.state<>%s \ - AND line.tax_code_id = %s \ - AND line.account_id = account.id \ - AND account.company_id = %s \ - AND move.id = line.move_id \ - AND line.period_id IN %s \ - AND ((invoice.state = %s) \ - OR (invoice.id IS NULL)) \ - GROUP BY account.id,account.name,account.code', ('draft', tax_code_id, - company_id, periods_ids, 'paid',)) - - else: - self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \ - SUM(line.debit) AS debit, \ - SUM(line.credit) AS credit, \ - COUNT(*) AS count, \ - account.id AS account_id, \ - account.name AS name, \ - account.code AS code \ - FROM account_move_line AS line, \ - account_account AS account \ - WHERE line.state <> %s \ - AND line.tax_code_id = %s \ - AND line.account_id = account.id \ - AND account.company_id = %s \ - AND line.period_id IN %s\ - AND account.active \ - GROUP BY account.id,account.name,account.code', ('draft', tax_code_id, - company_id, periods_ids,)) - res = self.cr.dictfetchall() - - i = 0 - while i<len(res): - res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context) - i+=1 - return res - - def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}): - obj_tc = self.pool.get('account.tax.code') - ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context) - - res = [] - for code in obj_tc.browse(self.cr, self.uid, ids, {'based_on': based_on}): - res.append(('.'*2*level, code)) - - res += self._get_codes(based_on, company_id, code.id, level+1, context=context) - return res - - def _add_codes(self, based_on, account_list=[], period_list=[], context={}): - res = [] - obj_tc = self.pool.get('account.tax.code') - for account in account_list: - ids = obj_tc.search(self.cr, self.uid, [('id','=', account[1].id)], context=context) - sum_tax_add = 0 - for period_ind in period_list: - for code in obj_tc.browse(self.cr, self.uid, ids, {'period_id':period_ind,'based_on': based_on}): - sum_tax_add = sum_tax_add + code.sum_period - - code.sum_period = sum_tax_add - - res.append((account[0], code)) - return res - - - def _get_company(self, form, context={}): - obj_company = self.pool.get('res.company') - return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name - - def _get_currency(self, form, context={}): - obj_company = self.pool.get('res.company') - return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name - - def sort_result(self, accounts, context={}): - # On boucle sur notre rapport - result_accounts = [] - ind=0 - old_level=0 - while ind<len(accounts): - # - account_elem = accounts[ind] - # - - # - # we will now check if the level is lower than the previous level, in this case we will make a subtotal - if (account_elem['level'] < old_level): - bcl_current_level = old_level - bcl_rup_ind = ind - 1 - - while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ): - tot_elem = copy.copy(accounts[bcl_rup_ind], context=context) - res_tot = { 'code': accounts[bcl_rup_ind]['code'], - 'name': '', - 'debit': 0, - 'credit': 0, - 'tax_amount': accounts[bcl_rup_ind]['tax_amount'], - 'type': accounts[bcl_rup_ind]['type'], - 'level': 0, - 'pos': 0 - } - - if res_tot['type'] == 1: - # on change le type pour afficher le total - res_tot['type'] = 2 - result_accounts.append(res_tot) - bcl_current_level = accounts[bcl_rup_ind]['level'] - bcl_rup_ind -= 1 - - old_level = account_elem['level'] - result_accounts.append(account_elem) - ind+=1 - - return result_accounts + _name = 'report.account.vat.declaration' + def __init__(self, cr, uid, name, context={}): + super(tax_report, self).__init__(cr, uid, name, context=context) + self.localcontext.update({ + 'time': time, + 'get_period': self._get_period, + 'get_codes': self._get_codes, + 'get_general': self._get_general, + 'get_company': self._get_company, + 'get_currency': self._get_currency, + 'get_lines': self._get_lines, + }) + + + def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}): + res = self._get_codes(based_on, company_id, parent, level, period_list, context=context) + + if period_list: + res = self._add_codes(based_on, res, period_list, context=context) + else: + self.cr.execute ("select id from account_fiscalyear") + fy = self.cr.fetchall() + self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],)) + periods = self.cr.fetchall() + for p in periods: + period_list.append(p[0]) + res = self._add_codes(based_on, res, period_list, context=context) + + i = 0 + top_result = [] + while i < len(res): + + res_dict = { 'code': res[i][1].code, + 'name': res[i][1].name, + 'debit': 0, + 'credit': 0, + 'tax_amount': res[i][1].sum_period, + 'type': 1, + 'level': res[i][0], + 'pos': 0 + } + + top_result.append(res_dict) + res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context) + ind_general = 0 + while ind_general < len(res_general): + res_general[ind_general]['type'] = 2 + res_general[ind_general]['pos'] = 0 + res_general[ind_general]['level'] = res_dict['level'] + top_result.append(res_general[ind_general]) + ind_general+=1 + i+=1 + return top_result + #return array_result + + def _get_period(self, period_id, context={}): + return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name + + def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}): + res=[] + obj_account = self.pool.get('account.account') + periods_ids = tuple(period_list) + if based_on == 'payments': + self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \ + SUM(line.debit) AS debit, \ + SUM(line.credit) AS credit, \ + COUNT(*) AS count, \ + account.id AS account_id, \ + account.name AS name, \ + account.code AS code \ + FROM account_move_line AS line, \ + account_account AS account, \ + account_move AS move \ + LEFT JOIN account_invoice invoice ON \ + (invoice.move_id = move.id) \ + WHERE line.state<>%s \ + AND line.tax_code_id = %s \ + AND line.account_id = account.id \ + AND account.company_id = %s \ + AND move.id = line.move_id \ + AND line.period_id IN %s \ + AND ((invoice.state = %s) \ + OR (invoice.id IS NULL)) \ + GROUP BY account.id,account.name,account.code', ('draft', tax_code_id, + company_id, periods_ids, 'paid',)) + + else: + self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \ + SUM(line.debit) AS debit, \ + SUM(line.credit) AS credit, \ + COUNT(*) AS count, \ + account.id AS account_id, \ + account.name AS name, \ + account.code AS code \ + FROM account_move_line AS line, \ + account_account AS account \ + WHERE line.state <> %s \ + AND line.tax_code_id = %s \ + AND line.account_id = account.id \ + AND account.company_id = %s \ + AND line.period_id IN %s\ + AND account.active \ + GROUP BY account.id,account.name,account.code', ('draft', tax_code_id, + company_id, periods_ids,)) + res = self.cr.dictfetchall() + + i = 0 + while i<len(res): + res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context) + i+=1 + return res + + def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}): + obj_tc = self.pool.get('account.tax.code') + ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context) + + res = [] + for code in obj_tc.browse(self.cr, self.uid, ids, {'based_on': based_on}): + res.append(('.'*2*level, code)) + + res += self._get_codes(based_on, company_id, code.id, level+1, context=context) + return res + + def _add_codes(self, based_on, account_list=[], period_list=[], context={}): + res = [] + obj_tc = self.pool.get('account.tax.code') + for account in account_list: + ids = obj_tc.search(self.cr, self.uid, [('id','=', account[1].id)], context=context) + sum_tax_add = 0 + for period_ind in period_list: + for code in obj_tc.browse(self.cr, self.uid, ids, {'period_id':period_ind,'based_on': based_on}): + sum_tax_add = sum_tax_add + code.sum_period + + code.sum_period = sum_tax_add + + res.append((account[0], code)) + return res + + + def _get_company(self, form, context={}): + obj_company = self.pool.get('res.company') + return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name + + def _get_currency(self, form, context={}): + obj_company = self.pool.get('res.company') + return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name + + def sort_result(self, accounts, context={}): + # On boucle sur notre rapport + result_accounts = [] + ind=0 + old_level=0 + while ind<len(accounts): + # + account_elem = accounts[ind] + # + + # + # we will now check if the level is lower than the previous level, in this case we will make a subtotal + if (account_elem['level'] < old_level): + bcl_current_level = old_level + bcl_rup_ind = ind - 1 + + while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ): + tot_elem = copy.copy(accounts[bcl_rup_ind], context=context) + res_tot = { 'code': accounts[bcl_rup_ind]['code'], + 'name': '', + 'debit': 0, + 'credit': 0, + 'tax_amount': accounts[bcl_rup_ind]['tax_amount'], + 'type': accounts[bcl_rup_ind]['type'], + 'level': 0, + 'pos': 0 + } + + if res_tot['type'] == 1: + # on change le type pour afficher le total + res_tot['type'] = 2 + result_accounts.append(res_tot) + bcl_current_level = accounts[bcl_rup_ind]['level'] + bcl_rup_ind -= 1 + + old_level = account_elem['level'] + result_accounts.append(account_elem) + ind+=1 + + return result_accounts report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code', - 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal") + 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index f6d4ec3d88e..24265065b25 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -5,150 +5,13 @@ <field name="name">Accounting / Invoice</field> </record> - <record id="group_account_user" model="res.groups"> + <record id="group_account_user" model="res.groups" context="{'noadmin':True}"> <field name="name">Accounting / Accountant</field> </record> - - <record id="group_account_manager" model="res.groups"> + <record id="group_account_manager" model="res.groups" context="{'noadmin':True}"> <field name="name">Accounting / Manager</field> </record> - <record id="menu_finance_reporting" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record> - - <record id="menu_finance_legal_statement" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_receivables" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_invoice'),ref('group_account_manager'),ref('group_account_user')])]" name="groups_id"/> - </record> - - <record id="menu_finance_payables" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_charts" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record> - - <record id="menu_eaction_account_moves_sale" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/> - </record> - - <record id="menu_eaction_account_moves_purchase" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/> - </record> - - <record id="menu_action_invoice_tree1" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_invoice_tree2" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_invoice_tree3" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_invoice_tree4" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_bank_and_cash" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_account_tree2" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_entries" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/> - </record> - - <record id="menu_action_move_journal_line_form" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_eaction_account_moves_all" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/> - </record> - - <record id="menu_dashboard_acc" model="ir.ui.menu"> - <field eval="[(6, 0, [ref('group_account_user')])]" name="groups_id"/> - </record> - - <record id="final_accounting_reports" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record> - - <record id="menu_journals_report" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_tax_code_tree" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_periodical_processing" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/> - </record> - - <record id="menu_general_ledger" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_general_Balance_report" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_account_bs_report" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_account_pl_report" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_tax_report" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="next_id_22" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_account_invoice_report_all" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_action_account_entries_report_all" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_statistic_report_statement" model="ir.ui.menu"> - <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/> - </record> - - <record id="menu_finance_generic_reporting" model="ir.ui.menu"> - <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record> - - <!--record id="menu_finance_configuration" model="ir.ui.menu"> - <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record--> - - <record id="menu_finance_entries" model="ir.ui.menu"> - <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record> - - <!--record id="menu_analytic_accounting" model="ir.ui.menu"> - <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/> - </record--> - <record id="account_move_comp_rule" model="ir.rule"> <field name="name">Account Entry</field> <field ref="model_account_move" name="model_id"/> diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml index 5f5d404139a..da59388eb91 100644 --- a/addons/account/wizard/account_move_journal_view.xml +++ b/addons/account/wizard/account_move_journal_view.xml @@ -21,17 +21,8 @@ <field name="context">{'journal_type':'sale','view_mode':False}</field> <field name="target">new</field> </record> - <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/> - -<!-- <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">--> -<!-- <field name="name">Journal Refund Items</field>--> -<!-- <field name="res_model">account.move.journal</field>--> -<!-- <field name="view_type">form</field>--> -<!-- <field name="view_id" ref="view_account_move_journal_form"/>--> -<!-- <field name="context">{'journal_type':'purchase_refund'}</field>--> -<!-- <field name="target">new</field>--> -<!-- </record>--> -<!-- <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>--> + <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale" + parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/> <record id="action_account_moves_purchase" model="ir.actions.act_window"> <field name="name">Journal Items</field> @@ -48,16 +39,6 @@ sequence="16" groups="group_account_user,group_account_manager"/> -<!-- <record id="action_account_moves_sale_refund" model="ir.actions.act_window">--> -<!-- <field name="name">Journal Refund Items</field>--> -<!-- <field name="res_model">account.move.journal</field>--> -<!-- <field name="view_type">form</field>--> -<!-- <field name="view_id" ref="view_account_move_journal_form"/>--> -<!-- <field name="context">{'journal_type':'sale_refund'}</field>--> -<!-- <field name="target">new</field>--> -<!-- </record>--> -<!-- <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>--> - <record id="action_account_moves_bank" model="ir.actions.act_window"> <field name="name">Journal Items</field> <field name="res_model">account.move.journal</field> diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index a80ffbc05cd..38ed195820b 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -58,8 +58,7 @@ <field name="writeoff_acc_id" domain="[('type', '<>', 'view')]"/> <field name="date_p"/> <field name="comment"/> - <separator string="Analytic" colspan="4"/> - <field name="analytic_id"/> + <field name="analytic_id" groups="analytic.group_analytic_accounting"/> <group colspan="4" col="6"> <label string ="" colspan="2"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/> diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml index f1c5ef35de9..68a757c6f9b 100644 --- a/addons/account/wizard/account_report_balance_sheet_view.xml +++ b/addons/account/wizard/account_report_balance_sheet_view.xml @@ -30,6 +30,7 @@ <menuitem icon="STOCK_PRINT" name="Balance Sheet" action="action_account_bs_report" + groups="group_account_user" id="menu_account_bs_report" parent="final_accounting_reports"/> diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml index b251252851c..5a6707f82de 100644 --- a/addons/account/wizard/account_report_general_ledger_view.xml +++ b/addons/account/wizard/account_report_general_ledger_view.xml @@ -56,6 +56,7 @@ name="General Ledger" parent="account.final_accounting_reports" action="action_account_general_ledger_menu" + groups="group_account_manager" id="menu_general_ledger" /> diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml index 33f8e765387..c1504f6d3f5 100644 --- a/addons/account/wizard/account_report_partner_ledger_view.xml +++ b/addons/account/wizard/account_report_partner_ledger_view.xml @@ -34,6 +34,7 @@ <menuitem icon="STOCK_PRINT" name="Partner Ledger" action="action_account_partner_ledger" + groups="group_account_manager" id="menu_account_partner_ledger" parent="account.next_id_22"/> diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml index f60ad394857..4174285d64d 100644 --- a/addons/account/wizard/account_tax_chart_view.xml +++ b/addons/account/wizard/account_tax_chart_view.xml @@ -34,12 +34,13 @@ <field name="target">new</field> </record> - <menuitem - icon="STOCK_INDENT" + <menuitem + icon="STOCK_INDENT" action="action_account_tax_chart" id="menu_action_tax_code_tree" parent="menu_finance_charts" + groups="group_account_user" sequence="12"/> - </data> + </data> </openerp> diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index c8a6645f744..018c753a7c2 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -10,7 +10,7 @@ <form string="Select Period"> <field name="company_id" groups="base.group_multi_company" widget='selection'/> <newline/> - <field name="based_on"/> + <field name="based_on" invisible="1"/> <newline/> <separator string="Select Period(s)" colspan="4"/> <field name="periods" nolabel="1" colspan="2"/> diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index e7aa4f1bbca..af1264d562c 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -23,19 +23,18 @@ "version" : "1.1", "author" : "OpenERP SA", "category": 'Generic Modules/Accounting', - "description": """Account Accountant: This module makes the account as an Invoicing system but not an -accounting one. + "description": """ +Give access to the admin user to all accounting features like the journal +items and the chart of accounts. """, 'website': 'http://www.openerp.com', 'init_xml': [], "depends" : ["account"], 'update_xml': [ - 'account_security.xml', - ], - 'demo_xml': [ - ], - 'test': [ + 'security/account_security.xml', ], + 'demo_xml': [ ], + 'test': [ ], 'installable': True, 'active': False, 'certificate': '', diff --git a/addons/account_accountant/account_security.xml b/addons/account_accountant/account_security.xml deleted file mode 100644 index 429508ebabc..00000000000 --- a/addons/account_accountant/account_security.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data> - - </data> -</openerp>
\ No newline at end of file diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml new file mode 100644 index 00000000000..9daabddfef8 --- /dev/null +++ b/addons/account_accountant/security/account_security.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + + <record id="base.user_admin" model="res.users"> + <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/> + </record> + + </data> +</openerp> diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po new file mode 100644 index 00000000000..8031d4b6bca --- /dev/null +++ b/addons/account_analytic_plans/i18n/mn.po @@ -0,0 +1,376 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-10-09 14:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" +"Language-Team: Mongolian <mn@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account4_ids:0 +msgid "Account4 Id" +msgstr "Дансны дугаар 4" + +#. module: account_analytic_plans +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж " +"\"\"болохгүй!" + +#. module: account_analytic_plans +#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic +#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report +msgid "Crossovered Analytic" +msgstr "Crossovered Analytic" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account5_ids:0 +msgid "Account5 Id" +msgstr "Дансны дугаар 5" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,date2:0 +msgid "End Date" +msgstr "Дуусах огноо" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,rate:0 +msgid "Rate (%)" +msgstr "Үнэ (%)" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,name:0 +#: field:account.analytic.plan.line,plan_id:0 +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action +msgid "Analytic Plan" +msgstr "Аналитик төлөвлөгөө" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line +msgid "Analytic Instance Line" +msgstr "Analytic Instance Line" + +#. module: account_analytic_plans +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Lines" +msgstr "Analytic Distribution Lines" + +#. module: account_analytic_plans +#: wizard_button:wizard.crossovered.analytic,init,print:0 +msgid "Print" +msgstr "Хэвлэх" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "To Date" +msgstr "Огноо" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,plan_id:0 +msgid "Plan Id" +msgstr "Төлөвлөгөөний дугаар" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action +msgid "Analytic Distribution's Models" +msgstr "Аналитик байрлалын модел" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Account Name" +msgstr "Дансны нэр" + +#. module: account_analytic_plans +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Line" +msgstr "Analytic Distribution Line" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,code:0 +msgid "Distribution Code" +msgstr "Байрлалын код" + +#. module: account_analytic_plans +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,name:0 +msgid "Plan Name" +msgstr "Plan Name" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Printing date" +msgstr "Хэвлэсэн огноо" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Percentage" +msgstr "Хувь" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,empty_line:0 +msgid "Dont show empty lines" +msgstr "Хоосон мөрийг харуулахгүй" + +#. module: account_analytic_plans +#: wizard_view:wizard.crossovered.analytic,init:0 +msgid "Select Information" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account3_ids:0 +msgid "Account3 Id" +msgstr "Дансны дугаар 3" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,journal_id:0 +#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 +msgid "Analytic Journal" +msgstr "Аналитик Журнал" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "100.00%" +msgstr "100.00%" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,ref:0 +msgid "Analytic Account Ref." +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account :" +msgstr "Analytic Account :" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +msgid "Analytic Plan Line" +msgstr "Analytic Plan Line" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account Reference:" +msgstr "Analytic Account Reference:" + +#. module: account_analytic_plans +#: model:ir.actions.wizard,name:account_analytic_plans.create_model +msgid "Create Model" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan,default_instance_id:0 +msgid "Default Entries" +msgstr "Default Entries" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,plan_ids:0 +#: field:account.journal,plan_id:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan +msgid "Analytic Plans" +msgstr "Аналитик төлөвлөгөө" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,min_required:0 +msgid "Minimum Allowed (%)" +msgstr "Minimum Allowed (%)" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account1_ids:0 +msgid "Account1 Id" +msgstr "Account1 Id" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,max_required:0 +msgid "Maximum Allowed (%)" +msgstr "Maximum Allowed (%)" + +#. module: account_analytic_plans +#: wizard_view:create.model,info:0 +msgid "Distribution Model Saved" +msgstr "Distribution Model Saved" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance +msgid "Analytic Plan Instance" +msgstr "Analytic Plan Instance" + +#. module: account_analytic_plans +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Дэлгэцийн XML алдаатай!" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open +msgid "Distribution Models" +msgstr "Distribution Models" + +#. module: account_analytic_plans +#: model:ir.module.module,description:account_analytic_plans.module_meta_information +msgid "" +"This module allows to use several analytic plans, according to the general " +"journal,\n" +"so that multiple analytic lines are created when the invoice or the entries\n" +"are confirmed.\n" +"\n" +"For example, you can define the following analytic structure:\n" +" Projects\n" +" Project 1\n" +" SubProj 1.1\n" +" SubProj 1.2\n" +" Project 2\n" +" Salesman\n" +" Eric\n" +" Fabien\n" +"\n" +"Here, we have two plans: Projects and Salesman. An invoice line must\n" +"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n" +"Fabien. The amount can also be split. The following example is for\n" +"an invoice that touches the two subproject and assigned to one salesman:\n" +"\n" +"Plan1:\n" +" SubProject 1.1 : 50%\n" +" SubProject 1.2 : 50%\n" +"Plan2:\n" +" Eric: 100%\n" +"\n" +"So when this line of invoice will be confirmed, it will generate 3 analytic " +"lines,\n" +"for one account entry.\n" +" " +msgstr "" + +#. module: account_analytic_plans +#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information +msgid "Multiple-plans management in Analytic Accounting" +msgstr "Multiple-plans management in Analytic Accounting" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line +msgid "Analytic Plan Lines" +msgstr "Analytic Plan Lines" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Crossovered Analytic -" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,plan_id:0 +msgid "Model's Plan" +msgstr "Model's Plan" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account2_ids:0 +msgid "Account2 Id" +msgstr "Account2 Id" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Amount" +msgstr "Дүн" + +#. module: account_analytic_plans +#: help:account.analytic.plan.line,root_analytic_id:0 +msgid "Root account of this plan." +msgstr "Root account of this plan." + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account6_ids:0 +msgid "Account6 Id" +msgstr "Account6 Id" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Quantity" +msgstr "Тоо хэмжээ" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account_ids:0 +msgid "Account Id" +msgstr "Account Id" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Code" +msgstr "Код" + +#. module: account_analytic_plans +#: wizard_button:create.model,info,end:0 +msgid "OK" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,root_analytic_id:0 +msgid "Root Account" +msgstr "Root Account" + +#. module: account_analytic_plans +#: wizard_view:create.model,info:0 +msgid "" +"This distribution model has been saved. You will be able to reuse it later." +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,sequence:0 +msgid "Sequence" +msgstr "Sequence" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Аналитик Данс" + +#. module: account_analytic_plans +#: field:account.analytic.default,analytics_id:0 +#: view:account.analytic.plan.instance:0 +#: field:account.analytic.plan.instance,name:0 +#: field:account.invoice.line,analytics_id:0 +#: field:account.move.line,analytics_id:0 +msgid "Analytic Distribution" +msgstr "Аналитик тархалт" + +#. module: account_analytic_plans +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action +msgid "Analytic Distribution's models" +msgstr "" + +#. module: account_analytic_plans +#: wizard_button:wizard.crossovered.analytic,init,end:0 +msgid "Cancel" +msgstr "Цуцлах" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,date1:0 +msgid "Start Date" +msgstr "Эхлэх огноо" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "at" +msgstr "at" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "From Date" +msgstr "From Date" diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po index 555253dc4d1..946a5d1e60e 100644 --- a/addons/account_cancel/i18n/es.po +++ b/addons/account_cancel/i18n/es.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-19 12:03+0000\n" -"PO-Revision-Date: 2010-10-06 02:17+0000\n" -"Last-Translator: Marcelo Zunino (http://infoprimo.com) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:36+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Spanish <es@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_cancel diff --git a/addons/account_chart/i18n/eu.po b/addons/account_chart/i18n/eu.po index ed5e94e1f73..570795a55f6 100644 --- a/addons/account_chart/i18n/eu.po +++ b/addons/account_chart/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 09:31+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart diff --git a/addons/account_reporting/i18n/nl.po b/addons/account_reporting/i18n/nl.po index 4ed85667eba..6202a88cc3b 100644 --- a/addons/account_reporting/i18n/nl.po +++ b/addons/account_reporting/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 17:30+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:36+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py index 41f33976c53..2b1478d9fa0 100644 --- a/addons/account_voucher/__init__.py +++ b/addons/account_voucher/__init__.py @@ -20,7 +20,8 @@ ############################################################################## import account_voucher +import invoice import report import wizard -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 59495eddc5f..683cca2442e 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -47,6 +47,7 @@ "voucher_payment_receipt_view.xml", "voucher_sales_purchase_view.xml", "account_voucher_wizard.xml", + "account_voucher_pay_invoice.xml", "security/account_voucher_security.xml" ], "test" : [ diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml new file mode 100644 index 00000000000..f4ebf0e3eb1 --- /dev/null +++ b/addons/account_voucher/account_voucher_pay_invoice.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<openerp> + <data> + <record id="view_invoice_customer" model="ir.ui.view"> + <field name="name">account.invoice.customer.pay</field> + <field name="model">account.invoice</field> + <field name="type">form</field> + <field name="inherit_id" ref="account.invoice_form"/> + <field name="arch" type="xml"> + <button name="invoice_open" position="after"> + <button name="invoice_pay_customer" type="object" string="Payment" states="open" icon="gtk-go-forward"/> + </button> + </field> + </record> + + <record id="view_invoice_supplier" model="ir.ui.view"> + <field name="name">account.invoice.supplier.pay</field> + <field name="model">account.invoice</field> + <field name="type">form</field> + <field name="inherit_id" ref="account.invoice_supplier_form"/> + <field name="arch" type="xml"> + <button name="invoice_open" position="after"> + <button name="invoice_pay_customer" type="object" string="Pay Invoice" states="open" icon="gtk-go-forward"/> + </button> + </field> + </record> + + </data> +</openerp> diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index b089825da9b..1ad3edd0760 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -218,14 +218,5 @@ </field> </record> - <act_window - id="act_invoice_voucher_open" - name="Pay Invoice" - view_mode="form,tree" - domain="[('partner_id', '=', partner_id)]" - context="{'default_partner_id': partner_id, 'default_amount':residual, 'default_name':name, 'default_state': 'draft', 'invoice_type':type, 'default_type': type in ('out_invoice','out_refund') and 'receipt' or 'payment'}" - res_model="account.voucher" - src_model="account.invoice"/> - </data> </openerp> diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po index a1ddddebc4d..2bde4729e33 100644 --- a/addons/account_voucher/i18n/pl.po +++ b/addons/account_voucher/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-07 16:41+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:28+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py new file mode 100644 index 00000000000..a2cf45391fb --- /dev/null +++ b/addons/account_voucher/invoice.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +import netsvc +from osv import fields, osv +from tools.translate import _ + +class invoice(osv.osv): + _inherit = 'account.invoice' + def invoice_pay_customer(self, cr, uid, ids, context={}): + if not ids: return [] + inv = self.browse(cr, uid, ids[0], context=context) + return { + 'name':_("Pay Invoice"), + 'view_mode': 'form', + 'view_id': False, + 'view_type': 'form', + 'res_model': 'account.voucher', + 'type': 'ir.actions.act_window', + 'nodestroy': True, + 'target': 'new', + 'domain': '[]', + 'context': { + 'default_partner_id': inv.partner_id.id, + 'default_amount': inv.residual, + 'default_name':inv.name, + 'close_after_process': True, + 'invoice_type':inv.type, + 'invoice_id':inv.id, + 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment' + } + } + +invoice() diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 1e717a07a33..8169cac31e3 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -219,7 +219,7 @@ <field name="state"/> <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/> <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/> - <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/> + <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/> </group> </form> @@ -257,7 +257,7 @@ <field name="model">account.voucher</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Sales Payment"> + <form string="Customer Payment"> <group col="6" colspan="4"> <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" string="Customer"/> <field name="journal_id" @@ -326,7 +326,7 @@ <field name="state"/> <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/> <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/> - <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/> + <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/> </group> </form> @@ -334,7 +334,7 @@ </record> <record id="action_vendor_receipt" model="ir.actions.act_window"> - <field name="name">Sales Payment</field> + <field name="name">Customer Payment</field> <field name="res_model">account.voucher</field> <field name="view_type">form</field> <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field> diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 576bf5fa5c7..7bc64a825ae 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -80,7 +80,7 @@ </record> <record id="act_pay_voucher" model="ir.actions.act_window"> - <field name="name">Sales Payment</field> + <field name="name">Customer Payment</field> <field name="res_model">account.voucher</field> <field name="view_type">form</field> <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field> @@ -111,7 +111,7 @@ <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/> <field name="name"/> <field name="amount" sum="Total"/> - <field name="account_analytic_id" groups="base.group_extended"/> + <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> </tree> </field> <group col="2" colspan="3"> @@ -152,8 +152,8 @@ <field name="state"/> <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/> <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/> - <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/> - <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Sales Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/> + <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/> + <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/> </group> </form> @@ -186,6 +186,7 @@ <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL" action="action_sale_receipt" parent="account.menu_finance_receivables" + groups="base.group_extended" sequence="10"/> <!-- Purchase Vouchers --> @@ -203,9 +204,9 @@ <field name="model">account.voucher</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Vendor Bills"> + <form string="Supplier Voucher"> <group col="6" colspan="4"> - <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/> + <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/> <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/> <field name="number"/> <field name="name" colspan="4"/> @@ -221,7 +222,7 @@ <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/> <field name="name"/> <field name="amount"/> - <field name="account_analytic_id" groups="base.group_extended"/> + <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> </tree> </field> <group col="2" colspan="3"> @@ -255,7 +256,7 @@ <field name="state"/> <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/> <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/> - <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/> + <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/> <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/> </group> @@ -263,7 +264,7 @@ </field> </record> <record id="action_purchase_receipt" model="ir.actions.act_window"> - <field name="name">Vendor Bills</field> + <field name="name">Supplier Vouchers</field> <field name="res_model">account.voucher</field> <field name="view_type">form</field> <field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field> @@ -285,7 +286,8 @@ </record> <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" - action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/> + action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10" + groups="base.group_extended"/> </data> </openerp> diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index 6147ee3e158..2eeda3aa370 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -7,9 +7,7 @@ <field eval="True" name="global"/> <field name="domain_force">[('company_id','=',user.company_id.id)]</field> </record> - - <record id="group_analytic_accounting" model="res.groups"> - <field name="name">Analytic Accounting</field> + <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}"> + <field name="name">Useability / Analytic Accounting</field> </record> - </data></openerp> diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml index a26e5355cde..da4989756f9 100644 --- a/addons/auction/auction_demo.xml +++ b/addons/auction/auction_demo.xml @@ -10,93 +10,93 @@ </record> <record model="account.account" id="auction_income_view"> - <field name="name">Auction Adjudications</field> - <field name="code">A0</field> - <field name="type">view</field> - <field name="currency_id" search="[('name','=','EUR')]"/> - <field name="parent_id" eval="0"> - <value search="[('type','=','view')]" model="account.account"/> - </field> - <field name="user_type" ref="account.account_type_root"/> - </record> + <field name="name">Auction Adjudications</field> + <field name="code">A0</field> + <field name="type">view</field> + <field name="currency_id" search="[('name','=','EUR')]"/> + <field name="parent_id" eval="0"> + <value search="[('type','=','view')]" model="account.account"/> + </field> + <field name="user_type" ref="account.account_type_root"/> + </record> <record model="account.account" id="auction_expense_view"> - <field name="name">Auction Adjudication Expenses</field> - <field name="code">A1</field> - <field name="type">view</field> - <field name="currency_id" search="[('name','=','EUR')]"/> - <field name="parent_id" eval="0"> - <value search="[('type','=','view')]" model="account.account"/> - </field> - <field name="user_type" ref="account.account_type_expense"/> - </record> - - <record model="account.account" id="auction_income"> - <field name="name">Auction Adjudications</field> - <field name="code">A7x*</field> + <field name="name">Auction Adjudication Expenses</field> + <field name="code">A1</field> + <field name="type">view</field> + <field name="currency_id" search="[('name','=','EUR')]"/> + <field name="parent_id" eval="0"> + <value search="[('type','=','view')]" model="account.account"/> + </field> + <field name="user_type" ref="account.account_type_expense"/> + </record> + + <record model="account.account" id="auction_income"> + <field name="name">Auction Adjudications</field> + <field name="code">A7x*</field> <field name="user_type" ref="account.account_type_income"/> - <field name="type">receivable</field> - <field name="currency_id" search="[('name','=','EUR')]"/> - <field name="parent_id" eval="auction_income_view"/> - </record> - - <record model="account.account" id="auction_expense"> - <field name="name">Auction Adjudication Expenses</field> - <field name="code">A6x*</field> - <field name="user_type" ref="account.account_type_expense"/> - <field name="type">payable</field> - <field name="currency_id" search="[('name','=','EUR')]"/> - <field name="parent_id" eval="auction_expense_view"/> - </record> - - <record model="account.account" id="auction_income_costs"> - <field name="name">Auction Buyer Costs</field> - <field name="code">A8x*</field> - <field name="type">payable</field> - <field name="currency_id" search="[('name','=','EUR')]"/> - <field name="parent_id" eval="auction_income_view"/> - <field name="user_type" ref="account.account_type_tax"/> - </record> - <record model="account.account" id="auction_expense_costs"> - <field name="name">Auction Seller Costs</field> - <field name="code">A9x*</field> - <field name="type">receivable</field> - <field name="currency_id" search="[('name','=','EUR')]"/> - <field name="parent_id" eval="auction_expense_view"/> - <field name="user_type" ref="account.account_type_tax"/> - </record> - - <record model="account.tax" id="tax_buyer_author"> - <field name="name">Author rights (4%)</field> - <field name="type">percent</field> - <field name="applicable_type">code</field> - <field name="amount">0.04</field> - <field name="domain">sabam</field> - <field name="account_collected_id" ref="auction_income_costs"/> - <field name="account_paid_id" ref="auction_income_costs"/> - <field name="python_applicable">result = (price_unit>=1250)</field> - </record> - <record model="account.tax" id="tax_buyer"> - <field name="name">Buyer Costs (20%)</field> - <field name="type">percent</field> - <field name="amount">0.20</field> - <field name="domain">auction</field> - <field name="account_collected_id" ref="auction_income_costs"/> - <field name="account_paid_id" ref="auction_income_costs"/> - </record> - <record model="account.tax" id="tax_seller"> - <field name="name">Seller Costs (12%)</field> - <field name="type">percent</field> - <field name="amount">-0.12</field> - <field name="domain">auction</field> - <field name="account_collected_id" ref="auction_expense_costs"/> - <field name="account_paid_id" ref="auction_expense_costs"/> - </record> - <!--demo data for the product--> - <record id="product.product_product_pc2" model="product.product"> - <field name="list_price">770.0</field> - <field name="standard_price">700.0</field> - </record> + <field name="type">receivable</field> + <field name="currency_id" search="[('name','=','EUR')]"/> + <field name="parent_id" eval="auction_income_view"/> + </record> + + <record model="account.account" id="auction_expense"> + <field name="name">Auction Adjudication Expenses</field> + <field name="code">A6x*</field> + <field name="user_type" ref="account.account_type_expense"/> + <field name="type">payable</field> + <field name="currency_id" search="[('name','=','EUR')]"/> + <field name="parent_id" eval="auction_expense_view"/> + </record> + + <record model="account.account" id="auction_income_costs"> + <field name="name">Auction Buyer Costs</field> + <field name="code">A8x*</field> + <field name="type">payable</field> + <field name="currency_id" search="[('name','=','EUR')]"/> + <field name="parent_id" eval="auction_income_view"/> + <field name="user_type" ref="account.account_type_tax"/> + </record> + <record model="account.account" id="auction_expense_costs"> + <field name="name">Auction Seller Costs</field> + <field name="code">A9x*</field> + <field name="type">receivable</field> + <field name="currency_id" search="[('name','=','EUR')]"/> + <field name="parent_id" eval="auction_expense_view"/> + <field name="user_type" ref="account.account_type_tax"/> + </record> + + <record model="account.tax" id="tax_buyer_author"> + <field name="name">Author rights (4%)</field> + <field name="type">percent</field> + <field name="applicable_type">code</field> + <field name="amount">0.04</field> + <field name="domain">sabam</field> + <field name="account_collected_id" ref="auction_income_costs"/> + <field name="account_paid_id" ref="auction_income_costs"/> + <field name="python_applicable">result = (price_unit>=1250)</field> + </record> + <record model="account.tax" id="tax_buyer"> + <field name="name">Buyer Costs (20%)</field> + <field name="type">percent</field> + <field name="amount">0.20</field> + <field name="domain">auction</field> + <field name="account_collected_id" ref="auction_income_costs"/> + <field name="account_paid_id" ref="auction_income_costs"/> + </record> + <record model="account.tax" id="tax_seller"> + <field name="name">Seller Costs (12%)</field> + <field name="type">percent</field> + <field name="amount">-0.12</field> + <field name="domain">auction</field> + <field name="account_collected_id" ref="auction_expense_costs"/> + <field name="account_paid_id" ref="auction_expense_costs"/> + </record> + <!--demo data for the product--> + <record id="product.product_product_pc2" model="product.product"> + <field name="list_price">770.0</field> + <field name="standard_price">700.0</field> + </record> <!--demo data for the partner--> @@ -106,39 +106,39 @@ </record> <record id="res_partner_unknown_address_1" model="res.partner.address"> - <field name="city">Bruxelles1</field> - <field name="name">Benoit Mortie1r1</field> - <field name="zip">1030</field> - <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/> - <field name="email">info@opensides.be</field> - <field name="phone">(+32)2 211 34 83</field> - <field name="street">Rue des Palais 44, bte 33</field> - <field name="type">default</field> - <field name="partner_id" ref="partner_record1"/> - </record> - - <record id="res_partner_unknown_address_2" model="res.partner.address"> - <field name="city">Avignon CEDEX 091</field> - <field name="name">Laurent Jacot1</field> - <field name="zip">84911</field> - <field name="country_id" model="res.country" search="[('name','=','France')]"/> - <field name="email">contact@tecsas.fr</field> - <field name="phone">(+33)4.32.74.10.57</field> - <field name="street">85 rue du traite de Rome</field> - <field name="type">default</field> - <field name="partner_id" ref="partner_record1"/> - </record> - - <record id="res_partner_unknown_address_3" model="res.partner.address"> - <field name="city">Louvain-la-Neuve</field> - <field name="name">Thomas Passot</field> - <field name="zip">1348</field> - <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/> - <field name="email">info@mediapole.net</field> - <field name="phone">(+32).10.45.17.73</field> - <field name="street">Rue de l'Angelique, 1</field> - <field name="partner_id" ref="partner_record1"/> - </record> + <field name="city">Bruxelles1</field> + <field name="name">Benoit Mortie1r1</field> + <field name="zip">1030</field> + <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/> + <field name="email">info@opensides.be</field> + <field name="phone">(+32)2 211 34 83</field> + <field name="street">Rue des Palais 44, bte 33</field> + <field name="type">default</field> + <field name="partner_id" ref="partner_record1"/> + </record> + + <record id="res_partner_unknown_address_2" model="res.partner.address"> + <field name="city">Avignon CEDEX 091</field> + <field name="name">Laurent Jacot1</field> + <field name="zip">84911</field> + <field name="country_id" model="res.country" search="[('name','=','France')]"/> + <field name="email">contact@tecsas.fr</field> + <field name="phone">(+33)4.32.74.10.57</field> + <field name="street">85 rue du traite de Rome</field> + <field name="type">default</field> + <field name="partner_id" ref="partner_record1"/> + </record> + + <record id="res_partner_unknown_address_3" model="res.partner.address"> + <field name="city">Louvain-la-Neuve</field> + <field name="name">Thomas Passot</field> + <field name="zip">1348</field> + <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/> + <field name="email">info@mediapole.net</field> + <field name="phone">(+32).10.45.17.73</field> + <field name="street">Rue de l'Angelique, 1</field> + <field name="partner_id" ref="partner_record1"/> + </record> <!-- demo data for the auction_artist object--> @@ -331,33 +331,33 @@ <!-- start == demo data for the auction_deposit--> <record model="auction.deposit" id="auction_deposit_1"> - <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/> - <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field> - <field name="method">keep</field> + <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/> + <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field> + <field name="method">keep</field> </record> <record model="auction.deposit" id="auction_deposit_2"> - <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/> - <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field> - <field name="method">keep</field> + <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/> + <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field> + <field name="method">keep</field> </record> <record model="auction.deposit" id="auction_deposit_3"> - <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/> - <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field> - <field name="method">keep</field> + <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/> + <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field> + <field name="method">keep</field> </record> <record model="auction.deposit" id="auction_deposit_4"> - <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/> - <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field> - <field name="method">keep</field> + <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/> + <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field> + <field name="method">keep</field> </record> <record model="auction.deposit" id="auction_deposit_5"> - <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/> - <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field> - <field name="method">keep</field> + <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/> + <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field> + <field name="method">keep</field> </record> <record model="auction.lots" id="auction_deposit_1_lot_1"> diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 3c8cb5c0278..1cda8ceba60 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -14,8 +14,8 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Artists"> - <field name="name"/> - <field name="birth_death_dates"/> + <field name="name"/> + <field name="birth_death_dates"/> </tree> </field> </record> @@ -27,10 +27,10 @@ <form string="Artists"> <separator string="Author/Artist" colspan="4"/> <group colspan="4" col="6"> - <field name="name" colspan="4" string="Name"/> - <newline/> - <field name="pseudo"/> - <field name="birth_death_dates"/> + <field name="name" colspan="4" string="Name"/> + <newline/> + <field name="pseudo"/> + <field name="birth_death_dates"/> </group> <separator string="Biography" colspan="4"/> <field name="biography" nolabel="1" colspan="4"/> @@ -109,15 +109,15 @@ <page string="Auction Dates"> <group colspan="4" col="4"> <group colspan="2" col="2"> - <separator string="Exposition Dates" colspan="4"/> - <field name="expo1"/> - <field name="expo2"/> - </group> - <group colspan="2" col="2"> - <separator string="Auction Dates" colspan="4"/> - <field name="auction1" select="1"/> - <field name="auction2" select="1"/> - </group> + <separator string="Exposition Dates" colspan="4"/> + <field name="expo1"/> + <field name="expo2"/> + </group> + <group colspan="2" col="2"> + <separator string="Auction Dates" colspan="4"/> + <field name="auction1" select="1"/> + <field name="auction2" select="1"/> + </group> </group> <separator string="" colspan="4"/> <field name="state"/> @@ -126,16 +126,16 @@ <page string="Accounting" > <group colspan="4" col="4"> <group colspan="2" col="2"> - <separator string="Accounting" colspan="4"/> - <field name="acc_expense" domain="[('type','<>','view'),('type','<>','consolidation')]"/> - <field name="acc_income" domain="[('type','<>','view'),('type','<>','consolidation')]"/> - </group> - <group colspan="2" col="2"> - <separator string="Analytic" colspan="4"/> - <field name="journal_id"/> - <field name="journal_seller_id"/> - <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> - </group> + <separator string="Accounting" colspan="4"/> + <field name="acc_expense" domain="[('type','<>','view'),('type','<>','consolidation')]"/> + <field name="acc_income" domain="[('type','<>','view'),('type','<>','consolidation')]"/> + </group> + <group colspan="2" col="2"> + <separator string="Analytic" colspan="4"/> + <field name="journal_id"/> + <field name="journal_seller_id"/> + <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> + </group> </group> </page> <page string="Commissions"> @@ -157,14 +157,14 @@ <field name="buyer_invoice_history" nolabel="1" widget="one2many_list" height="400"> <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice"> - <field name="date_invoice"/> - <field name="number"/> - <field name="partner_id" groups="base.group_user"/> - <field name="name"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <field name="user_id"/> - <field name="date_due"/> - <field name="origin"/> + <field name="date_invoice"/> + <field name="number"/> + <field name="partner_id" groups="base.group_user"/> + <field name="name"/> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="user_id"/> + <field name="date_due"/> + <field name="origin"/> <field name="state"/> </tree> </field> @@ -509,14 +509,14 @@ <field name="arch" type="xml"> <form string="Deposit Border Form"> <group colspan="4" col="6"> - <field name="name" string="Reference"/> - <field name="date_dep"/> - <field name="partner_id"/> - <newline/> - <field name="method"/> - <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','<>','purchase')]"/> - <field name="transfer"/> - </group> + <field name="name" string="Reference"/> + <field name="date_dep"/> + <field name="partner_id"/> + <newline/> + <field name="method"/> + <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','<>','purchase')]"/> + <field name="transfer"/> + </group> <notebook colspan="4"> <page string="General Information"> <field name="lot_id" colspan="4" mode="tree,graph" nolabel="1"> @@ -691,11 +691,11 @@ <field name="arch" type="xml"> <form string="Bids"> <group colspan="4" col="6"> - <field name="name"/> - <field name="auction_id"/> - <field name="contact_tel"/> - <newline/> - <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/> + <field name="name"/> + <field name="auction_id"/> + <field name="contact_tel"/> + <newline/> + <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/> </group> <field name="bid_lines" colspan="4" nolabel="1"> <tree string="Bids Lines" editable="bottom"> diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po index 2f356806b1e..c431225ff57 100644 --- a/addons/base_calendar/i18n/nl.po +++ b/addons/base_calendar/i18n/nl.po @@ -8,20 +8,20 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-19 12:50+0000\n" -"PO-Revision-Date: 2010-10-04 06:49+0000\n" +"PO-Revision-Date: 2010-10-09 14:13+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event starts" -msgstr "De activiteit begint" +msgstr "De gebeurtenis begint" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 @@ -173,7 +173,7 @@ msgstr "Geeft aan of een antwoordverzoek gevraagd wordt" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_attachment msgid "ir.attachment" -msgstr "" +msgstr "ir.attachment" #. module: base_calendar #: help:calendar.attendee,delegated_to:0 @@ -218,7 +218,7 @@ msgstr "Jaarlijks" #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event ends" -msgstr "De activiteit eindigt" +msgstr "De gebeurtenis eindigt" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 @@ -312,7 +312,7 @@ msgstr "Per seconde" #: field:calendar.attendee,event_date:0 #: view:calendar.event:0 msgid "Event Date" -msgstr "Datum activiteit" +msgstr "Datum gebeurtenis" #. module: base_calendar #: view:calendar.attendee:0 @@ -328,7 +328,7 @@ msgstr "Relatie gekoppeld aan contactpersoon" #. module: base_calendar #: help:calendar.attendee,cutype:0 msgid "Specify the type of Invitation" -msgstr "" +msgstr "Geef de soort uitnodiging op" #. module: base_calendar #: help:calendar.event,exrule:0 @@ -336,12 +336,14 @@ msgstr "" msgid "" "defines a rule or repeating pattern for an exception to a recurrence set" msgstr "" +"definieert een regel of herhalingspatroon voor een uitzondering op een " +"herhaling" #. module: base_calendar #: field:calendar.alarm,event_end_date:0 #: field:calendar.attendee,event_end_date:0 msgid "Event End Date" -msgstr "Einddatum activiteit" +msgstr "Einddatum gebeurtenis" #. module: base_calendar #: selection:calendar.attendee,role:0 @@ -384,7 +386,7 @@ msgstr "Organisator" #: model:res.request.link,name:base_calendar.request_link_meeting #, python-format msgid "Event" -msgstr "Activiteit" +msgstr "Gebeurtenis" #. module: base_calendar #: selection:calendar.alarm,trigger_occurs:0 @@ -402,7 +404,7 @@ msgstr "Bevestigd" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all msgid "Edit all events" -msgstr "Reeks bewerken" +msgstr "Wijzig alle gebeurtenissen" #. module: base_calendar #: field:calendar.alarm,attendee_ids:0 @@ -478,7 +480,7 @@ msgstr "E-mail" #. module: base_calendar #: view:calendar.attendee:0 msgid "Event Detail" -msgstr "Detail activiteit" +msgstr "Detail gebeurtenis" #. module: base_calendar #: selection:calendar.alarm,state:0 @@ -488,7 +490,7 @@ msgstr "Uitvoeren" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_alarm msgid "Event alarm information" -msgstr "Informatie herinnering activiteit" +msgstr "Alarminformatie gebeurtenis" #. module: base_calendar #: selection:calendar.event,class:0 @@ -553,7 +555,7 @@ msgstr "Toegewezen aan" #. module: base_calendar #: constraint:ir.cron:0 msgid "Invalid arguments" -msgstr "" +msgstr "Ongeldige argumenten" #. module: base_calendar #: view:calendar.attendee:0 @@ -631,219 +633,220 @@ msgstr "Selecteer gegevens voor uitzondering regel" #: view:base_calendar.invite.attendee:0 #: selection:base_calendar.invite.attendee,type:0 msgid "Partner Contacts" -msgstr "" +msgstr "Contactpersonen relatie" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "_Ok" -msgstr "" +msgstr "_Ok" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "First" -msgstr "" +msgstr "Eerste" #. module: base_calendar #: view:calendar.event:0 msgid "Privacy" -msgstr "" +msgstr "Privacy" #. module: base_calendar #: view:calendar.event:0 msgid "Subject" -msgstr "" +msgstr "Onderwerp" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "September" -msgstr "" +msgstr "September" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "December" -msgstr "" +msgstr "December" #. module: base_calendar #: help:base_calendar.invite.attendee,send_mail:0 msgid "Check this if you want to send an Email to Invited Person" -msgstr "" +msgstr "Vink aan als u een email naar de uitgenodigde persoon te sturen" #. module: base_calendar #: view:calendar.event:0 msgid "Availability" -msgstr "" +msgstr "Beschikbaarheid" #. module: base_calendar #: view:calendar.event.edit.all:0 msgid "_Save" -msgstr "" +msgstr "Op_slaan" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Individual" -msgstr "" +msgstr "Persoon" #. module: base_calendar #: field:calendar.alarm,user_id:0 msgid "Owner" -msgstr "" +msgstr "Eigenaar" #. module: base_calendar #: view:calendar.attendee:0 msgid "Delegation Info" -msgstr "" +msgstr "Overdracht info" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,date:0 msgid "Start Date" -msgstr "" +msgstr "Startdatum" #. module: base_calendar #: field:calendar.attendee,cn:0 msgid "Common name" -msgstr "" +msgstr "Algemene naam" #. module: base_calendar #: view:calendar.attendee:0 #: selection:calendar.attendee,state:0 msgid "Declined" -msgstr "" +msgstr "Geweigerd" #. module: base_calendar #: view:calendar.attendee:0 msgid "My Role" -msgstr "" +msgstr "Mijn rol" #. module: base_calendar #: view:calendar.event:0 msgid "My Events" -msgstr "" +msgstr "Mijn gebeurtenissen" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Decline" -msgstr "" +msgstr "Weigeren" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Group" -msgstr "" +msgstr "Groep" #. module: base_calendar #: view:calendar.event:0 msgid "Edit All" -msgstr "" +msgstr "Bewerk alles" #. module: base_calendar #: field:base_calendar.invite.attendee,contact_ids:0 msgid "Contacts" -msgstr "" +msgstr "Contactpersonen" #. module: base_calendar #: model:ir.model,name:base_calendar.model_res_alarm msgid "Basic Alarm Information" -msgstr "" +msgstr "Basis alarm informatie" #. module: base_calendar #: field:base.calendar.set.exrule,fr:0 #: field:calendar.event,fr:0 #: field:calendar.todo,fr:0 msgid "Fri" -msgstr "" +msgstr "Vrij" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Invitation Detail" -msgstr "" +msgstr "Detail uitnodiging" #. module: base_calendar #: field:calendar.attendee,member:0 msgid "Member" -msgstr "" +msgstr "Lid" #. module: base_calendar #: help:calendar.event,location:0 #: help:calendar.todo,location:0 msgid "Location of Event" -msgstr "" +msgstr "Locatie gebeurtenis" #. module: base_calendar #: field:calendar.event,rrule:0 #: field:calendar.todo,rrule:0 msgid "Recurrent Rule" -msgstr "" +msgstr "Herhaling regel" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Draft" -msgstr "" +msgstr "Concept" #. module: base_calendar #: field:calendar.alarm,attach:0 msgid "Attachment" -msgstr "" +msgstr "Bijlage" #. module: base_calendar #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fout ! U kunt geen recursief Menu maken." #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation From" -msgstr "" +msgstr "Uitnodiging van" #. module: base_calendar #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,alarm_id:0 msgid "Reminder" -msgstr "" +msgstr "Herinnering" #. module: base_calendar #: view:base.calendar.set.exrule:0 #: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule msgid "Set Exrule" -msgstr "" +msgstr "Stel uitzondering regel in" #. module: base_calendar #: view:calendar.event:0 #: model:ir.actions.act_window,name:base_calendar.action_view_event #: model:ir.ui.menu,name:base_calendar.menu_events msgid "Events" -msgstr "" +msgstr "Gebeurtenissen" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee msgid "Invite Attendees" -msgstr "" +msgstr "Uitnodigen deelnemers" #. module: base_calendar #: help:calendar.attendee,email:0 msgid "Email of Invited Person" -msgstr "" +msgstr "E-mail van uitgenodigde persoon" #. module: base_calendar #: field:calendar.alarm,repeat:0 #: field:res.alarm,repeat:0 msgid "Repeat" -msgstr "" +msgstr "Herhaal" #. module: base_calendar #: help:calendar.attendee,dir:0 @@ -851,131 +854,133 @@ msgid "" "Reference to the URIthat points to the directory information corresponding " "to the attendee." msgstr "" +"Verwijzing naar de URL die wijst naar de directory informatie die " +"overeenkomt met de deelnemer." #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "August" -msgstr "" +msgstr "Augustus" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Monday" -msgstr "" +msgstr "Maandag" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Third" -msgstr "" +msgstr "Derde" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "June" -msgstr "" +msgstr "Juni" #. module: base_calendar #: field:calendar.alarm,alarm_id:0 msgid "Basic Alarm" -msgstr "" +msgstr "Basis alarm" #. module: base_calendar #: view:base.calendar.set.exrule:0 #: view:calendar.event:0 msgid "The" -msgstr "" +msgstr "De" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,delegated_from:0 msgid "Delegated From" -msgstr "" +msgstr "Overgenomen van" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,user_id:0 msgid "User" -msgstr "" +msgstr "Gebruiker" #. module: base_calendar #: view:calendar.event:0 msgid "ExRule" -msgstr "" +msgstr "UitzRegel" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event,date:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "November" -msgstr "" +msgstr "November" #. module: base_calendar #: help:calendar.attendee,member:0 msgid "Indicate the groups that the attendee belongs to" -msgstr "" +msgstr "Geeft de groepen aan waar de deelnemer bij behoort" #. module: base_calendar #: field:base.calendar.set.exrule,mo:0 #: field:calendar.event,mo:0 #: field:calendar.todo,mo:0 msgid "Mon" -msgstr "" +msgstr "Maa" #. module: base_calendar #: field:base.calendar.set.exrule,count:0 #: field:calendar.event,count:0 #: field:calendar.todo,count:0 msgid "Count" -msgstr "" +msgstr "Aantal" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "October" -msgstr "" +msgstr "Oktober" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Uncertain" -msgstr "" +msgstr "Onzeker" #. module: base_calendar #: field:calendar.attendee,language:0 msgid "Language" -msgstr "" +msgstr "Taal" #. module: base_calendar #: field:calendar.alarm,trigger_occurs:0 #: field:res.alarm,trigger_occurs:0 msgid "Triggers" -msgstr "" +msgstr "Voor of na" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "January" -msgstr "" +msgstr "Januari" #. module: base_calendar #: field:calendar.alarm,trigger_related:0 #: field:res.alarm,trigger_related:0 msgid "Related to" -msgstr "" +msgstr "Begin of eind" #. module: base_calendar #: field:base.calendar.set.exrule,interval:0 @@ -984,20 +989,20 @@ msgstr "" #: field:calendar.todo,interval:0 #: field:res.alarm,trigger_interval:0 msgid "Interval" -msgstr "" +msgstr "Interval" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Wednesday" -msgstr "" +msgstr "Woensdag" #. module: base_calendar #: field:calendar.alarm,name:0 #: view:calendar.event:0 msgid "Summary" -msgstr "" +msgstr "Samenvatting" #. module: base_calendar #: field:calendar.alarm,active:0 @@ -1005,17 +1010,17 @@ msgstr "" #: field:calendar.todo,active:0 #: field:res.alarm,active:0 msgid "Active" -msgstr "" +msgstr "Actief" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation" -msgstr "" +msgstr "Uitnodiging" #. module: base_calendar #: field:calendar.alarm,action:0 msgid "Action" -msgstr "" +msgstr "Actie" #. module: base_calendar #: help:calendar.alarm,duration:0 @@ -1024,31 +1029,33 @@ msgid "" "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the " "other" msgstr "" +"Duur en herhaling zijn beide optioneel, maar als één is ingevuld dan moet de " +"ander ook" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_event_edit_all msgid "Calendar Edit all event" -msgstr "" +msgstr "Agenda wijzig alle gebeurtenissen" #. module: base_calendar #: help:calendar.attendee,role:0 msgid "Participation role for the calendar user" -msgstr "" +msgstr "Aanwezigheid" #. module: base_calendar #: field:calendar.attendee,ref:0 msgid "Event Ref" -msgstr "" +msgstr "Referentie" #. module: base_calendar #: help:calendar.alarm,action:0 msgid "Defines the action to be invoked when an alarm is triggered" -msgstr "" +msgstr "Definieert de te nemen actie als het alarm afgaat" #. module: base_calendar #: view:calendar.event:0 msgid "Search Events" -msgstr "" +msgstr "Zoek gebeurtenissen" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 @@ -1057,7 +1064,7 @@ msgstr "" #: selection:calendar.todo,freq:0 #: selection:calendar.todo,rrule_type:0 msgid "Weekly" -msgstr "" +msgstr "Wekelijks" #. module: base_calendar #: help:calendar.alarm,active:0 @@ -1068,12 +1075,14 @@ msgid "" "If the active field is set to true, it will allow you to hide the event " "alarm information without removing it." msgstr "" +"Als het actief veld wordt uitgezet, kunt u het verbergen zonder te moeten " +"verwijderen" #. module: base_calendar #: field:calendar.event,recurrent_id:0 #: field:calendar.todo,recurrent_id:0 msgid "Recurrent ID date" -msgstr "" +msgstr "Herhaling ID datum" #. module: base_calendar #: field:calendar.alarm,state:0 @@ -1083,60 +1092,60 @@ msgstr "" #: field:calendar.event,state:0 #: field:calendar.todo,state:0 msgid "State" -msgstr "" +msgstr "Status" #. module: base_calendar #: view:res.alarm:0 msgid "Reminder Details" -msgstr "" +msgstr "Details herinnering" #. module: base_calendar #: view:calendar.attendee:0 msgid "To Review" -msgstr "" +msgstr "Na te kijken" #. module: base_calendar #: field:base.calendar.set.exrule,freq:0 #: field:calendar.event,freq:0 #: field:calendar.todo,freq:0 msgid "Frequency" -msgstr "" +msgstr "Frequentie" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Done" -msgstr "" +msgstr "Klaar" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: field:base_calendar.invite.attendee,user_ids:0 msgid "Users" -msgstr "" +msgstr "Gebruikers" #. module: base_calendar #: view:base.calendar.set.exrule:0 #: view:calendar.event:0 msgid "of" -msgstr "" +msgstr "van" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: view:calendar.event:0 #: view:calendar.event.edit.all:0 msgid "Cancel" -msgstr "" +msgstr "Annuleren" #. module: base_calendar #: model:ir.model,name:base_calendar.model_res_users msgid "res.users" -msgstr "" +msgstr "res.users" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Tuesday" -msgstr "" +msgstr "Dinsdag" #. module: base_calendar #: help:calendar.alarm,description:0 @@ -1145,11 +1154,13 @@ msgid "" "calendar component, than that provided by the " "\"SUMMARY\" property" msgstr "" +"Geeft een meer complete beschrijving van de agenda component dan het " +"\"Samenvatting\" veld." #. module: base_calendar #: view:calendar.event:0 msgid "Responsible User" -msgstr "" +msgstr "Verantwoordelijke gebruiker" #. module: base_calendar #: selection:calendar.attendee,availability:0 @@ -1157,82 +1168,84 @@ msgstr "" #: selection:calendar.todo,show_as:0 #: selection:res.users,availability:0 msgid "Busy" -msgstr "" +msgstr "Bezet" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_event msgid "Calendar Event" -msgstr "" +msgstr "Agenda gebeurtenis" #. module: base_calendar #: selection:calendar.attendee,state:0 #: selection:calendar.event,state:0 #: selection:calendar.todo,state:0 msgid "Tentative" -msgstr "" +msgstr "Voorlopig" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event,user_id:0 #: field:calendar.todo,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Verantwoordelijke" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event,rrule_type:0 #: field:calendar.todo,rrule_type:0 msgid "Recurrency" -msgstr "" +msgstr "Herhaling" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations msgid "Event Invitations" -msgstr "" +msgstr "Uitnodigingen" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Thursday" -msgstr "" +msgstr "Donderdag" #. module: base_calendar #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 msgid "Custom" -msgstr "" +msgstr "Aangepast" #. module: base_calendar #: field:calendar.event,exrule:0 #: field:calendar.todo,exrule:0 msgid "Exception Rule" -msgstr "" +msgstr "Uitzondering regel" #. module: base_calendar #: help:calendar.attendee,language:0 msgid "" "To specify the language for text values in aproperty or property parameter." msgstr "" +"Om de taal op te geven voor tekst waarden in de eigenschap of eigenschap " +"parameter." #. module: base_calendar #: view:calendar.event:0 msgid "Details" -msgstr "" +msgstr "Details" #. module: base_calendar #: field:base.calendar.set.exrule,month_list:0 #: field:calendar.event,month_list:0 #: field:calendar.todo,month_list:0 msgid "Month" -msgstr "" +msgstr "Maand" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: view:calendar.event:0 msgid "Invite People" -msgstr "" +msgstr "Personen uitnodigen" #. module: base_calendar #: help:calendar.event,rrule:0 @@ -1242,11 +1255,14 @@ msgid "" "e.g.: Every other month on the last Sunday of the month for 10 occurrences: " " FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" msgstr "" +"Definieert een regel of herhalingspatroon voor terugkerende gebeurtenissen,\n" +"bijv.: Om de maand op de laatste zondag van de maand voor 10 keer:\n" +" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" #. module: base_calendar #: field:calendar.attendee,dir:0 msgid "URI Reference" -msgstr "" +msgstr "URI Referentie" #. module: base_calendar #: field:calendar.alarm,description:0 @@ -1256,59 +1272,59 @@ msgstr "" #: field:calendar.todo,description:0 #: field:calendar.todo,name:0 msgid "Description" -msgstr "" +msgstr "Omschrijving" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "May" -msgstr "" +msgstr "Mei" #. module: base_calendar #: field:base_calendar.invite.attendee,type:0 #: view:calendar.attendee:0 msgid "Type" -msgstr "" +msgstr "Soort" #. module: base_calendar #: view:calendar.attendee:0 msgid "Search Invitations" -msgstr "" +msgstr "Zoek uitnodigingen" #. module: base_calendar #: selection:calendar.alarm,trigger_occurs:0 #: selection:res.alarm,trigger_occurs:0 msgid "After" -msgstr "" +msgstr "Na" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Stop" -msgstr "" +msgstr "Stoppen" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_values msgid "ir.values" -msgstr "" +msgstr "ir.values" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model msgid "Objects" -msgstr "" +msgstr "Objecten" #. module: base_calendar #: view:calendar.attendee:0 #: selection:calendar.attendee,state:0 msgid "Delegated" -msgstr "" +msgstr "Overgedragen" #. module: base_calendar #: field:base.calendar.set.exrule,sa:0 #: field:calendar.event,sa:0 #: field:calendar.todo,sa:0 msgid "Sat" -msgstr "" +msgstr "Zat" #. module: base_calendar #: model:ir.module.module,description:base_calendar.module_meta_information @@ -1319,47 +1335,52 @@ msgid "" " - Recurring events\n" " - Invitations to people" msgstr "" +"Compleet agenda systeem met ondersteuning voor:\n" +" - Agenda voor vergaderingen\n" +" - Herinneringen (create requests)\n" +" - Terugkerende gebeurtenissen\n" +" - Uitnodigingen aan personen" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "Minutely" -msgstr "" +msgstr "Elke minuut" #. module: base_calendar #: help:calendar.attendee,sent_by:0 msgid "Specify the user that is acting on behalf of the calendar user" -msgstr "" +msgstr "Geef de gebruiker op die optreedt namens de kalender gebruiker" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,date_deadline:0 msgid "End Date" -msgstr "" +msgstr "Einddatum" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "February" -msgstr "" +msgstr "Februari" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Resource" -msgstr "" +msgstr "Resource" #. module: base_calendar #: field:res.alarm,name:0 msgid "Name" -msgstr "" +msgstr "Naam" #. module: base_calendar #: field:calendar.event,exdate:0 #: field:calendar.todo,exdate:0 msgid "Exception Date/Times" -msgstr "" +msgstr "Uitzondering data/tijden" #. module: base_calendar #: help:calendar.alarm,name:0 @@ -1367,6 +1388,8 @@ msgid "" "Contains the text to be used as the message subject for " "email or contains the text to be used for display" msgstr "" +"Bevat de tekst om te gebruiken als email bericht onderwerp of bevat de tekst " +"voor weergave" #. module: base_calendar #: field:calendar.event,alarm_id:0 @@ -1374,133 +1397,133 @@ msgstr "" #: field:calendar.todo,alarm_id:0 #: field:calendar.todo,base_calendar_alarm_id:0 msgid "Alarm" -msgstr "" +msgstr "Alarm" #. module: base_calendar #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 #, python-format msgid "Please Apply Recurrency before applying Exception Rule." -msgstr "" +msgstr "Pas eerst herhaling toe en daarna de uitzondering regel." #. module: base_calendar #: field:calendar.attendee,sent_by_uid:0 msgid "Sent By User" -msgstr "" +msgstr "Verstuurd door gebruiker" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "April" -msgstr "" +msgstr "April" #. module: base_calendar #: field:base.calendar.set.exrule,week_list:0 #: field:calendar.event,week_list:0 #: field:calendar.todo,week_list:0 msgid "Weekday" -msgstr "" +msgstr "Weekdag" #. module: base_calendar #: field:base.calendar.set.exrule,byday:0 #: field:calendar.event,byday:0 #: field:calendar.todo,byday:0 msgid "By day" -msgstr "" +msgstr "Op dag" #. module: base_calendar #: field:calendar.alarm,model_id:0 msgid "Model" -msgstr "" +msgstr "Model" #. module: base_calendar #: selection:calendar.alarm,action:0 msgid "Audio" -msgstr "" +msgstr "Geluid" #. module: base_calendar #: field:calendar.event,id:0 #: field:calendar.todo,id:0 msgid "ID" -msgstr "" +msgstr "ID" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "For information Purpose" -msgstr "" +msgstr "Voor informatie doeleinden" #. module: base_calendar #: view:base_calendar.invite.attendee:0 msgid "Invite" -msgstr "" +msgstr "Uitnodigen" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_attendee msgid "Attendee information" -msgstr "" +msgstr "Informatie deelnemer" #. module: base_calendar #: field:calendar.alarm,res_id:0 msgid "Resource ID" -msgstr "" +msgstr "Resource ID" #. module: base_calendar #: selection:calendar.attendee,state:0 msgid "Needs Action" -msgstr "" +msgstr "Vereist actie" #. module: base_calendar #: field:calendar.attendee,sent_by:0 msgid "Sent By" -msgstr "" +msgstr "Verstuurd door" #. module: base_calendar #: field:calendar.event,sequence:0 #: field:calendar.todo,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Volgnummer" #. module: base_calendar #: field:calendar.event,vtimezone:0 #: field:calendar.todo,vtimezone:0 msgid "Timezone" -msgstr "" +msgstr "Tijdzone" #. module: base_calendar #: selection:base_calendar.invite.attendee,type:0 msgid "Internal User" -msgstr "" +msgstr "Interne gebruiker" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Accept" -msgstr "" +msgstr "Accepteren" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Saturday" -msgstr "" +msgstr "Zaterdag" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation To" -msgstr "" +msgstr "Uitnodiging naar" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Second" -msgstr "" +msgstr "Seconde" #. module: base_calendar #: field:calendar.attendee,availability:0 #: field:res.users,availability:0 msgid "Free/Busy" -msgstr "" +msgstr "Vrij/bezet" #. module: base_calendar #: field:calendar.alarm,duration:0 @@ -1511,17 +1534,17 @@ msgstr "" #: field:res.alarm,duration:0 #: field:res.alarm,trigger_duration:0 msgid "Duration" -msgstr "" +msgstr "Duur" #. module: base_calendar #: selection:base_calendar.invite.attendee,type:0 msgid "External Email" -msgstr "" +msgstr "Externe e-mail" #. module: base_calendar #: field:calendar.alarm,trigger_date:0 msgid "Trigger Date" -msgstr "" +msgstr "Activeerdatum" #. module: base_calendar #: help:calendar.alarm,attach:0 @@ -1533,10 +1556,16 @@ msgid "" " * Points to a procedure resource, which is invoked when " " the alarm is triggered for procedure." msgstr "" +"* Verwijst naar een geluidsfragment, dat wordt afgespeeld nadat het alarm " +"voor audio is afgegaan,\n" +" * Bestand dat bedoeld is om mee te worden gestuurd als " +"bijlage bij een e-mail bericht,\n" +" * Verwijst naar een procedure bron, die wordt " +"aangeroepen nadat het alarm is afgegaan voor procedure." #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Fifth" -msgstr "" +msgstr "Vijfde" diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po index 210a3c644f8..849de035083 100644 --- a/addons/base_contact/i18n/nl.po +++ b/addons/base_contact/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 01:32+0000\n" -"Last-Translator: mga (Open ERP) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 15:15+0000\n" +"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po index 127595af75a..969dd928d23 100644 --- a/addons/base_iban/i18n/eu.po +++ b/addons/base_iban/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 09:51+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po index f3255b12f65..53e5775f97c 100644 --- a/addons/base_module_quality/i18n/nl.po +++ b/addons/base_module_quality/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 17:56+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:34+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po index efb8c5644a1..602cf5e47ab 100644 --- a/addons/base_module_record/i18n/nl.po +++ b/addons/base_module_record/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 17:28+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 59598f6577a..934e1a3bdf8 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -21,7 +21,6 @@ import installer import todo -import gtk_contact_form import wizard import os import base64 diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 041feb6d05c..13906abe6ba 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -25,17 +25,24 @@ </separator> <group colspan="8"> - <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <separator string="Install Specific Industry Sector Applications" colspan="4"/> - <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> - <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="account_voucher" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="account_accountant" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="marketing" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <separator string="Install Specific Industry Applications" colspan="4"/> + <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> + <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> </group> </data> </field> diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 56c205b16c9..7cd0563aafe 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -66,8 +66,8 @@ <record id="base_setup_company_todo" model="ir.actions.todo"> <field name="action_id" ref="action_base_setup_company"/> - <field name="sequence">3</field> - <field name="restart">always</field> + <field name="sequence">1</field> + <field name="restart">onskip</field> </record> </data> </openerp> diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py deleted file mode 100644 index c62951b13b7..00000000000 --- a/addons/base_setup/gtk_contact_form.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -############################################################################## -from operator import itemgetter - -from osv import osv, fields -import netsvc -import tools -from tools import misc - -class base_gtkcontactform(osv.osv_memory): - """ - """ - _name = 'base.gtkcontactform' - _inherit = 'res.config' - logger = netsvc.Logger() - - def default_get(self, cr, uid, fields_list=None, context=None): - ''' set email and phone number selected in the previous company information - form ''' - defaults = super(base_gtkcontactform, self)\ - .default_get(cr, uid, fields_list=fields_list, context=context) - company_id = self.pool.get('base.setup.company').search(cr, uid, []) - company = self.pool.get('base.setup.company').read(cr, uid, company_id) - company = company and company[0] or False - if company: - defaults.update({'email':company.get('email',''), - 'phone': company.get('phone','')}) - return defaults - - _columns = { - 'name':fields.char('Your Name', size=64), - 'job':fields.char('Job Title', size=64,), - 'email':fields.char('E-mail', size=64), - 'phone':fields.char('Phone', size=64), - 'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32), - 'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'), - ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'), - ('entertainment','Entertainment'),('environmental','Environmental'),('finance','Finance'),('government','Government'),('healthcare','Healthcare'),('hospitality','Hospitality'), - ('insurance','Insurance'),('machinery','Machinery'),('manufacturing','Manufacturing'),('media','Media'),('notforprofit','Not For Profit'), - ('recreation','Recreation'),('retail','Retail'),('shipping','Shipping'),('technology','Technology'),('telecommunications','Telecommunications'), - ('transportation','Transportation'),('utilities','Utilities'),('other','Other'), - ], 'Industry', size=32), - 'use_openerp':fields.boolean('We plan to use OpenERP'), - 'already_using_openerp':fields.boolean('Already using OpenERP'), - 'sell_openerp':fields.boolean('Plan to sell OpenERP'), - 'already_selling__openerp':fields.boolean('Already selling OpenERP'), - - 'features':fields.boolean('The features of OpenERP'), - 'saas':fields.boolean('OpenERP Online Solutions (SaaS)'), - 'partners_program':fields.boolean('OpenERP Partners Program (for integrators)'), - 'support':fields.boolean('Support and Maintenance Solutions'), - 'training':fields.boolean('OpenERP Training Program'), - 'other':fields.boolean('Other'), - 'ebook':fields.boolean('ebook'), - 'updates':fields.boolean('Updates'), - } - def execute(self, cr, uid, ids, context=None): - if context is None: - context = {} - - company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context) - company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context) - company_data = company_data and company_data[0] or {} - country = '' - - if company_data.get('country_id', False): - country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name'] - - for res in self.read(cr, uid, ids, context=context): - email = res.get('email','') - result = "\ncompany: "+ tools.ustr(company_data.get('name','')) - result += "\nname: " + tools.ustr(res.get('name','')) - result += "\njob: " + tools.ustr(res.get('job','')) - result += "\nphone: " + str(res.get('phone','')) - result += "\ncity: " + tools.ustr(company_data.get('city','')) - result += "\ncountry: " + str(country) - result += "\nindustry: " + tools.ustr(res.get('industry', '')) - result += "\ntotal_employees: " + str(res.get('total_employees', '')) - result += "\nplan_use: " + str(res.get('use_openerp', False)) - result += "\nalready_using_openerp: " + str(res.get('already_using_openerp', False)) - result += "\nsell_openerp: " + str(res.get('sell_openerp', False)) - result += "\nalready_selling__openerp: " + str(res.get('already_selling__openerp', False)) - result += "\nfeatures: " + str(res.get('features', False)) - result += "\nsaas: " + str(res.get('saas', False)) - result += "\npartners_program: " + str(res.get('partners_program', False)) - result += "\nsupport: " + str(res.get('support', False)) - result += "\ntraining: " + str(res.get('training', False)) - result += "\nupdates: " + str(res.get('updates', False)) - result += "\ncontact_me: " + str(res.get('contact_me', False)) - result += "\nebook: " + str(res.get('ebook',False)) - result += "\ngtk: " + str(True) - misc.upload_data(email, result, type='SURVEY') - - - -base_gtkcontactform()
\ No newline at end of file diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml deleted file mode 100644 index 660187a8ce0..00000000000 --- a/addons/base_setup/gtk_contact_form.xml +++ /dev/null @@ -1,77 +0,0 @@ -<openerp> - <data> - <record id="view_base_setup_contact" model="ir.ui.view"> - <field name="name">Contact information</field> - <field name="model">base.gtkcontactform</field> - <field name="type">form</field> - <field name="inherit_id" ref="base.res_config_view_base"/> - <field name="arch" type="xml"> - <data> - <form position="attributes"> - <attribute name="string">Contact Information</attribute> - </form> - <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute> - </xpath> - <xpath expr='//separator[@string="title"]' position='attributes'> - <attribute name='string'>Would you like more information or documentation ?</attribute> - <attribute name='colspan'>4</attribute> - </xpath> - <xpath expr='//separator[@string="vsep"]' position='attributes'> - <attribute name='rowspan'>22</attribute> - <attribute name='string'></attribute> - </xpath> - <group string="res_config_contents" position="replace"> - <group colspan="4" height="450" width="600"> - <group colspan="4"> - <field name="ebook" nolabel="1"/> - <label align="0.0" string="I want to receive the OpenERP ebook (PDF) by email." colspan="3"/> - <field name="updates" nolabel="1"/> - <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/> - </group> - <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}"> - <separator colspan="4" string="About You"/> - <field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/> - <field name="job" colspan="2"/> - <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/> - <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/> - <field name="total_employees" colspan="2"/> - <field name="industry" colspan="2"/> - </group> - <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}"> - <separator string="Your projects with OpenERP" colspan="4"/> - <field name="use_openerp" align="0.0" colspan="1"/> - <field name="already_using_openerp" align="0.0" colspan="1"/> - <field name="sell_openerp" align="0.0" colspan="1"/> - <field name="already_selling__openerp" align="0.0" colspan="1"/> - <separator colspan="4" string="You would like to know more about"/> - <field name="features" align="0.0" colspan="1"/> - <field name="training" align="0.0" colspan="1"/> - <field name="saas" align="0.0" colspan="1"/> - <field name="support" align="0.0" colspan="1"/> - <field name="partners_program" align="0.0" colspan="1"/> - <field name="other" align="0.0" colspan="1"/> - </group> - </group> - </group> - </data> - </field> - </record> - - <record id="action_base_contact" model="ir.actions.act_window"> - <field name="name">Setup contact information</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">base.gtkcontactform</field> - <field name="view_id" ref="view_base_setup_contact"/> - <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="target">new</field> - </record> - - <record id="base_setup_contact_todo" model="ir.actions.todo"> - <field name="action_id" ref="action_base_contact"/> - <field name="sequence">5</field> - <field name="restart">never</field> - </record> - </data> -</openerp> diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index f415447e5fb..e23f1171752 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -27,8 +27,7 @@ class base_setup_installer(osv.osv_memory): _install_if = { ('sale','crm'): ['sale_crm'], ('sale','project'): ['project_mrp'], - ('sale',):['account_accountant'] - } + } _columns = { # Generic modules 'crm':fields.boolean('Customer Relationship Management', @@ -46,14 +45,14 @@ class base_setup_installer(osv.osv_memory): help="Lets you install addons geared towards sharing knowledge " "with and between your employees."), 'stock':fields.boolean('Warehouse Management', - help="Helps you manage your stocks and stocks locations, as well " - "as the flow of stock between warehouses."), + help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."), 'mrp':fields.boolean('Manufacturing', help="Helps you manage your manufacturing processes and generate " "reports on those processes."), - 'account':fields.boolean('Financial & Accounting', - help="Helps you handle your accounting needs, as well as create " - "and track your budgets."), + 'account_voucher':fields.boolean('Invoicing', + help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."), + 'account_accountant':fields.boolean('Accounting & Finance', + help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "), 'purchase':fields.boolean('Purchase Management', help="Helps you manage your purchase-related processes such as " "requests for quotations, supplier invoices, etc..."), @@ -84,9 +83,6 @@ class base_setup_installer(osv.osv_memory): "applications selected to help you manage your auctions " "as well as the business processes around them."), } - _defaults = { - 'crm': True, - } def _if_knowledge(self, cr, uid, ids, context=None): if self.pool.get('res.users').browse(cr, uid, uid, context=context)\ @@ -95,16 +91,7 @@ class base_setup_installer(osv.osv_memory): return None def _if_misc_tools(self, cr, uid, ids, context=None): - interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view - if interface == 'simple' or interface =='extended' : - return ['profile_tools'] - return None - - def _if_account(self, cr, uid, ids, context=None): - if self.pool.get('res.users').browse(cr, uid, uid, context=context)\ - .view == 'simple': - return ['account_voucher'] - return None + return ['profile_tools'] def onchange_moduleselection(self, cr, uid, ids, *args, **kargs): value = {} diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index 7be56f9eabe..ae16f260876 100644 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -104,8 +104,8 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''') We suggest you to put bank information here: IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), 'logo':fields.binary('Logo'), - 'account_no':fields.char('Account No', size=64), - 'website': fields.char('Company Website', size=64, help="Exemple: http://openerp.com"), + 'account_no':fields.char('Bank Account No', size=64), + 'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"), } def execute(self, cr, uid, ids, context=None): diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po index 0c74a4f7195..d291216494b 100644 --- a/addons/base_vat/i18n/eu.po +++ b/addons/base_vat/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 09:35+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:35+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat diff --git a/addons/claim_from_delivery/i18n/nl.po b/addons/claim_from_delivery/i18n/nl.po index a30269ad2b4..90a8df127f3 100644 --- a/addons/claim_from_delivery/i18n/nl.po +++ b/addons/claim_from_delivery/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 12:02+0000\n" -"PO-Revision-Date: 2010-10-07 05:54+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:37+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: claim_from_delivery diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 98b311592b7..aa8b6cc4820 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -130,8 +130,11 @@ <separator string="Description" colspan="4" /> <field name="description" nolabel="1" colspan="4" /> <separator colspan="4"/> - <group col="8" colspan="4"> + <group col="8" colspan="4" groups="base.group_extended"> <field name="state" /> + <button name="case_cancel" string="Cancel" + states="draft,open" type="object" + icon="gtk-cancel" /> <button name="case_close" string="Done" states="open" type="object" icon="gtk-jump-to" /> @@ -141,9 +144,6 @@ <button name="case_open" string="Confirm" states="draft" type="object" icon="gtk-go-forward" /> - <button name="case_cancel" string="Cancel" - states="draft,open" type="object" - icon="gtk-cancel" /> </group> </page> <page string="Invitation Detail"> @@ -241,7 +241,7 @@ <field name="location" /> <field name="categ_id" string="Meeting Type"/> <field name="class" string="Privacy"/> - <field name="state"/> + <field name="state" groups="base.group_extended"/> <field name="user_id" invisible="1"/> <field name="show_as" invisible="1" string="Show time as"/> <button name="case_reset" string="Reset to Unconfirmed" @@ -303,6 +303,7 @@ <group col="12" colspan="4"> <filter icon="terp-check" name="current" string="Current" domain="[('state','in',('draft', 'open'))]" + groups="base.group_extended" help="Current Meetings"/> <separator orientation="vertical"/> <field name="name" select="1" string="Subject"/> diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 8f70560f367..315cd206687 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -74,6 +74,9 @@ <separator colspan="4"/> <group col="10" colspan="4"> <field name="state"/> + <button name="case_cancel" string="Cancel" + states="draft" type="object" + icon="gtk-close" /> <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" /> @@ -87,9 +90,6 @@ states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" /> - <button name="case_cancel" string="Cancel" - states="draft" type="object" - icon="gtk-close" /> <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" /> diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po index f8e168df0cf..bd2d8953efa 100644 --- a/addons/crm/i18n/it.po +++ b/addons/crm/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-10-06 12:16+0000\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index 6a3af2858cc..5d7e5b0856b 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-10-07 17:37+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-09 15:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -326,7 +326,7 @@ msgstr "Tweede gesprek" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe msgid "Subscribe to a Remote calendar" -msgstr "Abonneer op een kalender op afstand" +msgstr "Abonneer op een agenda op afstand" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ-act @@ -478,7 +478,7 @@ msgstr "Bestaande klant" #. module: crm #: model:crm.case.category2,name:crm.category_meet2 msgid "Home" -msgstr "" +msgstr "Home" #. module: crm #: field:crm.case,categ_id:0 @@ -672,7 +672,7 @@ msgstr "Deze personen ontvangen email." #. module: crm #: help:crm.case.section,calendar:0 msgid "Allows to show calendar" -msgstr "Kalender tonen toegestaan" +msgstr "Agenda tonen toegestaan" #. module: crm #: view:crm.job:0 @@ -1484,7 +1484,7 @@ msgstr "Minimum prioriteit" #. module: crm #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act msgid "Meeting Generic Wizard" -msgstr "Generieke afspraak wizard" +msgstr "Generiek afspraak assistent" #. module: crm #: model:crm.case.categ,name:crm.categ_claim2 @@ -1946,12 +1946,12 @@ msgstr "crm.meeting.generic_wizard" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_history-act msgid "Histories" -msgstr "" +msgstr "Geschiedenis" #. module: crm #: model:crm.case.category2,name:crm.category_job1 msgid "Graduate" -msgstr "" +msgstr "Afgestudeerde" #. module: crm #: wizard_view:crm.job.meeting_set,init:0 @@ -1966,23 +1966,23 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Leads Tree" -msgstr "" +msgstr "Leads-boom" #. module: crm #: field:crm.meeting,caldav_url:0 msgid "Caldav URL" -msgstr "" +msgstr "Caldav URL" #. module: crm #: view:crm.meeting:0 msgid "Attendee" -msgstr "" +msgstr "Deelnemer" #. module: crm #: code:addons/crm/crm.py:0 #, python-format msgid "Email Fail!" -msgstr "" +msgstr "Email Mislukt!" #. module: crm #: model:crm.case.categ,name:crm.categ_phone1 @@ -1990,12 +1990,12 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound msgid "Inbound" -msgstr "" +msgstr "Inkomend" #. module: crm #: constraint:crm.case.section:0 msgid "Error ! You cannot create recursive sections." -msgstr "" +msgstr "Fout! U kunt geen recursieve secties maken." #. module: crm #: model:ir.ui.menu,name:crm.menu_crm @@ -2008,6 +2008,8 @@ msgid "" " Will allow you to synchronise your Open ERP calendars with your phone, " "outlook, Sunbird, ical, ..." msgstr "" +" Maakt het mogelijk uw OpenERP-agenda te synchroniseren met uw telefoon, " +"Outlook, Sunbird, iCAL, ..." #. module: crm #: view:report.crm.case.section.categ.categ2:0 @@ -2015,7 +2017,7 @@ msgstr "" #: view:report.crm.case.section.categ2:0 #: view:report.crm.case.section.stage:0 msgid "This Year" -msgstr "" +msgstr "Dit jaar" #. module: crm #: field:crm.case.rule,act_remind_partner:0 @@ -2033,7 +2035,7 @@ msgstr "Hoogste" #. module: crm #: view:crm.job:0 msgid "Contract Data" -msgstr "" +msgstr "Contractgegevens" #. module: crm #: selection:crm.case.rule,trg_date_range_type:0 @@ -2044,11 +2046,13 @@ msgstr "Dagen" #: help:crm.menu.config_wizard,bugs:0 msgid "Used by companies to track bugs and support requests on software" msgstr "" +"Wordt door bedrijven gebruikt voor foutopvolging en support vragen over " +"software" #. module: crm #: field:crm.menu.config_wizard,document_ics:0 msgid "Shared Calendar" -msgstr "" +msgstr "Gedeelde agenda" #. module: crm #: field:crm.case.section,reply_to:0 @@ -2058,7 +2062,7 @@ msgstr "Antwoord aan" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ msgid "Cases by Leads and Type" -msgstr "" +msgstr "Dossiers per lead en soort" #. module: crm #: selection:crm.case.rule,trg_date_range_type:0 @@ -2069,12 +2073,12 @@ msgstr "Minuten" #: field:report.crm.case.section.categ2,amount_revenue:0 #: field:report.crm.case.section.stage,amount_revenue:0 msgid "Est.Revenue" -msgstr "" +msgstr "Gesch. omzet" #. module: crm #: model:crm.case.stage,name:crm.stage_job1 msgid "Initial Jobs Demand" -msgstr "" +msgstr "Initiële wervingsvraag" #. module: crm #: field:crm.case.rule,trg_priority_to:0 @@ -2084,17 +2088,17 @@ msgstr "Hoogste prioriteit" #. module: crm #: selection:crm.meeting,transparent:0 msgid "OPAQUE" -msgstr "" +msgstr "OPAQUE" #. module: crm #: view:crm.claim:0 msgid "Claims Info" -msgstr "" +msgstr "Info klachten" #. module: crm #: field:crm.case.category2,name:0 msgid "Case Category2 Name" -msgstr "" +msgstr "Dossier naam categorie2" #. module: crm #: wizard_view:crm.lead.opportunity_set,opportunity:0 @@ -2108,23 +2112,23 @@ msgstr "Omzetten naar verkoopkans" #: model:crm.case.stage,name:crm.stage_phone2 #: view:crm.phonecall:0 msgid "Held" -msgstr "" +msgstr "Vastgehouden" #. module: crm #: view:crm.case:0 msgid "Helpdesk Supports" -msgstr "" +msgstr "Helpdesk Supports" #. module: crm #: model:crm.case.section,name:crm.section_support4 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise msgid "Fund Raising" -msgstr "" +msgstr "Fondsenwerving" #. module: crm #: selection:crm.new.send.mail,init,state:0 msgid "Unchanged" -msgstr "" +msgstr "Ongewijzigd" #. module: crm #: wizard_view:crm.job.partner_create,init:0 @@ -2133,7 +2137,7 @@ msgstr "" #: wizard_view:crm.phonecall.opportunity_set,create_partner:0 #: wizard_view:crm.phonecall.partner_create,init:0 msgid "Convert To Partner" -msgstr "" +msgstr "Omzetten naar relatie" #. module: crm #: field:crm.case.rule,trg_state_from:0 @@ -2159,17 +2163,17 @@ msgstr "Prioriteit" #. module: crm #: view:crm.opportunity:0 msgid "Source" -msgstr "" +msgstr "Bron" #. module: crm #: field:crm.meeting,location:0 msgid "Location" -msgstr "" +msgstr "Locatie" #. module: crm #: view:crm.fundraising:0 msgid "Payment Mode" -msgstr "" +msgstr "Betalingsvorm" #. module: crm #: help:crm.case.rule,trg_date_range:0 @@ -2187,7 +2191,7 @@ msgstr "" #: view:crm.job:0 #: view:crm.lead:0 msgid "Stage: " -msgstr "" +msgstr "Fase: " #. module: crm #: view:crm.case.section:0 @@ -2218,7 +2222,7 @@ msgstr "Te veranderen velden" #. module: crm #: model:crm.case.category2,name:crm.category_lead1 msgid "Telesales" -msgstr "" +msgstr "Telefonische verkoop" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main @@ -2233,7 +2237,7 @@ msgstr "Aangemaakt" #. module: crm #: view:crm.lead:0 msgid "Lead Information" -msgstr "" +msgstr "Lead informatie" #. module: crm #: model:ir.model,name:crm.model_crm_segmentation_line @@ -2245,7 +2249,7 @@ msgstr "Segmentatieregels" #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0 #: view:crm.phonecall:0 msgid "Planned Date" -msgstr "" +msgstr "Geplande datum" #. module: crm #: selection:crm.case.rule,trg_date_range_type:0 @@ -2258,21 +2262,23 @@ msgid "" "Helps you to encode the result of a phone call or to plan a list of phone " "calls to process." msgstr "" +"Helpt bij het vastleggen van het telefoongesprek resultaat of het plannen " +"van een lijst van te voeren gesprekken." #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import msgid "Import ICS File" -msgstr "" +msgstr "Importeer ICS bestand" #. module: crm #: view:crm.meeting:0 msgid "Attendee Detail" -msgstr "" +msgstr "Detail deelnemer" #. module: crm #: model:crm.case.category2,name:crm.category_job3 msgid " > Bac +5" -msgstr "" +msgstr " > Bac +5" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -2280,17 +2286,17 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "July" -msgstr "" +msgstr "Juli" #. module: crm #: model:crm.case.stage,name:crm.stage_oppor1 msgid "Prospecting" -msgstr "" +msgstr "Zoeken" #. module: crm #: field:crm.case,partner_name2:0 msgid "Employee Email" -msgstr "" +msgstr "E-mail werknemer" #. module: crm #: model:ir.model,name:crm.model_crm_meeting @@ -2300,7 +2306,7 @@ msgstr "Afspraak dossiers" #. module: crm #: view:crm.job:0 msgid "Job Info" -msgstr "" +msgstr "Vacature-info" #. module: crm #: view:crm.meeting:0 @@ -2310,18 +2316,18 @@ msgstr "Afspraak annuleren" #. module: crm #: model:crm.case.section,name:crm.section_support0 msgid "Jobs" -msgstr "" +msgstr "Banen" #. module: crm #: view:crm.case.rule:0 msgid "%(case_date)s = Creation date" -msgstr "" +msgstr "%(case_date)s = Aanmaakdatum" #. module: crm #: model:crm.case.stage,name:crm.stage_phone3 #: view:crm.phonecall:0 msgid "Not Held" -msgstr "" +msgstr "Niet vastgehouden" #. module: crm #: field:crm.case.rule,act_mail_to_user:0 @@ -2331,12 +2337,12 @@ msgstr "Email de verantwoordelijke" #. module: crm #: view:crm.job:0 msgid "Jobs - Recruitment Form" -msgstr "" +msgstr "Banen - Wervingsformulier" #. module: crm #: model:crm.case.category2,name:crm.category_claim1 msgid "Corrective" -msgstr "" +msgstr "Correctief" #. module: crm #: model:ir.model,name:crm.model_crm_opportunity @@ -2346,7 +2352,7 @@ msgstr "Verkoopkans dossiers" #. module: crm #: view:crm.case:0 msgid "Support Query" -msgstr "" +msgstr "Supportvraag" #. module: crm #: view:crm.case.rule:0 @@ -2359,7 +2365,7 @@ msgstr "Sjabloon te verzenden email" #: field:report.crm.case.section.categ2,month:0 #: field:report.crm.case.section.stage,month:0 msgid "Month" -msgstr "" +msgstr "Maand" #. module: crm #: model:crm.case.section,name:crm.section_support2 @@ -2369,23 +2375,23 @@ msgstr "" #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads #: model:process.node,name:crm.process_node_leads0 msgid "Leads" -msgstr "" +msgstr "Leads" #. module: crm #: wizard_button:crm.new.send.mail,init,send:0 #: wizard_button:crm.send.mail,init,send:0 msgid "Send Email" -msgstr "" +msgstr "Verstuur Email" #. module: crm #: wizard_view:crm.new.send.mail,init:0 msgid "Set case state to" -msgstr "" +msgstr "Zet dossierstatus op" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund3 msgid "Credit Card" -msgstr "" +msgstr "Creditcard" #. module: crm #: code:addons/crm/crm.py:0 @@ -2400,7 +2406,7 @@ msgstr "" #. module: crm #: view:crm.job:0 msgid "Search Jobs" -msgstr "" +msgstr "Zoek banen" #. module: crm #: field:crm.case.history,log_id:0 @@ -2411,17 +2417,17 @@ msgstr "Log" #: help:crm.menu.config_wizard,fund:0 msgid "" "This may help associations in their fund raising process and tracking." -msgstr "" +msgstr "Dit kan verenigingen helpen bij het bijhouden van hun fondsenwerving" #. module: crm #: view:crm.meeting:0 msgid "Reset to Unconfirmed" -msgstr "" +msgstr "Terugzetten naar onbevestigd" #. module: crm #: view:crm.case:0 msgid "Helpdesk Support" -msgstr "" +msgstr "Helpdesk Support" #. module: crm #: field:crm.case,email_cc:0 @@ -2439,7 +2445,7 @@ msgstr "Opmerking" #: field:report.crm.case.section.categ2,delay_close:0 #: field:report.crm.case.section.stage,delay_close:0 msgid "Delay Close" -msgstr "" +msgstr "Vertraag afsluiten" #. module: crm #: selection:crm.case,priority:0 @@ -2465,7 +2471,7 @@ msgstr "Gesloten" #. module: crm #: view:crm.job:0 msgid "Candidate Name2" -msgstr "" +msgstr "Naam kandidaat 2" #. module: crm #: code:addons/crm/crm.py:0 @@ -2485,7 +2491,7 @@ msgstr "Interne bespreking" #: view:crm.lead:0 #: view:crm.opportunity:0 msgid "Events" -msgstr "" +msgstr "Gebeurtenissen" #. module: crm #: help:crm.menu.config_wizard,lead:0 @@ -2493,6 +2499,8 @@ msgid "" "Allows you to track and manage leads which are pre-sales requests or " "contacts, the very first contact with a customer request." msgstr "" +"Maakt het mogelijk om leads, pre-sales verzoeken en -contacten, te " +"registreren en te volgen." #. module: crm #: help:crm.case,som:0 @@ -2501,11 +2509,15 @@ msgid "" "mentality in relation to our services.The scale hasto be created with a " "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)." msgstr "" +"De gemoedstoestanden laat u een schaalverdeling definieren van de houding " +"van de relatie t.o.v. onze dienstverlening. De verdeling moet worden gemaakt " +"met een factor voor elk niveau van 0 (zeer ontevreden) tot 10 (uitzonderlijk " +"tevreden)" #. module: crm #: field:crm.meeting,freebusy:0 msgid "FreeBusy" -msgstr "" +msgstr "Vrijbezet" #. module: crm #: model:crm.case.categ,name:crm.categ_meet1 @@ -2515,22 +2527,22 @@ msgstr "Klant afspraak" #. module: crm #: wizard_field:crm.new.send.mail,init,doc2:0 msgid "Attachment2" -msgstr "" +msgstr "Bijlage2" #. module: crm #: wizard_field:crm.new.send.mail,init,doc3:0 msgid "Attachment3" -msgstr "" +msgstr "Bijlage3" #. module: crm #: view:crm.job:0 msgid "Degree" -msgstr "" +msgstr "Graad" #. module: crm #: wizard_field:crm.new.send.mail,init,doc1:0 msgid "Attachment1" -msgstr "" +msgstr "Bijlage1" #. module: crm #: code:addons/crm/crm_phonecall.py:0 @@ -2541,7 +2553,7 @@ msgstr "" #: model:ir.ui.menu,name:crm.menu_crm_case_phone #, python-format msgid "Phone Calls" -msgstr "" +msgstr "Telefoongesprekken" #. module: crm #: help:crm.case,active:0 @@ -2549,11 +2561,13 @@ msgid "" "If the active field is set to true, it will allow you to hide the case " "without removing it." msgstr "" +"Als het actiefveld is gevuld, laat het u het dossier verbergen zonder het te " +"verwijderen." #. module: crm #: model:ir.model,name:crm.model_crm_menu_config_wizard msgid "crm.menu.config_wizard" -msgstr "" +msgstr "crm.menu.config_wizard" #. module: crm #: view:crm.case.history:0 @@ -2563,12 +2577,12 @@ msgstr "Dossiergeschiedenis" #. module: crm #: field:crm.case,partner_phone:0 msgid "Phone" -msgstr "" +msgstr "Telefoon" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund2 msgid "Cheque" -msgstr "" +msgstr "Cheque" #. module: crm #: field:crm.case,active:0 @@ -2599,12 +2613,12 @@ msgstr ">" #. module: crm #: view:crm.job:0 msgid "Candidate Phone" -msgstr "" +msgstr "Telefoonnummer kandidaat" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail msgid "Send Mail" -msgstr "" +msgstr "Verstuur bericht" #. module: crm #: selection:crm.case.rule,trg_date_range_type:0 @@ -2621,13 +2635,13 @@ msgstr "Maanden" #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard msgid "To Assign" -msgstr "" +msgstr "Toe te wijzen" #. module: crm #: code:addons/crm/wizard/wizard_cal_subscribe.py:0 #, python-format msgid "Please provide Proper URL !" -msgstr "" +msgstr "Geef aub correcte URL !" #. module: crm #: model:process.node,note:crm.process_node_opportunities0 @@ -2638,6 +2652,7 @@ msgstr "Wanneer een echt project/verkoopkans is ontdekt" #: wizard_view:crm.job.partner_create,init:0 msgid "Are you sure you want to create a partner based on this job request ?" msgstr "" +"Weet u zeker dat u een relatie wilt maken op basis van deze vacature?" #. module: crm #: wizard_field:crm.lead.opportunity_set,create_partner,action:0 @@ -2654,7 +2669,7 @@ msgstr "Actie" #: model:ir.ui.menu,name:crm.menu_crm_case_claims #, python-format msgid "Claims" -msgstr "" +msgstr "Klachten" #. module: crm #: field:crm.segmentation,som_interval_decrease:0 @@ -2664,18 +2679,18 @@ msgstr "Verminder (0>1)" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_case_history_event msgid "History of Events" -msgstr "" +msgstr "Gebeurtenis geschiedenis" #. module: crm #: model:ir.model,name:crm.model_crm_case_category2 msgid "Category2 of case" -msgstr "" +msgstr "Categorie2 van dossier" #. module: crm #: wizard_field:crm.new.send.mail,init,to:0 #: wizard_field:crm.send.mail,init,to:0 msgid "To" -msgstr "" +msgstr "Aan" #. module: crm #: view:crm.case.rule:0 @@ -2685,7 +2700,7 @@ msgstr "%(case_user_email)s = Email verantwoordelijke" #. module: crm #: model:ir.ui.menu,name:crm.menu_presale msgid "Sales" -msgstr "" +msgstr "Verkoop" #. module: crm #: view:crm.case:0 @@ -2696,18 +2711,18 @@ msgstr "Algemeen" #. module: crm #: model:crm.case.stage,name:crm.stage_lead2 msgid "Assigned" -msgstr "" +msgstr "Toegewezen" #. module: crm #: model:crm.case.stage,name:crm.stage_lead5 msgid "Recycled" -msgstr "" +msgstr "Hergebruikt" #. module: crm #: model:crm.case.categ,name:crm.categ_lead8 #: model:crm.case.categ,name:crm.categ_oppor8 msgid "Other" -msgstr "" +msgstr "Overig" #. module: crm #: view:crm.case:0 @@ -2717,7 +2732,7 @@ msgstr "" #: selection:crm.new.send.mail,init,state:0 #: view:crm.opportunity:0 msgid "Done" -msgstr "" +msgstr "Klaar" #. module: crm #: field:crm.segmentation,som_interval_max:0 @@ -2727,7 +2742,7 @@ msgstr "Max interval" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11 msgid "All Opportunities" -msgstr "" +msgstr "Alle verkoopkansen" #. module: crm #: code:addons/crm/crm.py:0 @@ -2748,12 +2763,12 @@ msgstr "" #: selection:report.crm.case.section.stage,state:0 #, python-format msgid "Open" -msgstr "Openen" +msgstr "Open" #. module: crm #: selection:crm.meeting,class:0 msgid "PUBLIC" -msgstr "" +msgstr "PUBLIEK" #. module: crm #: code:addons/crm/wizard/crm_job_wizard.py:0 @@ -2761,22 +2776,22 @@ msgstr "" #: code:addons/crm/wizard/crm_phonecall_wizard.py:0 #, python-format msgid "A partner is already existing with the same name." -msgstr "" +msgstr "Er bestaat al een relatie met deze naam." #. module: crm #: model:ir.model,name:crm.model_crm_phonecall msgid "Phonecall Cases" -msgstr "" +msgstr "Telefoongesprek dossiers" #. module: crm #: help:crm.case.rule,sequence:0 msgid "Gives the sequence order when displaying a list of case rules." -msgstr "" +msgstr "Bepaalt de volgorde waarin de dossier regels lijst wordt afgebeeld." #. module: crm #: field:crm.menu.config_wizard,helpdesk:0 msgid "Helpdesk" -msgstr "" +msgstr "Helpdesk" #. module: crm #: field:crm.case,user_id:0 @@ -2798,7 +2813,7 @@ msgstr "Verantwoordelijke" #: model:crm.case.stage,name:crm.stage_claim4 #: model:crm.case.stage,name:crm.stage_meet3 msgid "Invalid" -msgstr "" +msgstr "Ongeldig" #. module: crm #: wizard_button:crm.job.meeting_set,init,order:0 @@ -2814,7 +2829,7 @@ msgstr "Afsprakenagenda" #. module: crm #: view:crm.case:0 msgid "Cases By Stage and Estimates" -msgstr "" +msgstr "Dossiers op fase en schattingen" #. module: crm #: code:addons/crm/crm.py:0 @@ -2829,12 +2844,12 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Lead Name" -msgstr "" +msgstr "Leadnaam" #. module: crm #: view:crm.claim:0 msgid "Claim/Action Description" -msgstr "" +msgstr "Klacht/Actie Omschrijving" #. module: crm #: field:crm.case.rule,trg_max_history:0 @@ -2850,22 +2865,22 @@ msgstr "Afspraak voor leads-generatie" #: wizard_view:crm.lead.opportunity_set,create_partner:0 #: wizard_view:crm.lead.partner_create,init:0 msgid "Are you sure you want to create a partner based on this lead ?" -msgstr "" +msgstr "Weet u zeker dat u een relatie wilt aanmaken op basis van deze lead?" #. module: crm #: model:crm.case.stage,name:crm.stage_job6 msgid "Refused by Employee" -msgstr "" +msgstr "Geweigerd door werknemer" #. module: crm #: field:crm.case,partner_name:0 msgid "Employee's Name" -msgstr "" +msgstr "Werknemernaam" #. module: crm #: model:crm.case.stage,name:crm.stage_job2 msgid "First Interview" -msgstr "" +msgstr "Eerste gesprek" #. module: crm #: view:report.crm.case.section.categ.categ2:0 @@ -2873,17 +2888,17 @@ msgstr "" #: view:report.crm.case.section.categ2:0 #: view:report.crm.case.section.stage:0 msgid "This Month" -msgstr "" +msgstr "Deze maand" #. module: crm #: view:crm.job:0 msgid "Availability (weeks)" -msgstr "" +msgstr "Beschikbaarheid (weken)" #. module: crm #: view:crm.opportunity:0 msgid "Opportunities Tree" -msgstr "" +msgstr "Verkoopkansen" #. module: crm #: help:crm.case,state:0 @@ -2896,16 +2911,23 @@ msgid "" " \n" "If the case needs to be reviewed then the state is set to 'Pending'." msgstr "" +"De status wordt op 'Concept' gezet als het dossier wordt gemaakt. " +" \n" +"Als het dossier in behandeling is, wordt de status op 'Open' gezet. " +" \n" +"Als het dossier klaar is, gaat de status naar 'Gereed'. " +" \n" +"Als het dossier moet worden nagekeken, wordt de status op 'Wachtend' gezet." #. module: crm #: view:crm.job:0 msgid "Open Jobs" -msgstr "" +msgstr "Open vacatures" #. module: crm #: selection:crm.email.add.cc,name:0 msgid "Email Address" -msgstr "" +msgstr "Emailadres" #. module: crm #: help:crm.segmentation,som_interval_max:0 @@ -2919,17 +2941,17 @@ msgstr "" #. module: crm #: field:crm.case,case_id:0 msgid "Related Case" -msgstr "" +msgstr "Gerelateerde dossiers" #. module: crm #: field:crm.case.rule,server_action_id:0 msgid "Server Action" -msgstr "" +msgstr "Server-actie" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0 msgid "All Claims" -msgstr "" +msgstr "Alle klachten" #. module: crm #: field:crm.case.log,user_id:0 @@ -2940,12 +2962,12 @@ msgstr "Verantwoordelijke" #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0 #, python-format msgid "Email not sent !" -msgstr "" +msgstr "Email niet verstuurd!" #. module: crm #: wizard_field:crm.phonecall.partner_create,init,close:0 msgid "Close Phonecall" -msgstr "" +msgstr "Afsluiten telefoongesprek" #. module: crm #: field:crm.case,email_last:0 @@ -2955,12 +2977,12 @@ msgstr "Laatste e-mail" #. module: crm #: view:crm.case.rule:0 msgid "Regex on Communication History" -msgstr "" +msgstr "Regex op communicatie historie" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund4 msgid "Demand Draft" -msgstr "" +msgstr "Incasso" #. module: crm #: field:crm.case,id:0 @@ -2981,7 +3003,7 @@ msgstr "Samenvatting verkoopkans" #. module: crm #: view:crm.case:0 msgid "Search Case" -msgstr "" +msgstr "Zoek dossier" #. module: crm #: view:crm.segmentation:0 @@ -2997,7 +3019,7 @@ msgstr "Dossieromschrijving" #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0 msgid "Assign To" -msgstr "" +msgstr "Toewijzen aan" #. module: crm #: field:crm.case,date_action_last:0 @@ -3007,22 +3029,22 @@ msgstr "Laatste actie" #. module: crm #: field:crm.case,duration:0 msgid "Duration" -msgstr "" +msgstr "Duur" #. module: crm #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage msgid "Cases by section, Category and stage" -msgstr "" +msgstr "Dossiers op sectie, categorie en fase" #. module: crm #: view:crm.job:0 msgid "Candidate Hired" -msgstr "" +msgstr "Kandidaat aangenomen" #. module: crm #: field:crm.menu.config_wizard,jobs:0 msgid "Jobs Hiring Process" -msgstr "" +msgstr "Werving & selectieproces" #. module: crm #: model:ir.ui.menu,name:crm.next_id_52 @@ -3033,12 +3055,12 @@ msgstr "Alle dossiers" #: code:addons/crm/wizard/crm_lead_wizard.py:0 #, python-format msgid "A partner is already defined on this lead." -msgstr "" +msgstr "Er is al een relatie gekoppeld aan deze lead" #. module: crm #: view:crm.lead:0 msgid "Lead Source" -msgstr "" +msgstr "Bron lead" #. module: crm #: field:report.crm.case.section.categ.categ2,nbr:0 @@ -3046,17 +3068,17 @@ msgstr "" #: field:report.crm.case.section.categ2,nbr:0 #: field:report.crm.case.section.stage,nbr:0 msgid "# of Cases" -msgstr "" +msgstr "# Dossiers" #. module: crm #: selection:crm.meeting,class:0 msgid "PRIVATE" -msgstr "" +msgstr "PRIVÉ" #. module: crm #: wizard_view:caldav.crm.subscribe,init:0 msgid "Provide path for Remote Calendar" -msgstr "" +msgstr "Geef pad naar remote agenda" #. module: crm #: view:crm.segmentation:0 @@ -3067,7 +3089,7 @@ msgstr "Segmentatie" #. module: crm #: view:crm.fundraising:0 msgid "Funds Form" -msgstr "" +msgstr "Fondsenformulier" #. module: crm #: view:crm.meeting:0 @@ -3078,17 +3100,17 @@ msgstr "Zoek afspraken" #: selection:crm.lead.opportunity_set,create_partner,action:0 #: selection:crm.phonecall.opportunity_set,create_partner,action:0 msgid "Create a new partner" -msgstr "" +msgstr "Maak een nieuwe relatie" #. module: crm #: field:crm.case,company_id:0 msgid "Company" -msgstr "" +msgstr "Bedrijf" #. module: crm #: model:crm.case.stage,name:crm.stage_lead3 msgid "In Process" -msgstr "" +msgstr "In behandeling" #. module: crm #: selection:crm.segmentation,state:0 @@ -3104,18 +3126,18 @@ msgstr "%(case_user)s = Naam verantwoordelijke" #: wizard_field:crm.job.reschedule_phone_call,init,note:0 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0 msgid "Goals" -msgstr "" +msgstr "Doelstellingen" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree #: view:report.crm.case.section.categ2:0 msgid "Cases by Section and Type" -msgstr "" +msgstr "Dossiers op sectie en soort" #. module: crm #: model:ir.ui.menu,name:crm.menu_aftersale msgid "After-Sale Services" -msgstr "" +msgstr "Nazorg" #. module: crm #: wizard_button:caldav.crm.export,init,end:0 @@ -3123,17 +3145,17 @@ msgstr "" #: wizard_button:caldav.crm.subscribe,display,end:0 #: view:crm.email.add.cc:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: crm #: wizard_field:caldav.crm.export,init,name:0 msgid "File name" -msgstr "" +msgstr "Bestandsnaam" #. module: crm #: view:crm.lead:0 msgid "Search Leads" -msgstr "" +msgstr "Zoek leads" #. module: crm #: help:crm.case.rule,active:0 @@ -3141,6 +3163,8 @@ msgid "" "If the active field is set to true, it will allow you to hide the case rule " "without removing it." msgstr "" +"Als het actiefveld in gevuld, kunt u het dossier verbergen zonder het te " +"verwijderen." #. module: crm #: code:addons/crm/crm.py:0 @@ -3152,13 +3176,13 @@ msgstr "Fout!" #. module: crm #: model:ir.model,name:crm.model_crm_claim_assign_wizard msgid "crm.claim.assign_wizard" -msgstr "" +msgstr "crm.claim.assign_wizard" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job msgid "All Jobs Requests" -msgstr "" +msgstr "Alle vacatureaanvragen" #. module: crm #: selection:crm.case,state:0 @@ -3170,12 +3194,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,state:0 #: selection:report.crm.case.section.stage,state:0 msgid "Cancelled" -msgstr "" +msgstr "Geannuleerd" #. module: crm #: view:crm.job:0 msgid "Applied Job" -msgstr "" +msgstr "Toegepaste baan" #. module: crm #: help:crm.meeting,exrule:0 @@ -3183,11 +3207,13 @@ msgid "" "defines a rule or repeating pattern for " "anexception to a recurrence set" msgstr "" +"definieert een regel of herhalingspatroon voor een uitzondering op de " +"herhalingsset" #. module: crm #: view:crm.phonecall:0 msgid "Relevant" -msgstr "" +msgstr "Relevant" #. module: crm #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0 @@ -3197,17 +3223,17 @@ msgstr "Naam verkoopkans" #. module: crm #: field:crm.meeting,rrule:0 msgid "Recurrent Rule" -msgstr "" +msgstr "Herhaling regel" #. module: crm #: wizard_view:caldav.crm.import,init:0 msgid "Import ICS" -msgstr "" +msgstr "ICS importeren" #. module: crm #: view:crm.phonecall:0 msgid "Call Summary" -msgstr "" +msgstr "Samenvatting gesprek" #. module: crm #: field:crm.segmentation.line,expr_operator:0 @@ -3222,7 +3248,7 @@ msgstr "Communicatiegeschiedenis dossier" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ msgid "Cases by Opportunities and Type" -msgstr "" +msgstr "Dossiers op verkoopkans en soort" #. module: crm #: view:crm.case.rule:0 @@ -3256,17 +3282,18 @@ msgstr "Optionele expressie" #: model:crm.case.categ,name:crm.categ_fund1 msgid "Social Rehabilitation And Rural Upliftment" msgstr "" +"Sociale reïntegratie en ontwikkelingsstimulans niet-stedelijke gebieden" #. module: crm #: code:addons/crm/wizard/crm_job_wizard.py:0 #, python-format msgid "A partner is already defined on this job request." -msgstr "" +msgstr "Er is al een relatie gedefinieerd voor deze vacature." #. module: crm #: model:crm.case.stage,name:crm.stage_lead1 msgid "New" -msgstr "" +msgstr "Nieuw" #. module: crm #: field:crm.case,description:0 @@ -3290,12 +3317,12 @@ msgstr "Kanaal" #. module: crm #: help:crm.case.rule,act_mail_to_email:0 msgid "Email-id of the persons whom mail is to be sent" -msgstr "" +msgstr "Email-id van de personen waarvan de mail wordt verstuurd" #. module: crm #: model:ir.model,name:crm.model_crm_claim msgid "Claim Cases" -msgstr "" +msgstr "Klachtendossiers" #. module: crm #: view:crm.case.rule:0 @@ -3305,27 +3332,27 @@ msgstr "Email herinneringen (Inclusief de inhoud van het dossier)" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage msgid "Cases by Leads and Stage" -msgstr "" +msgstr "Dossiers op lead en fase" #. module: crm #: field:crm.meeting,exdate:0 msgid "Exception Date/Times" -msgstr "" +msgstr "Uitzondering Data/tijden" #. module: crm #: view:crm.meeting.generic_wizard:0 msgid "Generic Wizard" -msgstr "" +msgstr "Generieke assistent" #. module: crm #: model:process.transition,note:crm.process_transition_leadopportunity0 msgid "Creating business opportunities from Leads" -msgstr "" +msgstr "Verkoopkansen van leads maken" #. module: crm #: model:ir.ui.menu,name:crm.next_id_64 msgid "Reporting" -msgstr "" +msgstr "Overzichten" #. module: crm #: code:addons/crm/crm.py:0 @@ -3356,7 +3383,7 @@ msgstr "Verkoopkans prospect" #. module: crm #: view:crm.job:0 msgid "Expected Salary" -msgstr "" +msgstr "Verwacht salaris" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_configuration @@ -3366,7 +3393,7 @@ msgstr "Instellingen" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail msgid "Send New Mail" -msgstr "" +msgstr "Verstuur nieuwe mail" #. module: crm #: constraint:ir.cron:0 @@ -3376,23 +3403,23 @@ msgstr "Ongeldige argumenten" #. module: crm #: field:crm.meeting,transparent:0 msgid "Trensparent" -msgstr "" +msgstr "Transparant" #. module: crm #: view:crm.case:0 msgid "My Cases" -msgstr "" +msgstr "Mijn dossiers" #. module: crm #: model:crm.case.categ,name:crm.categ_lead7 #: model:crm.case.categ,name:crm.categ_oppor7 msgid "Word of mouth" -msgstr "" +msgstr "Mond-op-mond reclame" #. module: crm #: view:crm.lead:0 msgid "Lead Subject" -msgstr "" +msgstr "Onderwerp lead" #. module: crm #: view:crm.lead:0 @@ -3403,27 +3430,27 @@ msgstr "Omzetten naar verkoopkans" #. module: crm #: model:crm.case.stage,name:crm.stage_phone1 msgid "Planned" -msgstr "" +msgstr "Gepland" #. module: crm #: model:crm.case.category2,name:crm.category_meet3 msgid "Customer Office" -msgstr "" +msgstr "Kantoor klant" #. module: crm #: view:crm.job:0 msgid "Candidate Email" -msgstr "" +msgstr "E-mail kandidaat" #. module: crm #: view:crm.opportunity:0 msgid "Sales Stage: " -msgstr "" +msgstr "Verkoopfase: " #. module: crm #: view:crm.claim:0 msgid "Type of Action" -msgstr "" +msgstr "Soort actie" #. module: crm #: field:crm.case.rule,act_user_id:0 @@ -3456,12 +3483,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "December" -msgstr "" +msgstr "December" #. module: crm #: view:report.crm.case.section.categ.categ2:0 msgid "Search Cases by User" -msgstr "" +msgstr "Zoek dossiers per gebruiker" #. module: crm #: view:crm.case.rule:0 @@ -3476,7 +3503,7 @@ msgstr "Naar relatie mailen" #. module: crm #: view:crm.fundraising:0 msgid "Funds Tree" -msgstr "" +msgstr "Fondsen" #. module: crm #: field:crm.case.rule,act_method:0 @@ -3486,7 +3513,7 @@ msgstr "Object-methode aanroepen" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1 msgid "All Funds" -msgstr "" +msgstr "Alle fondsen" #. module: crm #: field:crm.case.section,calendar:0 @@ -3498,12 +3525,12 @@ msgstr "Agenda" #. module: crm #: model:crm.case.categ,name:crm.categ_job1 msgid "Salesman" -msgstr "" +msgstr "Verkoper" #. module: crm #: model:crm.case.section,name:crm.section_support_help msgid "HelpDesk" -msgstr "" +msgstr "Helpdesk" #. module: crm #: field:crm.case,ref2:0 @@ -3525,7 +3552,7 @@ msgstr "Afspraak plannen" #. module: crm #: model:crm.case.categ,name:crm.categ_fund4 msgid "Arts And Culture" -msgstr "" +msgstr "Kunst en cultuur" #. module: crm #: model:crm.case.categ,name:crm.categ_phone2 @@ -3533,7 +3560,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound msgid "Outbound" -msgstr "" +msgstr "Uitgaand" #. module: crm #: code:addons/crm/crm.py:0 @@ -3544,7 +3571,7 @@ msgstr "In historie plaatsen" #. module: crm #: view:crm.meeting:0 msgid "Confirmed" -msgstr "" +msgstr "Bevestigd" #. module: crm #: selection:crm.segmentation,state:0 @@ -3556,7 +3583,7 @@ msgstr "Niet lopend" #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0 msgid "Success Probability" -msgstr "" +msgstr "Kans op succes" #. module: crm #: code:addons/crm/crm.py:0 @@ -3581,7 +3608,7 @@ msgstr "Uitstellen na trigger datum" #. module: crm #: view:crm.lead:0 msgid "Lead Details" -msgstr "" +msgstr "Details lead" #. module: crm #: field:crm.case.rule,act_section_id:0 @@ -3613,17 +3640,17 @@ msgstr "" #: wizard_view:crm.phonecall.opportunity_set,create_partner:0 #: wizard_view:crm.phonecall.partner_create,init:0 msgid "You may have to verify that this partner does not exist already." -msgstr "" +msgstr "U dient te controleren of deze relatie niet al bestaat." #. module: crm #: view:crm.job:0 msgid "Qualication" -msgstr "" +msgstr "Kwalificatie" #. module: crm #: view:crm.meeting:0 msgid "Change RRule" -msgstr "" +msgstr "Wijzig regel" #. module: crm #: selection:crm.email.add.cc,name:0 @@ -3633,14 +3660,14 @@ msgstr "" #: field:report.crm.case.section.categ2,user_id:0 #: field:report.crm.case.section.stage,user_id:0 msgid "User" -msgstr "" +msgstr "Gebruiker" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree #: view:report.crm.case.section.categ.categ2:0 msgid "Cases by Section, Category and Type" -msgstr "" +msgstr "Dossiers op sectie, categorie en soort" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3648,12 +3675,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "November" -msgstr "" +msgstr "November" #. module: crm #: model:crm.case.category2,name:crm.category_job2 msgid "Licenced" -msgstr "" +msgstr "In licentie" #. module: crm #: field:crm.case.section,parent_id:0 @@ -3669,7 +3696,7 @@ msgstr "Hoofdsectie" #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call msgid "Schedule Phone Call" -msgstr "" +msgstr "Plan telefoongesprek" #. module: crm #: code:addons/crm/crm.py:0 @@ -3686,12 +3713,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "January" -msgstr "" +msgstr "Januari" #. module: crm #: model:process.process,name:crm.process_process_contractprocess0 msgid "Contract" -msgstr "" +msgstr "Contract" #. module: crm #: field:crm.case.section,child_ids:0 @@ -3706,7 +3733,7 @@ msgstr "Geraamde omzet" #. module: crm #: model:crm.case.categ,name:crm.categ_fund3 msgid "Healthcare" -msgstr "" +msgstr "Gezondheidszorg" #. module: crm #: view:crm.case:0 @@ -3720,7 +3747,7 @@ msgstr "" #: view:crm.phonecall:0 #: view:crm.phonecall.assign_wizard:0 msgid "Assign" -msgstr "" +msgstr "Toewijzen" #. module: crm #: field:crm.case,partner_address_id:0 @@ -3730,17 +3757,17 @@ msgstr "Contactpersoon relatie" #. module: crm #: model:crm.case.category2,name:crm.category_meet1 msgid "Office" -msgstr "" +msgstr "Kantoor" #. module: crm #: model:ir.model,name:crm.model_crm_fundraising msgid "Fund Raising Cases" -msgstr "" +msgstr "Fondsenwerving dossiers" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage msgid "Stage of case" -msgstr "" +msgstr "Dossierfase" #. module: crm #: view:crm.case:0 @@ -3764,7 +3791,7 @@ msgstr "Afsluiten" #. module: crm #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard msgid "crm.helpdesk.assign_wizard" -msgstr "" +msgstr "crm.helpdesk.assign_wizard" #. module: crm #: view:crm.case.rule:0 @@ -3785,23 +3812,23 @@ msgstr "Afspraakdatum" #. module: crm #: selection:crm.meeting,class:0 msgid "CONFIDENTIAL" -msgstr "" +msgstr "VERTROUWELIJK" #. module: crm #: help:crm.case.rule,act_mail_body:0 msgid "Content of mail" -msgstr "" +msgstr "Inhoud van mail" #. module: crm #: model:crm.case.stage,name:crm.stage_meet2 msgid "Not fixed" -msgstr "" +msgstr "Niet opgelost" #. module: crm #: model:crm.case.categ,name:crm.categ_lead3 #: model:crm.case.categ,name:crm.categ_oppor3 msgid "Employee" -msgstr "" +msgstr "Werknemer" #. module: crm #: field:crm.case,email_from:0 @@ -3811,7 +3838,7 @@ msgstr "Email relatie" #. module: crm #: view:crm.case.rule:0 msgid "% = The '%' Character" -msgstr "" +msgstr "% = het '%' teken" #. module: crm #: view:crm.case:0 @@ -3832,12 +3859,12 @@ msgstr "Omschrijving" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "May" -msgstr "" +msgstr "Mei" #. module: crm #: view:crm.job:0 msgid "Internal Notes" -msgstr "" +msgstr "Interne notities" #. module: crm #: help:crm.case.rule,act_remind_user:0 @@ -3857,7 +3884,7 @@ msgstr "" #: view:crm.opportunity:0 #: wizard_field:crm.send.mail,init,cc:0 msgid "CC" -msgstr "" +msgstr "CC" #. module: crm #: field:crm.segmentation.line,operator:0 @@ -3867,7 +3894,7 @@ msgstr "Verplicht / Optioneel" #. module: crm #: wizard_button:caldav.crm.import,init,open:0 msgid "_Import" -msgstr "" +msgstr "_Importeren" #. module: crm #: code:addons/crm/crm.py:0 @@ -3900,7 +3927,7 @@ msgstr "Laagste" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "February" -msgstr "" +msgstr "Februari" #. module: crm #: view:crm.phonecall:0 @@ -3928,7 +3955,7 @@ msgstr "" #: wizard_view:crm.new.send.mail,init:0 #: wizard_view:crm.send.mail,init:0 msgid "Mass Mailing" -msgstr "" +msgstr "Bulk-mailing" #. module: crm #: view:crm.case.rule:0 @@ -3941,22 +3968,22 @@ msgstr "E-mail acties" #: field:report.crm.case.section.categ2,name:0 #: field:report.crm.case.section.stage,name:0 msgid "Year" -msgstr "" +msgstr "Jaar" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund1 msgid "Cash" -msgstr "" +msgstr "Contant" #. module: crm #: view:crm.fundraising:0 msgid "Funds by Categories" -msgstr "" +msgstr "Fondsen op categorie" #. module: crm #: model:process.node,note:crm.process_node_leads0 msgid "Very first contact with new prospect" -msgstr "" +msgstr "Eerste contact met een nieuwe mogelijke klant" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3964,22 +3991,22 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "April" -msgstr "" +msgstr "April" #. module: crm #: model:crm.case.stage,name:crm.stage_meet5 msgid "Future" -msgstr "" +msgstr "Toekomst" #. module: crm #: wizard_field:caldav.crm.export,init,file_path:0 msgid "Save ICS file" -msgstr "" +msgstr "ICS bestand opslaan" #. module: crm #: wizard_field:caldav.crm.subscribe,init,url_path:0 msgid "Provide path for remote calendar" -msgstr "" +msgstr "Geef het pas naar de remote agenda" #. module: crm #: view:crm.case.log:0 @@ -3994,12 +4021,12 @@ msgstr "Voorwaarden aan timing" #. module: crm #: model:ir.model,name:crm.model_crm_helpdesk msgid "Helpdesk Cases" -msgstr "" +msgstr "Helpdesk dossiers" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export msgid "Export ICS File" -msgstr "" +msgstr "Exporteer ICS bestand" #. module: crm #: field:crm.case.rule,sequence:0 @@ -4012,12 +4039,12 @@ msgstr "Reeks" #: wizard_view:caldav.crm.import,init:0 #: wizard_field:caldav.crm.import,init,file_path:0 msgid "Select ICS file" -msgstr "" +msgstr "Selecteer ICS bestand" #. module: crm #: wizard_view:caldav.crm.import,display:0 msgid "Import Message" -msgstr "" +msgstr "Importeer bericht" #. module: crm #: field:crm.segmentation.line,expr_name:0 @@ -4033,17 +4060,17 @@ msgstr "Dossiers op sectie" #. module: crm #: view:crm.job:0 msgid "New Jobs" -msgstr "" +msgstr "Nieuwe banen" #. module: crm #: field:crm.menu.config_wizard,fund:0 msgid "Fund Raising Operations" -msgstr "" +msgstr "Fondswervingsacties" #. module: crm #: model:crm.case.category2,name:crm.category_lead8 msgid "Newsletter" -msgstr "" +msgstr "Nieuwsbrief" #~ msgid "Add Last Mail for Replying" #~ msgstr "Laatste email aan het antwoord toevoegen" diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index de78871a520..efb185982ed 100644 --- a/addons/crm/i18n/pl.po +++ b/addons/crm/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-10-06 13:24+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index 9502c39ad06..0e4fb4a7df5 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -140,7 +140,4 @@ class crm_phonecall_report(osv.osv): from crm_phonecall c )""") - crm_phonecall_report() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index d94169c2dd1..7046034afaf 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -56,7 +56,6 @@ class crm_lead2opportunity(osv.osv_memory): lead_obj = self.pool.get('crm.lead') data_obj = self.pool.get('ir.model.data') - model_obj = self.pool.get('ir.model') # Get Opportunity views result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter') @@ -156,7 +155,7 @@ class crm_lead2opportunity_partner(osv.osv_memory): _columns = { 'partner_id': fields.many2one('res.partner', 'Partner'), - 'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'), + 'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner'), ('no','Do not create a partner')], 'Action'), } def default_get(self, cr, uid, fields, context=None): @@ -209,7 +208,6 @@ class crm_lead2opportunity_partner(osv.osv_memory): partner_ids = self._create_partner(cr, uid, ids, context) mod_obj = self.pool.get('ir.model.data') - result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter') value = {} data_obj = self.pool.get('ir.model.data') data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action') diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml index 55196f0688e..bc3c0ebbf46 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml @@ -54,7 +54,6 @@ <separator string="" colspan="4" /> <group col="4" colspan="4"> <button special="cancel" string="Cancel" icon="gtk-cancel"/> - <button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/> <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/> </group> </form> diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py index aeb5b2db673..229850c6855 100644 --- a/addons/crm/wizard/crm_lead_to_partner.py +++ b/addons/crm/wizard/crm_lead_to_partner.py @@ -67,7 +67,6 @@ class crm_lead2partner(osv.osv_memory): lead_obj = self.pool.get('crm.lead') partner_obj = self.pool.get('res.partner') contact_obj = self.pool.get('res.partner.address') - rec_ids = context and context.get('active_ids', []) partner_id = False data = context and context.get('active_ids', []) or [] @@ -171,12 +170,13 @@ class crm_lead2partner(osv.osv_memory): partner_ids.append(partner_id) - vals = {} - if partner_id: - vals.update({'partner_id': partner_id}) - if contact_id: - vals.update({'partner_address_id': contact_id}) - lead_obj.write(cr, uid, [lead.id], vals) + if data.action<>'no': + vals = {} + if partner_id: + vals.update({'partner_id': partner_id}) + if contact_id: + vals.update({'partner_address_id': contact_id}) + lead_obj.write(cr, uid, [lead.id], vals) return partner_ids def make_partner(self, cr, uid, ids, context=None): diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po index 12c33ba2d66..9429ed442e5 100644 --- a/addons/crm_claim/i18n/nl.po +++ b/addons/crm_claim/i18n/nl.po @@ -8,84 +8,84 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 12:07+0000\n" -"PO-Revision-Date: 2010-09-10 11:49+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2010-10-09 14:10+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n" +"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_claim #: field:crm.claim,planned_revenue:0 msgid "Planned Revenue" -msgstr "" +msgstr "Geraamde omzet" #. module: crm_claim #: field:crm.claim.report,nbr:0 msgid "# of Cases" -msgstr "" +msgstr "# Dossiers" #. module: crm_claim #: view:crm.claim:0 #: view:crm.claim.report:0 msgid "Group By..." -msgstr "" +msgstr "Groepeer op.." #. module: crm_claim #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de definitie van de actie." #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "March" -msgstr "" +msgstr "Maart" #. module: crm_claim #: field:crm.claim.report,delay_close:0 msgid "Delay to close" -msgstr "" +msgstr "Vertraging tot sluiting" #. module: crm_claim #: field:crm.claim,company_id:0 #: view:crm.claim.report:0 #: field:crm.claim.report,company_id:0 msgid "Company" -msgstr "" +msgstr "Bedrijf" #. module: crm_claim #: field:crm.claim,email_cc:0 msgid "Watchers Emails" -msgstr "" +msgstr "Email toeschouwers" #. module: crm_claim #: view:crm.claim.report:0 msgid "#Claim" -msgstr "" +msgstr "# Klacht" #. module: crm_claim #: view:crm.claim.report:0 msgid "This Year" -msgstr "" +msgstr "Dit jaar" #. module: crm_claim #: view:crm.claim.report:0 msgid "Cases" -msgstr "" +msgstr "Dossiers" #. module: crm_claim #: selection:crm.claim,priority:0 #: selection:crm.claim.report,priority:0 msgid "Highest" -msgstr "" +msgstr "Hoogste" #. module: crm_claim #: view:crm.claim.report:0 #: field:crm.claim.report,day:0 msgid "Day" -msgstr "" +msgstr "Dag" #. module: crm_claim #: help:crm.claim,canal_id:0 @@ -94,6 +94,9 @@ msgid "" "customer. With each commercial opportunity, you can indicate thecanall which " "is this opportunity source." msgstr "" +"De kanalen geven de verschillende beschikbare communicatievormen met de " +"klant weer. Met elke verkoopkans kunt u aangeven via welk kanaal deze kans " +"is ontstaan." #. module: crm_claim #: help:crm.claim,section_id:0 @@ -101,152 +104,154 @@ msgid "" "Sales team to which Case belongs to.Define Responsible user and Email " "account for mail gateway." msgstr "" +"Verkoopteam waaraan het dossier is toegewezen. Definieer de " +"verantwoordelijke gebruiker en email account voor mail gateway." #. module: crm_claim #: field:crm.claim,partner_mobile:0 msgid "Mobile" -msgstr "" +msgstr "Mobiel" #. module: crm_claim #: field:crm.claim,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Berichten" #. module: crm_claim #: model:crm.case.categ,name:crm_claim.categ_claim1 msgid "Factual Claims" -msgstr "" +msgstr "Feitelijke klachten" #. module: crm_claim #: field:crm.claim,type_id:0 #: field:crm.claim.report,type_id:0 msgid "Claim Type" -msgstr "" +msgstr "Soort klacht" #. module: crm_claim #: selection:crm.claim,state:0 #: selection:crm.claim.report,state:0 msgid "Cancelled" -msgstr "" +msgstr "Geannuleerd" #. module: crm_claim #: model:crm.case.resource.type,name:crm_claim.type_claim2 msgid "Preventive" -msgstr "" +msgstr "Preventief" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim2 msgid "Fixed" -msgstr "" +msgstr "Opgelost" #. module: crm_claim #: field:crm.claim,partner_address_id:0 msgid "Partner Contact" -msgstr "" +msgstr "Contactpersoon relatie" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Case" -msgstr "" +msgstr "Mijn klacht" #. module: crm_claim #: field:crm.claim,ref:0 msgid "Reference" -msgstr "" +msgstr "Referentie" #. module: crm_claim #: field:crm.claim,date_action_next:0 msgid "Next Action" -msgstr "" +msgstr "Volgende actie" #. module: crm_claim #: view:crm.claim:0 msgid "Reset to Draft" -msgstr "" +msgstr "Terugzetten naar Concept" #. module: crm_claim #: view:crm.claim:0 msgid "Extra Info" -msgstr "" +msgstr "Extra info" #. module: crm_claim #: view:crm.claim:0 #: field:crm.claim,partner_id:0 #: field:crm.claim.report,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Relatie" #. module: crm_claim #: field:crm.claim,active:0 msgid "Active" -msgstr "" +msgstr "Actief" #. module: crm_claim #: field:crm.claim,date_closed:0 #: selection:crm.claim,state:0 #: selection:crm.claim.report,state:0 msgid "Closed" -msgstr "" +msgstr "Gesloten" #. module: crm_claim #: view:crm.claim.report:0 #: field:crm.claim.report,section_id:0 msgid "Section" -msgstr "" +msgstr "Afdeling" #. module: crm_claim #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Ongeldige XML voor weergave opbouw!" #. module: crm_claim #: field:crm.claim,priority:0 #: view:crm.claim.report:0 #: field:crm.claim.report,priority:0 msgid "Priority" -msgstr "" +msgstr "Prioriteit" #. module: crm_claim #: view:crm.claim:0 msgid "Send New Email" -msgstr "" +msgstr "Verstuur nieuwe email" #. module: crm_claim #: view:crm.claim:0 msgid "Reply" -msgstr "" +msgstr "Beantwoorden" #. module: crm_claim #: view:crm.claim:0 msgid "Stage: " -msgstr "" +msgstr "Fase: " #. module: crm_claim #: view:crm.claim:0 #: view:crm.claim.report:0 msgid "Type" -msgstr "" +msgstr "Soort" #. module: crm_claim #: field:crm.claim,email_from:0 msgid "Email" -msgstr "" +msgstr "Email" #. module: crm_claim #: field:crm.claim,canal_id:0 msgid "Channel" -msgstr "" +msgstr "Kanaal" #. module: crm_claim #: selection:crm.claim,priority:0 #: selection:crm.claim.report,priority:0 msgid "Lowest" -msgstr "" +msgstr "Laagste" #. module: crm_claim #: field:crm.claim,create_date:0 msgid "Creation Date" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm_claim #: view:crm.claim:0 @@ -254,28 +259,28 @@ msgstr "" #: view:crm.claim.report:0 #: selection:crm.claim.report,state:0 msgid "Pending" -msgstr "" +msgstr "Wacht" #. module: crm_claim #: view:crm.claim:0 #: field:crm.claim,date_deadline:0 msgid "Deadline" -msgstr "" +msgstr "Uiterste datum" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "July" -msgstr "" +msgstr "Juli" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act msgid "Claim Stages" -msgstr "" +msgstr "Klachtfases" #. module: crm_claim #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act msgid "Categories" -msgstr "" +msgstr "Categoriën" #. module: crm_claim #: view:crm.claim:0 @@ -283,110 +288,110 @@ msgstr "" #: view:crm.claim.report:0 #: field:crm.claim.report,stage_id:0 msgid "Stage" -msgstr "" +msgstr "Fase" #. module: crm_claim #: view:crm.claim:0 msgid "History Information" -msgstr "" +msgstr "Historie Informatie" #. module: crm_claim #: view:crm.claim:0 msgid "Dates" -msgstr "" +msgstr "Data" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.crm_claim_resource_act msgid "Claim Resource Type" -msgstr "" +msgstr "Klacht Actie Soorten" #. module: crm_claim #: view:crm.claim:0 msgid "Contact" -msgstr "" +msgstr "Contactpersoon" #. module: crm_claim #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act msgid "Stages" -msgstr "" +msgstr "Fasen" #. module: crm_claim #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree msgid "Claims Analysis" -msgstr "" +msgstr "Klachten Analyse" #. module: crm_claim #: help:crm.claim.report,delay_close:0 msgid "Number of Days to close the case" -msgstr "" +msgstr "Aantal dagen om de klacht te sluiten" #. module: crm_claim #: model:ir.model,name:crm_claim.model_crm_claim_report msgid "CRM Claim Report" -msgstr "" +msgstr "CRM Klachtenrapport" #. module: crm_claim #: view:crm.claim:0 msgid "Status and Categorization" -msgstr "" +msgstr "Status en and indeling" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim1 msgid "Accepted as Claim" -msgstr "" +msgstr "Geaccepteerd als klacht" #. module: crm_claim #: model:crm.case.resource.type,name:crm_claim.type_claim1 msgid "Corrective" -msgstr "" +msgstr "Correctief" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "September" -msgstr "" +msgstr "September" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "December" -msgstr "" +msgstr "December" #. module: crm_claim #: view:crm.claim.report:0 #: field:crm.claim.report,month:0 msgid "Month" -msgstr "" +msgstr "Maand" #. module: crm_claim #: field:crm.claim,write_date:0 msgid "Update Date" -msgstr "" +msgstr "Wijzigingsdatum" #. module: crm_claim #: field:crm.claim,ref2:0 msgid "Reference 2" -msgstr "" +msgstr "Referentie 2" #. module: crm_claim #: field:crm.claim,categ_id:0 #: view:crm.claim.report:0 #: field:crm.claim.report,categ_id:0 msgid "Category" -msgstr "" +msgstr "Categorie" #. module: crm_claim #: model:crm.case.categ,name:crm_claim.categ_claim2 msgid "Value Claims" -msgstr "" +msgstr "Waarde klachten" #. module: crm_claim #: view:crm.claim:0 msgid "Closure Date" -msgstr "" +msgstr "Afsluitdatum" #. module: crm_claim #: field:crm.claim,planned_cost:0 msgid "Planned Costs" -msgstr "" +msgstr "Verwachte kosten" #. module: crm_claim #: help:crm.claim,email_cc:0 @@ -395,111 +400,114 @@ msgid "" "outbound emails for this record before being sent. Separate multiple email " "addresses with a comma" msgstr "" +"Deze email adressen worden toegevoegd aan het CC veld van alle inkomende en " +"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen " +"scheidt u met een komma (,)." #. module: crm_claim #: selection:crm.claim,state:0 #: view:crm.claim.report:0 #: selection:crm.claim.report,state:0 msgid "Draft" -msgstr "" +msgstr "Concept" #. module: crm_claim #: selection:crm.claim,priority:0 #: selection:crm.claim.report,priority:0 msgid "Low" -msgstr "" +msgstr "Laag" #. module: crm_claim #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fout ! U kunt geen recursief menu maken." #. module: crm_claim #: view:crm.claim.report:0 msgid "7 Days" -msgstr "" +msgstr "7 Dagen" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "August" -msgstr "" +msgstr "Augustus" #. module: crm_claim #: selection:crm.claim,priority:0 #: selection:crm.claim.report,priority:0 msgid "Normal" -msgstr "" +msgstr "Normaal" #. module: crm_claim #: view:crm.claim:0 msgid "Global CC" -msgstr "" +msgstr "Globale CC" #. module: crm_claim #: model:ir.module.module,shortdesc:crm_claim.module_meta_information msgid "Customer & Supplier Relationship Management" -msgstr "" +msgstr "Customer & Supplier Relationship Management" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "June" -msgstr "" +msgstr "Juni" #. module: crm_claim #: view:crm.claim:0 msgid "Type of Action" -msgstr "" +msgstr "Soort actie" #. module: crm_claim #: field:crm.claim,partner_phone:0 msgid "Phone" -msgstr "" +msgstr "Telefoon" #. module: crm_claim #: view:crm.claim.report:0 #: field:crm.claim.report,user_id:0 msgid "User" -msgstr "" +msgstr "Gebruiker" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim5 msgid "Awaiting Response" -msgstr "" +msgstr "Wacht op reactie" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action msgid "Claim Categories" -msgstr "" +msgstr "Klachtcategoriën" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "November" -msgstr "" +msgstr "November" #. module: crm_claim #: view:crm.claim.report:0 msgid "Extended Filters..." -msgstr "" +msgstr "Uitgebreide filters..." #. module: crm_claim #: view:crm.claim:0 msgid "Closure" -msgstr "" +msgstr "Afsluiting" #. module: crm_claim #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_type_act msgid "Resource Type" -msgstr "" +msgstr "Actie Soort" #. module: crm_claim #: view:crm.claim.report:0 msgid "Search" -msgstr "" +msgstr "Zoeken" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "October" -msgstr "" +msgstr "Oktober" #. module: crm_claim #: model:ir.module.module,description:crm_claim.module_meta_information @@ -511,31 +519,37 @@ msgid "" "automatically new claims based on incoming emails.\n" " " msgstr "" +"\n" +"Deze modules laten u de klachten van uw klanten en leveranciers volgen.\n" +"Het is volledig geïntegreerd met de e-mail gateway zodat u automatisch " +"nieuwe\n" +"klachten kunt maken op basis van ingekomen emails.\n" +" " #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "January" -msgstr "" +msgstr "Januari" #. module: crm_claim #: view:crm.claim:0 msgid "Claim Date" -msgstr "" +msgstr "Klachtdatum" #. module: crm_claim #: help:crm.claim,email_from:0 msgid "These people will receive email." -msgstr "" +msgstr "Deze personen ontvangen email." #. module: crm_claim #: field:crm.claim,date:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim4 msgid "Invalid" -msgstr "" +msgstr "Ongeldig" #. module: crm_claim #: view:crm.claim:0 @@ -544,28 +558,28 @@ msgstr "" #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims msgid "Claims" -msgstr "" +msgstr "Klachten" #. module: crm_claim #: model:crm.case.categ,name:crm_claim.categ_claim3 msgid "Policy Claims" -msgstr "" +msgstr "Procedurele klachten" #. module: crm_claim #: view:crm.claim:0 msgid "History" -msgstr "" +msgstr "Historie" #. module: crm_claim #: model:ir.model,name:crm_claim.model_crm_claim #: model:ir.ui.menu,name:crm_claim.menu_config_claim msgid "Claim" -msgstr "" +msgstr "Klacht" #. module: crm_claim #: view:crm.claim:0 msgid "Attachments" -msgstr "" +msgstr "Bijlagen" #. module: crm_claim #: view:crm.claim:0 @@ -573,34 +587,34 @@ msgstr "" #: view:crm.claim.report:0 #: field:crm.claim.report,state:0 msgid "State" -msgstr "" +msgstr "Status" #. module: crm_claim #: view:crm.claim:0 msgid "Claim Info" -msgstr "" +msgstr "Klacht Informatie" #. module: crm_claim #: view:crm.claim:0 #: view:crm.claim.report:0 msgid "Done" -msgstr "" +msgstr "Klaar" #. module: crm_claim #: view:crm.claim:0 msgid "Communication" -msgstr "" +msgstr "Communicatie" #. module: crm_claim #: view:crm.claim:0 #: view:crm.claim.report:0 msgid "Cancel" -msgstr "" +msgstr "Annuleren" #. module: crm_claim #: view:crm.claim:0 msgid "Close" -msgstr "" +msgstr "Sluiten" #. module: crm_claim #: view:crm.claim:0 @@ -608,85 +622,86 @@ msgstr "" #: view:crm.claim.report:0 #: selection:crm.claim.report,state:0 msgid "Open" -msgstr "" +msgstr "Open" #. module: crm_claim #: view:crm.claim:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: crm_claim #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!" #. module: crm_claim #: view:crm.claim:0 #: field:crm.claim,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Verantwoordelijke" #. module: crm_claim #: view:crm.claim:0 msgid "Date of Claim" -msgstr "" +msgstr "Klachtdatum" #. module: crm_claim #: view:crm.claim:0 msgid "Current" -msgstr "" +msgstr "Actueel" #. module: crm_claim #: view:crm.claim:0 msgid "Details" -msgstr "" +msgstr "Details" #. module: crm_claim #: view:crm.claim:0 msgid "Cases By Stage and Estimates" -msgstr "" +msgstr "Klachten op fase en schattingen" #. module: crm_claim #: view:crm.claim:0 msgid "Claim/Action Description" -msgstr "" +msgstr "Klacht/actie omschrijving" #. module: crm_claim #: field:crm.claim,description:0 msgid "Description" -msgstr "" +msgstr "Omschrijving" #. module: crm_claim #: view:crm.claim:0 msgid "Search Claims" -msgstr "" +msgstr "Zoek klachten" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "May" -msgstr "" +msgstr "Mei" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.act_claim_partner #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address msgid "Report a Claim" -msgstr "" +msgstr "Rapporteer een klacht" #. module: crm_claim #: field:crm.claim,probability:0 msgid "Probability (%)" -msgstr "" +msgstr "Waarschijnlijkheid (%)" #. module: crm_claim #: field:crm.claim,partner_name:0 msgid "Employee's Name" -msgstr "" +msgstr "Werknemernaam" #. module: crm_claim #: view:crm.claim.report:0 msgid "This Month" -msgstr "" +msgstr "Deze maand" #. module: crm_claim #: help:crm.claim,state:0 @@ -699,66 +714,73 @@ msgid "" " \n" "If the case needs to be reviewed then the state is set to 'Pending'." msgstr "" +"De status wordt op 'Concept' gezet als het dossier wordt gemaakt. " +" \n" +"Als het dossier in behandeling is, wordt de status op 'Open' gezet. " +" \n" +"Als het dossier klaar is, gaat de status naar 'Gereed'. " +" \n" +"Als het dossier moet worden nagekeken, wordt de status op 'Wachtend' gezet." #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "February" -msgstr "" +msgstr "Februari" #. module: crm_claim #: field:crm.claim,name:0 msgid "Name" -msgstr "" +msgstr "Naam" #. module: crm_claim #: view:crm.claim:0 msgid "Communication history" -msgstr "" +msgstr "Communicatiegeschiedenis" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim3 msgid "Won't fix" -msgstr "" +msgstr "Wordt niet opgelost" #. module: crm_claim #: selection:crm.claim.report,month:0 msgid "April" -msgstr "" +msgstr "April" #. module: crm_claim #: view:crm.claim:0 msgid "References" -msgstr "" +msgstr "Verwijzingen" #. module: crm_claim #: field:crm.claim,id:0 msgid "ID" -msgstr "" +msgstr "ID" #. module: crm_claim #: selection:crm.claim,priority:0 #: selection:crm.claim.report,priority:0 msgid "High" -msgstr "" +msgstr "Hoog" #. module: crm_claim #: view:crm.claim:0 #: field:crm.claim,section_id:0 msgid "Sales Team" -msgstr "" +msgstr "Verkoopteam" #. module: crm_claim #: field:crm.claim.report,create_date:0 msgid "Create Date" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm_claim #: field:crm.claim,date_action_last:0 msgid "Last Action" -msgstr "" +msgstr "Laatste actie" #. module: crm_claim #: view:crm.claim.report:0 #: field:crm.claim.report,name:0 msgid "Year" -msgstr "" +msgstr "Jaar" diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po index 2bcc8ad61a4..dde3ab14915 100644 --- a/addons/document_webdav/i18n/eu.po +++ b/addons/document_webdav/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-05-30 15:14+0000\n" -"PO-Revision-Date: 2010-10-06 09:58+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document_webdav_old diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po index ec87c239bcc..8a78d6f631b 100644 --- a/addons/fetchmail/i18n/nl.po +++ b/addons/fetchmail/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 13:33+0000\n" -"PO-Revision-Date: 2010-10-07 20:03+0000\n" -"Last-Translator: Wouter Schrijvers <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:39+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: fetchmail diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po index 2e270076d5f..0a432783b9e 100644 --- a/addons/knowledge/i18n/nl.po +++ b/addons/knowledge/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 06:56+0000\n" -"PO-Revision-Date: 2010-10-06 18:07+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:31+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: knowledge diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po index bcf2ce6e299..d194189a5ee 100644 --- a/addons/marketing/i18n/nl.po +++ b/addons/marketing/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 07:04+0000\n" -"PO-Revision-Date: 2010-10-06 15:02+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:32+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: marketing diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po new file mode 100644 index 00000000000..2ec46996a11 --- /dev/null +++ b/addons/marketing/i18n/ru.po @@ -0,0 +1,124 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-08-20 07:04+0000\n" +"PO-Revision-Date: 2010-10-09 18:11+0000\n" +"Last-Translator: Anatoly Rudnev <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: marketing +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Некорректный формат XML для просмотра архитектуры!" + +#. module: marketing +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: marketing +#: field:marketing.installer,progress:0 +msgid "Configuration Progress" +msgstr "" + +#. module: marketing +#: view:marketing.installer:0 +msgid "title" +msgstr "заголовок" + +#. module: marketing +#: field:marketing.installer,email_template:0 +msgid "Automated E-Mails" +msgstr "Автоматизированные рассылки" + +#. module: marketing +#: field:marketing.installer,config_logo:0 +msgid "Image" +msgstr "Изображение" + +#. module: marketing +#: help:marketing.installer,marketing_campaign:0 +msgid "" +"Helps you to manage marketing campaigns and automate actions and " +"communication steps." +msgstr "" +"Помогает Вам настроить маркетинговые кампании и автоматизировать действия и " +"этапы взамодействия" + +#. module: marketing +#: help:marketing.installer,marketing_campaign_mailchimp:0 +msgid "" +"This modules integrate mailchimp.com's service with OpenERP to automate mass " +"mailings." +msgstr "" +"Этот модуль интегрирует в OpenERP сервисы mailchimp.com для автоматизации " +"почтовых рассылок" + +#. module: marketing +#: model:ir.module.module,description:marketing.module_meta_information +msgid "Menu for Marketing" +msgstr "" + +#. module: marketing +#: help:marketing.installer,email_template:0 +msgid "" +"Helps you to design templates of emails and integrate them in your different " +"processes." +msgstr "" +"Помогает разработать шаблоны сообщений электронной почты и интегрировать их " +"в ваши процессы." + +#. module: marketing +#: help:marketing.installer,crm_profiling:0 +msgid "" +"Helps you to perform segmentation within partners and design questionaires." +msgstr "" + +#. module: marketing +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." + +#. module: marketing +#: model:ir.module.module,shortdesc:marketing.module_meta_information +msgid "Marketing" +msgstr "Маркетинг" + +#. module: marketing +#: field:marketing.installer,crm_profiling:0 +msgid "Profiling Tools" +msgstr "Средства профилирования" + +#. module: marketing +#: field:marketing.installer,marketing_campaign:0 +msgid "Marketing Campaigns" +msgstr "Маркетинговые кампании" + +#. module: marketing +#: model:ir.model,name:marketing.model_marketing_installer +msgid "marketing.installer" +msgstr "" + +#. module: marketing +#: field:marketing.installer,marketing_campaign_mailchimp:0 +msgid "Mailchimp Integration" +msgstr "Интеграция с сервисом MailChimp" + +#. module: marketing +#: model:ir.actions.act_window,name:marketing.action_marketing_installer +msgid "Marketing Modules Installation" +msgstr "Установка модулей маркетинга" diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po new file mode 100644 index 00000000000..3806439682b --- /dev/null +++ b/addons/marketing_campaign/i18n/ru.po @@ -0,0 +1,935 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-08-20 07:09+0000\n" +"PO-Revision-Date: 2010-10-09 18:35+0000\n" +"Last-Translator: Anatoly Rudnev <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "The current step for this item has no email or report to preview." +msgstr "" +"Текущий шаг для этого элемента не имеет доступных для предварительного " +"просмотра отчетов иили шаблонов электронной почты" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,trigger:0 +msgid "Time" +msgstr "Время" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +#: view:marketing.campaign.workitem:0 +msgid "Group By..." +msgstr "Группировать по .." + +#. module: marketing_campaign +#: field:marketing.campaign.transition,trigger:0 +msgid "Trigger" +msgstr "Активатор" + +#. module: marketing_campaign +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." + +#. module: marketing_campaign +#: field:campaign.analysis,count:0 +msgid "# of Actions" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +msgid "Campaign Editor" +msgstr "Редактор кампаний" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "Today" +msgstr "Сегодня" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "March" +msgstr "Март" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,object_id:0 +#: field:marketing.campaign.segment,object_id:0 +#: field:marketing.campaign.workitem,object_id:0 +msgid "Object" +msgstr "Объект" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +msgid "Set to Draft" +msgstr "Сделать черновиком" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,to_ids:0 +msgid "Next Activities" +msgstr "Следующие действия" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Synchronization" +msgstr "Синхронизация" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "This Year" +msgstr "Этот год" + +#. module: marketing_campaign +#: help:marketing.campaign,partner_field_id:0 +msgid "" +"The generated workitems will be linked to the partner related to the record. " +"If the record is the partner itself left this field empty." +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "No preview" +msgstr "Без предпросмотра" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Outgoing Transitions" +msgstr "Исходящее перемещение" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Reset" +msgstr "Сброс" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,type:0 +msgid "" +"Describe type of action to be performed on the Activity.Eg : Send email,Send " +"paper.." +msgstr "" +"Опишите тип действия которое необходимо выполнить. Например: Отправить " +"электронную почту, отправить буклет ..." + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Year(s)" +msgstr "Год (а)" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,report_directory_id:0 +msgid "This folder is used to store the generated reports" +msgstr "Сгенереированные отчеты будут сохранены в этой папке" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: selection:marketing.campaign,state:0 +#: selection:marketing.campaign.segment,state:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "Cancelled" +msgstr "Отменено" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,trigger:0 +msgid "Automatic" +msgstr "Автоматически" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Activity Definition" +msgstr "Определение действия" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,keep_if_condition_not_met:0 +msgid "Keep as cancelled when condition not met" +msgstr "Оставить как отмененное если условие не выполнено." + +#. module: marketing_campaign +#: help:marketing.campaign,mode:0 +msgid "" +"Test - It creates and process all the activities directly (without waiting " +"for the delay on transitions) but does not send emails or produce reports.\n" +"Test in Realtime - It creates and processes all the activities directly but " +"does not send emails or produce reports.\n" +"With Manual Confirmation - the campaigns runs normally, but the user has to " +"validate all workitem manually.\n" +"Normal - the campaign runs normally and automatically sends all emails and " +"reports (be very careful with this mode, you're live!)" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,campaign_id:0 +#: view:marketing.campaign:0 +#: field:marketing.campaign.activity,campaign_id:0 +#: view:marketing.campaign.segment:0 +#: field:marketing.campaign.segment,campaign_id:0 +#: field:marketing.campaign.workitem,campaign_id:0 +msgid "Campaign" +msgstr "Кампания" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,start:0 +msgid "Start" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,segment_id:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,segment_id:0 +msgid "Segment" +msgstr "Сегмент" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,sync_mode:0 +msgid "Workitem creation mode" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Month(s)" +msgstr "Месяц (ы)" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "" +"The campaign hasn't any starting activity nor any activity with a signal and " +"no previous activity." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,partner_id:0 +#: model:ir.model,name:marketing_campaign.model_res_partner +#: field:marketing.campaign.workitem,partner_id:0 +msgid "Partner" +msgstr "Партнёр" + +#. module: marketing_campaign +#: selection:marketing.campaign.segment,sync_mode:0 +msgid "If record created after last sync" +msgstr "Если запись сделана после последней синхронизации" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Transitions" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Create After Sync" +msgstr "Создать После Синхронизации" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Dates" +msgstr "Даты" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,sync_mode:0 +msgid "" +"Determines when new workitems should be created for records matching a " +"segment." +msgstr "" +"Определяет, должен ли рабочий элемент создаваться для записи соответствующей " +"сегменту" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: view:marketing.campaign:0 +#: field:marketing.campaign,state:0 +#: view:marketing.campaign.segment:0 +#: field:marketing.campaign.segment,state:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,state:0 +msgid "State" +msgstr "Статус" + +#. module: marketing_campaign +#: model:ir.module.module,description:marketing_campaign.module_meta_information +msgid "" +"\n" +"Allows you to setup leads automation through marketing campaigns. The " +"campaigns\n" +"are dynamic and multi-channels. The process:\n" +"* Design marketing campaigns that incluces mail templates, reports to " +"print,\n" +" miscelleanous actions, etc.\n" +"* Define segments that are selections of target people\n" +"* Launch your campaign to automate communications.\n" +"\n" +"If you need demo data, you can install the module " +"marketing_campaign_crm_demo.\n" +" " +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,condition:0 +msgid "" +"Python expression to decide whether the activity can be executed, otherwise " +"it will be deleted or cancelled.The expression may use the following " +"[browsable] variables:\n" +" - activity: the campaign activity\n" +" - workitem: the campaign workitem\n" +" - object: the object this campaign item represents\n" +" - transitions: list of campaign transitions outgoing from this activity\n" +"...- re: Python regular expression module" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "Marketing Reports" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,type:0 +msgid "Type" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.workitem,res_name:0 +msgid "Resource Name" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +msgid "Run" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "" +"The campaign cannot be started: an email account is missing in the email " +"activity '%s'" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,from_ids:0 +msgid "Previous Activities" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,activity_from_id:0 +msgid "Previous Activity" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Marketing Campaign Activities" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,error_msg:0 +msgid "Error Message" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all +#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form +#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form +#: view:marketing.campaign:0 +msgid "Campaigns" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,interval_type:0 +msgid "Interval Unit" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,country_id:0 +msgid "Country" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "July" +msgstr "" + +#. module: marketing_campaign +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration +msgid "Configuration" +msgstr "" + +#. module: marketing_campaign +#: constraint:ir.cron:0 +msgid "Invalid arguments" +msgstr "" + +#. module: marketing_campaign +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Hour(s)" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment +msgid "Campaign Segment" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +#: view:marketing.campaign.workitem:0 +msgid "Cancel" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,keep_if_condition_not_met:0 +msgid "" +"By activating this option, workitems that aren't executed because the " +"condition is not met are marked as cancelled instead of being deleted." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "Exceptions" +msgstr "" + +#. module: marketing_campaign +#: field:res.partner,workitem_ids:0 +msgid "Workitems" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,fixed_cost:0 +msgid "Fixed Cost" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,interval_nbr:0 +msgid "Interval Value" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,revenue:0 +#: field:marketing.campaign.activity,revenue:0 +msgid "Revenue" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "September" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "December" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,month:0 +msgid "Month" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,activity_to_id:0 +msgid "Next Activity" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,email_template_id:0 +msgid "The e-mail to send when this activity is activated" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "This Month" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +msgid "Test Mode" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +msgid "Manual Mode" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,server_action_id:0 +msgid "The action to perform when this activity is activated" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,partner_field_id:0 +msgid "Partner Field" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_campaign_analysis +msgid "Campaign Analysis" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "Test in Realtime" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "Test Directly" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,report_directory_id:0 +msgid "Directory" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,sync_last_date:0 +msgid "Latest Synchronization" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: selection:marketing.campaign,state:0 +#: view:marketing.campaign.segment:0 +#: selection:marketing.campaign.segment,state:0 +msgid "Draft" +msgstr "" + +#. module: marketing_campaign +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,date_run:0 +msgid "Launching Date" +msgstr "" + +#. module: marketing_campaign +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Preview" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +#: view:marketing.campaign.workitem:0 +msgid "Status" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Run Date" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Related Resource" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "August" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "Normal" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,start:0 +msgid "This activity is launched when the campaign starts." +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,signal:0 +msgid "" +"An activity with a signal can be called programmatically. Be careful, the " +"workitem is always created when a signal is sent" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "June" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.segment,sync_mode:0 +msgid "All records (no duplicates)" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,date:0 +#: view:marketing.campaign.workitem:0 +msgid "Date" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "November" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,condition:0 +msgid "Condition" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,report_id:0 +msgid "The report to generate when this activity is activated" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "Exception" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "October" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign,fixed_cost:0 +msgid "" +"Fixed cost for the campaign (used for campaign analysis), see also variable " +"cost on activities" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "January" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,date:0 +msgid "Execution Date" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem +msgid "Campaign Workitem" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,ir_filter_id:0 +msgid "Filter" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Synchronize" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "Error" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +#: field:marketing.campaign.activity,server_action_id:0 +#: selection:marketing.campaign.activity,type:0 +msgid "Action" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "Automatic transition" +msgstr "" + +#. module: marketing_campaign +#: view:res.partner:0 +msgid "History" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign,object_id:0 +msgid "Choose the model on which you want this campaign to be run" +msgstr "" + +#. module: marketing_campaign +#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information +msgid "marketing_campaign" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Process" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#: selection:marketing.campaign.transition,trigger:0 +#, python-format +msgid "Cosmetic" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.transition,trigger:0 +msgid "How is the destination workitem triggered" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: selection:marketing.campaign,state:0 +#: selection:marketing.campaign.segment,state:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "Done" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_email_template +msgid "Email Templates for Models" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +msgid "Close" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "The campaign cannot be marked as done before all segments are done" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.workitem,res_id:0 +msgid "Resource ID" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition +msgid "Campaign Transition" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: view:marketing.campaign.workitem:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "To Do" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Campaign Step" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form +#: view:marketing.campaign.segment:0 +msgid "Segments" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened +msgid "All Segments" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Incoming Transitions" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.activity,type:0 +msgid "E-mail" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "" +"The campaign cannot be started: the email account is not approved in the " +"email activity '%s'" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Day(s)" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,activity_ids:0 +#: view:marketing.campaign.activity:0 +msgid "Activities" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "May" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Modified after Sync" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: selection:marketing.campaign,state:0 +#: view:marketing.campaign.segment:0 +#: selection:marketing.campaign.segment,state:0 +msgid "Running" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.activity,type:0 +msgid "Paper" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "After %(interval_nbr)d %(interval_type)s" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign +msgid "Marketing Campaign" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,date_done:0 +msgid "End Date" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "February" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: field:marketing.campaign,object_id:0 +msgid "Resource" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,name:0 +#: field:marketing.campaign.activity,name:0 +#: field:marketing.campaign.segment,name:0 +#: field:marketing.campaign.transition,name:0 +msgid "Name" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "Email Preview" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,signal:0 +msgid "Signal" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.workitem,date:0 +msgid "If date is not set, this workitem have to be run manually" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:0 +#, python-format +msgid "The campaign cannot be started: there are no activities in it" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "April" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: field:marketing.campaign,mode:0 +msgid "Mode" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,activity_id:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,activity_id:0 +msgid "Activity" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem +#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem +msgid "Campaign Followup" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity +msgid "Campaign Activity" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,variable_cost:0 +msgid "Variable Cost" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.segment,sync_mode:0 +msgid "If record modified after last sync (no duplicates)" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "With Manual Confirmation" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,total_cost:0 +msgid "Cost" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,year:0 +msgid "Year" +msgstr "" diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po new file mode 100644 index 00000000000..0b97e9c4c2b --- /dev/null +++ b/addons/mrp_jit/i18n/kab.po @@ -0,0 +1,23 @@ +# Kabyle translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-10-09 14:11+0000\n" +"Last-Translator: yugurten <yugurten1@hotmail.fr>\n" +"Language-Team: Kabyle <kab@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: mrp_jit +#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information +msgid "MRP JIT" +msgstr "MRP JIT" diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po index c4de97452cf..f01bcd3abda 100644 --- a/addons/product/i18n/eu.po +++ b/addons/product/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-05 22:13+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:29+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml index 6b756eb8d7f..51d012b8577 100644 --- a/addons/product/partner_view.xml +++ b/addons/product/partner_view.xml @@ -9,7 +9,7 @@ <field name="arch" type="xml"> <page string="Sales & Purchases" position="inside"> <newline/> - <group col="2" colspan="2"> + <group col="2" colspan="2" groups="base.group_extended"> <separator string="Sales Properties" colspan="2"/> <field name="property_product_pricelist"/> </group> diff --git a/addons/product/product.py b/addons/product/product.py index 6c1125268a9..09732a9bff3 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -247,7 +247,11 @@ class product_template(osv.osv): 'warranty': fields.float('Warranty (months)'), 'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."), 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."), - 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."), + 'state': fields.selection([('',''), + ('draft', 'In Development'), + ('sellable','Normal'), + ('end','End of Lifecycle'), + ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."), 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."), 'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."), 'uos_id' : fields.many2one('product.uom', 'Unit of Sale', @@ -274,7 +278,9 @@ class product_template(osv.osv): def _default_category(self, cr, uid, context={}): if 'categ_id' in context and context['categ_id']: return context['categ_id'] - return False + md = self.pool.get('ir.model.data') + res = md.get_object_reference(cr, uid, 'product', 'cat0') or False + return res and res[1] or False def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id): if uom_id and uom_po_id: diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index 05a57126402..2052221cf78 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -4,6 +4,10 @@ <!-- Resource: product.uom.categ --> + <record id="cat0" model="product.category"> + <field name="name">All products</field> + </record> + <record id="product_uom_categ_unit" model="product.uom.categ"> <field name="name">Unit</field> </record> diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index cbc1f4d458a..92d0df088ef 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -5,17 +5,12 @@ Resource: product.category --> - <record id="cat0" model="product.category"> - <field name="parent_id" ref="null"/> - <field name="name">All products</field> - <field name="type">view</field> - </record> <record id="cat1" model="product.category"> - <field name="parent_id" ref="cat0"/> + <field name="parent_id" ref="product.cat0"/> <field name="name">Sellable</field> </record> <record id="cat2" model="product.category"> - <field name="parent_id" ref="cat0"/> + <field name="parent_id" ref="product.cat0"/> <field name="name">Private</field> </record> <record id="product_category_3" model="product.category"> diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 7e9ae7ce45e..8f2e5efe649 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -89,7 +89,7 @@ <group colspan="2" col="2"> <separator string="Procurement" colspan="2"/> <field name="type"/> - <field name="procure_method"/> + <field name="procure_method" groups="base.group_extended"/> <field name="supply_method"/> </group> @@ -110,7 +110,7 @@ <group colspan="2" col="2" name="uom"> <separator string="Unit of Measure" colspan="2"/> <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/> - <field name="uom_po_id" widget="selection"/> + <field name="uom_po_id" widget="selection" groups="base.group_extended"/> </group> <group colspan="2" col="2" name="uos" groups="product.group_uos"> @@ -147,13 +147,11 @@ <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/> <field name="list_price"/> <newline/> - <field name="price_margin" groups="base.group_extended"/> - <field name="price_extra" groups="base.group_extended"/> + <field name="price_margin" groups="product.group_product_variant"/> + <field name="price_extra" groups="product.group_product_variant"/> <newline/> <field groups="base.group_extended" name="cost_method"/> <newline/> - <field groups="base.group_extended" name="seller_id"/> - <newline/> <field colspan="4" name="seller_ids" nolabel="1"/> </page> <page string="Descriptions"> @@ -306,9 +304,7 @@ <tree string="Units of Measure"> <field name="name"/> <field name="category_id"/> - <field name="uom_type"/> <field name="factor"/> - <field name="rounding"/> </tree> </field> </record> @@ -462,7 +458,6 @@ <field name="product_code" groups="base.group_extended"/> <field name="min_qty"/> <field name="product_uom" widget="selection"/> - <field name="qty"/> <field name="delay"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list"> @@ -487,7 +482,7 @@ <field name="sequence" string="Seq"/> <field name="name"/> <field name="delay"/> - <field name="qty"/> + <field name="min_qty"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </tree> </field> @@ -559,7 +554,7 @@ <group colspan="2" col="2"> <separator string="Procurement" colspan="2"/> <field name="type"/> - <field name="procure_method"/> + <field name="procure_method" groups="base.group_extended"/> <field name="supply_method"/> </group> @@ -580,7 +575,7 @@ <group colspan="2" col="2" name="uom"> <separator string="UOM" colspan="2"/> <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/> - <field name="uom_po_id"/> + <field name="uom_po_id" groups="base.group_extended"/> </group> <group colspan="2" col="2" name="uos" groups="product.group_uos"> diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po index 0a452d38977..ab6fb7826bf 100644 --- a/addons/product_expiry/i18n/pl.po +++ b/addons/product_expiry/i18n/pl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-06-30 15:09+0000\n" -"PO-Revision-Date: 2010-10-07 16:55+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:39+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product_expiry diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po index 27209105cea..efa64da581c 100644 --- a/addons/project/i18n/eu.po +++ b/addons/project/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-06 11:02+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-09 16:08+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: project @@ -307,57 +307,58 @@ msgstr "" #. module: project #: field:project.task.work,user_id:0 msgid "Done by" -msgstr "" +msgstr "Nork egina:" #. module: project #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all #: model:ir.actions.act_window,name:project.action_view_task #: model:ir.ui.menu,name:project.menu_action_view_task msgid "All Tasks" -msgstr "" +msgstr "Ataza Guztiak" #. module: project #: view:project.task:0 msgid "Planning" -msgstr "" +msgstr "Planifikazioa" #. module: project #: view:project.task:0 msgid "Extra Info" -msgstr "" +msgstr "Informazio gehigarria" #. module: project #: field:project.project,partner_id:0 #: field:project.task,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Kidea" #. module: project #: field:project.task,planned_hours:0 #: wizard_field:project.task.delegate,init,planned_hours:0 msgid "Planned Hours" -msgstr "" +msgstr "Aurreikusitako Orduak" #. module: project #: view:project.project:0 msgid "Task: %(name)s" -msgstr "" +msgstr "Ataza: %(name)s" #. module: project #: view:project.project:0 msgid "Reset as Project" -msgstr "" +msgstr "Proiektu bezala berrezarri" #. module: project #: view:project.task:0 msgid "Delegations" -msgstr "" +msgstr "Delegazioak" #. module: project #: help:project.project,members:0 msgid "" "Project's member. Not used in any computation, just for information purpose." msgstr "" +"Proiektuko kideak. Ez da inolako kalkulutan erabiltzen, informatzeko soilik." #. module: project #: view:project.project:0 diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po index 4087328ec2c..48db8e1680b 100644 --- a/addons/project_issue_sheet/i18n/pl.po +++ b/addons/project_issue_sheet/i18n/pl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 10:05+0000\n" -"PO-Revision-Date: 2010-10-07 16:53+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:31+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: project_issue_sheet diff --git a/addons/project_messages/i18n/pl.po b/addons/project_messages/i18n/pl.po index 30c1ea5569c..0e70ef20021 100644 --- a/addons/project_messages/i18n/pl.po +++ b/addons/project_messages/i18n/pl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-08-20 10:28+0000\n" -"PO-Revision-Date: 2010-10-07 16:53+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:38+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: project_messages diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po new file mode 100644 index 00000000000..a890f540a01 --- /dev/null +++ b/addons/project_retro_planning/i18n/kab.po @@ -0,0 +1,23 @@ +# Kabyle translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-10-09 14:25+0000\n" +"Last-Translator: yugurten <yugurten1@hotmail.fr>\n" +"Language-Team: Kabyle <kab@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: project_retro_planning +#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information +msgid "Project Retro planning" +msgstr "A qanib d we Siqwas n we Senfar" diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 7af6dbceff0..58b049e130e 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -46,8 +46,8 @@ 'wizard/purchase_order_group_view.xml', 'wizard/purchase_installer.xml', 'wizard/purchase_line_invoice_view.xml', - 'purchase_view.xml', 'purchase_report.xml', + 'purchase_view.xml', 'stock_view.xml', 'partner_view.xml', 'process/purchase_process.xml', diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index c85088c9b53..a9996202b20 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -35,19 +35,32 @@ action="base.action_partner_supplier_form" sequence="1"/> <!--Inventory control--> - <menuitem id="menu_procurement_management_inventory" name="Inventory Control" + <menuitem id="menu_procurement_management_inventory" name="Receive Products" parent="base.menu_purchase_root" sequence="4"/> <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory" - name="Incoming Shipments" sequence="9"/> + name="Incoming Shipments" sequence="9" + groups="base.group_extended"/> <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move" parent="menu_procurement_management_inventory" sequence="11"/> <!--Invoice control--> <menuitem id="menu_procurement_management_invoice" name="Invoice Control" parent="base.menu_purchase_root" sequence="6"/> + + <record id="action_invoice_pending" model="ir.actions.act_window"> + <field name="res_model">account.invoice</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,calendar,graph</field> + <field eval="False" name="view_id"/> + <field name="domain">[('type','=','in_invoice')]</field> + <field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field> + <field name="search_view_id" ref="account.view_account_invoice_filter"/> + <field name="help">This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.</field> + </record> + <menuitem name="Supplier Invoices to Receive" id="menu_procurement_management_pending_invoice" - action="account.action_invoice_tree_pending_invoice" + action="action_invoice_pending" parent="menu_procurement_management_invoice" sequence="13"/> @@ -100,13 +113,13 @@ </group> <notebook colspan="4"> <page string="Purchase Order"> - <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/> + <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}"/> <field name="partner_address_id"/> <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/> <field name="origin" groups="base.group_extended"/> <newline/> <field colspan="4" name="order_line" nolabel="1" mode="tree,form"> - <tree colors="red:date_planned<=current_date;black:date_planned>current_date" string="Purchase Order Lines"> + <tree string="Purchase Order Lines"> <field name="date_planned"/> <field name="name"/> <field name="product_qty"/> @@ -124,15 +137,16 @@ </group> <group col="11" colspan="4"> <field name="state" readonly="1"/> - <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/> - <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/> - <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/> - <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/> + <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/> <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/> <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/> - <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/> <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/> + <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/> + <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/> + <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/> + <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/> + </group> </page> <page string="Delivery & Invoices" groups="base.group_extended"> @@ -200,7 +214,7 @@ <field name="model">purchase.order</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree colors="grey:state in ('approved','done');blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order"> + <tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order"> <field name="name" string="Reference"/> <field name="date_order" string="Order Date"/> <field name="partner_id"/> @@ -222,7 +236,7 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.order</field> <field name="view_type">form</field> - <field name="context">{'search_default_draft': 1,'search_default_create_uid':uid}</field> + <field name="context">{'search_default_draft': 1}</field> <field name="view_mode">tree,form,graph,calendar</field> <field name="search_view_id" ref="view_purchase_order_filter"/> <field name="help">With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.</field> @@ -270,7 +284,7 @@ <newline/> <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/> </page> - <page string="Notes"> + <page string="Notes"> <field colspan="4" name="notes" nolabel="1"/> </page> <page string="History" groups="base.group_extended"> @@ -287,7 +301,7 @@ <field name="model">purchase.order.line</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree colors="red:date_planned<=current_date;black:date_planned>current_date" string="Purchase Order Lines"> + <tree string="Purchase Order Lines"> <field name="order_id"/> <field name="name"/> <field name="date_planned" widget="date" width="135"/> @@ -310,8 +324,8 @@ <form string="Purchase Order Line"> <notebook colspan="4"> <page string="Order Line"> - <separator colspan="4" string="General Information"/> - <field name="order_id"/> + <separator colspan="4" string="General Information"/> + <field name="order_id"/> <field name="product_id" readonly="1" /> <field name="product_qty" readonly="1" /> <field name="product_uom" readonly="1"/> @@ -332,7 +346,7 @@ <newline/> <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/> </page> - <page string="Notes"> + <page string="Notes"> <field colspan="4" name="notes" nolabel="1"/> </page> <page string="History" groups="base.group_extended"> @@ -349,7 +363,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Order"> - <group> + <group> <field name="order_id"/> <field name="product_id"/> </group> @@ -367,14 +381,14 @@ <act_window context="{'search_default_partner_id': [active_id]}" id="act_res_partner_2_purchase_order" - name="Purchase orders" + name="Purchase Orders" res_model="purchase.order" src_model="res.partner"/> <act_window context="{'search_default_product_id': [active_id]}" id="action_purchase_line_product_tree" - name="Product purchases" + name="Purchases" res_model="purchase.order.line" src_model="product.product" groups="base.group_extended"/> @@ -406,7 +420,7 @@ id="menu_purchase_line_order_draft" groups="base.group_extended" parent="menu_procurement_management_invoice" - sequence="12"/> + sequence="72"/> <!-- Procurements diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index 3ab41d7e6bf..aea6fa2b2ac 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -103,7 +103,7 @@ <record id="trans_confirmed_router" model="workflow.transition"> <field name="act_from" ref="act_confirmed"/> <field name="act_to" ref="act_router"/> - <field name="signal">purchase_approve</field> + <!-- <field name="signal">purchase_approve</field> removed from simplification/useability --> </record> <record id="trans_router_picking" model="workflow.transition"> <field name="act_from" ref="act_router"/> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 2b741536d3b..d5a645b4b98 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -17,8 +17,9 @@ <act_window domain="[('purchase_id', '=', active_id)]" id="act_purchase_order_2_stock_picking" - name="Picking" + name="Receptions" res_model="stock.picking" + groups="base.group_extended" src_model="purchase.order" context="{'contact_display': 'partner'}" /> diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml index cec987bc5ea..fe04af1a32b 100644 --- a/addons/purchase/wizard/purchase_order_group_view.xml +++ b/addons/purchase/wizard/purchase_order_group_view.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <record id="view_purchase_order_group" model="ir.ui.view"> + <record id="view_purchase_order_group" model="ir.ui.view"> <field name="name">Merger Purchase Orders</field> <field name="model">purchase.order.group</field> <field name="type">form</field> <field name="arch" type="xml"> <form string="Merge orders"> - <separator string="Are you sure you want to merge these orders ?" colspan="4"/> - <newline/> - <label string=" + <separator string="Are you sure you want to merge these orders ?" colspan="4"/> + <newline/> + <label string=" Please note that: Orders will only be merged if: * Purchase Orders are in draft @@ -17,23 +17,24 @@ Orders will only be merged if: * Purchase Orders are have same stock location, same pricelist Lines will only be merged if: * Order lines are exactly the same except for the product,quantity and unit -" colspan="4"/> - <newline/> - <separator string="" colspan="4" /> - <button special="cancel" string="Cancel" icon="gtk-cancel"/> - <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/> - </form> +" colspan="4"/> + <newline/> + <separator string="" colspan="4" /> + <button special="cancel" string="Cancel" icon="gtk-cancel"/> + <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/> + </form> </field> - </record> + </record> - <act_window name="Merge Purchase orders" - res_model="purchase.order.group" - src_model="purchase.order" - view_mode="form" - target="new" + <act_window name="Merge Purchase orders" + res_model="purchase.order.group" + src_model="purchase.order" + view_mode="form" + target="new" key2="client_action_multi" - id="action_view_purchase_order_group"/> - + groups="base.group_extended" + id="action_view_purchase_order_group"/> + </data> </openerp> diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 6c8bf247b23..70313b03b24 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -250,7 +250,7 @@ class sale_order(osv.osv): 'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}), 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."), 'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"), - 'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available Procurement generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"), + 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"), 'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'), 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'), 'invoiced': fields.function(_invoiced, method=True, string='Paid', @@ -912,7 +912,7 @@ class sale_order_line(osv.osv): else: a = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', - context=context) + context=context).id uosqty = _get_line_qty(line) uos_id = _get_line_uom(line) pu = 0.0 diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 7d95126cbe5..747414b7e8d 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -56,7 +56,7 @@ <field name="model">sale.order</field> <field name="type">calendar</field> <field name="arch" type="xml"> - <calendar string="Sales orders" color="state" date_start="date_order"> + <calendar string="Sales Orders" color="state" date_start="date_order"> <field name="partner_id"/> <field name="amount_total"/> </calendar> @@ -67,7 +67,7 @@ <field name="model">sale.order</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Sales orders" type="bar"> + <graph string="Sales Orders" type="bar"> <field name="partner_id"/> <field name="amount_total" operator="+"/> </graph> @@ -79,7 +79,7 @@ <field name="model">sale.order</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Sales orders" colors="grey:state=='done'"> + <tree string="Sales Orders" colors="grey:state=='done'"> <field name="name"/> <field name="date_order"/> <field name="partner_id"/> @@ -98,7 +98,7 @@ <field name="model">sale.order</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Sales order"> + <form string="Sales Order"> <group col="6" colspan="4"> <field name="name"/> <field name="date_order"/> @@ -181,7 +181,7 @@ </page> </notebook> </form> - <tree string="Sales order lines"> + <tree string="Sales Order Lines"> <field colspan="4" name="name"/> <field name="product_uom_qty" string="Qty"/> <field name="product_uom" string="UoM"/> @@ -344,7 +344,7 @@ to your configuration: from the sales order, from the pickings, etc. <field name="model">sale.order.line</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Sales order lines"> + <graph string="Sales Order Lines"> <field name="product_id"/> <field name="price_subtotal" operator="+"/> </graph> @@ -356,7 +356,7 @@ to your configuration: from the sales order, from the pickings, etc. <field name="model">sale.order.line</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Sales order lines"> + <tree string="Sales Order Lines"> <field name="order_id"/> <field name="order_partner_id"/> <field name="product_id"/> @@ -517,7 +517,8 @@ to your configuration: from the sales order, from the pickings, etc. src_model="product.product" groups="base.group_extended"/> - <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/> + <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5" + groups="base.group_extended"/> <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/> <!-- configartion view --> diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 933200d1883..057e8469431 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -54,10 +54,6 @@ class crm_make_sale(osv.osv_memory): def view_init(self, cr, uid, fields_list, context=None): if context is None: context = {} - if context.get('active_ids', False) and context['active_ids']: - for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']): - if not line.section_id: - raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.')) return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context) def makeOrder(self, cr, uid, ids, context=None): diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml index ed0b9ef780e..d73a2cee1ef 100644 --- a/addons/sale_crm/wizard/crm_make_sale_view.xml +++ b/addons/sale_crm/wizard/crm_make_sale_view.xml @@ -8,12 +8,10 @@ <field name="model">crm.make.sale</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Create a Sale Order" > + <form string="Convert to Quotation" > <group colspan="4"> <field name="partner_id" required="1"/> <field name="shop_id" required="1" widget="selection"/> - <field name="analytic_account" domain="[('type','=','normal')]" - groups="base.group_extended"/> <field name="close"/> </group> <newline/> diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index ef9b833ec32..fea019a12ab 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -60,9 +60,10 @@ <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> <field name="standard_price" position="replace"> - <group col="4" colspan="2"> - <field name="standard_price" readonly="True"/> - <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/> + <label string="Cost Price:" align="1.0" colspan="1"/> + <group col="2" colspan="1"> + <field name="standard_price" nolabel="1" attrs="{'readonly':[('valuation','=','real_time')]}"/> + <button name="%(action_view_change_standard_price)d" string="Update" type="action" icon="gtk-execute" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/> </group> </field> </field> @@ -76,8 +77,8 @@ <field name="priority">26</field> <field name="arch" type="xml"> <field name="property_account_expense" position="after"> - <field name="property_stock_account_output" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended"/> - <field name="property_stock_account_input" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended"/> + <field name="property_stock_account_output" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/> + <field name="property_stock_account_input" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/> </field> </field> </record> @@ -128,7 +129,7 @@ <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> <field name="cost_method" position="after"> - <field name="valuation"/> + <field name="valuation" groups="base.group_extended"/> </field> </field> </record> diff --git a/addons/stock/stock.py b/addons/stock/stock.py index f5c4ebd41e3..ae0f712f6b5 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1881,6 +1881,14 @@ class stock_move(osv.osv): move_obj = self.pool.get('account.move') if context is None: context = {} + + todo = [] + for move in self.browse(cr, uid, ids): + if move.state=="draft": + todo.append(move.id) + if todo: + self.action_confirm(cr, uid, todo, context=context) + for move in self.browse(cr, uid, ids): if move.picking_id: picking_ids.append(move.picking_id.id) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 84670ab514b..e0a1d61cd47 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -172,7 +172,7 @@ context="{'type': 'move_history_ids','field': ''}" colspan="2"/> </group> <notebook colspan="4"> - <page string="Stock Moves"> + <page string="Inventory Moves"> <field colspan="2" name="move_ids" nolabel="1"/> </page> </notebook> @@ -287,7 +287,7 @@ <page string="Revisions"> <field colspan="2" name="revisions" nolabel="1"/> </page> - <page string="Stock Moves"> + <page string="Inventory Moves"> <field colspan="2" name="move_ids" nolabel="1"/> </page> </notebook> @@ -348,7 +348,7 @@ # Lot composition (history) # <record id="stock_move_tree" model="ir.ui.view"> - <field name="name">Stock Moves</field> + <field name="name">Inventory Moves</field> <field name="model">stock.move</field> <field name="type">tree</field> <field name="field_parent">move_history_ids</field> @@ -373,7 +373,7 @@ </record> <record id="stock_move_tree2" model="ir.ui.view"> - <field name="name">Stock Moves</field> + <field name="name">Inventory Moves</field> <field name="model">stock.move</field> <field name="type">tree</field> <field name="field_parent">move_history_ids2</field> @@ -624,7 +624,7 @@ <notebook colspan="4"> <page string="Products"> <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}"> - <tree colors="grey:scrapped == True" string="Stock Moves"> + <tree colors="grey:scrapped == True" string="Inventory Moves"> <field name="name" string="Move Name"/> <field name="product_id"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> @@ -660,7 +660,7 @@ <field name="date_expected" string="Date Expected"/> <field name="state"/> </tree> - <form string="Stock Moves"> + <form string="Inventory Moves"> <group colspan="2" col="4"> <separator colspan="4" string="Move Information"/> <field name="name" invisible="1" colspan="4"/> @@ -717,7 +717,7 @@ </field> <group col="10" colspan="4"> <field name="state" readonly="1"/> - <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/> + <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/> <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/> <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/> <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/> @@ -810,7 +810,7 @@ <notebook colspan="4"> <page string="Products"> <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" > - <tree colors="grey:scrapped == True" string="Stock Moves"> + <tree colors="grey:scrapped == True" string="Inventory Moves"> <field name="name" string="Move Name"/> <field name="product_id"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> @@ -845,7 +845,7 @@ <field name="date_expected" string="Date Expected"/> <field name="state"/> </tree> - <form string="Stock Moves"> + <form string="Inventory Moves"> <group colspan="2" col="4"> <separator colspan="2" string="Move Information"/> <field name="name" invisible="1" colspan="4"/> @@ -1029,7 +1029,7 @@ <notebook colspan="4"> <page string="Products"> <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" > - <tree colors="grey:scrapped==True" string="Stock Moves"> + <tree colors="grey:scrapped==True" string="Inventory Moves"> <field name="product_id"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> <field name="product_uom" string="UoM"/> @@ -1060,7 +1060,7 @@ <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/> <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/> </tree> - <form string="Stock Moves"> + <form string="Inventory Moves"> <group colspan="2" col="4"> <separator colspan="4" string="Move Information"/> <field name="name" invisible="1" colspan="4" /> @@ -1242,7 +1242,7 @@ <notebook colspan="4"> <page string="General Information"> <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" > - <tree colors="grey:scrapped==True" string="Stock Moves"> + <tree colors="grey:scrapped==True" string="Inventory Moves"> <field name="product_id" readonly="1"/> <field name="product_qty" readonly="1"/> <field name="product_uom" string="UoM" readonly="1"/> @@ -1271,7 +1271,7 @@ <field name="location_dest_id"/> <field name="state"/> </tree> - <form string="Stock Moves"> + <form string="Inventory Moves"> <group colspan="2" col="4"> <separator colspan="4" string="Move Information"/> <field name="name" invisible="1" colspan="4"/> @@ -1516,33 +1516,35 @@ <field name="type">form</field> <field eval="4" name="priority"/> <field name="arch" type="xml"> - <form string="Stock Moves"> - <group colspan="2" col="4"> - <separator colspan="4" string="Move Information"/> - <field name="name" colspan="4"/> - <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/> - <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/> + <form string="Inventory Moves"> + <group colspan="4" col="7"> + <separator colspan="7" string="Move Information"/> + <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/> + <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> + <field name="product_uom" string="Unit Of Measure" widget="selection"/> <button name="%(stock.move_scrap)d" groups="base.group_extended" string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" colspan="1"/> - <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/> - <field name="product_uos_qty" groups="product.product_uos" colspan="4"/> - <field name="product_uos" groups="product.product_uos" colspan="4"/> + <newline/> + <field name="name" string="Reason"/> + <field name="product_uos_qty" groups="product.product_uos"/> + <field name="product_uos" groups="product.product_uos"/> + <newline/> + <field name="location_id"/> + <field name="location_dest_id"/> </group> <group colspan="2" col="2"> <separator string="Locations & Picking" colspan="2" /> - <field name="location_id" widget="selection"/> - <field name="location_dest_id" widget="selection"/> - <field name="picking_id"/> <field name="address_id" context="{'contact_display':'partner'}"/> + <field name="picking_id"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <group colspan="2" col="2"> <separator string="Dates & Priority" colspan="2" /> - <field name="date"/> + <field name="date" groups="base.group_extended"/> <field name="date_planned"/> <field name="date_expected"/> <field name="priority"/> @@ -1568,7 +1570,7 @@ <separator colspan="4"/> <field name="state"/> <group col="4" colspan="2"> - <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/> + <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/> <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/> <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/> <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/> @@ -1583,7 +1585,7 @@ <field name="type">search</field> <field eval="3" name="priority"/> <field name="arch" type="xml"> - <search string="Stock Moves"> + <search string="Inventory Moves"> <group col="14" colspan="4"> <filter icon="terp-go-today" string="Today" domain="[('date_planned','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/> <separator orientation="vertical"/> @@ -1624,7 +1626,7 @@ </record> <record id="action_move_form2" model="ir.actions.act_window"> - <field name="name">Stock Moves</field> + <field name="name">Inventory Moves</field> <field name="res_model">stock.move</field> <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> @@ -1673,7 +1675,7 @@ states="draft,assigned,confirmed,done"/> <field name="date_planned"/> <field name="state"/> - <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/> + <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes" groups="base.group_extended"/> <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/> <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/> </tree> @@ -1687,35 +1689,36 @@ <field eval="6" name="priority"/> <field name="arch" type="xml"> <form string="Moves"> - <group colspan="2" col="4"> - <separator colspan="4" string="Move Information"/> - <field name="name" colspan="4"/> - <field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)" colspan="4"/> - <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/> + <group colspan="4" col="7"> + <field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)"/> + <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> + <field name="product_uom" widget="selection"/> <button name="%(stock.move_scrap)d" groups="base.group_extended" string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" colspan="1"/> - <field name="product_uom" widget="selection" colspan="4"/> - <field name="product_uos_qty" groups="product.product_uos" colspan="4"/> - <field name="product_uos" widget="selection" groups="product.product_uos" colspan="4"/> - </group> - - <group colspan="2" col="2"> - <separator string="Locations & Picking" colspan="2" /> - <field name="location_id" widget="selection"/> - <field name="location_dest_id" widget="selection"/> - <field name="picking_id"/> - <field name="address_id" context="{'contact_display':'partner'}"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <newline/> + <field name="name" string="Reason"/> + <field name="product_uos_qty" groups="product.product_uos"/> + <field name="product_uos" widget="selection" groups="product.product_uos"/> + <newline/> + <field name="location_id"/> + <field name="location_dest_id"/> </group> <group colspan="2" col="2"> <separator string="Dates & Priority" colspan="2" /> - <field name="date"/> + <field name="date" groups="base.group_extended"/> <field name="date_planned"/> <field name="date_expected"/> - <field name="priority"/> + <field name="priority" groups="base.group_extended"/> + </group> + + <group colspan="2" col="2"> + <separator string="Locations & Picking" colspan="2" /> + <field name="address_id" context="{'contact_display':'partner'}"/> + <field name="picking_id"/> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <group colspan="2" col="4" groups="base.group_extended"> @@ -1737,11 +1740,11 @@ <separator colspan="4"/> <field name="state"/> <group col="5" colspan="2"> - <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/> - <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/> <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/> + <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/> + <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/> <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/> - <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/> + <button name="action_done" states="draft,confirmed,assigned" string="Done" type="object" icon="gtk-go-forward"/> </group> </form> </field> @@ -1753,7 +1756,7 @@ <field name="type">search</field> <field eval="6" name="priority"/> <field name="arch" type="xml"> - <search string="Stock Moves"> + <search string="Inventory Moves"> <group col="8" colspan="4"> <filter icon="terp-go-today" string="Today" domain="[('date_planned','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/> <separator orientation="vertical"/> @@ -1790,7 +1793,7 @@ <field name="view_mode">tree,form</field> <field name="domain">['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field> <field name="view_id" ref="view_move_tree_reception_picking"/> - <field name="context">{"search_default_receive":1}</field> + <field name="context" eval="'{\'search_default_receive\':1,\'full\':1,\'default_location_dest_id\': '+str(ref('stock.stock_location_stock'))+', \'default_location_id\': '+str(ref('stock.stock_location_suppliers'))+'}'"/> <field name="search_view_id" ref="view_move_search_reception_picking"/> </record> @@ -1852,7 +1855,7 @@ <act_window context="{'location': active_id, 'search_default_done': 1,'search_default_product_id': [active_id]}" id="act_product_stock_move_open" - name="Stock Moves" + name="Inventory Moves" res_model="stock.move" src_model="product.product"/> @@ -1867,7 +1870,7 @@ context="{'location': active_id, 'search_default_future': 1,'search_default_product_id': [active_id]}" domain="[('state','in',('waiting','confirmed','assigned'))]" id="act_product_stock_move_futur_open" - name="Future Stock Moves" + name="Future Inventory Moves" res_model="stock.move" src_model="product.product" groups="base.group_extended"/> @@ -1928,7 +1931,7 @@ <!-- Delivery Product Vs Planned --> <record model="ir.ui.view" id="view_move_delivery_products_planned_tree"> - <field name="name">Delivery Products</field> + <field name="name">Delivered Products</field> <field name="model">report.delivery.products.planned</field> <field name="type">tree</field> <field name="arch" type="xml"> @@ -1941,7 +1944,7 @@ </record> <record model="ir.ui.view" id="view_move_delivery_products_planned_graph"> - <field name="name">Delivery Products</field> + <field name="name">Delivered Products</field> <field name="model">report.delivery.products.planned</field> <field name="type">graph</field> <field name="arch" type="xml"> @@ -1954,7 +1957,7 @@ </record> <record id="action_move_delivery_products_planned" model="ir.actions.act_window"> - <field name="name">Delivery Products Vs Planned</field> + <field name="name">Delivered Products Vs Planned</field> <field name="res_model">report.delivery.products.planned</field> <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> @@ -1998,7 +2001,7 @@ <field name="view_mode">tree,form</field> <field name="domain">['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field> <field name="view_id" ref="view_move_tree_reception_picking"/> - <field name="context">{"search_default_receive":1}</field> + <field name="context" eval="'{\'search_default_receive\':1,\'full\':1,\'default_location_id\': '+str(ref('stock.stock_location_stock'))+', \'default_location_dest_id\': '+str(ref('stock.stock_location_customers'))+'}'"/> <field name="search_view_id" ref="view_move_search_reception_picking"/> </record> diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml index a7b4271a5b2..457ddc34ff7 100644 --- a/addons/stock/wizard/stock_partial_move_view.xml +++ b/addons/stock/wizard/stock_partial_move_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <act_window name="Delivery Product" + <act_window name="Deliver Products" res_model="stock.partial.move" src_model="stock.move" view_mode="form" diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index b399576c83d..4887c1e16d8 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -2,7 +2,7 @@ <openerp> <data> <record id="action_partial_picking" model="ir.actions.act_window"> - <field name="name">Making Picking</field> + <field name="name">Process Picking</field> <field name="res_model">stock.partial.picking</field> <field name="view_type">form</field> <field name="view_mode">form</field> diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po index 17c268d7652..d5836168c61 100644 --- a/addons/thunderbird/i18n/eu.po +++ b/addons/thunderbird/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-11-26 06:05+0000\n" -"PO-Revision-Date: 2010-10-05 22:18+0000\n" -"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n" +"PO-Revision-Date: 2010-10-08 07:34+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Basque <eu@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: thunderbird diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po index 1da34d2bef1..30b8bc8f72e 100644 --- a/addons/wiki/i18n/sv.po +++ b/addons/wiki/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-07 19:19+0000\n" +"PO-Revision-Date: 2010-10-08 07:35+0000\n" "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: wiki |