diff options
| author | rpa (Open ERP) <rpa@openerp.co.in> | 2010-03-03 11:14:14 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@openerp.co.in> | 2010-03-03 11:14:14 +0530 |
| commit | 6aed24dfd89b3ec543c0e20c8da58a6cdd42b1cf (patch) | |
| tree | cbc75101d656b2354c068398a823296285a6b105 | |
| parent | 94709660aa863399239c5a58be70a93fedf29a5a (diff) | |
| parent | 841d8f4960e3a49b28de12deeb387b43b6ecf85b (diff) | |
[Merge]: Merge with trunk addons
bzr revid: rpa@openerp.co.in-20100303054414-92l9awvj1f5t3aji
25 files changed, 2983 insertions, 229 deletions
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index d281403b68f..78e7244996e 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -115,19 +115,21 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice"> - <field name="name"/> - <field name="type"/> + <field name="date_invoice" select="1"/> <field name="number"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="partner_id" groups="base.group_user"/> - <field name="amount_untaxed" sum="Untaxed amount"/> - <field name="amount_total" sum="Total amount"/> + <field name="name"/> + <field name="journal_id" invisible="1"/> + <field name="period_id" invisible="1"/> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="user_id"/> + <field name="date_due"/> + <field name="origin"/> <field name="currency_id"/> - <field name="date_invoice" select="1"/> - <field name="date_due" select="1"/> - <field name="residual"/> + <field name="residual" sum="Residual Amount"/> + <field name="amount_untaxed" sum="Untaxed Amount"/> + <field name="amount_total" sum="Total Amount"/> <field name="state"/> - <field name="origin"/> </tree> </field> </record> @@ -299,7 +301,8 @@ <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/> <field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/> <newline/> - <field name="date_due" select="1"/> + <field name="date_due"/> + <field name="user_id"/> <newline/> <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/> <field name="origin" select="2"/> @@ -336,18 +339,28 @@ <group col="10" colspan="4"> <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/> <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/> - <filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/> + <filter icon="terp-account" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/> + <separator orientation="vertical"/> + <field name="number"/> + <field name="partner_id"/> + <field name="user_id"> + <filter string="My Invoices" icon="terp-account" domain="[('user_id','=',uid)]"/> + </field> + <field name="origin"/> + <field name="amount_total"/> + </group> + <newline/> + <group expand="1" string="Group By..." colspan="12" col="10"> + <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/> + <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/> <separator orientation="vertical"/> - <field name="number" select='1'/> - <field name="partner_id" select='1'/> - <field name="amount_total" string="Price" select='1'/> - <field name="origin" select='1'/> - </group> - <group expand="context.get('report',False)" string="Group By..." colspan="4" col="10"> <filter string="Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/> - <filter string="State" icon="terp-account" domain="[]" context="{'group_by':'state'}"/> - <filter string="Date Invoice" icon="terp-account" domain="[]" context="{'group_by':'date_invoice'}"/> - </group> + <filter string="Salesman" icon="terp-account" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="State" icon="terp-account" domain="[]" context="{'group_by':'state'}"/> + <separator orientation="vertical"/> + <filter string="Invoice Date" icon="terp-account" domain="[]" context="{group_by':'date_invoice'}"/> + <filter string="Due Date" icon="terp-account" domain="[]" context="{group_by':'date_due'}"/> + </group> </search> </field> </record> diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index 00d6bee5ca6..9e99e648ace 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.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-01-05 09:22+0000\n" -"Last-Translator: pmjt <Unknown>\n" +"PO-Revision-Date: 2010-03-02 11:01+0000\n" +"Last-Translator: smii <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-01-06 04:36+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1904,7 +1904,7 @@ msgstr "Tilit Sallittuja (tyhjä tarkoittaa ei kontrollia)" #. module: account #: view:account.invoice:0 msgid "Untaxed amount" -msgstr "" +msgstr "Veroton määrä" #. module: account #: field:account.tax,account_collected_id:0 @@ -2078,7 +2078,7 @@ msgstr "Laskunnumero, lasketaan automaattisesti kun laskua luodaan." #. module: account #: rml:account.invoice:0 msgid "Draft Invoice" -msgstr "" +msgstr "Laskun luonnos" #. module: account #: model:account.account.type,name:account.account_type_expense @@ -2849,7 +2849,7 @@ msgstr "Luoton keskitys" #. module: account #: rml:account.overdue:0 msgid "Customer Ref:" -msgstr "" +msgstr "Asiakkaan Viite:" #. module: account #: xsl:account.transfer:0 diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 2a98f3b7c9a..00d3c18ed46 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-06 19:29+0000\n" -"Last-Translator: Santjaga <Unknown>\n" +"PO-Revision-Date: 2010-03-02 15:44+0000\n" +"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-02-07 04:37+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -185,7 +185,7 @@ msgstr "Планы счетов" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select msgid "Move line select" -msgstr "" +msgstr "Выберите строку для перемещения" #. module: account #: rml:account.journal.period.print:0 @@ -397,7 +397,7 @@ msgstr "Проводки итогов" #: field:account.fiscal.position.account,account_src_id:0 #: field:account.fiscal.position.account.template,account_src_id:0 msgid "Account Source" -msgstr "" +msgstr "Счет источник" #. module: account #: field:account.journal,update_posted:0 @@ -413,7 +413,7 @@ msgstr "Согласование платежа" #. module: account #: model:account.journal,name:account.expenses_journal msgid "Journal de frais" -msgstr "" +msgstr "Журнал расходов" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal @@ -491,7 +491,7 @@ msgstr "Ссылка" #. module: account #: field:account.tax.template,type_tax_use:0 msgid "Tax Use In" -msgstr "" +msgstr "Использовать налог в" #. module: account #: help:account.tax.template,include_base_amount:0 @@ -516,7 +516,7 @@ msgstr "Состояния проводок аналитики" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "" +msgstr "Шаблоны кодов налога" #. module: account #: view:account.invoice:0 @@ -527,18 +527,18 @@ msgstr "Счет поставщика" #: model:process.transition,name:account.process_transition_reconcilepaid0 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "Reconcile Paid" -msgstr "" +msgstr "Выверите Оплаченный" #. module: account #: wizard_field:account.chart,init,target_move:0 msgid "Target Moves" -msgstr "" +msgstr "Цель перемещений" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form msgid "Tax Templates" -msgstr "" +msgstr "Шаблоны налогов" #. module: account #: field:account.invoice,reconciled:0 @@ -553,13 +553,13 @@ msgstr "Метод отсрочки" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "" +msgstr "Включить в базовую сумму" #. module: account #: field:account.tax,ref_base_code_id:0 #: field:account.tax.template,ref_base_code_id:0 msgid "Refund Base Code" -msgstr "" +msgstr "Базовый код возмещения" #. module: account #: view:account.invoice.line:0 @@ -569,7 +569,7 @@ msgstr "Строка" #. module: account #: rml:account.analytic.account.cost_ledger:0 msgid "J.C. or Move name" -msgstr "" +msgstr "J.C. или имя Перемещения" #. module: account #: selection:account.tax,applicable_type:0 @@ -587,12 +587,12 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax msgid "account.tax" -msgstr "" +msgstr "Счет налога" #. module: account #: rml:account.central.journal:0 msgid "Printing Date" -msgstr "" +msgstr "Дата печати" #. module: account #: rml:account.general.ledger:0 @@ -621,7 +621,7 @@ msgstr "" #: wizard_view:account.analytic.account.chart,init:0 #: wizard_view:account.analytic.line,init:0 msgid "(Keep empty to open the current situation)" -msgstr "" +msgstr "(Оставить пустым для отображения текущего состояния)" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account @@ -673,7 +673,7 @@ msgstr "Бухг. аналитика" #. module: account #: rml:account.overdue:0 msgid "Sub-Total :" -msgstr "" +msgstr "Подитог:" #. module: account #: field:account.analytic.account,line_ids:0 @@ -691,7 +691,7 @@ msgstr "месяц" #. module: account #: field:account.analytic.account,partner_id:0 msgid "Associated Partner" -msgstr "" +msgstr "Связанный контрагент" #. module: account #: field:account.invoice,comment:0 @@ -729,7 +729,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_line_open msgid "account.move.line" -msgstr "" +msgstr "Строки финансового документа" #. module: account #: model:process.transition,name:account.process_transition_supplieranalyticcost0 @@ -761,7 +761,7 @@ msgstr "Свойства покупки" #. module: account #: model:process.node,note:account.process_node_paymententries0 msgid "Can be draft or validated" -msgstr "" +msgstr "Может быть черновиком или подтвержденным" #. module: account #: wizard_button:account.invoice.pay,init,reconcile:0 @@ -771,7 +771,7 @@ msgstr "Частичный платеж" #. module: account #: wizard_view:account_use_models,create:0 msgid "Move Lines Created." -msgstr "" +msgstr "Строка финансового документа создана." #. module: account #: field:account.fiscalyear,state:0 @@ -787,7 +787,7 @@ msgstr "Статус" #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Period to" -msgstr "" +msgstr "Период по" #. module: account #: field:account.account.type,partner_account:0 @@ -818,12 +818,12 @@ msgstr "Оставить пустым для всех открытых финаÐ #. module: account #: field:account.invoice,move_lines:0 msgid "Move Lines" -msgstr "" +msgstr "Строки финансового документа" #. module: account #: model:ir.model,name:account.model_account_config_wizard msgid "account.config.wizard" -msgstr "" +msgstr "Мастер конфигурации" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree @@ -872,7 +872,7 @@ msgstr "Распечатать журнал" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard msgid "account.bank.accounts.wizard" -msgstr "" +msgstr "Мастер банковских счетов" #. module: account #: field:account.move.line,date_created:0 @@ -883,7 +883,7 @@ msgstr "Дата создания" #. module: account #: wizard_button:account.invoice.refund,init,cancel_invoice:0 msgid "Cancel Invoice" -msgstr "" +msgstr "Отмена счета" #. module: account #: field:account.journal.column,required:0 @@ -923,6 +923,8 @@ msgid "" "If a default tax is given in the partner it only overrides taxes from " "accounts (or products) in the same group." msgstr "" +"Если налог определен в настройках контрагента, он перекрывает налоги " +"настроенные с счетах или продукции если они в той же группе налогов" #. module: account #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0 @@ -932,7 +934,7 @@ msgstr "Открыть отчетный год" #. module: account #: view:account.config.wizard:0 msgid "Select Chart of Accounts" -msgstr "" +msgstr "Выбор плана счетов" #. module: account #: field:account.analytic.account,quantity:0 @@ -1013,7 +1015,7 @@ msgstr "Финансы и бухгалтерия" #. module: account #: rml:account.invoice:0 msgid "Net Total:" -msgstr "" +msgstr "Итог нетто" #. module: account #: view:account.fiscal.position:0 @@ -1027,7 +1029,7 @@ msgstr "" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Position" -msgstr "" +msgstr "Налоговая позиция" #. module: account #: field:account.analytic.line,product_uom_id:0 @@ -1038,7 +1040,7 @@ msgstr "Ед. изм." #. module: account #: wizard_field:account.third_party_ledger.report,init,page_split:0 msgid "One Partner Per Page" -msgstr "" +msgstr "Один контрагент на страницу" #. module: account #: field:account.account,child_parent_ids:0 @@ -1049,7 +1051,7 @@ msgstr "Потомки" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax msgid "Fiscal Position Taxes Mapping" -msgstr "" +msgstr "Структура налогов финансовой области" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2_new @@ -1077,7 +1079,7 @@ msgstr "Закрыть отчетный год" #. module: account #: field:account.sequence.fiscalyear,sequence_main_id:0 msgid "Main Sequence" -msgstr "" +msgstr "Основная Последовательность" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree @@ -1088,7 +1090,7 @@ msgstr "Распечатать журналы аналитики" #. module: account #: rml:account.tax.code.entries:0 msgid "Voucher Nb" -msgstr "" +msgstr "№ ваучера" #. module: account #: help:account.payment.term.line,sequence:0 @@ -1102,7 +1104,7 @@ msgstr "" #. module: account #: field:account.bank.statement.reconcile,total_new:0 msgid "Total write-off" -msgstr "" +msgstr "Общий объем списания" #. module: account #: view:account.tax.template:0 @@ -1121,7 +1123,7 @@ msgstr "Коды налогов" #: field:account.tax.template,chart_template_id:0 #: field:wizard.multi.charts.accounts,chart_template_id:0 msgid "Chart Template" -msgstr "" +msgstr "Шаблона плана счетов" #. module: account #: field:account.chart.template,property_account_income_categ:0 @@ -1149,7 +1151,7 @@ msgstr "Цена за ед." #. module: account #: rml:account.analytic.account.journal:0 msgid "Period from :" -msgstr "" +msgstr "Период с" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -1191,12 +1193,12 @@ msgstr "Открыть планы счетов" #. module: account #: wizard_view:account.fiscalyear.close.state,init:0 msgid "Are you sure you want to close the fiscal year ?" -msgstr "" +msgstr "Вы уверены, что хотите закрыть финансовый год?" #. module: account #: selection:account.move,type:0 msgid "Bank Receipt" -msgstr "" +msgstr "Квитанция банка" #. module: account #: view:res.partner:0 @@ -1206,7 +1208,7 @@ msgstr "Банковский счёт" #. module: account #: field:account.chart.template,tax_template_ids:0 msgid "Tax Template List" -msgstr "" +msgstr "Список шаблонов налогов" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 96f3a0afb40..6f4979d41b9 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -309,6 +309,7 @@ class account_invoice(osv.osv): help="Remaining amount due."), 'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'), 'move_name': fields.char('Ledger Posting', size=64), + 'user_id': fields.many2one('res.users', 'Salesman'), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position') } _defaults = { @@ -320,6 +321,7 @@ class account_invoice(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c), 'reference_type': lambda *a: 'none', 'check_total': lambda *a: 0.0, + 'user_id': lambda s,cr,u,c: u, } def unlink(self, cr, uid, ids, context=None): diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po index 799dd9c3dda..26b5c25fd5d 100644 --- a/addons/account_followup/i18n/fi.po +++ b/addons/account_followup/i18n/fi.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: 2009-09-08 15:28+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-03-02 15:41+0000\n" +"Last-Translator: smii <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup @@ -41,7 +41,7 @@ msgstr "" #. module: account_followup #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä." #. module: account_followup #: field:account_followup.followup.line,description:0 diff --git a/addons/analytic/__terp__.py b/addons/analytic/__terp__.py index 6ccdf3564d8..c19404388a6 100644 --- a/addons/analytic/__terp__.py +++ b/addons/analytic/__terp__.py @@ -36,6 +36,5 @@ ], 'installable': True, 'active': False, - 'certificate': '', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po new file mode 100644 index 00000000000..bffdb5a108f --- /dev/null +++ b/addons/auction/i18n/fi.po @@ -0,0 +1,2560 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-03-02 11:09+0000\n" +"Last-Translator: smii <Unknown>\n" +"Language-Team: Finnish <fi@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: auction +#: field:report.deposit.border,total_marge:0 +msgid "Total margin" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.sms_send,init:0 +msgid "SMS - Gateway: clickatell" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Set to draft" +msgstr "" + +#. module: auction +#: field:auction.deposit,partner_id:0 +#: view:auction.lots:0 +#: xsl:report.auction.seller.list:0 +#: field:report.deposit.border,seller:0 +#: field:report.seller.auction,seller:0 +#: field:report.seller.auction2,seller:0 +msgid "Seller" +msgstr "" + +#. module: auction +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä." + +#. module: auction +#: selection:auction.lots.send.aie,date_ask,numerotation:0 +#: selection:auction.lots.send.aie,init,numerotation:0 +msgid "Provisoire" +msgstr "" + +#. module: auction +#: selection:auction.lots.send.aie,date_ask,numerotation:0 +#: selection:auction.lots.send.aie,init,numerotation:0 +msgid "Definitive (ordre catalogue)" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my +msgid "My Encoded Objects Per Day" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lot_history +msgid "Lot history" +msgstr "" + +#. module: auction +#: field:report.seller.auction,avg_estimation:0 +msgid "Avg estimation" +msgstr "" + +#. module: auction +#: field:report.auction.object.date,obj_num:0 +#: field:report.auction.view2,obj_number:0 +msgid "# of Objects" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_action_bids_form +msgid "Bids line" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +msgid "Deposit Form" +msgstr "" + +#. module: auction +#: rml:auction.bids:0 +#: view:auction.lots:0 +#: field:auction.lots,ach_uid:0 +#: wizard_field:auction.lots.buyer_map,check,ach_uid:0 +#: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0 +#: wizard_field:auction.pay.buy,init,buyer_id:0 +#: rml:buyer.list:0 +#: model:ir.ui.menu,name:auction.auction_report_buyer_menu +#: rml:report.auction.buyer.result:0 +#: field:report.buyer.auction,buyer:0 +#: field:report.buyer.auction2,buyer:0 +msgid "Buyer" +msgstr "" + +#. module: auction +#: field:report.auction.view,nobjects:0 +#: field:report.buyer.auction,object:0 +msgid "No of objects" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree +msgid "Adjudication by Auction" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of paid items (based on invoices):" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_numerotate_lot +msgid "Numerotation (per lot)" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Books, manuscripts, eso." +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +#: model:ir.model,name:auction.model_auction_deposit +msgid "Deposit Border" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.make_invoice,init,amount:0 +#: wizard_field:auction.lots.make_invoice_buyer,init,amount:0 +msgid "Invoiced Amount" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Tin / Copper wares" +msgstr "" + +#. module: auction +#: field:auction.lots,paid_ach:0 +msgid "Buyer invoice reconciled" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.auction_wizard_able_taken +msgid "Mark as taken away" +msgstr "" + +#. module: auction +#: xsl:report.auction.seller.list:0 +msgid "Inv." +msgstr "" + +#. module: auction +#: field:auction.deposit.cost,amount:0 +msgid "Amount" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_deposit_border +#: model:ir.ui.menu,name:auction.menu_auction_deposit_border +msgid "Deposit border" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +msgid "VAT" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Statements" +msgstr "" + +#. module: auction +#: xsl:flagey.huissier:0 +msgid "Adjudication" +msgstr "" + +#. module: auction +#: field:auction.dates,account_analytic_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Unclassifieds" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction +msgid "Objects by Auction" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_num:0 +#: field:report.unclassified.objects,lot_num:0 +msgid "List Number" +msgstr "" + +#. module: auction +#: field:auction.deposit.cost,name:0 +msgid "Cost Name" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antiques" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "State" +msgstr "" + +#. module: auction +#: field:report.auction.estimation.adj.category,lot_type:0 +msgid "Object Type" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.sms_send,init,text:0 +msgid "SMS Message" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Contemporary Art" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: view:report.unclassified.objects:0 +msgid "Ref" +msgstr "" + +#. module: auction +#: field:report.auction.view,nseller:0 +msgid "No of sellers" +msgstr "" + +#. module: auction +#: selection:auction.lots.send.aie,date_ask,lang:0 +msgid "ned" +msgstr "" + +#. module: auction +#: constraint:hr.attendance:0 +msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: field:report.buyer.auction,total_price:0 +msgid "Total Adj." +msgstr "" + +#. module: auction +#: field:report.auction.view2,obj_margin_procent:0 +msgid "Net margin (%)" +msgstr "" + +#. module: auction +#: selection:auction.lots,state:0 +#: selection:report.object.encoded,state:0 +#: selection:report.seller.auction,state:0 +#: selection:report.unclassified.objects,state:0 +msgid "Unsold" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Dates" +msgstr "" + +#. module: auction +#: constraint:product.template:0 +msgid "Error: UOS must be in a different category than the UOM" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Items" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax5 +#: field:auction.dates,seller_costs:0 +msgid "Seller Costs" +msgstr "" + +#. module: auction +#: view:auction.bid:0 +#: view:auction.bid_line:0 +#: view:auction.lots:0 +#: field:auction.lots,bid_lines:0 +#: model:ir.actions.report.xml,name:auction.bid_auction +#: model:ir.ui.menu,name:auction.menu_action_bid_open +msgid "Bids" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_all_objects_menu +msgid "All objects" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2 +msgid "Buyer's auction for all months" +msgstr "" + +#. module: auction +#: field:auction.bid,contact_tel:0 +msgid "Contact" +msgstr "" + +#. module: auction +#: field:report.auction.view,obj_ret:0 +#: field:report.object.encoded,obj_ret:0 +#: field:report.object.encoded.manager,obj_ret:0 +msgid "# obj ret" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.sms_send,init,send:0 +msgid "Send SMS" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Painting" +msgstr "" + +#. module: auction +#: field:auction.lots,sel_inv_id:0 +msgid "Seller Invoice" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Commissions" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.numerotate,search,init:0 +msgid "Back" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_all_objects_unsold +msgid "Unsold objects" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_all_objects_sold1 +msgid "Sold Objects" +msgstr "" + +#. module: auction +#: view:report.buyer.auction2:0 +#: view:report.seller.auction2:0 +msgid "Sum net margin" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Deposit Border Form" +msgstr "" + +#. module: auction +#: field:auction.bid,bid_lines:0 +#: rml:auction.bids:0 +#: rml:bids.lots:0 +#: model:ir.model,name:auction.model_auction_bid_line +msgid "Bid" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.send.aie,date_ask,lang:0 +msgid "Langage" +msgstr "" + +#. module: auction +#: field:auction.bid_line,lot_id:0 +#: field:auction.lot.history,lot_id:0 +#: view:auction.lots:0 +#: model:ir.model,name:auction.model_auction_lots +msgid "Object" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_map_user +msgid "Map buyer username to Partners" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.numerotate,search,lot_num:0 +msgid "Inventory Number" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.buyer_map,check,end:0 +#: wizard_button:auction.lots.numerotate,not_exist,end:0 +#: wizard_button:auction.lots.numerotate,search,end:0 +#: wizard_button:auction.lots.numerotate_cont,init,end:0 +msgid "Exit" +msgstr "" + +#. module: auction +#: field:report.buyer.auction2,net_revenue:0 +msgid "Net Revenue" +msgstr "" + +#. module: auction +#: view:report.buyer.auction:0 +msgid "Auction buyer reporting form view" +msgstr "" + +#. module: auction +#: field:auction.dates,state:0 +#: field:auction.lots,state:0 +#: field:report.auction.adjudication,state:0 +#: field:report.object.encoded,state:0 +#: field:report.seller.auction,state:0 +#: field:report.unclassified.objects,state:0 +msgid "Status" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_sms +msgid "SMS Send" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Cartoons" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: selection:auction.lots,state:0 +#: selection:report.seller.auction,state:0 +#: selection:report.unclassified.objects,state:0 +msgid "Sold" +msgstr "" + +#. module: auction +#: constraint:hr.employee:0 +msgid "Error ! You cannot create recursive Hierarchy of Employees." +msgstr "" + +#. module: auction +#: field:auction.bid_line,name:0 +msgid "Bid date" +msgstr "" + +#. module: auction +#: field:auction.dates,acc_expense:0 +msgid "Expense Account" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_wizard_emporte +msgid "Deliveries Management" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_desc:0 +msgid "Object Description" +msgstr "" + +#. module: auction +#: selection:auction.deposit,method:0 +msgid "Contact the Seller" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Auction Objects" +msgstr "" + +#. module: auction +#: field:auction.lots,gross_revenue:0 +#: field:report.auction.view2,gross_revenue:0 +#: field:report.object.encoded.manager,gross_revenue:0 +#: field:report.seller.auction2,gross_revenue:0 +msgid "Gross revenue" +msgstr "" + +#. module: auction +#: view:report.seller.auction2:0 +msgid "Auction reporting2 form view" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_pay +msgid "Pay objects of the buyer" +msgstr "" + +#. module: auction +#: view:report.deposit.border:0 +msgid "Depositer's statistics" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Buyer information" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_seller_auction +msgid "Auction Reporting on seller view" +msgstr "" + +#. module: auction +#: field:auction.lots,name2:0 +msgid "Short Description (2)" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_dates +msgid "auction.dates" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_buyers_menu +msgid "Buyers" +msgstr "" + +#. module: auction +#: wizard_field:auction.pay.buy,init,amount:0 +#: wizard_field:auction.pay.buy,init,amount2:0 +#: wizard_field:auction.pay.buy,init,amount3:0 +msgid "Amount paid" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree +msgid "My Latest Deposits" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_est1:0 +#: wizard_field:auction.lots.numerotate,search,lot_est1:0 +#: field:report.auction.estimation.adj.category,lot_est1:0 +#: field:report.auction.view,min_est:0 +#: field:report.unclassified.objects,lot_est1:0 +msgid "Minimum Estimation" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Accounting" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2 +msgid "Buyer's Revenues" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_adjudication +msgid "report_auction_adjudication" +msgstr "" + +#. module: auction +#: field:auction.bid_line,price:0 +msgid "Maximum Price" +msgstr "" + +#. module: auction +#: selection:auction.lots.send.aie,date_ask,lang:0 +msgid "eng" +msgstr "" + +#. module: auction +#: view:report.buyer.auction2:0 +msgid "Auction buyer reporting tree view2" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.sms_send,init:0 +msgid "Bulk SMS send" +msgstr "" + +#. module: auction +#: wizard_view:auction.taken,init:0 +msgid "Select lots which are Sold" +msgstr "" + +#. module: auction +#: field:auction.lots,statement_id:0 +msgid "Payment" +msgstr "" + +#. module: auction +#: selection:auction.lots.send.aie,date_ask,lang:0 +msgid "fr" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Old weapons and militaria" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Oriental Arts/Chineese furnitures" +msgstr "" + +#. module: auction +#: selection:auction.deposit,method:0 +msgid "Keep until sold" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.numerotate,init,choice:0 +#: wizard_button:auction.lots.send.aie,init,date_ask:0 +#: wizard_button:auction.lots.send.aie.results,init,date_ask:0 +msgid "Continue" +msgstr "" + +#. module: auction +#: field:report.object.encoded,obj_num:0 +#: field:report.object.encoded.manager,obj_num:0 +msgid "# of Encoded obj." +msgstr "" + +#. module: auction +#: xsl:report.auction.vnd_bordereau:0 +msgid "List N." +msgstr "" + +#. module: auction +#: field:report.deposit.border,moy_est:0 +msgid "Avg. Est" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of sellers:" +msgstr "" + +#. module: auction +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "" + +#. module: auction +#: model:ir.module.module,description:auction.module_meta_information +msgid "" +"This module provides functionality to \n" +" manage artists, articles, sellers, buyers and auction.\n" +" Manage bids, track of sold, paid and unpaid objects.\n" +" Delivery Management. \n" +" " +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of items taken away:" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1 +msgid "Auction's Summary" +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +msgid "%)" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.able,init:0 +msgid "Confirmation set taken away" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.make_invoice,init,objects:0 +#: wizard_field:auction.lots.make_invoice_buyer,init,objects:0 +#: wizard_field:auction.lots.send.aie,date_ask,objects:0 +#: wizard_field:auction.lots.send.aie.results,date_ask,objects:0 +#: field:report.deposit.border,nb_obj:0 +msgid "# of objects" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_est2:0 +#: wizard_field:auction.lots.numerotate,search,lot_est2:0 +#: field:report.auction.estimation.adj.category,lot_est2:0 +#: field:report.auction.view,max_est:0 +#: field:report.unclassified.objects,lot_est2:0 +msgid "Maximum Estimation" +msgstr "" + +#. module: auction +#: field:auction.lots,buyer_price:0 +msgid "Buyer price" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel +msgid "Mark as paid for seller" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.seller_form_id +msgid "Seller List" +msgstr "" + +#. module: auction +#: field:auction.lots,is_ok:0 +msgid "Buyer's payment" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Close + Create all invoices" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.auction_catalog_flagy +msgid "Auction Catalog Flagey" +msgstr "" + +#. module: auction +#: field:auction.lot.history,price:0 +msgid "Withdrawn price" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax4 +msgid "Seller Costs1" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Verreries" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Toys" +msgstr "" + +#. module: auction +#: field:auction.deposit,create_uid:0 +#: field:auction.lots,create_uid:0 +msgid "Created by" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +msgid "Buyer form" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +msgid "Estimate" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of buyers:" +msgstr "" + +#. module: auction +#: field:auction.lots,costs:0 +msgid "Indirect costs" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +msgid "Cat" +msgstr "" + +#. module: auction +#: constraint:account.tax.code:0 +msgid "Error ! You can not create recursive accounts." +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_menu_root +msgid "Auction Management" +msgstr "" + +#. module: auction +#: field:auction.dates,journal_seller_id:0 +msgid "Seller Journal" +msgstr "" + +#. module: auction +#: view:report.buyer.auction:0 +msgid "Auction buyer reporting tree view" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_artist +msgid "Define Artists" +msgstr "" + +#. module: auction +#: field:auction.lot.category,name:0 +msgid "Category Name" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager +#: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member +msgid "Comparison of estimations" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot +msgid "Code barres du lot" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.numerotate,not_exist,init:0 +msgid "Retry" +msgstr "" + +#. module: auction +#: field:auction.artists,birth_death_dates:0 +msgid "Birth / Death dates" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Jewelry" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_unclassified_objects +msgid "Unclassified objects " +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.numerotate_cont,init,set_number:0 +#: wizard_field:auction.lots.send.aie,date_ask,numerotation:0 +#: wizard_field:auction.lots.send.aie,init,numerotation:0 +msgid "Numerotation" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit +msgid "Bordereau de dépôt" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +msgid "Document type" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_estimation_adj_category +msgid "comparaison estimate/adjudication " +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +msgid "Adj(EUR)" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Other Media" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_emporte +msgid "Gestion emporte" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Cat. N." +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_object_cat +msgid "Object Categories" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.send.aie,date_ask,img_send:0 +msgid "Send Image also ?" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "General Informations" +msgstr "" + +#. module: auction +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: auction +#: view:report.auction.view:0 +msgid "Auctions results" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.sms_send,init,app_id:0 +msgid "API ID" +msgstr "" + +#. module: auction +#: field:auction.bid,name:0 +#: field:auction.bid_line,bid_id:0 +msgid "Bid ID" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Min Estimate:" +msgstr "" + +#. module: auction +#: field:report.buyer.auction2,net_margin:0 +msgid "Net Margin" +msgstr "" + +#. module: auction +#: field:auction.lots,vnd_lim_net:0 +msgid "Net limit ?" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of commissions:" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_unclassified_objects +#: model:ir.ui.menu,name:auction.menu_all_objects_unclassified +#: view:report.unclassified.objects:0 +msgid "Unclassified objects" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.make_invoice_buyer,init:0 +msgid "(Keep empty for automatic number)" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_object_date +#: view:report.auction.object.date:0 +msgid "Objects per day" +msgstr "" + +#. module: auction +#: model:product.template,name:auction.monproduit_product_template +msgid "Oeuvres a 21%" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Carpet and textilles" +msgstr "" + +#. module: auction +#: xsl:report.auction.seller.list:0 +#: field:report.object.encoded.manager,adj:0 +msgid "Adj." +msgstr "" + +#. module: auction +#: field:auction.lot.history,name:0 +#: field:report.attendance,name:0 +#: field:report.auction.adjudication,date:0 +#: xsl:report.auction.deposit:0 +#: field:report.auction.estimation.adj.category,date:0 +msgid "Date" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_ret:0 +msgid "Price retired" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Extra Costs" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_dates_new +msgid "New Auction Dates" +msgstr "" + +#. module: auction +#: field:auction.lots,paid_vnd:0 +msgid "Seller Paid" +msgstr "" + +#. module: auction +#: field:auction.deposit,date_dep:0 +msgid "Deposit date" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.id_deposit +msgid "Deposits" +msgstr "" + +#. module: auction +#: field:auction.deposit,specific_cost_ids:0 +msgid "Specific Costs" +msgstr "" + +#. module: auction +#: view:report.buyer.auction2:0 +#: view:report.seller.auction2:0 +msgid "Sum adj" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: view:report.auction.view2:0 +msgid "Auctions" +msgstr "" + +#. module: auction +#: field:report.seller.auction,object_number:0 +msgid "No of Objects" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "History" +msgstr "" + +#. module: auction +#: field:auction.lot.category,priority:0 +msgid "Priority" +msgstr "" + +#. module: auction +#: rml:auction.code_bar_lot:0 +msgid "Nr." +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Painting" +msgstr "" + +#. module: auction +#: field:auction.lot.category,aie_categ:0 +msgid "Aie Category" +msgstr "" + +#. module: auction +#: xsl:flagey.huissier:0 +#: rml:report.auction.buyer.result:0 +#: xsl:report.auction.deposit:0 +msgid "Num" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.able,init,end:0 +#: wizard_button:auction.lots.auction_move,init,end:0 +#: wizard_button:auction.lots.enable,init,end:0 +#: wizard_button:auction.lots.make_invoice,init,end:0 +#: wizard_button:auction.lots.make_invoice_buyer,init,end:0 +#: wizard_button:auction.lots.numerotate,init,end:0 +#: wizard_button:auction.lots.send.aie,date_ask,end:0 +#: wizard_button:auction.lots.send.aie,init,end:0 +#: wizard_button:auction.lots.send.aie.results,date_ask,end:0 +#: wizard_button:auction.lots.send.aie.results,init,end:0 +#: wizard_button:auction.lots.sms_send,init,end:0 +#: wizard_button:auction.pay.buy,init,end:0 +#: wizard_button:auction.payer.sel,init,end:0 +msgid "Cancel" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Beginning of the auction" +msgstr "" + +#. module: auction +#: field:auction.artists,biography:0 +msgid "Biography" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_local:0 +msgid "Location" +msgstr "" + +#. module: auction +#: wizard_view:auction.payer.sel,init:0 +msgid "Check payment for seller" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.view_report_object_by_auction +msgid "Detailed lots" +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +#: view:report.object.encoded.manager:0 +msgid "Objects statistics" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Analytic" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_results +msgid "Send results to Auction-in-europe.com" +msgstr "" + +#. module: auction +#: rml:bids.lots:0 +#: rml:bids.phones.details:0 +msgid "Cat.N" +msgstr "" + +#. module: auction +#: selection:auction.deposit,method:0 +msgid "Decrease limit of 10%" +msgstr "" + +#. module: auction +#: field:auction.dates,adj_total:0 +#: field:report.auction.adjudication,adj_total:0 +#: field:report.auction.estimation.adj.category,adj_total:0 +msgid "Total Adjudication" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_reporting1 +#: model:ir.actions.act_window,name:auction.action_auction_reporting_all1 +#: model:ir.actions.act_window,name:auction.action_auction_reporting_all2 +msgid "Seller's auction" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_invoice_buyer1 +msgid "Invoice Buyer objects" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2 +msgid "Seller's Revenues" +msgstr "" + +#. module: auction +#: xsl:flagey.huissier:0 +msgid "Price" +msgstr "" + +#. module: auction +#: rml:bids.phones.details:0 +msgid "-" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Subtotal:" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Photos" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.make_invoice,init,number:0 +#: wizard_field:auction.lots.make_invoice_buyer,init,number:0 +msgid "Invoice Number" +msgstr "" + +#. module: auction +#: field:report.buyer.auction,date:0 +#: field:report.buyer.auction2,date:0 +#: field:report.object.encoded,date:0 +#: field:report.object.encoded.manager,date:0 +#: field:report.seller.auction,date:0 +msgid "Create Date" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view1 +msgid "Buyer's Summary" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +msgid "Customer Reference" +msgstr "" + +#. module: auction +#: rml:bids.lots:0 +msgid "Name" +msgstr "" + +#. module: auction +#: field:auction.deposit,name:0 +#: field:auction.lots,bord_vnd_id:0 +#: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0 +#: field:report.deposit.border,bord:0 +#: field:report.unclassified.objects,bord_vnd_id:0 +msgid "Depositer Inventory" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_deposit_tree_m +#: model:ir.ui.menu,name:auction.menu_report_deposit_tree_member +msgid "Depositer's Statistics" +msgstr "" + +#. module: auction +#: view:report.object.encoded.manager:0 +msgid "Total adj." +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.send.aie,date_ask,uname:0 +#: wizard_field:auction.lots.send.aie,init,uname:0 +#: wizard_field:auction.lots.send.aie.results,date_ask,uname:0 +#: wizard_field:auction.lots.send.aie.results,init,uname:0 +#: wizard_field:auction.lots.sms_send,init,user:0 +msgid "Login" +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +#: xsl:report.auction.seller.list:0 +msgid "To pay" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.enable,init,go:0 +msgid "Enable Taken away" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Others" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.seller_lots_3 +msgid "Seller Form" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_type:0 +#: field:report.unclassified.objects,lot_type:0 +msgid "Object category" +msgstr "" + +#. module: auction +#: wizard_view:auction.taken,init:0 +msgid "Mark Lots" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_num:0 +#: wizard_field:auction.lots.enable,init,confirm_en:0 +#: wizard_field:auction.lots.numerotate,search,obj_num:0 +#: field:report.unclassified.objects,obj_num:0 +msgid "Catalog Number" +msgstr "" + +#. module: auction +#: view:report.auction.view2:0 +msgid "Auction Reporting tree view2" +msgstr "" + +#. module: auction +#: view:report.buyer.auction2:0 +msgid "Auction buyer reporting form view2" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.bid_phone +msgid "Bids phones" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_report_object_by_auction +msgid "Auction dates" +msgstr "" + +#. module: auction +#: view:report.seller.auction2:0 +msgid "Auction seller reporting2 graph view" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree +msgid "Encoded Objects Per Day" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_buyer_auction +#: model:ir.model,name:auction.model_report_buyer_auction2 +msgid "Auction Reporting on buyer view" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Debit:" +msgstr "" + +#. module: auction +#: field:auction.lots,author_right:0 +msgid "Author rights" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Payment's history" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Document" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid ", TEL:" +msgstr "" + +#. module: auction +#: view:report.auction.view:0 +msgid "Auction results" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_allmonth_view2 +msgid "Auction's Revenues" +msgstr "" + +#. module: auction +#: view:report.object.encoded.manager:0 +msgid "Total net rev." +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.buyer_map,check,set_buyer:0 +msgid "Update" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_report_seller_menu +#: model:ir.ui.menu,name:auction.auction_seller_menu +msgid "Sellers" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Metal Ware" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.res_w_buyer +msgid "Results with buyer" +msgstr "" + +#. module: auction +#: selection:auction.lots.send.aie,date_ask,lang:0 +msgid "de" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.auction_move,init,set_date:0 +msgid "Move to Auction date" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_dates_old +msgid "Old Auctions" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of unsold items:" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Curiosa" +msgstr "" + +#. module: auction +#: field:auction.bid,auction_id:0 +#: field:auction.lots,auction_id:0 +#: wizard_field:auction.lots.auction_move,init,auction_id:0 +#: wizard_field:auction.lots.send.aie,date_ask,dates:0 +#: wizard_field:auction.lots.send.aie,init,dates:0 +#: wizard_field:auction.lots.send.aie.results,date_ask,dates:0 +#: wizard_field:auction.lots.send.aie.results,init,dates:0 +msgid "Auction Date" +msgstr "" + +#. module: auction +#: rml:auction.code_bar_lot:0 +msgid ", ID" +msgstr "" + +#. module: auction +#: model:ir.module.module,shortdesc:auction.module_meta_information +msgid "Auction module" +msgstr "" + +#. module: auction +#: field:auction.bid_line,auction:0 +msgid "Auction Name" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_manager_tree1 +#: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_member_tree1 +msgid "Attendance" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Seller information" +msgstr "" + +#. module: auction +#: field:auction.lots,ach_login:0 +#: wizard_field:auction.lots.buyer_map,check,ach_login:0 +#: field:report.unclassified.objects,ach_login:0 +msgid "Buyer Username" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Jewelry" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Inventory" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_dates_next +msgid "Next Auctions" +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +#: xsl:report.auction.seller.list:0 +msgid "#" +msgstr "" + +#. module: auction +#: field:auction.lots,ach_emp:0 +msgid "Taken Away" +msgstr "" + +#. module: auction +#: view:report.object.encoded.manager:0 +msgid "Total gross rev." +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Miniatures / Collections" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.numerotate,not_exist:0 +msgid "This lot does not exist !" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "End of auction" +msgstr "" + +#. module: auction +#: field:auction.bid_line,call:0 +msgid "To be Called" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_manager_tree +#: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_member_tree +#: view:report.auction.estimation.adj.category:0 +msgid "Min est/Adj/Max est" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.lot_list_inv +msgid "Lots List - Landscape" +msgstr "" + +#. module: auction +#: view:report.seller.auction:0 +msgid "Auction reporting tree view" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.auction_move,init:0 +#: model:ir.actions.wizard,name:auction.wizard_change_auction +msgid "Change Auction Date" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Photo" +msgstr "" + +#. module: auction +#: field:auction.deposit,method:0 +msgid "Withdrawned method" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Max Estimate:" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_bid +msgid "Bid auctions" +msgstr "" + +#. module: auction +#: field:report.auction.view2,obj_margin:0 +msgid "Avg margin" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Art from the Ivory Coast" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Religiosa" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.make_invoice,init,invoice:0 +#: wizard_button:auction.lots.make_invoice_buyer,init,invoice:0 +msgid "Create invoices" +msgstr "" + +#. module: auction +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" + +#. module: auction +#: xsl:report.auction.vnd_bordereau:0 +msgid "Lot" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_all_objects_unplanned1 +msgid "Unplanned objects" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Sculpture" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_artists +msgid "auction.artists" +msgstr "" + +#. module: auction +#: field:auction.dates,journal_id:0 +msgid "Buyer Journal" +msgstr "" + +#. module: auction +#: selection:auction.lots,state:0 +#: xsl:report.auction.ach_bordereau:0 +#: selection:report.object.encoded,state:0 +#: selection:report.unclassified.objects,state:0 +msgid "Paid" +msgstr "" + +#. module: auction +#: rml:bids.lots:0 +#: rml:bids.phones.details:0 +msgid "Phone" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Argenterie" +msgstr "" + +#. module: auction +#: wizard_button:auction.pay.buy,init,pay:0 +#: wizard_button:auction.payer.sel,init,pay2:0 +msgid "Pay" +msgstr "" + +#. module: auction +#: field:auction.lot.category,active:0 +msgid "Active" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Lightings" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Sculpture, bronze, eso." +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.seller.list:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Total:" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax2 +msgid "TVA1" +msgstr "" + +#. module: auction +#: view:report.auction.object.date:0 +msgid "Objects per Day" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +msgid "Document Number" +msgstr "" + +#. module: auction +#: field:report.object.encoded.manager,obj_margin:0 +#: field:report.seller.auction2,net_margin:0 +msgid "Net margin" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.numerotate,search,set_number:0 +msgid "Numerotate" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "Buyer, Price" +msgstr "" + +#. module: auction +#: rml:auction.code_bar_lot:0 +msgid "Flagey" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.v_huissier +msgid "Listing Huissiers" +msgstr "" + +#. module: auction +#: field:auction.lots,vnd_lim:0 +msgid "Seller limit" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.buyer_map,done:0 +msgid "All objects are assigned to buyers !" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.able,init,go:0 +msgid "Able Taken away" +msgstr "" + +#. module: auction +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: auction +#: field:auction.deposit,transfer:0 +msgid "Transfer" +msgstr "" + +#. module: auction +#: view:report.auction.adjudication:0 +#: field:report.seller.auction,total_price:0 +msgid "Total adjudication" +msgstr "" + +#. module: auction +#: field:auction.lots,artist2_id:0 +msgid "Artist/Author 2" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_seller_allmonth_view1 +msgid "Seller's Summary" +msgstr "" + +#. module: auction +#: view:report.seller.auction:0 +msgid "Auction reporting graph view" +msgstr "" + +#. module: auction +#: wizard_field:auction.taken,init,lot_ids:0 +msgid "Lots Emportes" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.send.aie,date_ask,send:0 +#: wizard_button:auction.lots.send.aie.results,date_ask,send:0 +msgid "Send on your website" +msgstr "" + +#. module: auction +#: field:auction.lots,net_margin:0 +msgid "Net Margin (%)" +msgstr "" + +#. module: auction +#: field:report.auction.object.date,month:0 +msgid "Month" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.auction_lots_open +msgid "Simplified lots for adjudication" +msgstr "" + +#. module: auction +#: field:auction.lots,product_id:0 +msgid "Product" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_view +msgid "Auction Reporting on view1" +msgstr "" + +#. module: auction +#: field:report.seller.auction2,sum_adj:0 +msgid "Sum Adjustication" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Porcelain, Ceramics, Glassmaking, ..." +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +msgid "Plate Number:" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +#: field:auction.deposit,lot_id:0 +#: model:ir.ui.menu,name:auction.auction_objects_menu +msgid "Objects" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.numerotate,init:0 +#: wizard_view:auction.lots.numerotate,search:0 +msgid "Object Reference" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Paid:" +msgstr "" + +#. module: auction +#: field:auction.deposit,total_neg:0 +msgid "Allow Negative Amount" +msgstr "" + +#. module: auction +#: rml:auction.bids:0 +#: view:auction.lots:0 +#: rml:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_report_auction_menu +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.deposit:0 +msgid "Auction" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Shows" +msgstr "" + +#. module: auction +#: field:auction.dates,name:0 +#: field:auction.lot.history,auction_id:0 +#: field:report.auction.adjudication,name:0 +#: field:report.auction.view,auction_id:0 +#: field:report.auction.view2,auction:0 +#: field:report.auction.view2,date:0 +#: field:report.buyer.auction,auction:0 +#: field:report.buyer.auction2,auction:0 +#: field:report.seller.auction,auction:0 +#: field:report.seller.auction2,auction:0 +#: field:report.seller.auction2,date:0 +#: field:report.unclassified.objects,auction:0 +msgid "Auction date" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_all_objects_unsold +msgid "Unsold Objects" +msgstr "" + +#. module: auction +#: field:report.buyer.auction,avg_price:0 +msgid "Avg Adj." +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_deposit_cost +msgid "auction.deposit.cost" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.numerotate,search,bord_vnd_id:0 +msgid "Object Inventory" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Art from the Ivory Coast/African Arts" +msgstr "" + +#. module: auction +#: field:auction.dates,auction1:0 +msgid "First Auction Day" +msgstr "" + +#. module: auction +#: view:report.attendance:0 +msgid "User's pointing" +msgstr "" + +#. module: auction +#: view:auction.lot.category:0 +msgid "Lot Category" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_report_manager_menu +msgid "Manager" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Names" +msgstr "" + +#. module: auction +#: view:auction.artists:0 +msgid "Artists" +msgstr "" + +#. module: auction +#: field:report.attendance,total_attendance:0 +#: xsl:report.auction.ach_bordereau:0 +msgid "Total" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open +msgid "Open lots" +msgstr "" + +#. module: auction +#: view:report.seller.auction:0 +msgid "Auction reporting form view" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Lots" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_send +msgid "Send to website" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_dates_old +msgid "Old Auction Dates" +msgstr "" + +#. module: auction +#: field:auction.lots,seller_price:0 +msgid "Seller price" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_seller_auction2 +msgid "Auction Reporting on seller view2" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.buy_id_list +msgid "Buyer List" +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +msgid "Buyer costs(" +msgstr "" + +#. module: auction +#: wizard_field:auction.pay.buy,init,statement_id1:0 +#: wizard_field:auction.pay.buy,init,statement_id2:0 +#: wizard_field:auction.pay.buy,init,statement_id3:0 +msgid "Statement" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Engravings" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax20 +#: model:account.tax,name:auction.auction_tax6 +msgid "Frais de vente" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.numerotate_cont,init:0 +#: wizard_field:auction.lots.numerotate_cont,init,number:0 +msgid "First Number" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax +msgid "Droit d'auteur" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_view2 +msgid "Auction Reporting on view2" +msgstr "" + +#. module: auction +#: field:auction.dates,expo1:0 +msgid "First Exposition Day" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.auction_move,init:0 +msgid "" +"Warning, this will erase the object adjudication price and its buyer !" +msgstr "" + +#. module: auction +#: field:report.auction.object.date,name:0 +msgid "Created date" +msgstr "" + +#. module: auction +#: view:auction.bid:0 +msgid "Bid information" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "TEL:" +msgstr "" + +#. module: auction +#: field:auction.dates,acc_income:0 +msgid "Income Account" +msgstr "" + +#. module: auction +#: field:auction.lots,net_revenue:0 +#: field:report.auction.view2,net_revenue:0 +#: field:report.object.encoded.manager,net_revenue:0 +#: field:report.seller.auction2,net_revenue:0 +msgid "Net revenue" +msgstr "" + +#. module: auction +#: xsl:report.auction.deposit:0 +#: xsl:report.auction.lots.list.landscape:0 +msgid "Limit" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree_manager +msgid "Latest Deposits" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "# of items:" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Musical Instruments" +msgstr "" + +#. module: auction +#: field:report.object.encoded,estimation:0 +#: field:report.object.encoded.manager,estimation:0 +msgid "Estimation" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Graphic Arts" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.buyer_form_id +msgid "Buyer Form" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_invoice +msgid "Invoice Seller objects" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Oriental Arts" +msgstr "" + +#. module: auction +#: field:auction.bid,partner_id:0 +msgid "Buyer Name" +msgstr "" + +#. module: auction +#: field:report.auction.view2,sum_adj:0 +msgid "Sum of adjudication" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.auction_wizard_enable_taken +msgid "Unmark as taken away" +msgstr "" + +#. module: auction +#: field:auction.lots,gross_margin:0 +msgid "Gross Margin (%)" +msgstr "" + +#. module: auction +#: selection:auction.dates,state:0 +#: selection:report.auction.adjudication,state:0 +msgid "Closed" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_comm:0 +#: field:report.unclassified.objects,obj_comm:0 +msgid "Commission" +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.numerotate,init,lot_num:0 +msgid "Lot Number" +msgstr "" + +#. module: auction +#: constraint:res.partner:0 +msgid "The VAT doesn't seem to be correct." +msgstr "" + +#. module: auction +#: field:report.attendance,employee_id:0 +msgid "Employee" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Adj.(EUR)" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "Est." +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_report_menu +msgid "Reporting" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Catalog" +msgstr "" + +#. module: auction +#: field:auction.deposit.cost,account:0 +msgid "Destination Account" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_deposit_border +msgid "Report deposit border" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_config_menu +msgid "Configuration" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_outils_menu +msgid "Tools Bar Codes" +msgstr "" + +#. module: auction +#: field:auction.deposit.cost,deposit_id:0 +msgid "Deposit" +msgstr "" + +#. module: auction +#: field:auction.dates,expo2:0 +msgid "Last Exposition Day" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view1 +#: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view2 +#: model:ir.actions.act_window,name:auction.action_auction_report_thismonth_view2 +msgid "Auction report" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lot_category +msgid "auction.lot.category" +msgstr "" + +#. module: auction +#: field:auction.artists,name:0 +msgid "Artist/Author Name" +msgstr "" + +#. module: auction +#: field:auction.lots,image:0 +msgid "Image" +msgstr "" + +#. module: auction +#: selection:report.object.encoded,state:0 +msgid "Invoiced" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: selection:auction.lots,state:0 +msgid "Taken away" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Collectible & art objects" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "BID:" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting +#: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting2 +#: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all1 +msgid "Buyer's auction" +msgstr "" + +#. module: auction +#: view:report.seller.auction2:0 +msgid "Auction reporting2 tree view" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Deposit Costs" +msgstr "" + +#. module: auction +#: constraint:res.partner:0 +msgid "Error ! You can not create recursive associated members." +msgstr "" + +#. module: auction +#: selection:auction.dates,state:0 +#: selection:auction.lots,state:0 +#: selection:report.auction.adjudication,state:0 +#: selection:report.object.encoded,state:0 +#: selection:report.seller.auction,state:0 +#: selection:report.unclassified.objects,state:0 +msgid "Draft" +msgstr "" + +#. module: auction +#: rml:buyer.list:0 +msgid "........." +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +msgid "Buyer Cost:" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "NET" +msgstr "" + +#. module: auction +#: rml:report.auction.buyer.result:0 +msgid "Adj" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: model:ir.ui.menu,name:auction.auction_date_menu +msgid "Auction Dates" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Furnitures" +msgstr "" + +#. module: auction +#: xsl:report.auction.ach_bordereau:0 +msgid "Customer Contact" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "Inv, Name" +msgstr "" + +#. module: auction +#: field:report.auction.adjudication,user_id:0 +#: field:report.auction.estimation.adj.category,user_id:0 +#: field:report.auction.object.date,user_id:0 +#: field:report.object.encoded,user_id:0 +#: field:report.object.encoded.manager,user_id:0 +msgid "User" +msgstr "" + +#. module: auction +#: view:report.unplanned.object:0 +msgid "Unplanned Objects" +msgstr "" + +#. module: auction +#: field:report.buyer.auction2,gross_revenue:0 +msgid "Gross Revenue" +msgstr "" + +#. module: auction +#: field:auction.artists,pseudo:0 +msgid "Pseudo" +msgstr "" + +#. module: auction +#: field:auction.lots,important:0 +msgid "To be Emphatized" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Not sold" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax3 +#: field:auction.dates,buyer_costs:0 +msgid "Buyer Costs" +msgstr "" + +#. module: auction +#: model:ir.actions.wizard,name:auction.wizard_numerotate_automatic +msgid "Numerotation (automatic)" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Auction Date:" +msgstr "" + +#. module: auction +#: field:auction.lots,ach_inv_id:0 +msgid "Buyer Invoice" +msgstr "" + +#. module: auction +#: rml:auction.bids:0 +msgid "Tel" +msgstr "" + +#. module: auction +#: wizard_field:auction.pay.buy,init,total:0 +msgid "Amount to paid" +msgstr "" + +#. module: auction +#: field:auction.lots,artist_id:0 +msgid "Artist/Author" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax1 +msgid "TVA" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.total_result1 +msgid "Auction Totals with lists" +msgstr "" + +#. module: auction +#: wizard_button:auction.lots.buyer_map,done,end:0 +msgid "Close" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_object_encoded +#: model:ir.model,name:auction.model_report_object_encoded_manager +msgid "Object encoded" +msgstr "" + +#. module: auction +#: rml:bids.phones.details:0 +msgid "Est" +msgstr "" + +#. module: auction +#: field:report.auction.view,nbuyer:0 +msgid "No of buyers" +msgstr "" + +#. module: auction +#: field:report.seller.auction,avg_price:0 +msgid "Avg adjudication" +msgstr "" + +#. module: auction +#: view:report.object.encoded.manager:0 +msgid "Object statistic" +msgstr "" + +#. module: auction +#: field:auction.dates,auction2:0 +msgid "Last Auction Day" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_dates_next1 +msgid "Next Auction Dates" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_attendance +msgid "Report Sign In/Out" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +#: field:auction.deposit,info:0 +#: view:auction.lots:0 +#: wizard_field:auction.lots.numerotate,search,obj_desc:0 +#: rml:bids.phones.details:0 +#: xsl:flagey.huissier:0 +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.deposit:0 +#: xsl:report.auction.lots.list.landscape:0 +#: xsl:report.auction.vnd_bordereau:0 +msgid "Description" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Cont. Art/Arts" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_price:0 +#: field:report.auction.view,adj_price:0 +#: field:report.unclassified.objects,obj_price:0 +msgid "Adjudication price" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_all_objects_to_sell +msgid "Objects to sell" +msgstr "" + +#. module: auction +#: xsl:flagey.huissier:0 +msgid "Ref." +msgstr "" + +#. module: auction +#: wizard_field:auction.lots.send.aie,date_ask,password:0 +#: wizard_field:auction.lots.send.aie,init,password:0 +#: wizard_field:auction.lots.send.aie.results,date_ask,password:0 +#: wizard_field:auction.lots.send.aie.results,init,password:0 +#: wizard_field:auction.lots.sms_send,init,password:0 +msgid "Password" +msgstr "" + +#. module: auction +#: field:auction.lots,ach_avance:0 +msgid "Buyer Advance" +msgstr "" + +#. module: auction +#: field:auction.lots,name:0 +#: wizard_field:auction.lots.numerotate,search,name:0 +#: field:report.unclassified.objects,name:0 +msgid "Short Description" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_report_employees_menu +msgid "Employees" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Clocks and watches" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Scientific Instruments" +msgstr "" + +#. module: auction +#: wizard_view:auction.lots.enable,init:0 +msgid "Confirmation enable taken away" +msgstr "" + +#. module: auction +#: wizard_view:auction.pay.buy,init:0 +msgid "Pay objects" +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +#: view:report.object.encoded.manager:0 +msgid "# objects" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Adjudication:" +msgstr "" + +#. module: auction +#: field:report.buyer.auction2,sumadj:0 +msgid "Sum of adjustication" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.details_bids_phones +msgid "Bids per lot (phone)" +msgstr "" + +#. module: auction +#: field:report.buyer.auction,buyer_login:0 +#: field:report.buyer.auction2,buyer_login:0 +msgid "Buyer Login" +msgstr "" + +#. module: auction +#: field:auction.deposit,tax_id:0 +msgid "Expenses" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Wine" +msgstr "" + +#. module: auction +#: rml:auction.total.rml:0 +msgid "Auction name:" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/African Arts" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.art2 +msgid "Artists Biography" +msgstr "" + +#. module: auction +#: selection:auction.lot.category,aie_categ:0 +msgid "Antique/Posters" +msgstr "" + +#. module: auction +#: field:auction.lots,history_ids:0 +msgid "Auction history" +msgstr "" + +#. module: auction +#: xsl:report.auction.lots.list.landscape:0 +msgid "Orders" +msgstr "" diff --git a/addons/crm_project/__terp__.py b/addons/crm_project/__terp__.py index c55a302f9da..caae2eeeff8 100644 --- a/addons/crm_project/__terp__.py +++ b/addons/crm_project/__terp__.py @@ -46,6 +46,5 @@ 'demo_xml': ['crm_bugs_demo.xml'], 'installable': True, 'active': False, - 'certificate': '', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_recruitment/hr_hr.py b/addons/hr_recruitment/hr_hr.py index 9b7742b053a..27767c493cb 100644 --- a/addons/hr_recruitment/hr_hr.py +++ b/addons/hr_recruitment/hr_hr.py @@ -58,5 +58,16 @@ class hr_applicant(osv.osv): 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"), 'department_id':fields.many2one('hr.department','Department'), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'), + 'response' : fields.integer("Response"), } hr_applicant() + +class hr_job(osv.osv): + _inherit = "hr.job" + _name = "hr.job" + _columns = { + 'survey_id': fields.many2one('survey', 'Survey'), + } + +hr_job()
\ No newline at end of file diff --git a/addons/hr_recruitment/hr_hr_view.xml b/addons/hr_recruitment/hr_hr_view.xml index df9a0e841de..67f5ef6783c 100644 --- a/addons/hr_recruitment/hr_hr_view.xml +++ b/addons/hr_recruitment/hr_hr_view.xml @@ -43,6 +43,8 @@ <field name="partner_phone"/> <field name="job_id"/> <field name="stage_id"/> + <field name="survey" invisible="1"/> + <field name="response" invisible="1"/> <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/> <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/> <field name="priority"/> @@ -66,7 +68,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Jobs - Recruitment Form"> - <group colspan="4" col="7"> + <group colspan="4" col="8"> <field name="name" string="Subject"/> <label string="Stage: " align="1.0"/> <group colspan="1" col="2"> @@ -76,12 +78,16 @@ <field name="user_id"/> <button string="Schedule a Phone Call" name="%(wizard_hr_job_reschedule_phone_call)d" icon="gtk-redo" type="action"/> + <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" + icon="gtk-execute" context="{'survey_id': survey, 'response_id': response ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/> <newline/> <field name="partner_name"/> <field name="job_id"/> <field name="department_id" widget="selection"/> <button name="%(wizard_hr_job_meeting_set)d" string="Schedule Meeting" icon="terp-hr" type="action"/> - </group> + <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" + icon="gtk-print" context="{'survey_id': survey, 'response_id' : response,}" attrs="{'readonly':[('response','=',False)]}" /> + </group> <notebook colspan="4"> <page string="Job Info"> <group col="2" colspan="2"> @@ -109,7 +115,6 @@ <field name="write_date"/> <field name="date_closed"/> </group> - <separator colspan="4" string="Status"/> <group col="8" colspan="4"> <field name="state"/> @@ -235,5 +240,21 @@ </field> </record> + # ------------------------------------------------------ + # HR Job + # ------------------------------------------------------ + + <record id="hr_job_survey" model="ir.ui.view"> + <field name="name">hr.job.form1</field> + <field name="model">hr.job</field> + <field name="type">form</field> + <field name="inherit_id" ref="hr.view_hr_job_form"/> + <field name="arch" type="xml"> + <field name="no_of_employee" position="after"> + <field name="survey_id"/> + </field> + </field> + </record> + </data> </openerp> diff --git a/addons/l10n_lu/i18n/hr.po b/addons/l10n_lu/i18n/hr.po index 3d2c003f26b..7278c4774b2 100644 --- a/addons/l10n_lu/i18n/hr.po +++ b/addons/l10n_lu/i18n/hr.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: l10n_lu diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po index 554d4690d89..f4abc4e0653 100644 --- a/addons/membership/i18n/fi.po +++ b/addons/membership/i18n/fi.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: 2009-12-11 08:33+0000\n" -"Last-Translator: NightSpirit <Unknown>\n" +"PO-Revision-Date: 2010-03-02 12:22+0000\n" +"Last-Translator: smii <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-16 05:07+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: membership @@ -42,7 +42,7 @@ msgstr "" #: field:report.partner_member.year,currency:0 #: field:report.partner_member.year_new,currency:0 msgid "Currency" -msgstr "" +msgstr "Valuutta" #. module: membership #: model:process.node,note:membership.process_node_setassociation0 @@ -102,12 +102,12 @@ msgstr "Virhe: BVR -viite on pakollinen." #. module: membership #: field:product.product,membership_date_from:0 msgid "Date from" -msgstr "" +msgstr "Päiväys alkaen" #. module: membership #: field:membership.membership_line,partner:0 msgid "Partner" -msgstr "" +msgstr "Kumppani" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_free @@ -123,12 +123,12 @@ msgstr "" #. module: membership #: view:res.partner:0 msgid "Partners" -msgstr "" +msgstr "Kumppanit" #. module: membership #: field:membership.membership_line,date_from:0 msgid "From" -msgstr "" +msgstr "Kohteesta" #. module: membership #: constraint:membership.membership_line:0 @@ -138,17 +138,17 @@ msgstr "Virhe, tämä jäsentuote on vanhentunut" #. module: membership #: wizard_button:wizard_invoice_membership,init,ok:0 msgid "Confirm" -msgstr "" +msgstr "Hyväksy" #. module: membership #: model:process.transition.action,name:membership.process_transition_action_create0 msgid "Create" -msgstr "" +msgstr "Luo" #. module: membership #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Virheellinen XML näkymä-arkkitehtuurille!" #. module: membership #: model:ir.model,name:membership.model_membership_membership_line @@ -158,7 +158,7 @@ msgstr "Jäsen rivi" #. module: membership #: field:membership.membership_line,state:0 msgid "State" -msgstr "" +msgstr "Tila" #. module: membership #: field:res.partner,membership_start:0 @@ -180,12 +180,12 @@ msgstr "Jäsenyys vuosissa" #. module: membership #: model:ir.ui.menu,name:membership.menu_reporting msgid "Reporting" -msgstr "" +msgstr "Raportointi" #. module: membership #: view:res.partner:0 msgid "Members" -msgstr "" +msgstr "Jäsenet" #. module: membership #: selection:membership.membership_line,state:0 @@ -201,7 +201,7 @@ msgstr "Avaa lasku." #. module: membership #: model:ir.ui.menu,name:membership.menu_conf msgid "Configuration" -msgstr "" +msgstr "Asetukset" #. module: membership #: model:process.transition,note:membership.process_transition_producttomember0 @@ -250,7 +250,7 @@ msgstr "Jäsenyystuote - 1" #: field:report.partner_member.year_new,canceled_amount:0 #: field:report.partner_member.year_new,canceled_number:0 msgid "Canceled" -msgstr "" +msgstr "Peruttu" #. module: membership #: model:product.pricelist,name:membership.list1m @@ -263,7 +263,7 @@ msgstr "Jäsenen myynnin hintalista" #: field:report.partner_member.year_new,invoiced_amount:0 #: field:report.partner_member.year_new,invoiced_number:0 msgid "Invoiced" -msgstr "" +msgstr "Laskutettu" #. module: membership #: selection:membership.membership_line,state:0 @@ -318,7 +318,7 @@ msgstr "Jäsenyyslasku maksettu." #: field:report.partner_member.year_new,paid_amount:0 #: field:report.partner_member.year_new,paid_number:0 msgid "Paid" -msgstr "" +msgstr "Maksettu" #. module: membership #: selection:membership.membership_line,state:0 @@ -361,7 +361,7 @@ msgstr "Laskutetut jäsenet" #. module: membership #: constraint:product.pricelist.version:0 msgid "You cannot have 2 pricelist versions that overlap!" -msgstr "" +msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_old @@ -396,7 +396,7 @@ msgstr "" #: field:report.partner_member.year_new,waiting_amount:0 #: field:report.partner_member.year_new,waiting_number:0 msgid "Waiting" -msgstr "" +msgstr "Odotetaan" #. module: membership #: model:process.transition,note:membership.process_transition_waitingtoinvoice0 @@ -411,7 +411,7 @@ msgstr "Tulevat jäsenet" #. module: membership #: wizard_button:wizard_invoice_membership,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Peru" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_associated @@ -428,7 +428,7 @@ msgstr "Maksaneet jäsenet" #. module: membership #: view:product.product:0 msgid "Information" -msgstr "" +msgstr "Tietoa" #. module: membership #: field:membership.membership_line,account_invoice_line:0 @@ -472,7 +472,7 @@ msgstr "Lopeta jäsenyyspäivämäärä" #: model:ir.actions.act_window,name:membership.action_membership_members #: model:ir.ui.menu,name:membership.menu_members msgid "Current members" -msgstr "" +msgstr "Tämänhetkiset jäsenet" #. module: membership #: model:ir.model,name:membership.model_report_partner_member_year_new @@ -510,13 +510,13 @@ msgstr "Jäsenyystuote" #. module: membership #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Virhe: Virheellinen EAN-koodi" #. module: membership #: field:report.partner_member.year,year:0 #: field:report.partner_member.year_new,year:0 msgid "Year" -msgstr "" +msgstr "Vuosi" #. module: membership #: field:res.partner,membership_state:0 diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index cf734682af5..67879ddf7b3 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -5,10 +5,10 @@ <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing" groups="group_mrp_user,group_mrp_manager" sequence="3"/> <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/> - <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/> + <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/> <menuitem name="Control" id="menu_mrp_control" parent="menu_mrp_root" sequence="3" /> - <menuitem name="Master Data" + <menuitem name="Master Data" id="menu_mrp_bom" parent="menu_mrp_root" sequence="5" /> @@ -386,6 +386,7 @@ <field name="name"/> <field name="product_id"/> <field name="product_qty" sum="Total Qty"/> + <field name="product_uom"/> <field name="date_planned"/> <field name="routing_id" groups="base.group_extended"/> <field name="hour_total" sum="Total Hours" groups="base.group_extended"/> @@ -446,7 +447,7 @@ id="mrp.wizard_change_production_qty" keyword="client_action_multi" multi="True"/> - + <record id="mrp_production_form_view" model="ir.ui.view"> <field name="name">mrp.production.form</field> <field name="model">mrp.production</field> @@ -460,8 +461,10 @@ <field name="product_id" on_change="product_id_change(product_id)" select="1"/> <field name="product_qty"/> <group colspan="2" col="3"> - <field name="product_uom"/> + <field name="product_uom"/> + <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/> </group> + <label string="" colspan="2"/> <field name="product_uos_qty" groups="product.group_uos"/> <group colspan="2" col="3" groups="product.group_uos"> @@ -479,51 +482,55 @@ <separator string="" colspan="4"/> <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list" - mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]"> - <tree string="Products to Consume"> - <field name="product_id" /> - <field name="product_qty" /> - <field name="product_uom" /> - <field name="state" invisible="1" /> - <button - name="%(stock.move_consume)d" - string=">" type="action" - icon="gtk-go-forward" context="{'consume': True}" - states="draft,waiting,confirmed,assigned"/> - <button name="%(stock.move_scrap)d" - string="D" type="action" - icon="gtk-justify-fill" context="{'scrap': True}" - states="draft,waiting,confirmed,assigned" /> - </tree> - <form string="Products to Consume"> - <field name="product_id" /> - <field name="product_qty" /> - <field name="product_uom" /> - </form> + mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]"> + <tree string="Products to Consume"> + <field name="product_id" /> + <field name="product_qty" /> + <field name="product_uom" /> + <field name="state" invisible="1" /> + <button + name="%(stock.move_consume)d" + string=">" type="action" + icon="gtk-go-forward" context="{'consume': True}" + states="draft,waiting,confirmed,assigned"/> + <button name="%(stock.move_scrap)d" + string="D" type="action" + icon="gtk-justify-fill" context="{'scrap': True}" + states="draft,waiting,confirmed,assigned" /> + </tree> + <form string="Products to Consume"> + <field name="product_id" /> + <field name="product_qty" /> + <field name="product_uom" /> + </form> </field> <field colspan="2" name="move_lines2" nolabel="1" domain="[('state','in', ('done', 'cancel'))]" - widget="one2many_list" mode="tree,form" height="275"> - <tree string="Consumed Products" editable="bottom"> - <field name="product_id" readonly="1" string="Product"/> - <field name="product_qty" readonly="1" string="Qty"/> - <field name="product_uom" readonly="1" string="Prod. UOM"/> - <field name="state" invisible="1" /> - <field name="location_id" readonly="1" string="Source Loc."/> - <field name="prodlot_id" string="Production Lot"/> - <button - name="%(stock.track_line)d" - string="Split in production lots" - type="action" icon="gtk-justify-fill" - states="done,cancel" /> - <button - name="%(stock.move_scrap)d" - string="D" type="action" - icon="gtk-convert" - states="done,cancel" /> - </tree> - </field> - + widget="one2many_list" mode="tree,form" height="275"> + <tree string="Consumed Products" editable="bottom"> + <field name="product_id" readonly="1"/> + <field name="product_qty" readonly="1"/> + <field name="product_uom" readonly="1" /> + <field name="state" invisible="1" /> + <field name="location_id" readonly="1"/> + <field name="prodlot_id" /> + <button + name="%(stock.track_line)d" + string="Split in production lots" + type="action" icon="gtk-justify-fill" + states="done,cancel" /> + <button + name="%(stock.move_scrap)d" + string="D" type="action" + icon="gtk-convert" + states="done,cancel" /> + </tree> + <form string="Consumed Products"> + <field name="product_id" /> + <field name="product_qty" /> + <field name="product_uom" /> + </form> + </field> <group col="9" colspan="4"> <field name="state" select="2"/> <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/> @@ -537,50 +544,50 @@ </page> <page string="Finished Products"> <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list" - mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]"> - <tree string="Products to Finish"> - <field name="product_id" /> - <field name="product_qty" /> - <field name="product_uom" /> - <field name="state" invisible="1" /> - <button - name="%(stock.move_consume)d" - string=">" type="action" - icon="gtk-go-forward" - states="draft,waiting,confirmed,assigned"/> - <button name="%(stock.move_scrap)d" - string="D" type="action" - icon="gtk-justify-fill" context="{'scrap': True}" - states="draft,waiting,confirmed,assigned" /> - </tree> - <form string="Products to Finish"> - <field name="product_id" /> - <field name="product_qty" /> - <field name="product_uom" /> - </form> + mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]"> + <tree string="Products to Finish"> + <field name="product_id" /> + <field name="product_qty" /> + <field name="product_uom" /> + <field name="state" invisible="1" /> + <button + name="%(stock.move_consume)d" + string=">" type="action" + icon="gtk-go-forward" + states="draft,waiting,confirmed,assigned"/> + <button name="%(stock.move_scrap)d" + string="D" type="action" + icon="gtk-justify-fill" context="{'scrap': True}" + states="draft,waiting,confirmed,assigned" /> + </tree> + <form string="Products to Finish"> + <field name="product_id" /> + <field name="product_qty" /> + <field name="product_uom" /> + </form> </field> <field colspan="2" name="move_created_ids2" nolabel="1" domain="[('state','in', ('done', 'cancel'))]" - widget="one2many_list" mode="tree,form" height="275"> - <tree string="Finished Products" editable="bottom"> - <field name="product_id" readonly="1"/> - <field name="product_qty" readonly="1"/> - <field name="product_uom" readonly="1" /> - <field name="state" invisible="1" /> - <field name="location_id" readonly="1"/> - <field name="prodlot_id" /> - <button name="%(stock.track_line)d" + widget="one2many_list" mode="tree,form" height="275"> + <tree string="Finished Products" editable="bottom"> + <field name="product_id" readonly="1"/> + <field name="product_qty" readonly="1"/> + <field name="product_uom" readonly="1" /> + <field name="state" invisible="1" /> + <field name="location_id" readonly="1"/> + <field name="prodlot_id" /> + <button name="%(stock.track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/> - <button name="%(stock.move_scrap)d" - string="D" type="action" icon="gtk-go-forward" - states="done,cancel" /> - </tree> - <form string="Finished Products"> - <field name="product_id" /> - <field name="product_qty" /> - <field name="product_uom" /> - </form> - </field> + <button name="%(stock.move_scrap)d" + string="D" type="action" icon="gtk-go-forward" + states="done,cancel" /> + </tree> + <form string="Finished Products"> + <field name="product_id" /> + <field name="product_qty" /> + <field name="product_uom" /> + </form> + </field> </page> <page string="Work Orders"> <field colspan="4" name="workcenter_lines" nolabel="1"> @@ -627,27 +634,36 @@ <field name="arch" type="xml"> <search string="Search Production"> <group col='9' colspan='4'> + <filter icon="terp-mrp" string="Draft" + domain="[('state','=','draft')]" + help="Non confirmed manufacturing orders"/> + <filter icon="terp-mrp" string="Current" + default="1" + domain="[('state','in',('confirmed','ready'))]" + help="Manufacturing Orders which are waiting for raw materials"/> <filter icon="terp-mrp" string="Ready" - domain="[('state','=','ready')]" - help="Manufacturing Orders which are ready to produce" /> + domain="[('state','=','ready')]" + help="Manufacturing Orders which are ready to produce" /> <filter icon="terp-mrp" string="In Production" - domain="[('state','=','in_production')]" - help="Manufacturing Orders which are in production" /> + domain="[('state','=','in_production')]" + help="Manufacturing Orders which are in production" /> + <separator orientation="vertical"/> <filter icon="terp-mrp" string="Late" - domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" - help="Production started late" /> - + domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" + help="Production started late" /> <separator orientation="vertical"/> - <field name="name" select='1'/> - <field name="product_id" select='1'/> - <field name="routing_id" select='1'/> - <field name="origin" select='1'/> + <field name="name"/> + <field name="product_id"/> + <field name="routing_id"/> + <field name="origin"/> </group> - <group expand="1" string="Group By" colspan="4" col="8"> + <newline/> + <group expand="1" string="Group By" colspan="10" col="8"> <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/> <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/> - <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/> <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/> + <separator orientation="vertical"/> + <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/> </group> </search> </field> @@ -825,7 +841,7 @@ <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/> <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/> <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/> - <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/> + <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/> </group> </page> <page string="Extra Information"> @@ -858,8 +874,8 @@ <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/> <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/> <filter icon="terp-mrp" string="Late" - domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" - help="Procurement started late" /> + domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" + help="Procurement started late" /> <separator orientation="vertical"/> <field name="name"/> <field name="origin"/> @@ -871,7 +887,7 @@ <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/> <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/> - </group> + </group> </search> </field> </record> @@ -898,7 +914,7 @@ </record> <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management" - name="Requisitions" sequence="5" /> + name="Requisitions" sequence="5" /> @@ -911,7 +927,7 @@ <field name="domain">[('state','=','exception')]</field> </record> - <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control" + <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control" sequence="1" /> <record id="mrp_procurement_action4" model="ir.actions.act_window"> <field name="name">Procurement Exceptions to Fix</field> diff --git a/addons/olap_crm/i18n/hr.po b/addons/olap_crm/i18n/hr.po new file mode 100644 index 00000000000..d146d77351b --- /dev/null +++ b/addons/olap_crm/i18n/hr.po @@ -0,0 +1,34 @@ +# Croatian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-26 05:29+0000\n" +"PO-Revision-Date: 2010-03-02 23:39+0000\n" +"Last-Translator: goranc <goranc@gmail.com>\n" +"Language-Team: Croatian <hr@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: olap_crm +#: model:ir.module.module,description:olap_crm.module_meta_information +msgid "" +"\n" +" Sale module will load the data in olap tables\n" +" " +msgstr "" +"\n" +" Modul prodaja uvesti će podatke u olap tablice\n" +" " + +#. module: olap_crm +#: model:ir.module.module,shortdesc:olap_crm.module_meta_information +msgid "olap_crm" +msgstr "olap_crm" diff --git a/addons/olap_extract/i18n/hr.po b/addons/olap_extract/i18n/hr.po new file mode 100644 index 00000000000..4e2d3e89d57 --- /dev/null +++ b/addons/olap_extract/i18n/hr.po @@ -0,0 +1,59 @@ +# Croatian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-26 05:29+0000\n" +"PO-Revision-Date: 2010-03-02 23:44+0000\n" +"Last-Translator: goranc <goranc@gmail.com>\n" +"Language-Team: Croatian <hr@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: olap_extract +#: model:ir.module.module,shortdesc:olap_extract.module_meta_information +msgid "olap_extract" +msgstr "olap_extract" + +#. module: olap_extract +#: wizard_button:olap.extract.schema,init,ok:0 +msgid "OK" +msgstr "U redu" + +#. module: olap_extract +#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema +msgid "Olap Extract" +msgstr "Olap izvajanje" + +#. module: olap_extract +#: model:ir.module.module,description:olap_extract.module_meta_information +msgid "" +"\n" +" Extracts the schema structure.\n" +" " +msgstr "" +"\n" +" Izdvajanje strukture sheme.\n" +" " + +#. module: olap_extract +#: wizard_field:olap.extract.schema,init,module_name:0 +msgid "Module Name" +msgstr "Naziv modula" + +#. module: olap_extract +#: wizard_button:olap.extract.schema,init,end:0 +msgid "Cancel" +msgstr "Odustani" + +#. module: olap_extract +#: wizard_view:olap.extract.schema,init:0 +msgid "New Module Name" +msgstr "Novi naziv modula" diff --git a/addons/olap_sale/i18n/hr.po b/addons/olap_sale/i18n/hr.po new file mode 100644 index 00000000000..9a5c801e5ed --- /dev/null +++ b/addons/olap_sale/i18n/hr.po @@ -0,0 +1,34 @@ +# Croatian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-26 05:29+0000\n" +"PO-Revision-Date: 2010-03-02 23:45+0000\n" +"Last-Translator: goranc <goranc@gmail.com>\n" +"Language-Team: Croatian <hr@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: olap_sale +#: model:ir.module.module,description:olap_sale.module_meta_information +msgid "" +"\n" +" Sale module will load the data in olap tables\n" +" " +msgstr "" +"\n" +" Modul prodaja uvesti će podatke u olap tablice\n" +" " + +#. module: olap_sale +#: model:ir.module.module,shortdesc:olap_sale.module_meta_information +msgid "olap_sale" +msgstr "olap_sale" diff --git a/addons/olap_sale/i18n/sk.po b/addons/olap_sale/i18n/sk.po index 33079ea4b36..536e9fef96e 100644 --- a/addons/olap_sale/i18n/sk.po +++ b/addons/olap_sale/i18n/sk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: olap_sale diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index e0ff14c0b9a..e6c5588f4f7 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -16,14 +16,15 @@ <separator orientation="vertical"/> <field name="default_code" select="1"/> <field name="name" select="1"/> - <field name="categ_id" select="1" widget="selection"/> + <field name="categ_id" select="1" widget="selection" operator="child_of"/> <newline/> - <group col='8' colspan='4' expand='1' string='Group by...'> - <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" /> - </group> - <group col='8' colspan='7' expand="1" string="Extended options..."> + <group col='8' colspan='14' expand="1" string="Extended options..."> <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" /> </group> + <newline/> + <group col='8' colspan='15' expand='1' string='Group by...'> + <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" /> + </group> </search> </field> </record> diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index cceaef7cdd5..9dca54aad1a 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -2,7 +2,7 @@ <openerp> <data noupdate="1"> - <record id="group_uos" model="res.groups"> + <record id="group_uos" context="{'noadmin':True}" model="res.groups"> <field name="name">Useability / Product UoS View</field> </record> <record id="group_product_manager" model="res.groups"> @@ -20,7 +20,7 @@ <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field> </record> - <record id="group_product_variant" model="res.groups"> + <record id="group_product_variant" model="res.groups" context="{'noadmin':True}"> <field name="name">Product / Variant</field> </record> diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po index aef8f2bad7f..67bd7e27428 100644 --- a/addons/product_margin/i18n/cs.po +++ b/addons/product_margin/i18n/cs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product_margin diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 4b5f31b549f..bdf92843ed1 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -8,7 +8,7 @@ <field name="type">form</field> <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/> <field name="arch" type="xml"> - <xpath expr="/form[@string='Opportunities']/group/group/button[@string='Schedule Call']" position="after"> + <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after"> <button string="Quotation" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> </xpath> </field> diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po index 921c16443c5..5d3ec5b2ac0 100644 --- a/addons/survey/i18n/cs.po +++ b/addons/survey/i18n/cs.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: survey diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py index 2cc9fd0de8b..1ba53f4cd33 100644 --- a/addons/survey/report/survey_browse_response.py +++ b/addons/survey/report/survey_browse_response.py @@ -186,7 +186,7 @@ class survey_browse_response(report_rml): surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response') if datas.has_key('form') and datas['form'].has_key('response_ids'): response_id = datas['form']['response_ids'][0][2] - elif context.has_key('response_id'): + elif context.has_key('response_id') and context['response_id']: response_id = [int(context['response_id'])] else: response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)]) diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 9bce2101683..a3772f55f92 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -681,7 +681,7 @@ class survey_question_wiz(osv.osv_memory): total_pages = len(p_id) pre_button = False readonly = 0 - if context.has_key('response_id'): + if context.has_key('response_id') and context['response_id']: readonly = 1 if not sur_name_rec['page_no'] + 1 : surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':{}}) @@ -693,7 +693,7 @@ class survey_question_wiz(osv.osv_memory): fields = {} if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 : if len(p_id) > sur_name_rec['page_no'] + 1 : - if not context.has_key('active') and not sur_name_rec['page_no'] + 1: + if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1: cr.execute('select count(id) from survey_history where user_id=%s\ and survey_id=%s' % (uid,survey_id)) res = cr.fetchone()[0] @@ -735,12 +735,12 @@ class survey_question_wiz(osv.osv_memory): que_rec = que_obj.read(cr, uid, que) descriptive_text = "" separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question']) - if not context.has_key('active') and que_rec['is_require_answer']: - star='*' + if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and que_rec['is_require_answer']: + star = '*' else: - star='' + star = '' xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'}) - if context.has_key('active') and context.has_key('edit'): + if context.has_key('active') and context['active'] and context.has_key('edit'): xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'}) etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'}) xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'}) @@ -902,11 +902,11 @@ class survey_question_wiz(osv.osv_memory): but_string = "Next" if int(page_number) + 1 == total_pages: but_string = "Done" - if context.has_key('active') and int(page_number) + 1 == total_pages: + if context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages: etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'string': "Done" ,'special':"cancel",'context' : tools.ustr(context)}) else: etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)}) - if context.has_key('active') and context.has_key('edit'): + if context.has_key('active') and context['active'] and context.has_key('edit'): etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'}) context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']}) xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'}) @@ -985,8 +985,8 @@ class survey_question_wiz(osv.osv_memory): tot_page_id = self.pool.get('survey').browse(cr, uid, context['survey_id']) tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids)) value[field] = tot_per - if context.has_key('response_id'): - response_obj = self.pool.get('survey.response') + response_obj = self.pool.get('survey.response') + if context.has_key('response_id') and context['response_id']: response_ans = response_obj.browse(cr, uid, context['response_id']) fields_list.sort() for que in response_ans.question_ids: @@ -1066,6 +1066,9 @@ class survey_question_wiz(osv.osv_memory): survey_obj = self.pool.get('survey') sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id']) survey_obj.write(cr, uid, sur_name_read['survey_id'], {'tot_start_survey' : sur_rec['tot_start_survey'] + 1}) + if context.has_key('cur_id'): + self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id}) + for key,val in sur_name_read['store_ans'].items(): for field in vals: if field.split('_')[0] == val['question_id']: diff --git a/addons/wiki/i18n/cs.po b/addons/wiki/i18n/cs.po index 7859d1e5d12..d5a231c4dfe 100644 --- a/addons/wiki/i18n/cs.po +++ b/addons/wiki/i18n/cs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: wiki |
