diff options
| author | sgo@tinyerp.com <> | 2013-06-04 11:06:54 +0530 |
|---|---|---|
| committer | sgo@tinyerp.com <> | 2013-06-04 11:06:54 +0530 |
| commit | bb00be2dfe2f6ceefb34e11ed6c3afbb451e5c0a (patch) | |
| tree | 1e299d0cca264289084b7046c106eab406db625e | |
| parent | 4bbb78f5317c2001770aca0dadcb2790275d161f (diff) | |
| parent | 95c9d77c9f6330c4f87da460124cc59d4bd852b2 (diff) | |
[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130604053654-iioke97u2i18j5jz
72 files changed, 629 insertions, 627 deletions
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 14aabed86ad..ab6ad97b180 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1460,6 +1460,7 @@ class account_invoice_line(osv.osv): result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=context) + result['name'] = res.partner_ref if type in ('out_invoice','out_refund'): a = res.property_account_income.id if not a: @@ -1474,19 +1475,21 @@ class account_invoice_line(osv.osv): if type in ('out_invoice', 'out_refund'): taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False) + if res.description_sale: + result['name'] += '\n'+res.description_sale else: taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False) + if res.description_purchase: + result['name'] += '\n'+res.description_purchase + tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) if type in ('in_invoice', 'in_refund'): result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) - result['name'] = res.partner_ref result['uos_id'] = uom_id or res.uom_id.id - if res.description: - result['name'] += '\n'+res.description domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]} diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index ce9a09def08..3940c1e5357 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -313,8 +313,8 @@ <field name="code">TSAJ</field> <field name="type">sale</field> <field name="sequence_id" ref="sequence_sale_journal"/> - <field model="account.account" name="default_credit_account_id" ref="a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="a_sale"/> + <field name="default_credit_account_id" ref="a_sale"/> + <field name="default_debit_account_id" ref="a_sale"/> <field name="analytic_journal_id" ref="cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> </record> @@ -323,8 +323,8 @@ <field name="code">TSCNJ</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="sequence_refund_sales_journal"/> - <field model="account.account" name="default_credit_account_id" ref="a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="a_sale"/> + <field name="default_credit_account_id" ref="a_sale"/> + <field name="default_debit_account_id" ref="a_sale"/> <field name="analytic_journal_id" ref="cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> </record> @@ -334,8 +334,8 @@ <field name="code">TEXJ</field> <field name="type">purchase</field> <field name="sequence_id" ref="sequence_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="a_expense"/> + <field name="default_debit_account_id" ref="a_expense"/> + <field name="default_credit_account_id" ref="a_expense"/> <field name="analytic_journal_id" ref="exp"/> <field name="user_id" ref="base.user_root"/> </record> @@ -344,8 +344,8 @@ <field name="code">TECNJ</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="sequence_refund_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="a_expense"/> + <field name="default_debit_account_id" ref="a_expense"/> + <field name="default_credit_account_id" ref="a_expense"/> <field name="analytic_journal_id" ref="exp"/> <field name="user_id" ref="base.user_root"/> </record> @@ -355,8 +355,8 @@ <field name="code">TBNK</field> <field name="type">bank</field> <field name="sequence_id" ref="sequence_bank_journal"/> - <field model="account.account" name="default_debit_account_id" ref="bnk"/> - <field model="account.account" name="default_credit_account_id" ref="bnk"/> + <field name="default_debit_account_id" ref="bnk"/> + <field name="default_credit_account_id" ref="bnk"/> <field name="analytic_journal_id" ref="sit"/> <field name="user_id" ref="base.user_root"/> </record> @@ -365,8 +365,8 @@ <field name="code">TCHK</field> <field name="type">bank</field> <field name="sequence_id" ref="sequence_check_journal"/> - <field model="account.account" name="default_debit_account_id" ref="cash"/> - <field model="account.account" name="default_credit_account_id" ref="cash"/> + <field name="default_debit_account_id" ref="cash"/> + <field name="default_credit_account_id" ref="cash"/> <field name="analytic_journal_id" ref="sit"/> <field name="user_id" ref="base.user_root"/> </record> @@ -374,9 +374,9 @@ <field name="name">Cash Journal - (test)</field> <field name="code">TCSH</field> <field name="type">cash</field> - <field name="profit_account_id" model="account.account" ref="rsa" /> - <field name="loss_account_id" model="account.account" ref="rsa" /> - <field name="internal_account_id" model="account.account" ref="rsa" /> + <field name="profit_account_id" ref="rsa" /> + <field name="loss_account_id" ref="rsa" /> + <field name="internal_account_id" ref="rsa" /> <field name="with_last_closing_balance" eval="True" /> <!-- Usually, cash payment methods requires a control at opening and closing. @@ -385,8 +385,8 @@ --> <field name="cash_control" eval="False"/> <field name="sequence_id" ref="sequence_cash_journal"/> - <field model="account.account" name="default_debit_account_id" ref="cash"/> - <field model="account.account" name="default_credit_account_id" ref="cash"/> + <field name="default_debit_account_id" ref="cash"/> + <field name="default_credit_account_id" ref="cash"/> <field name="analytic_journal_id" ref="sit"/> <field name="user_id" ref="base.user_root"/> </record> @@ -403,8 +403,8 @@ <field name="code">TOEJ</field> <field name="type">situation</field> <field name="sequence_id" ref="sequence_opening_journal"/> - <field model="account.account" name="default_debit_account_id" ref="o_income"/> - <field model="account.account" name="default_credit_account_id" ref="o_expense"/> + <field name="default_debit_account_id" ref="o_income"/> + <field name="default_credit_account_id" ref="o_expense"/> <field eval="True" name="centralisation"/> <field name="user_id" ref="base.user_root"/> </record> @@ -413,8 +413,8 @@ <field name="name">USD Bank Journal - (test)</field> <field name="code">TUBK</field> <field name="type">bank</field> - <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/> - <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/> + <field name="default_debit_account_id" ref="usd_bnk"/> + <field name="default_credit_account_id" ref="usd_bnk"/> <field name="currency" ref="base.USD"/> </record> <!-- diff --git a/addons/account/html/index.html b/addons/account/html/index.html index 9a32fb015aa..09a58fb3246 100644 --- a/addons/account/html/index.html +++ b/addons/account/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account"> <img src="account_sc_00.png" alt="Online Demo"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index 8971235c1f7..e45f8080518 100644 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -123,24 +123,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirm statement"""" name="name"/> <field eval=""""The accountant confirms the statement."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/> - <field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/> + <field name="target_node_id" ref="process_node_accountingstatemententries0"/> + <field name="source_node_id" ref="account.process_node_draftstatement0"/> </record> <record id="process_transition_analyticinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""From analytic accounts"""" name="name"/> <field eval=""""Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_analytic0"/> + <field name="target_node_id" ref="process_node_draftinvoices0"/> + <field name="source_node_id" ref="process_node_analytic0"/> </record> <record id="process_transition_customerinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""Draft invoices are checked, validated and printed."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/> + <field name="target_node_id" ref="process_node_invoiceinvoice0"/> + <field name="source_node_id" ref="process_node_draftinvoices0"/> <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/> </record> @@ -148,40 +148,40 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""Accountant validates the accounting entries coming from the invoice."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/> - <field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/> + <field name="target_node_id" ref="process_node_accountingentries0"/> + <field name="source_node_id" ref="process_node_invoiceinvoice0"/> </record> <record id="process_transition_entriesreconcile0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Accounting entries"""" name="name"/> <field eval=""""Accounting entries are the first input of the reconciliation."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/> - <field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/> + <field name="target_node_id" ref="process_node_reconciliation0"/> + <field name="source_node_id" ref="process_node_accountingentries0"/> </record> <record id="process_transition_statemententries0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""Manual or automatic creation of payment entries according to the statements"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/> - <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/> + <field name="target_node_id" ref="process_node_paymententries0"/> + <field name="source_node_id" ref="process_node_bankstatement0"/> </record> <record id="process_transition_paymentreconcile0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Payment entries"""" name="name"/> <field eval=""""Payment entries are the second input of the reconciliation."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/> - <field model="process.node" name="source_node_id" ref="process_node_paymententries0"/> + <field name="target_node_id" ref="process_node_reconciliation0"/> + <field name="source_node_id" ref="process_node_paymententries0"/> </record> <record id="process_transition_reconcilepaid0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Payment"""" name="name"/> <field eval=""""As soon as the reconciliation is done, the invoice can be paid."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/> + <field name="target_node_id" ref="process_node_paidinvoice0"/> + <field name="source_node_id" ref="process_node_reconciliation0"/> </record> <!-- diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 64dd7520bc1..81b1748a6d4 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -68,8 +68,8 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Automatic import of the bank statement"""" name="name"/> <field eval=""""Import of the statement in the system from an electronic file"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/> - <field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/> + <field name="target_node_id" ref="process_node_draftstatement0"/> + <field name="source_node_id" ref="process_node_electronicfile0"/> </record> <record id="process_transition_invoicemanually0" model="process.transition"> @@ -77,17 +77,17 @@ <field eval=""""Manual entry"""" name="name"/> <field eval=""""A statement with manual entries becomes a draft statement."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/> - <field model="process.node" name="source_node_id" ref="process_node_manually0"/> + <field name="target_node_id" ref="process_node_draftstatement0"/> + <field name="source_node_id" ref="process_node_manually0"/> </record> <record id="process_transition_invoiceimport0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Import from invoice or payment"""" name="name"/> <field eval=""""Import of the statement in the system from a supplier or customer invoice"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/> - <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/> + <field name="target_node_id" ref="process_node_draftstatement0"/> + <field name="source_node_id" ref="process_node_importinvoice0"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index 58b98220f95..b1d9de904aa 100644 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -111,16 +111,16 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""From analytic accounts"""" name="name"/> <field eval=""""Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/> + <field name="target_node_id" ref="process_node_supplierdraftinvoices0"/> + <field name="source_node_id" ref="process_node_analyticcost0"/> </record> <record id="process_transition_suppliercustomerinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""Draft invoices are validated. """" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/> + <field name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/> + <field name="source_node_id" ref="process_node_supplierdraftinvoices0"/> <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/> </record> @@ -128,40 +128,40 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""Accountant validates the accounting entries coming from the invoice. """" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/> + <field name="target_node_id" ref="process_node_supplieraccountingentries0"/> + <field name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/> </record> <record id="process_transition_supplierentriesreconcile0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Accounting entries"""" name="name"/> <field eval=""""Accounting entries are an input of the reconciliation."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/> + <field name="target_node_id" ref="process_node_supplierreconciliation0"/> + <field name="source_node_id" ref="process_node_supplieraccountingentries0"/> </record> <record id="process_transition_paymentorderbank0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Payment entries"""" name="name"/> <field eval=""""The payment order is sent to the bank."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/> + <field name="target_node_id" ref="process_node_supplierbankstatement0"/> + <field name="source_node_id" ref="process_node_supplierpaymentorder0"/> </record> <record id="process_transition_paymentorderreconcilation0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""Bank statements are entered in the system."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/> + <field name="target_node_id" ref="process_node_supplierreconciliation0"/> + <field name="source_node_id" ref="process_node_supplierbankstatement0"/> </record> <record id="process_transition_supplierreconcilepaid0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""System payment"""" name="name"/> <field eval=""""As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/> + <field name="target_node_id" ref="process_node_supplierpaidinvoice0"/> + <field name="source_node_id" ref="process_node_supplierreconciliation0"/> </record> </data> diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po index 3944c48afb6..339d425c717 100644 --- a/addons/account_analytic_analysis/i18n/ru.po +++ b/addons/account_analytic_analysis/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2011-02-19 12:16+0000\n" +"PO-Revision-Date: 2013-05-31 07:35+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:25+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -73,7 +73,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "⇒ Invoice" -msgstr "" +msgstr "⇒ Счет" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -196,6 +196,8 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -335,7 +337,7 @@ msgstr "Теоретическая выручка" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Renew" -msgstr "" +msgstr "К продлению" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -431,7 +433,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,toinvoice_total:0 msgid "Total to Invoice" -msgstr "" +msgstr "Всего в счет" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -546,18 +548,18 @@ msgstr "Дата последней операции по этому счету. #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 msgid "Mandatory use of templates." -msgstr "" +msgstr "Обязательное использование шаблонов." #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action msgid "Contract Template" -msgstr "" +msgstr "Шаблон контракта" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -612,7 +614,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Total" -msgstr "" +msgstr "Итого" #~ msgid "Hours summary by user" #~ msgstr "Итого часов по пользователям" diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml index 63c6e30eb22..cdce2a9955e 100644 --- a/addons/account_analytic_default/security/account_analytic_default_security.xml +++ b/addons/account_analytic_default/security/account_analytic_default_security.xml @@ -4,7 +4,7 @@ <record id="analytic_default_comp_rule" model="ir.rule"> <field name="name">Analytic Default multi company rule</field> - <field model="ir.model" name="model_id" ref="model_account_analytic_default"/> + <field name="model_id" ref="model_account_analytic_default"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po index ba32246e8d6..29cb3ea910f 100644 --- a/addons/account_analytic_plans/i18n/ru.po +++ b/addons/account_analytic_plans/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-28 10:00+0000\n" +"PO-Revision-Date: 2013-05-31 07:41+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:26+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account4_ids:0 @@ -48,7 +48,7 @@ msgstr "Ставка (%)" #: code:addons/account_analytic_plans/account_analytic_plans.py:234 #, python-format msgid "The total should be between %s and %s." -msgstr "" +msgstr "Итог должен быть между %s и %s." #. module: account_analytic_plans #: view:account.analytic.plan:0 @@ -131,7 +131,7 @@ msgstr "Не показывать пустые строки" #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 #, python-format msgid "There are no analytic lines related to account %s." -msgstr "" +msgstr "Нет позиций аналитики относящихся к счету %s." #. module: account_analytic_plans #: field:account.analytic.plan.instance,account3_ids:0 @@ -315,7 +315,7 @@ msgstr "Журнал аналитики" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38 #, python-format msgid "Please put a name and a code before saving the model." -msgstr "" +msgstr "Пожалуйста, введите имя и код перед сохранением модели." #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -347,7 +347,7 @@ msgstr "Журнал" #: code:addons/account_analytic_plans/account_analytic_plans.py:486 #, python-format msgid "You have to define an analytic journal on the '%s' journal." -msgstr "" +msgstr "Вы должны определить журнал аналитики для журнала '%s'" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:342 @@ -375,7 +375,7 @@ msgstr "Позиция счета" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "There is no analytic plan defined." -msgstr "" +msgstr "Аналитический план счетов не определен." #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_bank_statement @@ -402,7 +402,7 @@ msgstr "Разнесение аналитики" #: code:addons/account_analytic_plans/account_analytic_plans.py:221 #, python-format msgid "A model with this name and code already exists." -msgstr "" +msgstr "Модель с таким названием и кодом уже существует." #. module: account_analytic_plans #: help:account.analytic.plan.line,root_analytic_id:0 diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po index a0950a98370..d6bc83aacb5 100644 --- a/addons/account_asset/i18n/ru.po +++ b/addons/account_asset/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2011-07-12 12:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-05-31 08:06+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -148,7 +148,7 @@ msgstr "" #. module: account_asset #: help:account.asset.asset,method_period:0 msgid "The amount of time between two depreciations, in months" -msgstr "" +msgstr "Количество времени между амортизациями, в месяцах" #. module: account_asset #: field:account.asset.depreciation.line,depreciation_date:0 @@ -160,7 +160,7 @@ msgstr "Дата амортизации" #. module: account_asset #: constraint:account.asset.asset:0 msgid "Error ! You cannot create recursive assets." -msgstr "" +msgstr "Ошибка! Нельзя создавать рекурсивные активы." #. module: account_asset #: field:asset.asset.report,posted_value:0 @@ -205,7 +205,7 @@ msgstr "# позиций амортизации" #. module: account_asset #: field:account.asset.asset,method_period:0 msgid "Number of Months in a Period" -msgstr "" +msgstr "Количество месяцев в периоде" #. module: account_asset #: view:asset.asset.report:0 @@ -234,7 +234,7 @@ msgstr "Счет активов" #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard msgid "Compute Assets" -msgstr "" +msgstr "Вычислить активы" #. module: account_asset #: field:account.asset.category,method_period:0 @@ -265,12 +265,12 @@ msgstr "Изменить длительность" #: help:account.asset.category,method_number:0 #: help:account.asset.history,method_number:0 msgid "The number of depreciations needed to depreciate your asset" -msgstr "" +msgstr "Количество амортизаций необходимых для обесценивания актива" #. module: account_asset #: view:account.asset.category:0 msgid "Analytic Information" -msgstr "" +msgstr "Аналитическая информация" #. module: account_asset #: field:account.asset.category,account_analytic_id:0 @@ -293,7 +293,7 @@ msgstr "" #. module: account_asset #: field:account.asset.depreciation.line,remaining_value:0 msgid "Next Period Depreciation" -msgstr "" +msgstr "Следующий период амортизации" #. module: account_asset #: help:account.asset.history,method_period:0 @@ -344,7 +344,7 @@ msgstr "Поиск категории актива" #. module: account_asset #: view:asset.modify:0 msgid "months" -msgstr "" +msgstr "месяцы" #. module: account_asset #: model:ir.model,name:account_asset.model_account_invoice_line @@ -372,7 +372,7 @@ msgstr "" #: view:asset.depreciation.confirmation.wizard:0 #: view:asset.modify:0 msgid "or" -msgstr "" +msgstr "или" #. module: account_asset #: field:account.asset.asset,note:0 @@ -406,7 +406,7 @@ msgstr "" #. module: account_asset #: view:asset.asset.report:0 msgid "Assets in running state" -msgstr "" +msgstr "Активы в рабочем состоянии" #. module: account_asset #: view:account.asset.asset:0 @@ -427,7 +427,7 @@ msgstr "" #: field:account.asset.asset,state:0 #: field:asset.asset.report,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: account_asset #: field:account.asset.asset,partner_id:0 @@ -474,12 +474,12 @@ msgstr "Вычислить" #. module: account_asset #: view:account.asset.history:0 msgid "Asset History" -msgstr "" +msgstr "История актива" #. module: account_asset #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard msgid "asset.depreciation.confirmation.wizard" -msgstr "" +msgstr "asset.depreciation.confirmation.wizard" #. module: account_asset #: field:account.asset.asset,active:0 @@ -505,7 +505,7 @@ msgstr "История" #. module: account_asset #: view:asset.depreciation.confirmation.wizard:0 msgid "Compute Asset" -msgstr "" +msgstr "Вычислить актив" #. module: account_asset #: field:asset.depreciation.confirmation.wizard,period_id:0 @@ -521,7 +521,7 @@ msgstr "Общий" #: field:account.asset.asset,prorata:0 #: field:account.asset.category,prorata:0 msgid "Prorata Temporis" -msgstr "" +msgstr "По истечении срока" #. module: account_asset #: model:ir.model,name:account_asset.model_account_invoice @@ -553,7 +553,7 @@ msgstr "Элементы журнала" #. module: account_asset #: view:asset.modify:0 msgid "Asset Durations to Modify" -msgstr "" +msgstr "Актив - интервал времени для изменения" #. module: account_asset #: field:account.asset.asset,purchase_date:0 @@ -574,6 +574,8 @@ msgid "" "Choose the period for which you want to automatically post the depreciation " "lines of running assets" msgstr "" +"Выберите период, за который вы хотите автоматически создавать записи " +"амортизации для актива" #. module: account_asset #: view:account.asset.asset:0 @@ -588,12 +590,12 @@ msgstr "Метод амортизации" #. module: account_asset #: field:account.asset.depreciation.line,amount:0 msgid "Current Depreciation" -msgstr "" +msgstr "Текущая аммортизация" #. module: account_asset #: field:account.asset.asset,name:0 msgid "Asset Name" -msgstr "" +msgstr "Название актива" #. module: account_asset #: field:account.asset.category,open_asset:0 @@ -618,7 +620,7 @@ msgstr "Журнал" #. module: account_asset #: field:account.asset.history,name:0 msgid "History name" -msgstr "" +msgstr "Название истории" #. module: account_asset #: field:account.asset.depreciation.line,depreciated_value:0 @@ -657,7 +659,7 @@ msgstr "" #. module: account_asset #: field:account.asset.asset,purchase_value:0 msgid "Gross Value" -msgstr "" +msgstr "Валовая стоимость" #. module: account_asset #: field:account.asset.category,name:0 @@ -703,12 +705,12 @@ msgstr "" #. module: account_asset #: field:account.asset.depreciation.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Нумерация" #. module: account_asset #: help:account.asset.category,method_period:0 msgid "State here the time between 2 depreciations, in months" -msgstr "" +msgstr "Время между двумя амортизациями в месяцах" #. module: account_asset #: field:account.asset.history,date:0 @@ -729,7 +731,7 @@ msgstr "Число амортизаций" #. module: account_asset #: view:account.asset.asset:0 msgid "Create Move" -msgstr "" +msgstr "Создать перемещение" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/account_check_writing/i18n/ru.po b/addons/account_check_writing/i18n/ru.po index ba474c72a22..8e68dd7152a 100644 --- a/addons/account_check_writing/i18n/ru.po +++ b/addons/account_check_writing/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-11 13:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-06-03 07:47+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:51+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_check_writing #: selection:res.company,check_layout:0 @@ -25,13 +25,13 @@ msgstr "" #. module: account_check_writing #: report:account.print.check.top:0 msgid "Open Balance" -msgstr "" +msgstr "Открытый баланс" #. module: account_check_writing #: view:account.check.write:0 #: view:account.voucher:0 msgid "Print Check" -msgstr "" +msgstr "Напечатать чек" #. module: account_check_writing #: selection:res.company,check_layout:0 @@ -82,7 +82,7 @@ msgstr "Описание" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_account_journal msgid "Journal" -msgstr "" +msgstr "Журнал" #. module: account_check_writing #: model:ir.actions.act_window,name:account_check_writing.action_write_check @@ -95,14 +95,14 @@ msgstr "" #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Discount" -msgstr "" +msgstr "Скидка" #. module: account_check_writing #: report:account.print.check.bottom:0 #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Original Amount" -msgstr "" +msgstr "Первоначальная сумма" #. module: account_check_writing #: field:res.company,check_layout:0 @@ -119,7 +119,7 @@ msgstr "" #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Payment" -msgstr "" +msgstr "Платеж" #. module: account_check_writing #: field:account.journal,use_preprint_check:0 @@ -153,7 +153,7 @@ msgstr "" #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Due Date" -msgstr "" +msgstr "Дата исполнения" #. module: account_check_writing #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle @@ -163,13 +163,13 @@ msgstr "" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_res_company msgid "Companies" -msgstr "" +msgstr "Компании" #. module: account_check_writing #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59 #, python-format msgid "Error!" -msgstr "" +msgstr "Ошибка!" #. module: account_check_writing #: help:account.check.write,check_number:0 @@ -202,12 +202,12 @@ msgstr "" #. module: account_check_writing #: view:account.check.write:0 msgid "or" -msgstr "" +msgstr "или" #. module: account_check_writing #: field:account.voucher,amount_in_word:0 msgid "Amount in Word" -msgstr "" +msgstr "Сумма прописью" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_account_check_write @@ -217,7 +217,7 @@ msgstr "" #. module: account_check_writing #: view:account.check.write:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: account_check_writing #: field:account.check.write,check_number:0 diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po index f6cb2cf0412..b57c8e4315e 100644 --- a/addons/account_followup/i18n/ru.po +++ b/addons/account_followup/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2011-11-11 15:21+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2013-05-31 10:28+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:11+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_followup #: model:email.template,subject:account_followup.email_template_account_followup_default @@ -22,7 +22,7 @@ msgstr "" #: model:email.template,subject:account_followup.email_template_account_followup_level1 #: model:email.template,subject:account_followup.email_template_account_followup_level2 msgid "${user.company_id.name} Payment Reminder" -msgstr "" +msgstr "${user.company_id.name} напоминание о платеже" #. module: account_followup #: help:res.partner,latest_followup_level_id:0 @@ -43,12 +43,12 @@ msgstr "Дальнейшие действия" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(date)s" -msgstr "" +msgstr "%(date)s" #. module: account_followup #: field:res.partner,payment_next_action_date:0 msgid "Next Action Date" -msgstr "" +msgstr "Дата следующего действия" #. module: account_followup #: view:account_followup.followup.line:0 @@ -64,7 +64,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "⇾ Mark as Done" -msgstr "" +msgstr "⇾ отметить как сделанное" #. module: account_followup #: field:account_followup.followup.line,manual_action_note:0 @@ -94,7 +94,7 @@ msgstr "Тема эл.письма" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(user_signature)s" -msgstr "" +msgstr "%(user_signature)s" #. module: account_followup #: view:account_followup.followup.line:0 @@ -109,19 +109,19 @@ msgstr "" #. module: account_followup #: field:account_followup.print,email_body:0 msgid "Email Body" -msgstr "" +msgstr "Тело эл. письма" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_print msgid "Send Follow-Ups" -msgstr "" +msgstr "Послать напоминания" #. module: account_followup #: report:account_followup.followup.print:0 #: code:addons/account_followup/account_followup.py:263 #, python-format msgid "Amount" -msgstr "" +msgstr "Сумма" #. module: account_followup #: help:res.partner,payment_next_action:0 @@ -133,7 +133,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "No Responsible" -msgstr "" +msgstr "Нет ответственного" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 @@ -209,17 +209,17 @@ msgstr "Всего по дебету" #. module: account_followup #: field:res.partner,payment_next_action:0 msgid "Next Action" -msgstr "" +msgstr "Следующее действие" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Partner Name" -msgstr "" +msgstr ": Название партнера" #. module: account_followup #: field:account_followup.followup.line,manual_action_responsible_id:0 msgid "Assign a Responsible" -msgstr "" +msgstr "Назначить ответственного" #. module: account_followup #: view:account_followup.followup:0 @@ -305,7 +305,7 @@ msgstr "" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(partner_name)s" -msgstr "" +msgstr "%(partner_name)s" #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level1 @@ -377,7 +377,7 @@ msgstr "Определяет порядок вывода списка напом #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid " will be sent" -msgstr "" +msgstr " будет отправлен" #. module: account_followup #: view:account_followup.followup.line:0 @@ -388,7 +388,7 @@ msgstr "" #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_letter:0 msgid "Send a Letter" -msgstr "" +msgstr "Отправить письмо" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form @@ -466,7 +466,7 @@ msgstr "Напечатанное сообщение" #: code:addons/account_followup/wizard/account_followup_print.py:155 #, python-format msgid "Anybody" -msgstr "" +msgstr "Кто угодно" #. module: account_followup #: help:account_followup.followup.line,send_email:0 @@ -528,7 +528,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Search Partner" -msgstr "" +msgstr "Поиск партнера" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_print_menu @@ -554,7 +554,7 @@ msgstr "" #. module: account_followup #: view:account_followup.print:0 msgid "or" -msgstr "" +msgstr "или" #. module: account_followup #: view:res.partner:0 diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml index 1586403d701..69c9a44a1b9 100644 --- a/addons/account_followup/security/account_followup_security.xml +++ b/addons/account_followup/security/account_followup_security.xml @@ -4,7 +4,7 @@ <record id="account_followup_comp_rule" model="ir.rule"> <field name="name">Account Follow-up multi company rule</field> - <field model="ir.model" name="model_id" ref="model_account_followup_followup"/> + <field name="model_id" ref="model_account_followup_followup"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 4bca00eaa6d..fbe29699e86 100644 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -15,21 +15,21 @@ <record id="payment_mode_comp_rule" model="ir.rule"> <field name="name">Payment Mode company rule</field> - <field model="ir.model" name="model_id" ref="model_payment_mode"/> + <field name="model_id" ref="model_payment_mode"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> <record id="payment_order_comp_rule" model="ir.rule"> <field name="name">Payment order multi company rule</field> - <field model="ir.model" name="model_id" ref="model_payment_order"/> + <field name="model_id" ref="model_payment_order"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> <record id="payment_line_comp_rule" model="ir.rule"> <field name="name">Payment line multi company rule</field> - <field model="ir.model" name="model_id" ref="model_payment_line"/> + <field name="model_id" ref="model_payment_line"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html index 84e90f63679..d59c110dde5 100644 --- a/addons/account_voucher/html/index.html +++ b/addons/account_voucher/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account"> <img src="account_sc_00.png" alt="Online Demo"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml index 04540fd8aa0..daa5934b256 100644 --- a/addons/account_voucher/security/account_voucher_security.xml +++ b/addons/account_voucher/security/account_voucher_security.xml @@ -3,13 +3,13 @@ <data noupdate="1"> <record id="voucher_comp_rule" model="ir.rule"> <field name="name">Voucher multi-company</field> - <field model="ir.model" name="model_id" ref="model_account_voucher"/> + <field name="model_id" ref="model_account_voucher"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> <record id="voucher_line_comp_rule" model="ir.rule"> <field name="name">Voucher Line multi-company</field> - <field model="ir.model" name="model_id" ref="model_account_voucher_line"/> + <field name="model_id" ref="model_account_voucher_line"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index 70688275de2..bf103ca8988 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -4,14 +4,14 @@ <record id="analytic_comp_rule" model="ir.rule"> <field name="name">Analytic multi company rule</field> - <field model="ir.model" name="model_id" ref="model_account_analytic_account"/> + <field name="model_id" ref="model_account_analytic_account"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> <record id="analytic_line_comp_rule" model="ir.rule"> <field name="name">Analytic line multi company rule</field> - <field model="ir.model" name="model_id" ref="model_account_analytic_line"/> + <field name="model_id" ref="model_account_analytic_line"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po index c8673c26815..3ca5b1eab04 100644 --- a/addons/base_action_rule/i18n/ru.po +++ b/addons/base_action_rule/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-05-10 18:17+0000\n" -"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2013-05-31 10:23+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: base_action_rule #: selection:base.action.rule.lead.test,state:0 @@ -58,7 +58,7 @@ msgstr "Добавить подписчиков" #. module: base_action_rule #: field:base.action.rule,act_user_id:0 msgid "Set Responsible" -msgstr "" +msgstr "Указать ответственного" #. module: base_action_rule #: help:base.action.rule,trg_date_range:0 @@ -71,7 +71,7 @@ msgstr "" #. module: base_action_rule #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test msgid "base.action.rule.lead.test" -msgstr "" +msgstr "base.action.rule.lead.test" #. module: base_action_rule #: selection:base.action.rule.lead.test,state:0 @@ -142,7 +142,7 @@ msgstr "Часы" #. module: base_action_rule #: view:base.action.rule:0 msgid "To create a new filter:" -msgstr "" +msgstr "Для создания нового фильтра:" #. module: base_action_rule #: field:base.action.rule,active:0 @@ -167,7 +167,7 @@ msgstr "" #. module: base_action_rule #: view:base.action.rule:0 msgid "Filter Condition" -msgstr "" +msgstr "Условие фильтра" #. module: base_action_rule #: view:base.action.rule:0 @@ -216,7 +216,7 @@ msgstr "Тип задержки" #. module: base_action_rule #: view:base.action.rule:0 msgid "Server actions to run" -msgstr "" +msgstr "Действия сервера для запуска" #. module: base_action_rule #: help:base.action.rule,active:0 @@ -246,7 +246,7 @@ msgstr "Минуты" #. module: base_action_rule #: field:base.action.rule,model_id:0 msgid "Related Document Model" -msgstr "" +msgstr "Модель связанного документа" #. module: base_action_rule #: help:base.action.rule,filter_pre_id:0 @@ -310,7 +310,7 @@ msgstr "Действия сервера" #. module: base_action_rule #: field:base.action.rule.lead.test,name:0 msgid "Subject" -msgstr "" +msgstr "Тема" #~ msgid "Set State to" #~ msgstr "Уснатовить состояние в" diff --git a/addons/crm/html/index.html b/addons/crm/html/index.html index 355fdb0be36..5ae542f5c91 100644 --- a/addons/crm/html/index.html +++ b/addons/crm/html/index.html @@ -9,7 +9,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm"> <img src="crm_sc_01.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/crm/process/crm_configuration_process.xml b/addons/crm/process/crm_configuration_process.xml index c56bb8935d9..882c9680268 100644 --- a/addons/crm/process/crm_configuration_process.xml +++ b/addons/crm/process/crm_configuration_process.xml @@ -60,24 +60,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Prospect Opportunity"""" name="name"/> <field eval=""""Creating business opportunities from Leads"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_opportunities0"/> - <field model="process.node" name="source_node_id" ref="process_node_leads0"/> + <field name="target_node_id" ref="process_node_opportunities0"/> + <field name="source_node_id" ref="process_node_leads0"/> </record> <record id="process_transition_leadpartner0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Prospect Partner"""" name="name"/> <field eval=""""Prospect is converting to business partner"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_partner0"/> - <field model="process.node" name="source_node_id" ref="process_node_leads0"/> + <field name="target_node_id" ref="process_node_partner0"/> + <field name="source_node_id" ref="process_node_leads0"/> </record> <record id="process_transition_opportunitymeeting0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Opportunity Meeting"""" name="name"/> <field eval=""""Normal or phone meeting for opportunity"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_meeting0"/> - <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/> + <field name="target_node_id" ref="process_node_meeting0"/> + <field name="source_node_id" ref="process_node_opportunities0"/> </record> </data> diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml index d75c416a93e..dbf6bc8fbcc 100644 --- a/addons/document_webdav/webdav_setup.xml +++ b/addons/document_webdav/webdav_setup.xml @@ -1,4 +1,3 @@ -<?xml version="1.0"?> <openerp> <data noupdate="1"> <!--This file contains a typical setup of a WebDAV folders' structure, @@ -25,7 +24,7 @@ <field eval="0" name="ressource_tree"/> <field name="user_id" eval="False"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">directory</field> <field eval="[(6,0,[])]" name="group_ids"/> <field name="name">groups</field> @@ -36,7 +35,7 @@ <field eval="1" name="resource_find_all"/> <field eval="0" name="ressource_tree"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">directory</field> <field eval="[(6,0,[])]" name="group_ids"/> <field name="name">resources</field> @@ -48,7 +47,7 @@ <field name="user_id" eval="False"/> <field name="resource_field" ref="base.field_res_users_login"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">ressource</field> <field name="ressource_type_id" ref="base.model_res_users"/> <field eval="[(6,0,[])]" name="group_ids"/> @@ -61,7 +60,7 @@ <field name="user_id" eval="False"/> <field name="resource_field" ref="base.field_res_users_login"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">ressource</field> <field name="ressource_type_id" ref="base.model_res_users"/> <field eval="[(6,0,[])]" name="group_ids"/> @@ -72,7 +71,7 @@ <field eval="1" name="resource_find_all"/> <field eval="0" name="ressource_tree"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">directory</field> <field eval="[(6,0,[])]" name="group_ids"/> <field name="name">locations</field> @@ -91,4 +90,4 @@ </record> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po index f9f0523056e..b47b8ba2074 100644 --- a/addons/fleet/i18n/de.po +++ b/addons/fleet/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-21 17:06+0000\n" -"PO-Revision-Date: 2013-01-06 11:09+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-06-03 05:25+0000\n" +"Last-Translator: Armin GREGOR <armin.gregor@gmail.com>\n" "Language-Team: German <de@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: 2013-03-16 05:52+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 @@ -35,7 +35,7 @@ msgstr "Ersatz Kälteklimakompressor" #. module: fleet #: help:fleet.vehicle,vin_sn:0 msgid "Unique number written on the vehicle motor (VIN/SN number)" -msgstr "Eindeutige Fahrzeug-Identifizierungsnummer (FIN)" +msgstr "Fahrgestellnummer" #. module: fleet #: selection:fleet.service.type,category:0 @@ -157,7 +157,7 @@ msgstr "Batterie Inspektion" #. module: fleet #: field:fleet.vehicle,company_id:0 msgid "Company" -msgstr "Unternehmen" +msgstr "Firma" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -324,7 +324,7 @@ msgstr "Ersatz Luftfilter" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle_tag msgid "fleet.vehicle.tag" -msgstr "" +msgstr "fleet.vehicle.tag" #. module: fleet #: view:fleet.vehicle:0 @@ -339,7 +339,7 @@ msgstr "Bezeichnung des zu erneuernden Vertrags" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior msgid "Senior" -msgstr "" +msgstr "Senior" #. module: fleet #: help:fleet.vehicle.log.contract,state:0 @@ -490,6 +490,8 @@ msgid "" "$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { " "$(this).addClass('oe_employee_picture_wide') } });" msgstr "" +"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { " +"$(this).addClass('oe_employee_picture_wide') } });" #. module: fleet #: view:board.board:0 @@ -737,7 +739,7 @@ msgstr "Aktueller Fahrzeugzustand" #. module: fleet #: selection:fleet.vehicle,transmission:0 msgid "Manual" -msgstr "Betriebsanleitung" +msgstr "Handbuch" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_52 @@ -917,7 +919,7 @@ msgstr "Kaufdatum des Fahrzeugs" #. module: fleet #: view:fleet.vehicle.model:0 msgid "Models" -msgstr "Modell" +msgstr "Modelle" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -1055,7 +1057,7 @@ msgstr "Kraftstoffart" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_22 msgid "Fuel Injector Replacement" -msgstr "Ersatz Einfüllstutzen" +msgstr "Ersatz Einspritzdüse" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act @@ -1101,7 +1103,7 @@ msgstr "Datum Vertragsbeginn" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 msgid "Electric" -msgstr "Elektrisch" +msgstr "Elektrik" #. module: fleet #: field:fleet.vehicle,tag_ids:0 @@ -1174,7 +1176,7 @@ msgstr "Ersatz Lichtmaschine" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_3 msgid "A/C Diagnosis" -msgstr "Diagnose Batterie" +msgstr "Diagnose Klimaanlage" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_23 @@ -1199,7 +1201,7 @@ msgstr "Ersatz Wärmepumpe" #. module: fleet #: view:fleet.vehicle:0 msgid "show all the costs for this vehicle" -msgstr "gesamte Kostenübersicht der Fahrzeuge" +msgstr "gesamte Kostenübersicht des Fahrzeugs" #. module: fleet #: view:fleet.vehicle.odometer:0 @@ -1534,7 +1536,7 @@ msgstr "Achsvermessung" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased msgid "Purchased" -msgstr "Ersatzteil" +msgstr "Eingekauft" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act @@ -1747,7 +1749,7 @@ msgstr "Preis" #: field:fleet.vehicle.cost,odometer:0 #: field:fleet.vehicle.odometer,value:0 msgid "Odometer Value" -msgstr "Tachostand" +msgstr "Kilometerstand" #. module: fleet #: view:fleet.vehicle:0 @@ -1805,7 +1807,7 @@ msgstr "Schreiben Sie hier alle erforderlichen Zusatzinformationen auf." #. module: fleet #: model:fleet.service.type,name:fleet.type_service_29 msgid "Ignition Coil Replacement" -msgstr "Ersatz Zündkerzen" +msgstr "Ersatz Zündspule" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_16 @@ -1815,7 +1817,7 @@ msgstr "Optionen" #. module: fleet #: model:fleet.service.type,name:fleet.type_contract_repairing msgid "Repairing" -msgstr "Reparieren" +msgstr "Wird repariert" #. module: fleet #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs @@ -1853,7 +1855,7 @@ msgstr "Getriebe" #. module: fleet #: field:fleet.vehicle,vin_sn:0 msgid "Chassis Number" -msgstr "Fahrzeuqinformationsnummer" +msgstr "Fahrgestellnummer" #. module: fleet #: help:fleet.vehicle,color:0 @@ -2009,7 +2011,7 @@ msgstr "Reifenwechsel" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_42 msgid "Starter Replacement" -msgstr "Erstinspektion" +msgstr "Ersatz Anlasser" #. module: fleet #: view:fleet.vehicle.cost:0 diff --git a/addons/hr/html/index.html b/addons/hr/html/index.html index acfa5041a9d..0bc3db084a4 100644 --- a/addons/hr/html/index.html +++ b/addons/hr/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=hr"> <img src="hr_kanban.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index edefb3be0a2..548df39905c 100644 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -54,17 +54,17 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Link a user to an employee"""" name="name"/> <field eval=""""The Related user field on the Employee form allows to link the OpenERP user (and her rights) to the employee."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/> - <field model="process.node" name="source_node_id" ref="process_node_employee0"/> + <field name="target_node_id" ref="process_node_openerpuser0"/> + <field name="source_node_id" ref="process_node_employee0"/> </record> <record id="process_transition_contactofemployee0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Link the employee to information"""" name="name"/> <field eval=""""In the Employee form, there are different kind of information like Contact information."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/> - <field model="process.node" name="source_node_id" ref="process_node_employee0"/> + <field name="target_node_id" ref="process_node_employeecontact0"/> + <field name="source_node_id" ref="process_node_employee0"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 8f3697f234a..4383f2d6c74 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -25,13 +25,13 @@ <record id="hr_dept_comp_rule" model="ir.rule"> <field name="name">Department multi company rule</field> - <field model="ir.model" name="model_id" ref="model_hr_department"/> + <field name="model_id" ref="model_hr_department"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> <record id="hr_job_comp_rule" model="ir.rule"> <field name="name">Job multi company rule</field> - <field model="ir.model" name="model_id" ref="model_hr_job"/> + <field name="model_id" ref="model_hr_job"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml index 857fc2f54ae..0bf3b73d76e 100644 --- a/addons/hr_attendance/security/ir_rule.xml +++ b/addons/hr_attendance/security/ir_rule.xml @@ -9,13 +9,13 @@ <record id="property_rule_attendace_manager" model="ir.rule"> <field name="name">Manager Attendance</field> - <field model="ir.model" name="model_id" ref="model_hr_attendance"/> + <field name="model_id" ref="model_hr_attendance"/> <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/> </record> <record id="property_rule_attendace_employee" model="ir.rule"> <field name="name">Employee Attendance</field> - <field model="ir.model" name="model_id" ref="model_hr_attendance"/> + <field name="model_id" ref="model_hr_attendance"/> <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> <field name="groups" eval="[(4,ref('base.group_user'))]"/> </record> diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml index 7c7d6f43ee3..209ca281396 100644 --- a/addons/hr_evaluation/security/hr_evaluation_security.xml +++ b/addons/hr_evaluation/security/hr_evaluation_security.xml @@ -31,14 +31,14 @@ <record id="hr_evaluation_plan_comp_rule" model="ir.rule"> <field name="name">Evaluation Plan multi company rule</field> - <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan"/> + <field name="model_id" ref="model_hr_evaluation_plan"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> <record id="hr_evaluation_plan_phase_comp_rule" model="ir.rule"> <field name="name">Evaluation Plan Phase multi company rule</field> - <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan_phase"/> + <field name="model_id" ref="model_hr_evaluation_plan_phase"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml index 242fe6393c2..3ade1f1daca 100644 --- a/addons/hr_expense/process/hr_expense_process.xml +++ b/addons/hr_expense/process/hr_expense_process.xml @@ -101,48 +101,48 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirm expense"""" name="name"/> <field eval=""""Expense is confirmed."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_confirmedexpenses0"/> - <field model="process.node" name="source_node_id" ref="process_node_draftexpenses0"/> + <field name="target_node_id" ref="process_node_confirmedexpenses0"/> + <field name="source_node_id" ref="process_node_draftexpenses0"/> </record> <record id="process_transition_refuseexpense0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Refuse expense"""" name="name"/> <field eval=""""Expense is refused."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_refused0"/> - <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/> + <field name="target_node_id" ref="process_node_refused0"/> + <field name="source_node_id" ref="process_node_confirmedexpenses0"/> </record> <record id="process_transition_approveexpense0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Approve expense"""" name="name"/> <field eval=""""Expense is approved."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_approved0"/> - <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/> + <field name="target_node_id" ref="process_node_approved0"/> + <field name="source_node_id" ref="process_node_confirmedexpenses0"/> </record> <record id="process_transition_approveinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Supplier Invoice"""" name="name"/> <field eval=""""Creates supplier invoice."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplierinvoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_approved0"/> + <field name="target_node_id" ref="process_node_supplierinvoice0"/> + <field name="source_node_id" ref="process_node_approved0"/> </record> <record id="process_transition_reimburseexpense0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Reimburse expense"""" name="name"/> <field eval=""""After creating invoice, reimburse expenses"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_reimbursement0"/> - <field model="process.node" name="source_node_id" ref="process_node_supplierinvoice0"/> + <field name="target_node_id" ref="process_node_reimbursement0"/> + <field name="source_node_id" ref="process_node_supplierinvoice0"/> </record> <record id="process_transition_reimbursereinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Reinvoice"""" name="name"/> <field eval=""""Create Customer invoice"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_reinvoicing0"/> - <field model="process.node" name="source_node_id" ref="process_node_reimbursement0"/> + <field name="target_node_id" ref="process_node_reinvoicing0"/> + <field name="source_node_id" ref="process_node_reimbursement0"/> </record> <!-- @@ -178,4 +178,4 @@ </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml index b9ad5778d1e..3c3cb018489 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -4,19 +4,19 @@ <record id="property_rule_expense_manager" model="ir.rule"> <field name="name">Manager Expense</field> - <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/> + <field name="model_id" ref="model_hr_expense_expense"/> <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/> </record> <record id="property_rule_expense_employee" model="ir.rule"> <field name="name">Employee Expense</field> - <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/> + <field name="model_id" ref="model_hr_expense_expense"/> <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> <field name="groups" eval="[(4,ref('base.group_user'))]"/> </record> <record id="hr_expense_comp_rule" model="ir.rule"> <field name="name">Expense multi company rule</field> - <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/> + <field name="model_id" ref="model_hr_expense_expense"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml index 5c10fdff749..79029e45e09 100644 --- a/addons/hr_holidays/process/hr_holidays_process.xml +++ b/addons/hr_holidays/process/hr_holidays_process.xml @@ -100,48 +100,48 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Employee Declaration"""" name="name"/> <field eval=""""Document for employee"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_legaldeclaration0"/> - <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/> + <field name="target_node_id" ref="process_node_legaldeclaration0"/> + <field name="source_node_id" ref="hr.process_node_employee0"/> </record> <record id="process_transition_holidaysdefrequest0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Holidays def Request"""" name="name"/> <field eval=""""If holidays available, employee can take it and fill it."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_holidaysrequest0"/> - <field model="process.node" name="source_node_id" ref="process_node_holidaysdefinition0"/> + <field name="target_node_id" ref="process_node_holidaysrequest0"/> + <field name="source_node_id" ref="process_node_holidaysdefinition0"/> </record> <record id="process_transition_refusedrequest0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Refused Request"""" name="name"/> <field eval=""""Request is refused."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_refused0"/> - <field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0" /> + <field name="target_node_id" ref="process_node_refused0"/> + <field name="source_node_id" ref="process_node_holidaysrequest0" /> </record> <record id="process_transition_approvedrequest0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Approved Request"""" name="name"/> <field eval=""""Request is approved."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_approved0"/> - <field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0"/> + <field name="target_node_id" ref="process_node_approved0"/> + <field name="source_node_id" ref="process_node_holidaysrequest0"/> </record> <record id="process_transition_setholiday0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Set Holiday"""" name="name"/> <field eval=""""Holiday is set in the calendar."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_calendar0"/> - <field model="process.node" name="source_node_id" ref="process_node_approved0"/> + <field name="target_node_id" ref="process_node_calendar0"/> + <field name="source_node_id" ref="process_node_approved0"/> </record> <record id="process_transition_employeeholidays0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Employee Holidays"""" name="name"/> <field eval=""""Employee get holidays"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_holidays0"/> - <field model="process.node" name="source_node_id" ref="process_node_legaldeclaration0"/> + <field name="target_node_id" ref="process_node_holidays0"/> + <field name="source_node_id" ref="process_node_legaldeclaration0"/> </record> <!-- @@ -170,4 +170,4 @@ </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml index ff0270026a4..e2c0ffb1a6f 100644 --- a/addons/hr_holidays/security/ir_rule.xml +++ b/addons/hr_holidays/security/ir_rule.xml @@ -3,14 +3,14 @@ <data> <record id="property_rule_holidays_employee" model="ir.rule"> <field name="name">Employee Holidays</field> - <field model="ir.model" name="model_id" ref="model_hr_holidays"/> + <field name="model_id" ref="model_hr_holidays"/> <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> <field name="groups" eval="[(4,ref('base.group_user'))]"/> </record> <record id="property_rule_holidays_officer" model="ir.rule"> <field name="name">Holidays Officer</field> - <field model="ir.model" name="model_id" ref="model_hr_holidays"/> + <field name="model_id" ref="model_hr_holidays"/> <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/> </record> diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml index d55f1c81cce..e410eae7250 100644 --- a/addons/hr_payroll/security/hr_security.xml +++ b/addons/hr_payroll/security/hr_security.xml @@ -8,10 +8,10 @@ <record id="property_rule_employee_payslip" model="ir.rule"> <field name="name">Employee Payslip</field> - <field model="ir.model" name="model_id" ref="model_hr_payslip"/> + <field name="model_id" ref="model_hr_payslip"/> <field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field> <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml index 570b0f036cd..4fccca1a791 100644 --- a/addons/hr_recruitment/security/hr_recruitment_security.xml +++ b/addons/hr_recruitment/security/hr_recruitment_security.xml @@ -4,7 +4,7 @@ <record id="hr_applicant_comp_rule" model="ir.rule"> <field name="name">Applicant multi company rule</field> - <field model="ir.model" name="model_id" ref="model_hr_applicant"/> + <field name="model_id" ref="model_hr_applicant"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml index b6773dbbdd6..2abea3ada67 100644 --- a/addons/hr_timesheet/hr_timesheet_demo.xml +++ b/addons/hr_timesheet/hr_timesheet_demo.xml @@ -34,7 +34,7 @@ <field name="product_uom_id" ref="product.product_uom_hour"/> <field name="account_id" ref="account.analytic_administratif"></field> <field eval="-60.00" name="amount"/> - <field name="general_account_id" model="account.account" ref="account.a_expense"/> + <field name="general_account_id" ref="account.a_expense"/> <field name="journal_id" ref="analytic_journal"/> </record> @@ -47,7 +47,7 @@ <field name="product_uom_id" ref="product.product_uom_hour"/> <field name="account_id" ref="account.analytic_administratif"></field> <field eval="-30.00" name="amount"/> - <field name="general_account_id" model="account.account" ref="account.a_expense"/> + <field name="general_account_id" ref="account.a_expense"/> <field name="journal_id" ref="analytic_journal"/> </record> @@ -60,7 +60,7 @@ <field name="product_uom_id" ref="product.product_uom_hour"/> <field name="account_id" ref="account.analytic_administratif"></field> <field eval="-90.00" name="amount"/> - <field name="general_account_id" model="account.account" ref="account.a_expense"/> + <field name="general_account_id" ref="account.a_expense"/> <field name="journal_id" ref="analytic_journal"/> </record> @@ -73,7 +73,7 @@ <field name="product_uom_id" ref="product.product_uom_hour"/> <field name="account_id" ref="account.analytic_administratif"></field> <field eval="-30.00" name="amount"/> - <field name="general_account_id" model="account.account" ref="account.a_expense"/> + <field name="general_account_id" ref="account.a_expense"/> <field name="journal_id" ref="analytic_journal"/> </record> @@ -86,7 +86,7 @@ <field name="product_uom_id" ref="product.product_uom_hour"/> <field name="account_id" ref="account.analytic_administratif"></field> <field eval="-30.00" name="amount"/> - <field name="general_account_id" model="account.account" ref="account.a_expense"/> + <field name="general_account_id" ref="account.a_expense"/> <field name="journal_id" ref="analytic_journal"/> </record> diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml index d7cf34fa1fd..c5549d1ed27 100644 --- a/addons/hr_timesheet/security/hr_timesheet_security.xml +++ b/addons/hr_timesheet/security/hr_timesheet_security.xml @@ -4,14 +4,14 @@ <record id="property_rule_timesheet_manager" model="ir.rule"> <field name="name">Manager HR Analytic Timesheet</field> - <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/> + <field name="model_id" ref="model_hr_analytic_timesheet"/> <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/> </record> <record id="property_rule_timesheet_employee" model="ir.rule"> <field name="name">Employee HR Analytic Timesheet</field> - <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/> + <field name="model_id" ref="model_hr_analytic_timesheet"/> <field name="domain_force">[('user_id', '=', user.id)]</field> <field name="groups" eval="[(4,ref('base.group_user'))]"/> </record> diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 628cc2097ae..7ebec9ab228 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -100,24 +100,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Sign in/out"""" name="name"/> <field eval=""""The employee signs in and signs out."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/> - <field model="process.node" name="source_node_id" ref="process_node_attendance0"/> + <field name="target_node_id" ref="process_node_drafttimesheetsheet0"/> + <field name="source_node_id" ref="process_node_attendance0"/> </record> <record id="process_transition_timesheetdraft0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Service"""" name="name"/> <field eval=""""The timesheet line represents the time spent by the employee on a specific service provided."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/> - <field model="process.node" name="source_node_id" ref="process_node_timesheet0"/> + <field name="target_node_id" ref="process_node_drafttimesheetsheet0"/> + <field name="source_node_id" ref="process_node_timesheet0"/> </record> <record id="process_transition_confirmtimesheet0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirmation"""" name="name"/> <field eval=""""The employee periodically confirms his own timesheets."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_confirmedtimesheet0"/> - <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/> + <field name="target_node_id" ref="process_node_confirmedtimesheet0"/> + <field name="source_node_id" ref="process_node_drafttimesheetsheet0"/> <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/> </record> @@ -125,24 +125,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Validation"""" name="name"/> <field eval=""""The project manager validates the timesheets."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_validatedtimesheet0"/> - <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/> + <field name="target_node_id" ref="process_node_validatedtimesheet0"/> + <field name="source_node_id" ref="process_node_confirmedtimesheet0"/> </record> <record id="process_transition_invoiceontimesheet0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Billing"""" name="name"/> <field eval=""""The invoice is created based on the timesheet."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/> - <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/> + <field name="target_node_id" ref="process_node_invoiceonwork0"/> + <field name="source_node_id" ref="process_node_confirmedtimesheet0"/> </record> <record id="process_transition_tasktimesheet0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Task timesheet"""" name="name"/> <field eval=""""Moves task entry into the timesheet line"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_timesheet0"/> - <field model="process.node" name="source_node_id" ref="process_node_workontask0"/> + <field name="target_node_id" ref="process_node_timesheet0"/> + <field name="source_node_id" ref="process_node_workontask0"/> </record> <!-- diff --git a/addons/l10n_cr/l10n_cr_base_data.xml b/addons/l10n_cr/l10n_cr_base_data.xml index 2268ecb37ed..28674185a85 100644 --- a/addons/l10n_cr/l10n_cr_base_data.xml +++ b/addons/l10n_cr/l10n_cr_base_data.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <openerp> <data> @@ -8,38 +7,38 @@ --> <record id="state_SJ" model="res.country.state"> <field name="code">SJ</field> - <field name="name">San José</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="name">San José</field> + <field name="country_id" ref="base.cr"/> </record> <record id="state_A" model="res.country.state"> <field name="code">A</field> <field name="name">Alajuela</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="country_id" ref="base.cr"/> </record> <record id="state_H" model="res.country.state"> <field name="code">H</field> <field name="name">Heredia</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="country_id" ref="base.cr"/> </record> <record id="state_C" model="res.country.state"> <field name="code">C</field> <field name="name">Cartago</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="country_id" ref="base.cr"/> </record> <record id="state_P" model="res.country.state"> <field name="code">P</field> <field name="name">Puntarenas</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="country_id" ref="base.cr"/> </record> <record id="state_G" model="res.country.state"> <field name="code">G</field> <field name="name">Guanacaste</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="country_id" ref="base.cr"/> </record> <record id="state_L" model="res.country.state"> <field name="code">L</field> - <field name="name">Limón</field> - <field model="res.country" name="country_id" ref="base.cr"/> + <field name="name">Limón</field> + <field name="country_id" ref="base.cr"/> </record> <!-- Resource: res.partner.title @@ -71,7 +70,7 @@ <field name="domain">contact</field> </record> <record id="res_partner_title_sal" model="res.partner.title"> - <field name="name">Sociedad Anónima Laboral</field> + <field name="name">Sociedad Anónima Laboral</field> <field name="shortcut">S.A.L.</field> <field name="domain">partner</field> </record> @@ -136,4 +135,4 @@ <field name="domain">contact</field> </record> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html index ad7f9daf1a9..b564cf3ab1e 100644 --- a/addons/mail/html/index.html +++ b/addons/mail/html/index.html @@ -9,7 +9,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm"> <img src="mail_sc_00.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml index 92443fe987d..89a299e3a85 100644 --- a/addons/marketing_campaign/marketing_campaign_demo.xml +++ b/addons/marketing_campaign/marketing_campaign_demo.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" ?> <openerp> <data> <!-- Email tempalte --> @@ -66,13 +65,13 @@ <!-- Transition --> <record id="marketing_campaign_transition_0" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/> + <field name="activity_from_id" ref="marketing_campaign_activity_0"/> + <field name="activity_to_id" ref="marketing_campaign_activity_1"/> </record> <record id="marketing_campaign_transition_1" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/> + <field name="activity_from_id" ref="marketing_campaign_activity_1"/> + <field name="activity_to_id" ref="marketing_campaign_activity_2"/> </record> <!-- Segment --> @@ -85,9 +84,9 @@ <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/> <field name="name">OpenERP Partner</field> <field name="sync_mode">create_date</field> - <field name="ir_filter_id" ref="filter0"></field> + <field name="ir_filter_id" ref="filter0"/> <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/> </record> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml index 141981a21d6..f6eb8a1d905 100644 --- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml +++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml @@ -1,11 +1,10 @@ -<?xml version="1.0" ?> <openerp> <data> <record id="action_dummy" model="ir.actions.server"> <field name="name">Dummy Action</field> <field name="model_id" ref="crm.model_crm_lead"/> <field name="state">dummy</field> - <field name="code"></field> + <field name="code"/> <field eval="5" name="sequence"/> <field eval="True" name="condition"/> </record> @@ -40,10 +39,10 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>Thanks for the genuine interest you have shown in OpenERP.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>Thanks for the genuine interest you have shown in OpenERP.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">For OpenERP OnDemand Free Trial 2010</field> </record> <record id="email_template_2" model="email.template"> @@ -53,11 +52,11 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>We have very good offer that might suit you. - We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>We have very good offer that might suit you. + We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">For OpenERP Discovery Day on May 2010</field> </record> @@ -68,10 +67,10 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">For OpenERP Discovery Day</field> </record> @@ -82,10 +81,10 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>Thanks for showing interest and buying the OpenERP book.</p> + <field name="body_html"><p>Hello,</p> + <p>Thanks for showing interest and buying the OpenERP book.</p> If any further information required kindly revert back. - <p>Regards,OpenERP Team,</p>]]></field> + <p>Regards,OpenERP Team,</p></field> <field name="name">For OpenERP book</field> </record> @@ -95,11 +94,11 @@ <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/> <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>We have very good offer that might suit you. - For our gold partners,We are arranging free technical training on june,2010.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>We have very good offer that might suit you. + For our gold partners,We are arranging free technical training on june,2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">technical training to gold partners</field> </record> @@ -110,11 +109,11 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>We have very good offer that might suit you. - For our silver partners,We are paid technical training on june,2010.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>We have very good offer that might suit you. + For our silver partners,We are paid technical training on june,2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">training to silver partners</field> </record> @@ -125,11 +124,11 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>We have very good offer that might suit you. - For our silver partners, we are offering Gold partnership.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>We have very good offer that might suit you. + For our silver partners, we are offering Gold partnership.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">gold partnership to silver partners</field> </record> @@ -140,11 +139,11 @@ <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/> <field name="model_id" ref="crm.model_crm_lead"/> <field eval="0" name="user_signature"/> - <field name="body_html"><![CDATA[<p>Hello,</p> - <p>Thanks for showing interest and for subscribing to technical training.</p> - If any further information required kindly revert back.I really appreciate your co-operation on this.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,OpenERP Team,</p>]]></field> + <field name="body_html"><p>Hello,</p> + <p>Thanks for showing interest and for subscribing to technical training.</p> + If any further information required kindly revert back.I really appreciate your co-operation on this.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p></field> <field name="name">subscribing to technical training</field> </record> <!-- Report --> @@ -171,7 +170,7 @@ <record id="marketing_campaign_activity_0" model="marketing.campaign.activity"> <field name="name">Propose a 1 month free trial for an OnDemand offer</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="report_directory_id" ref="document_directory_campaign1"/> <field name="type">report</field> <field eval="1" name="start"/> @@ -180,27 +179,27 @@ <record id="marketing_campaign_activity_1" model="marketing.campaign.activity"> <field name="name">Thanks for showing interest</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_1"/> </record> <record id="marketing_campaign_activity_2" model="marketing.campaign.activity"> <field name="name">Propose to subscribe to the OpenERP Discovery Day on May 2010</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_2"/> </record> <record id="marketing_campaign_activity_3" model="marketing.campaign.activity"> <field name="name">Thanks for subscribing to the OpenERP Discovery Day</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_3"/> </record> <record id="marketing_campaign_activity_4" model="marketing.campaign.activity"> <field name="name">Propose to buy the OpenERP Book</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="report_directory_id" ref="document_directory_campaign1"/> <field name="type">report</field> <field name="report_id" ref="mc_crm_lead_demo_report"/> @@ -209,81 +208,81 @@ <record id="marketing_campaign_activity_5" model="marketing.campaign.activity"> <field name="name">Thanks for buying the OpenERP book</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_4"/> </record> <record id="marketing_campaign_activity_6" model="marketing.campaign.activity"> <field name="name">Propose a free technical training to Gold partners</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_5"/> </record> <record id="marketing_campaign_activity_7" model="marketing.campaign.activity"> <field name="name">Propose paid training to Silver partners</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_6"/> </record> <record id="marketing_campaign_activity_8" model="marketing.campaign.activity"> <field name="name">Propose gold partnership to silver partners</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_7"/> </record> <record id="marketing_campaign_activity_9" model="marketing.campaign.activity"> <field name="name">Thanks for subscribing to technical training</field> <field name="server_action_id" ref="action_dummy"/> - <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> + <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/> <field name="email_template_id" ref="email_template_8"/> </record> <!-- Tranisition --> <record id="marketing_campaign_transition_0" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/> + <field name="activity_from_id" ref="marketing_campaign_activity_0"/> + <field name="activity_to_id" ref="marketing_campaign_activity_1"/> </record> <record id="marketing_campaign_transition_1" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/> + <field name="activity_from_id" ref="marketing_campaign_activity_0"/> + <field name="activity_to_id" ref="marketing_campaign_activity_2"/> </record> <record id="marketing_campaign_transition_2" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_3"/> + <field name="activity_from_id" ref="marketing_campaign_activity_2"/> + <field name="activity_to_id" ref="marketing_campaign_activity_3"/> </record> <record id="marketing_campaign_transition_3" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_4"/> + <field name="activity_from_id" ref="marketing_campaign_activity_2"/> + <field name="activity_to_id" ref="marketing_campaign_activity_4"/> </record> <record id="marketing_campaign_transition_4" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_5"/> + <field name="activity_from_id" ref="marketing_campaign_activity_4"/> + <field name="activity_to_id" ref="marketing_campaign_activity_5"/> </record> <record id="marketing_campaign_transition_5" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_6"/> + <field name="activity_from_id" ref="marketing_campaign_activity_4"/> + <field name="activity_to_id" ref="marketing_campaign_activity_6"/> </record> <record id="marketing_campaign_transition_6" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_7"/> + <field name="activity_from_id" ref="marketing_campaign_activity_4"/> + <field name="activity_to_id" ref="marketing_campaign_activity_7"/> </record> <record id="marketing_campaign_transition_7" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_6"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/> + <field name="activity_from_id" ref="marketing_campaign_activity_6"/> + <field name="activity_to_id" ref="marketing_campaign_activity_9"/> </record> <record id="marketing_campaign_transition_8" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_8"/> + <field name="activity_from_id" ref="marketing_campaign_activity_7"/> + <field name="activity_to_id" ref="marketing_campaign_activity_8"/> </record> <record id="marketing_campaign_transition_9" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/> + <field name="activity_from_id" ref="marketing_campaign_activity_7"/> + <field name="activity_to_id" ref="marketing_campaign_activity_9"/> </record> <record id="marketing_campaign_transition_10" model="marketing.campaign.transition"> - <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_9"/> - <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/> + <field name="activity_from_id" ref="marketing_campaign_activity_9"/> + <field name="activity_to_id" ref="marketing_campaign_activity_1"/> </record> <!-- Segment --> @@ -296,4 +295,4 @@ </record> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml index d67ee864b34..b3ba426ff4a 100644 --- a/addons/membership/process/membership_process.xml +++ b/addons/membership/process/membership_process.xml @@ -87,16 +87,16 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Product to member"""" name="name"/> <field eval=""""Define product for membership."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/> - <field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/> + <field name="target_node_id" ref="process_node_waitingmember0"/> + <field name="source_node_id" ref="process_node_membershipproduct0"/> </record> <record id="process_transition_waitingtoinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Waiting to invoice"""" name="name"/> <field eval=""""Draft invoice is now open."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/> - <field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/> + <field name="target_node_id" ref="process_node_invoicedmember0"/> + <field name="source_node_id" ref="process_node_waitingmember0"/> </record> <record id="process_transition_action_create0" model="process.transition.action"> @@ -110,25 +110,25 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Invoice to paid"""" name="name"/> <field eval=""""Invoice is be paid."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_paidmember0"/> - <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/> + <field name="target_node_id" ref="process_node_paidmember0"/> + <field name="source_node_id" ref="process_node_invoicedmember0"/> </record> <record id="process_transition_invoicetoassociate0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""invoice to associate"""" name="name"/> <field eval=""""Invoiced member may be Associated member."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/> - <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/> + <field name="target_node_id" ref="process_node_associatedmember0"/> + <field name="source_node_id" ref="process_node_invoicedmember0"/> </record> <record id="process_transition_associationpartner0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Association Partner"""" name="name"/> <field eval=""""Associated partner."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/> - <field model="process.node" name="source_node_id" ref="process_node_setassociation0"/> + <field name="target_node_id" ref="process_node_associatedmember0"/> + <field name="source_node_id" ref="process_node_setassociation0"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html index d3e7a048490..5777eb5f147 100644 --- a/addons/mrp/html/index.html +++ b/addons/mrp/html/index.html @@ -9,7 +9,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=mrp"> <img src="mrp_product.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po index 8d3c0aee785..39cc3d602cf 100644 --- a/addons/mrp/i18n/mn.po +++ b/addons/mrp/i18n/mn.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-07-21 12:33+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-06-04 04:00+0000\n" +"Last-Translator: erdenebold <erdenebold10@gmail.com>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:01+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -48,7 +48,7 @@ msgstr "Дамжлагуудын Ашиглалт" #. module: mrp #: view:mrp.routing.workcenter:0 msgid "Routing Work Centers" -msgstr "Дамжлагуудын маршрут" +msgstr "Шугамын дамжлагууд" #. module: mrp #: field:mrp.production.workcenter.line,cycle:0 @@ -86,12 +86,12 @@ msgstr "" #: model:ir.actions.act_window,name:mrp.mrp_routing_action #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action msgid "Routings" -msgstr "Маршрут" +msgstr "Шугам" #. module: mrp #: view:mrp.bom:0 msgid "Search Bill Of Material" -msgstr "Жор Хайх" +msgstr "Орц Хайх" #. module: mrp #: model:process.node,note:mrp.process_node_stockproduct1 @@ -112,8 +112,8 @@ msgid "" "Number of iterations this work center has to do in the specified operation " "of the routing." msgstr "" -"Үйлдвэрлэлийн нэг маршрутын хувьд уг дамжлага өөрийн үйлдлийг давтан " -"гүйцэтгэх давтамжын тоо." +"Үйлдвэрлэлийн нэг шугамын хувьд уг дамжлага өөрийн үйлдлийг давтан гүйцэтгэх " +"давтамжын тоо." #. module: mrp #: view:product.product:0 @@ -214,7 +214,7 @@ msgstr "" #: code:addons/mrp/mrp.py:633 #, python-format msgid "Cannot cancel manufacturing order!" -msgstr "" +msgstr "Үйлдвэрийн захиалгыг цуцлах боломжгүй!" #. module: mrp #: field:mrp.workcenter,costs_cycle_account_id:0 @@ -337,7 +337,7 @@ msgstr "Бараа Үйлдвэрлэх" #. module: mrp #: constraint:mrp.bom:0 msgid "Error ! You cannot create recursive BoM." -msgstr "Алдаа ! Тойрог хамааралтай жор үүсгэж болохгүй." +msgstr "Алдаа ! Тойрог хамааралтай орц үүсгэж болохгүй." #. module: mrp #: model:ir.model,name:mrp.model_mrp_routing_workcenter @@ -423,7 +423,7 @@ msgstr "" #: field:mrp.production,product_qty:0 #: field:mrp.production.product.line,product_qty:0 msgid "Product Quantity" -msgstr "" +msgstr "Барааны тоо" #. module: mrp #: help:mrp.production,picking_id:0 @@ -491,13 +491,13 @@ msgstr "Товлогдсон огноо" #: code:addons/mrp/procurement.py:124 #, python-format msgid "Manufacturing Order <em>%s</em> created." -msgstr "" +msgstr "Үйлдвэрлэлийн захиалга <em>%s</em> үүсгэгдлээ." #. module: mrp #: view:mrp.bom:0 #: report:mrp.production.order:0 msgid "Bill Of Material" -msgstr "Жор" +msgstr "Орц" #. module: mrp #: help:mrp.routing,location_id:0 @@ -518,7 +518,7 @@ msgstr "Нөөцийн Үнийн Хазайлт" #. module: mrp #: model:ir.actions.act_window,name:mrp.action2 msgid "Bill of Materials Structure" -msgstr "Жорын Бүтэц" +msgstr "Орцын Бүтэц" #. module: mrp #: model:process.node,note:mrp.process_node_serviceproduct0 @@ -560,7 +560,7 @@ msgstr "" msgid "" "The Bill of Material is linked to a routing, i.e. the succession of work " "centers." -msgstr "Жор нь маршруттай холбогдсон, ө.х. дамжлагуудын цуваанууд" +msgstr "Орц нь шугамтай холбогдсон, ө.х. дамжлагуудын цуваанууд" #. module: mrp #: view:mrp.production:0 @@ -592,7 +592,7 @@ msgstr "Нөөцийн үнэ" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_product_bom_structure msgid "Product BoM Structure" -msgstr "Барааны Жорын Бүтэц" +msgstr "Барааны Орцын Бүтэц" #. module: mrp #: view:mrp.production:0 @@ -603,12 +603,12 @@ msgstr "Үйлдвэрлэл Хайх" #: help:mrp.routing.workcenter,sequence:0 msgid "" "Gives the sequence order when displaying a list of routing Work Centers." -msgstr "Маршруутын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө." +msgstr "Шугамын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө." #. module: mrp #: field:mrp.bom,child_complete_ids:0 msgid "BoM Hierarchy" -msgstr "Жорын удамшил" +msgstr "Орцын удамшил" #. module: mrp #: model:process.transition,name:mrp.process_transition_stockproduction0 @@ -637,7 +637,7 @@ msgstr "Бэлтгэлтийн Сондгойрол" #. module: mrp #: field:mrp.bom,bom_lines:0 msgid "BoM Lines" -msgstr "Жорын мөрүүд" +msgstr "Орцын мөрүүд" #. module: mrp #: field:mrp.workcenter,time_start:0 @@ -650,13 +650,13 @@ msgid "" "If the active field is set to False, it will allow you to hide the routing " "without removing it." msgstr "" -"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал машрутыг устгалгүйгээр " +"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал шугамыг устгалгүйгээр " "нуудаг." #. module: mrp #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0 msgid "Material Routing" -msgstr "Материалын Машрут" +msgstr "Материалын Шугам" #. module: mrp #: view:mrp.production:0 @@ -676,13 +676,13 @@ msgstr "Дамжлагын Ачаалал" #: code:addons/mrp/procurement.py:50 #, python-format msgid "No BoM defined for this product !" -msgstr "Энэ бараанд жор тодорхойлогдоогүй байна !" +msgstr "Энэ бараанд орц тодорхойлогдоогүй байна !" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2 msgid "Bill of Material Components" -msgstr "Жорын бүрдэлүүд" +msgstr "Орцын бүрдэлүүд" #. module: mrp #: model:ir.model,name:mrp.model_stock_move @@ -708,7 +708,7 @@ msgid "" "operations and to plan future loads on work centers based on production " "plannification." msgstr "" -"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Машрут гэдэг нь " +"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Шугам гэдэг нь " "үндсэндээ дамжлагуудын өртөгийг тооцоолох болон ажлын ачааллыг тооцоолоход " "үйлдвэрлэлийн төлөвлөгөөн дээр суурилан бодоход хэрэглэгддэг." @@ -734,7 +734,7 @@ msgstr "" #. module: mrp #: constraint:mrp.bom:0 msgid "BoM line product should not be same as BoM product." -msgstr "Жорын мөр нь жорын бараатайгаа ижил байж болохгүй." +msgstr "Орцын мөр нь орцын бараатайгаа ижил байж болохгүй." #. module: mrp #: view:mrp.production:0 @@ -744,7 +744,7 @@ msgstr "Үйлдвэрлэгдэж буй" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_property msgid "Master Bill of Materials" -msgstr "Мастер жор" +msgstr "Мастер орц" #. module: mrp #: help:mrp.config.settings,module_product_manufacturer:0 @@ -907,7 +907,7 @@ msgid "" "All product quantities must be greater than 0.\n" "You should install the mrp_byproduct module if you want to manage extra " "products on BoMs !" -msgstr "" +msgstr "Бүх бүтээгдэхүүнийг тоог 0-оос эхэлж үүсгэнэ." #. module: mrp #: view:mrp.production:0 @@ -954,7 +954,7 @@ msgstr "" #. module: mrp #: field:mrp.bom,type:0 msgid "BoM Type" -msgstr "Жорын төрөл" +msgstr "Орцын төрөл" #. module: mrp #: code:addons/mrp/procurement.py:52 @@ -962,7 +962,7 @@ msgstr "Жорын төрөл" msgid "" "Procurement '%s' has an exception: 'No BoM defined for this product !'" msgstr "" -"'%s' татан авалтад сондгойрол байна: 'Бараанд жор тодорхойлогдоогүй !'" +"'%s' татан авалтад сондгойрол байна: 'Бараанд орц тодорхойлогдоогүй !'" #. module: mrp #: view:mrp.property:0 @@ -1077,7 +1077,7 @@ msgstr "Нөөцлүүлэх" #. module: mrp #: report:bom.structure:0 msgid "BOM Name" -msgstr "Жорын нэр" +msgstr "Орцын нэр" #. module: mrp #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open @@ -1167,7 +1167,7 @@ msgstr "Хийгдэж байгаа үйлдвэрлэлийн захиалгу #. module: mrp #: model:ir.actions.client,name:mrp.action_client_mrp_menu msgid "Open MRP Menu" -msgstr "" +msgstr "Нээлттэй MRP цэс" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_action4 @@ -1194,7 +1194,7 @@ msgstr "Циклийн Өртөг" #: code:addons/mrp/wizard/change_production_qty.py:88 #, python-format msgid "Cannot find bill of material for this product." -msgstr "" +msgstr "Энэ бараа материалаар хайх боломжгүй." #. module: mrp #: selection:mrp.workcenter.load,measure_unit:0 @@ -1216,8 +1216,7 @@ msgstr "Нөөцүүд" msgid "" "Time in hours for this Work Center to achieve the operation of the specified " "routing." -msgstr "" -"Заагдсан маршрутын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар." +msgstr "Заагдсан шугамын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар." #. module: mrp #: field:mrp.workcenter,costs_journal_id:0 @@ -1272,7 +1271,7 @@ msgstr "Үйлдвэрлэлийг эхлүүлэхэд бэлэн Үйлдвэ #: field:mrp.production,bom_id:0 #: model:process.node,name:mrp.process_node_billofmaterial0 msgid "Bill of Material" -msgstr "Жор" +msgstr "Орц" #. module: mrp #: view:mrp.workcenter.load:0 @@ -1304,9 +1303,9 @@ msgid "" "Routing is indicated then,the third tab of a production order (Work Centers) " "will be automatically pre-completed." msgstr "" -"Маршрут нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг " -"илэрхийлдэг. Хэрэв маршрут байгаа бол гурав дахь үйлдвэрлэлийн дарааллын " -"хавтас автоматаар бөглөгддөг." +"Шугам нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг илэрхийлдэг. " +"Хэрэв шугам байгаа бол гурав дахь үйлдвэрлэлийн дарааллын хавтас автоматаар " +"бөглөгддөг." #. module: mrp #: code:addons/mrp/mrp.py:505 @@ -1431,7 +1430,7 @@ msgstr "Үйлдвэрлэлийн дамжлагыг хайх" #. module: mrp #: view:mrp.bom:0 msgid "BoM Structure" -msgstr "Жорын бүтэц" +msgstr "Орцын бүтэц" #. module: mrp #: field:mrp.production,date_start:0 @@ -1541,7 +1540,7 @@ msgstr "БЗ Дугаар" #: code:addons/mrp/mrp.py:505 #, python-format msgid "Cannot delete a manufacturing order in state '%s'." -msgstr "" +msgstr "Үйлдвэрлэлийн захиалгын '%s' төлөвт устгах боломжгүй." #. module: mrp #: selection:mrp.production,state:0 @@ -1689,7 +1688,7 @@ msgstr "Нөөц" #: help:mrp.bom,date_stop:0 msgid "Validity of this BoM or component. Keep empty if it's always valid." msgstr "" -"Энэ жор эсвэл бүрэлдхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон " +"Орц эсвэл бүрэлдэхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон " "үлдээнэ." #. module: mrp @@ -1710,7 +1709,7 @@ msgid "" "operations and to plan future loads on work centers based on production " "planning." msgstr "" -"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Машрут нь " +"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Шугам нь " "үйлдвэрлэлийн захиалга дээр үндэслэн дамжлагуудын өртөгийг тооцох, ажлын " "ирээдүйн ачааллыг тооцоолох зэрэгт голчлон хэрэглэгддэг." @@ -1816,8 +1815,8 @@ msgid "" "are products themselves) can also have their own Bill of Material (multi-" "level)." msgstr "" -"Жор гэдэг нь барааны задаргаа юм. Бүрэлдхүүнүүд (мөн бараанууд) нь мөн " -"өөрийн жортой буюу олон түвшний жор байж болно." +"Орц гэдэг нь барааны задаргаа юм. Бүрэлдэхүүнүүд (мөн бараанууд) нь мөн " +"өөрийн орцтой буюу олон түвшний орц байж болно." #. module: mrp #: field:mrp.bom,company_id:0 @@ -1882,7 +1881,7 @@ msgstr "Бүрэлдэхүүнүүд" #: report:bom.structure:0 #: model:ir.actions.report.xml,name:mrp.report_bom_structure msgid "BOM Structure" -msgstr "Жорын бүтэц" +msgstr "Орцын бүтэц" #. module: mrp #: field:mrp.config.settings,module_mrp_jit:0 @@ -1902,7 +1901,7 @@ msgstr "Хүчинтэй байх эхлэл" #. module: mrp #: selection:mrp.bom,type:0 msgid "Normal BoM" -msgstr "Хэвийн жор" +msgstr "Хэвийн орц" #. module: mrp #: field:res.company,manufacturing_lead:0 @@ -1958,7 +1957,7 @@ msgid "" "If the active field is set to False, it will allow you to hide the bills of " "material without removing it." msgstr "" -"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол жорыг устгалгүйгээр нууна." +"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол орцыг устгалгүйгээр нууна." #. module: mrp #: field:mrp.bom,product_rounding:0 @@ -2083,7 +2082,7 @@ msgstr "" #. module: mrp #: field:procurement.order,bom_id:0 msgid "BoM" -msgstr "Жор" +msgstr "Орц" #. module: mrp #: model:ir.model,name:mrp.model_report_mrp_inout @@ -2145,12 +2144,12 @@ msgstr "Хангах болон Үйлдвэрлэх" #. module: mrp #: field:mrp.bom,bom_id:0 msgid "Parent BoM" -msgstr "Эцэг жор" +msgstr "Эцэг орц" #. module: mrp #: report:bom.structure:0 msgid "BOM Ref" -msgstr "Жорын код" +msgstr "Орцын код" #. module: mrp #: code:addons/mrp/mrp.py:765 @@ -2190,7 +2189,7 @@ msgstr "Тоо хэмжээг сонго" #: view:product.product:0 #: field:product.product,bom_ids:0 msgid "Bill of Materials" -msgstr "Жорууд" +msgstr "Орцууд" #. module: mrp #: code:addons/mrp/mrp.py:610 @@ -2322,7 +2321,7 @@ msgstr "" msgid "" "a manufacturing\n" " order" -msgstr "" +msgstr "үйлдвэрлэл" #. module: mrp #: field:mrp.config.settings,group_mrp_properties:0 @@ -2344,7 +2343,7 @@ msgstr "Үзүүлэлтийн бүлэгүүд" #: view:mrp.routing:0 #: model:process.node,name:mrp.process_node_routing0 msgid "Routing" -msgstr "Маршрут" +msgstr "Шугам" #. module: mrp #: model:process.transition,note:mrp.process_transition_procurestockableproduct0 @@ -2390,8 +2389,8 @@ msgid "" "the BOM, through a run of the schedulers (MRP)." msgstr "" "Түүхий эдийг хангахын тулд (худалдан авах эсвэл үйлдвэрлэх) үйлдвэрлэлийн " -"захиалга нь жорд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг ба " -"энэ нь товлогчийг ажиллахад үүсдэг." +"захиалга нь орцонд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг " +"ба энэ нь товлогчийг ажиллахад үүсдэг." #. module: mrp #: help:mrp.product_price,number:0 @@ -2423,7 +2422,7 @@ msgstr "Нөөцийн Амралт, Чөлөө" #. module: mrp #: help:mrp.bom,sequence:0 msgid "Gives the sequence order when displaying a list of bills of material." -msgstr "Жорын жагсаалтыг харуулах дэс дарааллыг өгдөг." +msgstr "Орцын жагсаалтыг харуулах дэс дарааллыг өгдөг." #. module: mrp #: model:ir.model,name:mrp.model_mrp_config_settings diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index b827a2731c9..dd52268e2d1 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -131,96 +131,96 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Make to Order"""" name="name"/> <field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/> - <field model="process.node" name="target_node_id" ref="procurement.process_node_serviceonorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> + <field name="target_node_id" ref="procurement.process_node_serviceonorder0"/> + <field name="source_node_id" ref="process_node_serviceproduct1"/> </record> <record id="process_transition_servicemts0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Make to Stock"""" name="name"/> <field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/> - <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> + <field name="target_node_id" ref="mrp.process_node_servicemts0"/> + <field name="source_node_id" ref="process_node_serviceproduct1"/> </record> <record id="process_transition_stockmts0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Make to Stock"""" name="name"/> <field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/> - <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> + <field name="target_node_id" ref="mrp.process_node_mts0"/> + <field name="source_node_id" ref="process_node_stockproduct1"/> </record> <record id="process_transition_stockproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Make to Order"""" name="name"/> <field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/> - <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> + <field name="target_node_id" ref="mrp.process_node_stock0"/> + <field name="source_node_id" ref="process_node_stockproduct1"/> </record> <record id="process_transition_productionprocureproducts0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Procurement of raw material"""" name="name"/> <field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> - <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> + <field name="target_node_id" ref="process_node_procureproducts0"/> + <field name="source_node_id" ref="process_node_productionorder0"/> </record> <record id="process_transition_minimumstockprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""'Minimum stock rule' material"""" name="name"/> <field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> - <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/> + <field name="target_node_id" ref="process_node_procureproducts0"/> + <field name="source_node_id" ref="process_node_minimumstockrule0"/> </record> <record id="process_transition_procurestockableproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Procurement of stockable Products"""" name="name"/> <field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/> - <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> + <field name="target_node_id" ref="process_node_stockproduct0"/> + <field name="source_node_id" ref="process_node_procureproducts0"/> </record> <record id="process_transition_procureserviceproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Procurement of services"""" name="name"/> <field eval=""""Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/> - <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> + <field name="target_node_id" ref="process_node_serviceproduct0"/> + <field name="source_node_id" ref="process_node_procureproducts0"/> </record> <record id="process_transition_purchaseprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Automatic RFQ"""" name="name"/> <field eval=""""The system launches automatically a RFQ to the preferred supplier."""" name="note"/> - <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/> + <field name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/> + <field name="source_node_id" ref="process_node_purchaseprocure0"/> </record> <record id="process_transition_producttostockrules0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Procurement rule"""" name="name"/> <field eval=""""The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Inventory management menu and configured by product."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/> - <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> + <field name="target_node_id" ref="process_node_productminimumstockrule0"/> + <field name="source_node_id" ref="product.process_node_product0"/> </record> <record id="process_transition_billofmaterialrouting0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Material Routing"""" name="name"/> <field eval=""""The Bill of Material is linked to a routing, i.e. the succession of work centers."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_routing0"/> - <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/> + <field name="target_node_id" ref="process_node_routing0"/> + <field name="source_node_id" ref="process_node_billofmaterial0"/> </record> <record id="process_transition_bom0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Manufacturing decomposition"""" name="name"/> <field eval=""""The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/> - <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> + <field name="target_node_id" ref="process_node_billofmaterial0"/> + <field name="source_node_id" ref="product.process_node_product0"/> </record> </data> diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml index 965f3f57d69..0005be6f48c 100644 --- a/addons/mrp/process/service_product_process.xml +++ b/addons/mrp/process/service_product_process.xml @@ -39,9 +39,9 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""To Buy"""" name="name"/> <field eval=""""If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/> - <field model="process.node" name="source_node_id" ref="procurement.process_node_serviceonorder0"/> + <field name="target_node_id" ref="process_node_orderrfq0"/> + <field name="source_node_id" ref="procurement.process_node_serviceonorder0"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index e3fa1136822..a43a09313b8 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -69,16 +69,16 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""To Buy"""" name="name"/> <field eval=""""In case the Supply method of the product is Buy, the system creates a purchase order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_rfq0"/> - <field model="process.node" name="source_node_id" ref="process_node_stock0"/> + <field name="target_node_id" ref="process_node_rfq0"/> + <field name="source_node_id" ref="process_node_stock0"/> </record> <record id="process_transition_stockproduction0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""To Produce"""" name="name"/> <field eval=""""In case the Supply method of the product is Produce, the system creates a production order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_production0"/> - <field model="process.node" name="source_node_id" ref="process_node_stock0"/> + <field name="target_node_id" ref="process_node_production0"/> + <field name="source_node_id" ref="process_node_stock0"/> </record> </data> diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml index 452434bbe92..d448b6a299a 100644 --- a/addons/mrp_operations/process/mrp_operation_process.xml +++ b/addons/mrp_operations/process/mrp_operation_process.xml @@ -75,32 +75,32 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Creation of the work order"""" name="name"/> <field eval=""""The work orders are created on the basis of the production order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/> - <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> + <field name="target_node_id" ref="process_node_startoperation0"/> + <field name="source_node_id" ref="process_node_productionorder0"/> </record> <record id="process_transition_workstartoperation0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Details of the work order"""" name="name"/> <field eval=""""There is 1 work order per work center. The information about the number of cycles or the cycle time."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/> - <field model="process.node" name="source_node_id" ref="process_node_workorder0"/> + <field name="target_node_id" ref="process_node_startoperation0"/> + <field name="source_node_id" ref="process_node_workorder0"/> </record> <record id="process_transition_startdoneoperation0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Operation done"""" name="name"/> <field eval=""""When the operation is finished, the operator updates the system by finishing the work order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/> - <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/> + <field name="target_node_id" ref="process_node_doneoperation0"/> + <field name="source_node_id" ref="process_node_startoperation0"/> </record> <record id="process_transition_startcanceloperation0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Operation cancelled"""" name="name"/> <field eval=""""When the operation needs to be cancelled, you can do it in the work order form."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/> - <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/> + <field name="target_node_id" ref="process_node_canceloperation0"/> + <field name="source_node_id" ref="process_node_startoperation0"/> </record> </data> diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml index 0b34310fc4e..e94b675b57f 100644 --- a/addons/mrp_repair/security/mrp_repair_security.xml +++ b/addons/mrp_repair/security/mrp_repair_security.xml @@ -11,4 +11,4 @@ </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 088aa35e915..c772a8fd67d 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -192,8 +192,8 @@ <field name="code">SAJ-OpenERP IN</field> <field name="type">sale</field> <field name="sequence_id" ref="account.sequence_sale_journal"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> + <field name="default_credit_account_id" ref="account.a_sale"/> + <field name="default_debit_account_id" ref="account.a_sale"/> <field name="analytic_journal_id" ref="account.cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -204,8 +204,8 @@ <field name="code">SCNJ-OpenERP IN</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> + <field name="default_credit_account_id" ref="account.a_sale"/> + <field name="default_debit_account_id" ref="account.a_sale"/> <field name="analytic_journal_id" ref="account.cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -216,8 +216,8 @@ <field name="code">EXJ-OpenERP IN</field> <field name="type">purchase</field> <field name="sequence_id" ref="account.sequence_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> + <field name="default_debit_account_id" ref="account.a_expense"/> + <field name="default_credit_account_id" ref="account.a_expense"/> <field name="analytic_journal_id" ref="account.exp"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -228,8 +228,8 @@ <field name="code">ECNJ-OpenERP IN</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> + <field name="default_debit_account_id" ref="account.a_expense"/> + <field name="default_credit_account_id" ref="account.a_expense"/> <field name="analytic_journal_id" ref="account.exp"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -240,8 +240,8 @@ <field name="code">BNK-OpenERP IN</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_bank_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -252,8 +252,8 @@ <field name="code">CHK-OpenERP IN</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_check_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -264,8 +264,8 @@ <field name="code">CSH-OpenERP IN</field> <field name="type">cash</field> <field name="sequence_id" ref="account.sequence_cash_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_in"/> @@ -277,8 +277,8 @@ <field name="code">SAJ-OpenERP US</field> <field name="type">sale</field> <field name="sequence_id" ref="account.sequence_sale_journal"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> + <field name="default_credit_account_id" ref="account.a_sale"/> + <field name="default_debit_account_id" ref="account.a_sale"/> <field name="analytic_journal_id" ref="account.cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -289,8 +289,8 @@ <field name="code">SCNJ-OpenERP US</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> + <field name="default_credit_account_id" ref="account.a_sale"/> + <field name="default_debit_account_id" ref="account.a_sale"/> <field name="analytic_journal_id" ref="account.cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -301,8 +301,8 @@ <field name="code">EXJ-OpenERP US</field> <field name="type">purchase</field> <field name="sequence_id" ref="account.sequence_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> + <field name="default_debit_account_id" ref="account.a_expense"/> + <field name="default_credit_account_id" ref="account.a_expense"/> <field name="analytic_journal_id" ref="account.exp"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -313,8 +313,8 @@ <field name="code">ECNJ-OpenERP US</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> + <field name="default_debit_account_id" ref="account.a_expense"/> + <field name="default_credit_account_id" ref="account.a_expense"/> <field name="analytic_journal_id" ref="account.exp"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -325,8 +325,8 @@ <field name="code">BNK-OpenERP US</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_bank_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -337,8 +337,8 @@ <field name="code">CHK-OpenERP US</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_check_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -349,8 +349,8 @@ <field name="code">CSH-OpenERP US</field> <field name="type">cash</field> <field name="sequence_id" ref="account.sequence_cash_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_us"/> @@ -363,8 +363,8 @@ <field name="code">SAJ-OpenERP BE</field> <field name="type">sale</field> <field name="sequence_id" ref="account.sequence_sale_journal"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> + <field name="default_credit_account_id" ref="account.a_sale"/> + <field name="default_debit_account_id" ref="account.a_sale"/> <field name="analytic_journal_id" ref="account.cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> @@ -375,8 +375,8 @@ <field name="code">SCNJ-OpenERP BE</field> <field name="type">sale_refund</field> <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> + <field name="default_credit_account_id" ref="account.a_sale"/> + <field name="default_debit_account_id" ref="account.a_sale"/> <field name="analytic_journal_id" ref="account.cose_journal_sale"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> @@ -387,8 +387,8 @@ <field name="code">EXJ-OpenERP BE</field> <field name="type">purchase</field> <field name="sequence_id" ref="account.sequence_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> + <field name="default_debit_account_id" ref="account.a_expense"/> + <field name="default_credit_account_id" ref="account.a_expense"/> <field name="analytic_journal_id" ref="account.exp"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> @@ -399,8 +399,8 @@ <field name="code">ECNJ-OpenERP BE</field> <field name="type">purchase_refund</field> <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> - <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> + <field name="default_debit_account_id" ref="account.a_expense"/> + <field name="default_credit_account_id" ref="account.a_expense"/> <field name="analytic_journal_id" ref="account.exp"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> @@ -411,8 +411,8 @@ <field name="code">BNK-OpenERP BE</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_bank_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> @@ -423,8 +423,8 @@ <field name="code">CHK-OpenERP BE</field> <field name="type">bank</field> <field name="sequence_id" ref="account.sequence_check_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> @@ -435,8 +435,8 @@ <field name="code">CSH-OpenERP BE</field> <field name="type">cash</field> <field name="sequence_id" ref="account.sequence_cash_journal"/> - <field model="account.account" name="default_debit_account_id" ref="account.cash"/> - <field model="account.account" name="default_credit_account_id" ref="account.cash"/> + <field name="default_debit_account_id" ref="account.cash"/> + <field name="default_credit_account_id" ref="account.cash"/> <field name="analytic_journal_id" ref="account.sit"/> <field name="user_id" ref="base.user_root"/> <field name="company_id" ref="res_company_oerp_be"/> diff --git a/addons/note/html/index.html b/addons/note/html/index.html index 4e7db34df58..7ef37c646e9 100644 --- a/addons/note/html/index.html +++ b/addons/note/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=note"> <img src="notes_sc_00.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml index b0c79561355..2c6e9f3bc7f 100644 --- a/addons/note/security/ir.rule.xml +++ b/addons/note/security/ir.rule.xml @@ -3,7 +3,7 @@ <data> <record id="note_note_rule_global" model="ir.rule"> <field name="name">Only followers can access a sticky notes</field> - <field model="ir.model" ref="model_note_note" name="model_id"/> + <field ref="model_note_note" name="model_id"/> <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field> <field eval="True" name="global"/> <field eval="1" name="perm_unlink"/> @@ -14,7 +14,7 @@ <record id="note_stage_rule_global" model="ir.rule"> <field name="name">Each user have his stage name</field> - <field model="ir.model" ref="model_note_stage" name="model_id"/> + <field ref="model_note_stage" name="model_id"/> <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field> <field eval="True" name="global"/> </record> diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/html/index.html index 41f935d8ad9..130806ddb11 100644 --- a/addons/point_of_sale/html/index.html +++ b/addons/point_of_sale/html/index.html @@ -9,7 +9,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=point_of_sale"> <img src="pos_sc_02.jpg"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml index 31c48046d64..67d610c65c9 100644 --- a/addons/procurement/stock_orderpoint.xml +++ b/addons/procurement/stock_orderpoint.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> @@ -7,50 +6,50 @@ <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint"> <field name="product_max_qty">25.0</field> <field name="product_min_qty">5.0</field> - <field model="product.uom" name="product_uom" ref="product.product_uom_dozen"/> + <field name="product_uom" ref="product.product_uom_dozen"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> - <field model="product.product" name="product_id" ref="product.product_product_36"/> + <field name="product_id" ref="product.product_product_36"/> <field name="location_id" ref="stock.stock_location_stock"/> </record> <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint"> <field name="product_max_qty">10.0</field> <field name="product_min_qty">5.0</field> - <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> + <field name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> - <field model="product.product" name="product_id" ref="product.product_product_28"/> + <field name="product_id" ref="product.product_product_28"/> <field name="location_id" ref="stock.stock_location_stock"/> </record> <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint"> <field name="product_max_qty">12.0</field> <field name="product_min_qty">5.0</field> - <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> + <field name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> - <field model="product.product" name="product_id" ref="product.product_product_20"/> + <field name="product_id" ref="product.product_product_20"/> <field name="location_id" ref="stock.stock_location_stock"/> </record> <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint"> <field name="product_max_qty">50.0</field> <field name="product_min_qty">10.0</field> - <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> + <field name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> - <field model="product.product" name="product_id" ref="product.product_product_46"/> + <field name="product_id" ref="product.product_product_46"/> <field name="location_id" ref="stock.stock_location_stock"/> </record> <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint"> <field name="product_max_qty">15.0</field> <field name="product_min_qty">5.0</field> - <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> + <field name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> - <field model="product.product" name="product_id" ref="product.product_product_23"/> + <field name="product_id" ref="product.product_product_23"/> <field name="location_id" ref="stock.stock_location_stock"/> </record> <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint"> <field name="product_max_qty">5.0</field> <field name="product_min_qty">3.0</field> - <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> + <field name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> - <field model="product.product" name="product_id" ref="product.product_product_48"/> + <field name="product_id" ref="product.product_product_48"/> <field name="location_id" ref="stock.stock_location_stock"/> </record> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 03ce904abad..652710fac94 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -43,8 +43,8 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Supplier of the product"""" name="name"/> <field eval=""""1 or several supplier(s) can be linked to a product. All information stands in the product form."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_supplier0"/> - <field model="process.node" name="source_node_id" ref="process_node_product0"/> + <field name="target_node_id" ref="process_node_supplier0"/> + <field name="source_node_id" ref="process_node_product0"/> </record> </data> diff --git a/addons/product/product.py b/addons/product/product.py index 518e455ddc1..656812bebbb 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -292,9 +292,14 @@ class product_template(osv.osv): _columns = { 'name': fields.char('Name', size=128, required=True, translate=True, select=True), 'product_manager': fields.many2one('res.users','Product Manager'), - 'description': fields.text('Description',translate=True), - 'description_purchase': fields.text('Purchase Description',translate=True), - 'description_sale': fields.text('Sale Description',translate=True), + 'description': fields.text('Description',translate=True, + help="A precise description of the Product, used only for internal information purposes."), + 'description_purchase': fields.text('Purchase Description',translate=True, + help="A description of the Product that you want to communicate to your suppliers. " + "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."), + 'description_sale': fields.text('Sale Description',translate=True, + help="A description of the Product that you want to communicate to your customers. " + "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"), 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."), 'rental': fields.boolean('Can be Rent'), diff --git a/addons/project/html/index.html b/addons/project/html/index.html index c1b6c3b966f..93f1be8a41d 100644 --- a/addons/project/html/index.html +++ b/addons/project/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=project"> <img src="project_01.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 4a73bfd00d1..9955fe1ffe1 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -68,24 +68,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Delegate"""" name="name"/> <field eval=""""Delegates tasks to the other user"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_drafttask0"/> - <field model="process.node" name="source_node_id" ref="process_node_taskbydelegate0"/> + <field name="target_node_id" ref="process_node_drafttask0"/> + <field name="source_node_id" ref="process_node_taskbydelegate0"/> </record> <record id="process_transition_draftopentask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Draft Open task"""" name="name"/> <field eval=""""From draft state, it will come into the open state."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_opentask0"/> - <field model="process.node" name="source_node_id" ref="process_node_drafttask0"/> + <field name="target_node_id" ref="process_node_opentask0"/> + <field name="source_node_id" ref="process_node_drafttask0"/> </record> <record id="process_transition_opendonetask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Open Done Task"""" name="name"/> <field eval=""""When task is completed, it will come into the done state."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_donetask0"/> - <field model="process.node" name="source_node_id" ref="process_node_opentask0"/> + <field name="target_node_id" ref="process_node_donetask0"/> + <field name="source_node_id" ref="process_node_opentask0"/> </record> diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index e2195c6f61b..c25cd264538 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -50,24 +50,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Procurement Task"""" name="name"/> <field eval=""""if product type is 'service' then it creates the task."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/> - <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/> + <field name="target_node_id" ref="process_node_procuretasktask0"/> + <field name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/> </record> <record id="process_transition_createtask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Task"""" name="name"/> <field eval=""""Product type is service, then its creates the task."""" name="note"/> - <field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleordertask0"/> + <field name="target_node_id" ref="project.process_node_drafttask0"/> + <field name="source_node_id" ref="process_node_saleordertask0"/> </record> <record id="process_transition_ordertask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Order Task"""" name="name"/> <field eval=""""If procurement method is Make to order and supply method is produce"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/> - <field model="process.node" name="source_node_id" ref="procurement.process_node_serviceonorder0"/> + <field name="target_node_id" ref="process_node_mrptask0"/> + <field name="source_node_id" ref="procurement.process_node_serviceonorder0"/> </record> </data> diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml index 1bff69b603e..17dd35dcad2 100644 --- a/addons/project_timesheet/process/project_timesheet_process.xml +++ b/addons/project_timesheet/process/project_timesheet_process.xml @@ -46,24 +46,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Fill Timesheet"""" name="name"/> <field eval=""""Task summary is comes into the timesheet line"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/> - <field model="process.node" name="source_node_id" ref="project.process_node_opentask0"/> + <field name="target_node_id" ref="process_node_timesheettask0"/> + <field name="source_node_id" ref="project.process_node_opentask0"/> </record> <record id="process_transition_taskencoding0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Task encoding"""" name="name"/> <field eval=""""Encode how much time u spent on your task"""" name="note"/> - <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/> - <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/> + <field name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/> + <field name="source_node_id" ref="process_node_taskwork0"/> </record> <record id="process_transition_taskinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Task invoice"""" name="name"/> <field eval=""""After task is completed, Create its invoice."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_triggerinvoice0"/> - <field model="process.node" name="source_node_id" ref="project.process_node_donetask0"/> + <field name="target_node_id" ref="process_node_triggerinvoice0"/> + <field name="source_node_id" ref="project.process_node_donetask0"/> </record> </data> diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html index 9134c1ab9d2..67b122ac557 100644 --- a/addons/purchase/html/index.html +++ b/addons/purchase/html/index.html @@ -9,7 +9,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=purchase"> <img src="purchase_po.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index c6b6805351a..7feb47690e0 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -154,16 +154,16 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""From a Pick list"""" name="name"/> <field eval=""""A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."""" name="note"/> - <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/> + <field name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/> + <field name="source_node_id" ref="process_node_productrecept0"/> </record> <record id="process_transition_confirmingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirmation"""" name="name"/> <field eval=""""The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/> + <field name="target_node_id" ref="process_node_confirmpurchaseorder0"/> + <field name="source_node_id" ref="process_node_draftpurchaseorder0"/> <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/> </record> @@ -171,24 +171,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirmation"""" name="name"/> <field eval=""""In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/> + <field name="target_node_id" ref="process_node_confirmpurchaseorder0"/> + <field name="source_node_id" ref="process_node_draftpurchaseorder1"/> </record> <record id="process_transition_approvingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Approbation"""" name="name"/> <field eval=""""The supplier approves the Purchase Order."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" /> + <field name="target_node_id" ref="process_node_approvepurchaseorder0"/> + <field name="source_node_id" ref="process_node_confirmpurchaseorder0" /> </record> <record id="process_transition_invoicefrompurchase0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Invoice"""" name="name"/> <field eval=""""The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/> - <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/> + <field name="target_node_id" ref="process_node_invoicecontrol0"/> + <field name="source_node_id" ref="process_node_approvepurchaseorder0"/> <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/> </record> @@ -196,32 +196,32 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Pick list generated"""" name="name"/> <field eval=""""A pick list is generated to track the incoming products."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> - <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/> + <field name="target_node_id" ref="process_node_packinglist0"/> + <field name="source_node_id" ref="process_node_approvepurchaseorder0"/> </record> <record id="process_transition_invoicefrompackinglist0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Invoice"""" name="name"/> <field eval=""""The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/> - <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> + <field name="target_node_id" ref="process_node_invoiceafterpacking0"/> + <field name="source_node_id" ref="process_node_packinglist0"/> </record> <record id="process_transition_purchaseinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""From a purchase order"""" name="name"/> <field eval=""""A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."""" name="note"/> - <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/> + <field name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/> + <field name="source_node_id" ref="process_node_purchaseorder0"/> </record> <record id="process_transition_packinginvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""From a Pick list"""" name="name"/> <field eval=""""A Pick list generates an invoice. Depending on the Invoicing control of the sales order, the invoice is based on delivered or on ordered quantities."""" name="note"/> - <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/> + <field name="target_node_id" ref="account.process_node_draftinvoices0"/> + <field name="source_node_id" ref="process_node_packinginvoice0"/> </record> <!-- diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index 11936db0bed..68a6cd12733 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -57,7 +57,7 @@ <field name="wkf_id" ref="purchase_order"/> <field name="name">invoice</field> <field name="kind">subflow</field> - <field name="subflow_id" search="[('osv','=','account.invoice')]" type="int"/> + <field name="subflow_id" search="[('osv','=','account.invoice')]"/> <field name="action">action_invoice_create()</field> </record> <record id="act_invoice_done" model="workflow.activity"> diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html index be0d9ac0f94..1eb6215db2f 100644 --- a/addons/sale/html/index.html +++ b/addons/sale/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=sale"> <img src="sale_invoice.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po index 405ac210af5..8449bd83224 100644 --- a/addons/sale/i18n/ru.po +++ b/addons/sale/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-12-28 14:12+0000\n" +"PO-Revision-Date: 2013-06-03 07:54+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:22+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: sale #: model:res.groups,name:sale.group_analytic_accounting @@ -89,6 +89,8 @@ msgid "" "${(object.name or '').replace('/','_')}_${object.state == 'draft' and " "'draft' or ''}" msgstr "" +"${(object.name or '').replace('/','_')}_${object.state == 'draft' and " +"'draft' or ''}" #. module: sale #: view:sale.order.line:0 @@ -558,6 +560,7 @@ msgstr "Подготовить счета основанные на распис #, python-format msgid "You cannot cancel a sales order line that has already been invoiced." msgstr "" +"Нельзя отменить позиции заказа продажи на которые был выставлен счет." #. module: sale #: view:account.invoice.report:0 @@ -1550,7 +1553,7 @@ msgstr "Искать позиции без счетов" #. module: sale #: model:ir.model,name:sale.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: sale #: sql_constraint:sale.order:0 @@ -1876,7 +1879,7 @@ msgstr "" #. module: sale #: view:res.partner:0 msgid "sale.group_delivery_invoice_address" -msgstr "" +msgstr "sale.group_delivery_invoice_address" #. module: sale #: code:addons/sale/sale.py:781 diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 706d42913de..b3034cafa28 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -70,8 +70,8 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirm Quotation"""" name="name"/> <field eval=""""The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_quotation0"/> + <field name="target_node_id" ref="process_node_saleorder0"/> + <field name="source_node_id" ref="process_node_quotation0"/> <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/> </record> @@ -80,8 +80,8 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Invoice"""" name="name"/> <field eval=""""The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> + <field name="target_node_id" ref="process_node_invoice0"/> + <field name="source_node_id" ref="process_node_saleorder0"/> <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/> </record> @@ -90,8 +90,8 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""From a sales order"""" name="name"/> <field eval=""""Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."""" name="note"/> - <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_order0"/> + <field name="target_node_id" ref="account.process_node_draftinvoices0"/> + <field name="source_node_id" ref="process_node_order0"/> </record> <!-- diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po index 90d9eb5c3b9..8995b7b45c0 100644 --- a/addons/sale_analytic_plans/i18n/ru.po +++ b/addons/sale_analytic_plans/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:06+0000\n" -"PO-Revision-Date: 2010-12-25 22:14+0000\n" +"PO-Revision-Date: 2013-06-03 08:05+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: sale_analytic_plans #: field:sale.order.line,analytics_id:0 @@ -24,7 +24,7 @@ msgstr "Разнесение аналитики" #. module: sale_analytic_plans #: model:ir.model,name:sale_analytic_plans.model_sale_order msgid "Sales Order" -msgstr "" +msgstr "Заказ продаж" #. module: sale_analytic_plans #: model:ir.model,name:sale_analytic_plans.model_sale_order_line diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po index 8ae90e42303..f6266edf8ca 100644 --- a/addons/sale_crm/i18n/ru.po +++ b/addons/sale_crm/i18n/ru.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:06+0000\n" -"PO-Revision-Date: 2011-03-23 13:50+0000\n" +"PO-Revision-Date: 2013-06-03 08:05+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:10+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:90 #, python-format msgid "Insufficient Data!" -msgstr "" +msgstr "Недостаточно данных!" #. module: sale_crm #: view:crm.lead:0 @@ -31,12 +31,12 @@ msgstr "Преобразовать в предложение" #. module: sale_crm #: model:ir.model,name:sale_crm.model_account_invoice_report msgid "Invoices Statistics" -msgstr "" +msgstr "Статистика по счетам" #. module: sale_crm #: field:crm.make.sale,close:0 msgid "Mark Won" -msgstr "" +msgstr "Отметить \"Выиграна\"" #. module: sale_crm #: field:res.users,default_section_id:0 @@ -51,23 +51,23 @@ msgstr "Мои отделы продаж" #. module: sale_crm #: model:ir.model,name:sale_crm.model_res_users msgid "Users" -msgstr "" +msgstr "Пользователи" #. module: sale_crm #: help:crm.make.sale,close:0 msgid "" "Check this to close the opportunity after having created the sales order." -msgstr "" +msgstr "Отметьте, для закрытия предложения после создания заказа продажи." #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent msgid "Quotation Send" -msgstr "" +msgstr "Отправить предложение" #. module: sale_crm #: field:sale.order,categ_ids:0 msgid "Categories" -msgstr "" +msgstr "Категории" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:124 @@ -94,7 +94,7 @@ msgstr "Продать" #. module: sale_crm #: model:ir.model,name:sale_crm.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Счет" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:93 @@ -106,7 +106,7 @@ msgstr "Предложение: %s" #: code:addons/sale_crm/wizard/crm_make_sale.py:110 #, python-format msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>." -msgstr "" +msgstr "Предложение <b>преобразовано</b> в заявку <em>%s</em>." #. module: sale_crm #: field:crm.make.sale,shop_id:0 @@ -117,12 +117,12 @@ msgstr "Магазин" #: code:addons/sale_crm/wizard/crm_make_sale.py:90 #, python-format msgid "No addresse(s) defined for this customer." -msgstr "" +msgstr "Не задан адрес для этого заказчика" #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed msgid "Sales Order Confirmed" -msgstr "" +msgstr "Заказ продаж подтвержден" #. module: sale_crm #: view:account.invoice:0 @@ -136,7 +136,7 @@ msgstr "Отдел продаж" #. module: sale_crm #: view:crm.lead:0 msgid "Create Quotation" -msgstr "" +msgstr "Создать заявку" #. module: sale_crm #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale @@ -156,7 +156,7 @@ msgstr "Заказ продаж" #. module: sale_crm #: view:crm.make.sale:0 msgid "or" -msgstr "" +msgstr "или" #~ msgid "Create" #~ msgstr "Создать" diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml index 721508a2ba5..21297e12dbd 100644 --- a/addons/sale_crm/process/sale_crm_process.xml +++ b/addons/sale_crm/process/sale_crm_process.xml @@ -42,8 +42,8 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Crm opportunity quotation"""" name="name"/> <field eval=""""Opportunity goes into the quotation"""" name="note"/> - <field model="process.node" name="target_node_id" ref="sale.process_node_quotation0"/> - <field model="process.node" name="source_node_id" ref="process_node_crmopportunity0"/> + <field name="target_node_id" ref="sale.process_node_quotation0"/> + <field name="source_node_id" ref="process_node_crmopportunity0"/> </record> @@ -51,24 +51,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Opportunity Quotation"""" name="name"/> <field eval=""""Opportunity convert into quotation"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_crmquotation0"/> - <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/> + <field name="target_node_id" ref="process_node_crmquotation0"/> + <field name="source_node_id" ref="crm.process_node_opportunities0"/> </record> <record id="process_transition_opportunitypricelist0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Opportunity Pricelist"""" name="name"/> <field eval=""""Opporunity convert to the Pricelist"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/> - <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/> + <field name="target_node_id" ref="process_node_contractpricelist0"/> + <field name="source_node_id" ref="crm.process_node_opportunities0"/> </record> <record id="process_transition_opportunityanalytic0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Opportunity Analytic"""" name="name"/> <field eval=""""Analytic Account"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/> - <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/> + <field name="target_node_id" ref="process_node_contractanalytic0"/> + <field name="source_node_id" ref="crm.process_node_opportunities0"/> </record> --> diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml index c10b34c8866..1ebebec7809 100644 --- a/addons/sale_stock/process/sale_stock_process.xml +++ b/addons/sale_stock/process/sale_stock_process.xml @@ -72,40 +72,40 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Procurement Order"""" name="name"/> <field eval=""""A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. """" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/> - <field model="process.node" name="source_node_id" ref="sale.process_node_saleorder0"/> + <field name="target_node_id" ref="process_node_saleprocurement0"/> + <field name="source_node_id" ref="sale.process_node_saleorder0"/> </record> <record id="process_transition_packing0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Pick List"""" name="name"/> <field eval=""""The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/> + <field name="target_node_id" ref="process_node_packinglist0"/> + <field name="source_node_id" ref="process_node_saleprocurement0"/> </record> <record id="process_transition_deliver0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Delivery Order"""" name="name"/> <field eval=""""Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> + <field name="target_node_id" ref="process_node_deliveryorder0"/> + <field name="source_node_id" ref="process_node_packinglist0"/> </record> <record id="process_transition_invoiceafterdelivery0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Invoice"""" name="name"/> <field eval=""""If the sale order was set to create the invoice 'On Delivery Order', then an invoice is automatically created based on what you delivered. If you rather want to create your invoice based on your sale order, you can set the sale order to create invoice 'On Demand', then track and process the sales order that have been fully delivered and invoice them from there."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/> - <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> + <field name="target_node_id" ref="process_node_invoiceafterdelivery0"/> + <field name="source_node_id" ref="process_node_packinglist0"/> </record> <record id="process_transition_saleorderprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Procurement of sold material"""" name="name"/> <field eval=""""For every sales order line, a procurement order is created to supply the sold product."""" name="note"/> - <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/> + <field name="target_node_id" ref="procurement.process_node_procureproducts0"/> + <field name="source_node_id" ref="process_node_saleorderprocurement0"/> </record> <!-- diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html index 21d2800e0dc..aac71e529ae 100644 --- a/addons/stock/html/index.html +++ b/addons/stock/html/index.html @@ -9,7 +9,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=stock"> <img src="stock_main.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po index 4a79cec4b89..d0d34b32191 100644 --- a/addons/stock/i18n/ru.po +++ b/addons/stock/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-01-22 08:16+0000\n" +"PO-Revision-Date: 2013-06-03 12:48+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 04:58+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -660,6 +660,8 @@ msgid "" "Forces to specify a Serial Number for all moves containing this product and " "going to a Customer Location" msgstr "" +"Принудительно установить порядковый номер для всех перемещений этой " +"продукции в место хранения заказчика" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_products_moves @@ -845,6 +847,8 @@ msgid "" "Forces to specify a Serial Number for all moves containing this product and " "coming from a Supplier Location" msgstr "" +"Принудительно установить порядковый номер для всех перемещений этой " +"продукции из мест хранения поставщика" #. module: stock #: help:stock.config.settings,group_uos:0 diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml index 6578a961ff3..d9a220daef6 100644 --- a/addons/stock_location/stock_location_demo_cpu1.xml +++ b/addons/stock_location/stock_location_demo_cpu1.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" ?> <openerp> <data noupdate="1"> <record id="product.product_product_9" model="product.product"> @@ -73,7 +72,7 @@ <field name="company_id" ref="stock.res_company_1"/> <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/> <field name="location_id" ref="stock.stock_location_shop0"/> - <field model="product.product" name="product_id" ref="product.product_product_9"/> + <field name="product_id" ref="product.product_product_9"/> </record> <record id="sale_shop2" model="sale.shop"> @@ -89,4 +88,4 @@ <field model="account.payment.term" name="payment_default_id" search="[]"/> </record> </data> -</openerp> +</openerp>
\ No newline at end of file |